Merge remote-tracking branch 'origin/maven/fixes/9.1' into maven/release/9.1

metaventis-build · metaventis-build · commit 166125f66ecf · 2025-02-10T10:24:16.000Z
diff --git a/Backend/alfresco/module/src/main/java/org/edu_sharing/metadataset/v2/MetadataQueryParameter.java b/Backend/alfresco/module/src/main/java/org/edu_sharing/metadataset/v2/MetadataQueryParameter.java
@@ -14,6 +14,7 @@
 public class MetadataQueryParameter implements Serializable {
 	// the used syntax, inherited by the group of queries
 	private final String syntax;
+	private final transient MetadataSet mds;
 	private String name;
 	private Map<String,String> statements;
 	private boolean multiple;
@@ -26,8 +27,9 @@ public class MetadataQueryParameter implements Serializable {
 	//only DSL
 	private boolean asFilter = true;
 
-	public MetadataQueryParameter(String syntax){
+	public MetadataQueryParameter(String syntax, MetadataSet mds){
 		this.syntax = syntax;
+		this.mds = mds;
 	}
 
 	public String getSyntax() {
@@ -153,6 +155,9 @@ public boolean isMandatory() {
 
 	public boolean isAsFilter() { return asFilter; }
 
+	public MetadataSet getMds() {
+		return mds;
+	}
 	@Getter
 	@Setter
 	@NoArgsConstructor
diff --git a/Backend/alfresco/module/src/main/java/org/edu_sharing/metadataset/v2/MetadataQueryPreprocessor.java b/Backend/alfresco/module/src/main/java/org/edu_sharing/metadataset/v2/MetadataQueryPreprocessor.java
@@ -34,6 +34,20 @@ public String run(MetadataQueryParameter parameter,String valueIn) throws NoSuch
     }
 
 
+    /**
+     * DO NOT DELETE. Used via Reflection by mds
+     */
+    private static String alternative_id(MetadataQueryParameter parameter,String value){
+        try {
+             return parameter.getMds().findWidget(parameter.getName()).getValuesAsMap().get(value).getAlternativeKeys().get(0);
+        }catch (Throwable t){
+            logger.info("Could not resolve alternative_id at " + parameter.getName() + ": " + t.getMessage());
+            return value;
+        }
+    }
+    /**
+     * DO NOT DELETE. Used via Reflection by mds
+     */
     private String node_path(MetadataQueryParameter parameter,String value){
         return AuthenticationUtil.runAsSystem(()-> {
             ApplicationContext applicationContext = AlfAppContextGate.getApplicationContext();
@@ -58,6 +72,10 @@ private String node_path(MetadataQueryParameter parameter,String value){
             return serviceRegistry.getNodeService().getPath(nodeRef).toPrefixString(serviceRegistry.getNamespaceService());
         });
     }
+
+    /**
+     * DO NOT DELETE. Used via Reflection by mds
+     */
     // convert values like YYYY-MM-DD to a unix millis string (e.g. for elastic)
     private String date_millis(MetadataQueryParameter parameter,String value){
         try {
diff --git a/Backend/alfresco/module/src/main/java/org/edu_sharing/metadataset/v2/MetadataReader.java b/Backend/alfresco/module/src/main/java/org/edu_sharing/metadataset/v2/MetadataReader.java
@@ -269,7 +269,7 @@ private Map<String, MetadataQueries> getQueries(MetadataSet mds) throws Exceptio
                     if (parameterNode.getNodeName().equals("condition")) {
                         handleQueryCondition(parameterNode, query);
                     }
-                    MetadataQueryParameter parameter = new MetadataQueryParameter(syntaxName);
+                    MetadataQueryParameter parameter = new MetadataQueryParameter(syntaxName, mds);
                     NodeList list3 = parameterNode.getChildNodes();
                     NamedNodeMap attributes = parameterNode.getAttributes();
                     if (attributes == null || attributes.getNamedItem("name") == null) {
diff --git a/Backend/services/core/src/main/java/org/edu_sharing/restservices/NodeDao.java b/Backend/services/core/src/main/java/org/edu_sharing/restservices/NodeDao.java
@@ -2716,7 +2716,7 @@ public static void setProperty(RepositoryDao repoDao, String nodeId, String prop
     }
 
     private static void setPropertyInternal(NodeService nodeService, String nodeId, String property, Serializable value) {
-        if (value == null) {
+        if (value == null || (value instanceof java.util.Collection && ((java.util.Collection<?>) value).isEmpty())) {
             nodeService.removeProperty(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE.getProtocol(), StoreRef.STORE_REF_WORKSPACE_SPACESSTORE.getIdentifier(), nodeId, property);
         } else {
             nodeService.setProperty(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE.getProtocol(), StoreRef.STORE_REF_WORKSPACE_SPACESSTORE.getIdentifier(), nodeId, property, value, false);
diff --git a/Backend/services/core/src/test/java/org/edu_sharing/metadataset/v2/tools/MetadataElasticSearchHelperTest.java b/Backend/services/core/src/test/java/org/edu_sharing/metadataset/v2/tools/MetadataElasticSearchHelperTest.java
@@ -83,7 +83,7 @@ void getElasticSearchQueryBasic() throws JsonProcessingException {
     void getElasticSearchQueryMultipleParameter() {
         SearchToken token = new SearchToken();
         List<MetadataQueryParameter> parameters = new ArrayList<>();
-        MetadataQueryParameter parameter = new MetadataQueryParameter(query.getSyntax());
+        MetadataQueryParameter parameter = new MetadataQueryParameter(query.getSyntax(), null);
         parameter.setMultiple(true);
         parameter.setMultiplejoin("AND");
         parameter.setName("parameter");
@@ -112,7 +112,7 @@ void getElasticSearchQueryMultipleParameter() {
 
 
         // 2 Parameters AND combined
-        MetadataQueryParameter parameter2 = new MetadataQueryParameter(query.getSyntax());
+        MetadataQueryParameter parameter2 = new MetadataQueryParameter(query.getSyntax(), null);
         parameter2.setMultiple(true);
         parameter2.setMultiplejoin("AND");
         parameter2.setName("parameter2");
@@ -141,7 +141,7 @@ void getElasticSearchQueryMultipleParameter() {
     @Test
     void getAggregations() {
         SearchToken token = new SearchToken();
-        MetadataQueryParameter parameter = new MetadataQueryParameter(query.getSyntax());
+        MetadataQueryParameter parameter = new MetadataQueryParameter(query.getSyntax(), null);
         parameter.setName("test_facet");
 
         query.setParameters(Collections.singletonList(parameter));
@@ -160,7 +160,7 @@ void getAggregations() {
         );
 
         // 2 facets
-        MetadataQueryParameter parameter2 = new MetadataQueryParameter(query.getSyntax());
+        MetadataQueryParameter parameter2 = new MetadataQueryParameter(query.getSyntax(), null);
         parameter2.setName("test_facet2");
         query.setParameters(Arrays.asList(parameter, parameter2));
 
@@ -214,7 +214,7 @@ void getAggregations() {
     void getAggregationsSearchToken() {
         SearchToken token = new SearchToken();
         token.setQueryString("A B C");
-        MetadataQueryParameter parameter = new MetadataQueryParameter(query.getSyntax());
+        MetadataQueryParameter parameter = new MetadataQueryParameter(query.getSyntax(), null);
         parameter.setName("test_facet");
         MetadataWidget widget = new MetadataWidget();
         widget.setId("test_facet");
diff --git a/Frontend/projects/edu-sharing-ui/src/lib/list-items/list-node-workflow/list-node-workflow.component.html b/Frontend/projects/edu-sharing-ui/src/lib/list-items/list-node-workflow/list-node-workflow.component.html
@@ -1,3 +1,3 @@
-<div class="workflowStatus" [style.background-color]="getWorkflowStatus().color">
-  {{ 'WORKFLOW.' + getWorkflowStatus().id | translate }}
+<div class="workflowStatus" [style.background-color]="getWorkflowStatus()?.color">
+  {{ 'WORKFLOW.' + getWorkflowStatus()?.id | translate }}
 </div>
diff --git a/Frontend/src/app/core-ui-module/ui-helper.ts b/Frontend/src/app/core-ui-module/ui-helper.ts
@@ -13,7 +13,7 @@ import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 import { Ace, LoginInfo } from 'ngx-edu-sharing-api';
 import { ListItem, OPEN_URL_MODE, UIConstants } from 'ngx-edu-sharing-ui';
-import { Observable, Observer, forkJoin as observableForkJoin, of } from 'rxjs';
+import { forkJoin as observableForkJoin, Observable, Observer, of } from 'rxjs';
 import { catchError, first, take } from 'rxjs/operators';
 import { BridgeService } from '../services/bridge.service';
 import {
@@ -25,7 +25,6 @@ import {
     NodeLock,
     NodeWrapper,
     ParentList,
-    Permission,
 } from '../core-module/rest/data-object';
 import { Helper } from '../core-module/rest/helper';
 import { RestConstants } from '../core-module/rest/rest-constants';
@@ -50,7 +49,13 @@ import { ExtendedAce } from '../features/dialogs/dialog-modules/share-dialog/sha
 export class UIHelper {
     // TODO: check, whether these parameters are still used and remove or include them in
     // `PRESERVED_QUERY_PARAMS` in `main/location-strategy.ts` accordingly.
-    static COPY_URL_PARAMS = ['reurlTypes', 'reurlCreate', 'applyDirectories', 'onlyDownloadable'];
+    static COPY_URL_PARAMS = [
+        'reurl',
+        'reurlTypes',
+        'reurlCreate',
+        'applyDirectories',
+        'onlyDownloadable',
+    ];
     public static getBlackWhiteContrast(color: string) {}
 
     static changeQueryParameter(router: Router, route: ActivatedRoute, name: string, value: any) {
diff --git a/Frontend/src/app/pages/collections-page/collections-page.component.html b/Frontend/src/app/pages/collections-page/collections-page.component.html
@@ -112,7 +112,11 @@ <h1 *ngIf="isRootLevelCollection()" esTitle class="cdk-visually-hidden">
           <es-breadcrumbs
             class="collections-breadcrumb"
             [home]="'COLLECTIONS.TAB.' + tabSelected"
-            [homeRouterLink]="{ routerLink: ['.'], queryParams: { scope: tabSelected } }"
+            [homeRouterLink]="{
+              routerLink: ['.'],
+              queryParams: { scope: tabSelected, id: null },
+              queryParamsHandling: 'merge'
+            }"
             [invisibleDescription]="true"
             [canDropNodes]="collectionContentComponent.canDropOnCollectionBreadcrumbs"
             (onDrop)="collectionContentComponent.dropOnCollection($event.target, $event.source)"
diff --git a/Frontend/src/app/shared/components/breadcrumbs/breadcrumbs.component.scss b/Frontend/src/app/shared/components/breadcrumbs/breadcrumbs.component.scss
@@ -100,6 +100,7 @@ button {
 
 .breadcrumb-element-home {
     text-decoration: none;
+    @include clickable();
 }
 
 .breadcrumb-inner {
diff --git a/deploy/docker/helm/service/src/main/chart/templates/persistentvolumeclaim.yaml b/deploy/docker/helm/service/src/main/chart/templates/persistentvolumeclaim.yaml
@@ -26,7 +26,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: {{ include "edusharing_repository_service.pvc.share.safe" . }}
-  labels: {{ include "edusharing_repository_service.labels.app" . | nindent 4 }}
+  labels: {{ include "edusharing_common_lib.labels.app" . | nindent 4 }}
   annotations:
     "helm.sh/resource-policy": keep
 spec: {{ merge .Values.persistence.share.safe.spec .Values.global.cluster.storage.share.spec | toYaml | nindent 2 }}

Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@ private Map<String, MetadataQueries> getQueries(MetadataSet mds) throws Exceptio`
`269`	`269`	`if (parameterNode.getNodeName().equals("condition")) {`
`270`	`270`	`handleQueryCondition(parameterNode, query);`
`271`	`271`	`}`
`272`		`- MetadataQueryParameter parameter = new MetadataQueryParameter(syntaxName);`
	`272`	`+ MetadataQueryParameter parameter = new MetadataQueryParameter(syntaxName, mds);`
`273`	`273`	`NodeList list3 = parameterNode.getChildNodes();`
`274`	`274`	`NamedNodeMap attributes = parameterNode.getAttributes();`
`275`	`275`	`if (attributes == null \|\| attributes.getNamedItem("name") == null) {`
Original file line number	Diff line number	Diff line change
`@@ -2716,7 +2716,7 @@ public static void setProperty(RepositoryDao repoDao, String nodeId, String prop`
`2716`	`2716`	`}`
`2717`	`2717`
`2718`	`2718`	`private static void setPropertyInternal(NodeService nodeService, String nodeId, String property, Serializable value) {`
`2719`		`- if (value == null) {`
	`2719`	`+ if (value == null \|\| (value instanceof java.util.Collection && ((java.util.Collection<?>) value).isEmpty())) {`
`2720`	`2720`	`nodeService.removeProperty(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE.getProtocol(), StoreRef.STORE_REF_WORKSPACE_SPACESSTORE.getIdentifier(), nodeId, property);`
`2721`	`2721`	`} else {`
`2722`	`2722`	`nodeService.setProperty(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE.getProtocol(), StoreRef.STORE_REF_WORKSPACE_SPACESSTORE.getIdentifier(), nodeId, property, value, false);`
Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,7 @@ button {`
`100`	`100`
`101`	`101`	`.breadcrumb-element-home {`
`102`	`102`	`text-decoration: none;`
	`103`	`+ @include clickable();`
`103`	`104`	`}`
`104`	`105`
`105`	`106`	`.breadcrumb-inner {`