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

Author: metaventis-build

Backend/alfresco/module/src/main/java/org/edu_sharing/metadataset/v2/MetadataReader.java

@@ -744,7 +744,7 @@ private List<MetadataKey> getValues(NodeList keysNode, String valuespaceI18n, St
                             ? key.getKey()
                             : cap,
                     fallback));
-            key.setDescription(getTranslation(key, description));
+            key.setDescription(getTranslation(key, description, ""));
             keys.add(key);
         }
         return keys;

Backend/services/core/src/main/java/org/edu_sharing/metadataset/v2/tools/MetadataTemplateRenderer.java

@@ -11,7 +11,6 @@
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
-import org.edu_sharing.alfresco.policy.GuestCagePolicy;
 import org.edu_sharing.alfresco.repository.server.authentication.Context;
 import org.edu_sharing.metadataset.v2.*;
 import org.edu_sharing.repository.client.tools.CCConstants;
@@ -36,6 +35,8 @@
 import java.text.SimpleDateFormat;
 import java.time.Duration;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 
@@ -150,6 +151,7 @@ private String renderTemplate(MetadataTemplate template) throws IllegalArgumentE
 			html += "<div class='mdsGroup mdsGroup-" + template.getId() + "'>" + "<h2 class='mdsCaption " + template.getId() + "'>" + template.getCaption() + "</h2>" + "<div class='mdsContent'>";
 		}
 		String content=template.getHtml();
+		content = replaceI18nStrings(content);
 		for(MetadataWidget srcWidget : mds.getWidgets()){
 			MetadataWidget widget=mds.findWidgetForTemplateAndCondition(srcWidget.getId(),template.getId(),properties);
 			int start=content.indexOf("<"+srcWidget.getId());
@@ -433,6 +435,22 @@ private String renderTemplate(MetadataTemplate template) throws IllegalArgumentE
 		return html;
 	}
 
+	private static String replaceI18nStrings(String content) {
+		Pattern pattern = Pattern.compile("<i18n ([^>]+)>");
+		Matcher matcher = pattern.matcher(content);
+		content = matcher.replaceAll(matchResult -> {
+			if(matchResult.groupCount() == 1) {
+                try {
+                    return MetadataHelper.getTranslation(matchResult.group(1));
+                } catch (Exception e) {
+                    return matchResult.group(1);
+                }
+            }
+			return "";
+		});
+		return content;
+	}
+
 	private boolean renderMaterialFeedback(MetadataWidget widget, StringBuffer widgetHtml) {
 		boolean empty=true;
 		try {

Backend/services/core/src/main/java/org/edu_sharing/service/search/SearchServiceElastic.java

@@ -219,6 +219,7 @@ public BoolQuery.Builder getReadPermissionsQuery(BoolQuery.Builder builder) {
         // @TODO: FIX after DESP-840
         BoolQuery collectionPermissions = getPermissionsQuery(QueryBuilders.bool(), "collections.permissions.read")
                 .should(s -> s.match(m -> m.field("collections.owner").query(user)))
+                .must(must -> must.match(match -> match.field("collections.relation.type").query("ccm:usage")))
                 .build();
 
         BoolQuery proposalPermissions = getPermissionsQuery(QueryBuilders.bool(), "collections.permissions.Coordinator", getUserAuthorities().stream().filter(a -> !a.equals(CCConstants.AUTHORITY_GROUP_EVERYONE)).collect(Collectors.toSet()))

Backend/services/core/src/main/java/org/edu_sharing/spring/security/saml2/SecurityConfigurationSamlRelyingParties.java

@@ -27,9 +27,8 @@
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.security.interfaces.RSAPrivateKey;
-import java.util.Collection;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 @Profile("samlEnabled")
@@ -64,9 +63,13 @@ RelyingPartyRegistrationRepository relyingPartyRegistrationRepository() {
                 throw new RuntimeException("no IDP metadata configured");
             }
 
+            Map<String, AtomicInteger> rpIds = new HashMap<>();
+
             List<RelyingPartyRegistration> relyingPartyRegistration = b
                     .stream().map((builder) -> {
                         String relyingPartyId = getRelyingPartyId(builder);
+                        int count = rpIds.computeIfAbsent(relyingPartyId, k -> new AtomicInteger(0)).incrementAndGet();
+                        relyingPartyId = (count > 1) ? relyingPartyId + "-" + count : relyingPartyId;
                         return builder.registrationId(relyingPartyId)
                                 .entityId("{baseUrl}/saml2/service-provider-metadata/" + globalSPRegistrationId)
                                 .assertionConsumerServiceLocation("{baseUrl}/login/saml2/sso/" + globalSPRegistrationId)

Frontend/projects/edu-sharing-ui/src/lib/list-items/list-text/list-text.component.html

@@ -162,7 +162,7 @@
         {{ displayName$ | async }}
       </ng-container>
       <ng-container *ngIf="DATE_FIELDS.includes(item.name)">
-        {{ $any(getNode()).properties[item.name]?.[0] | formatDate: { async: true, time: true, relative: true } | async }}
+        {{ ($any(getNode()).properties[item.name + '_LONG']?.[0] || $any(getNode()).properties[item.name]?.[0]) | formatDate: { async: true, time: true, relative: true } | async }}
       </ng-container>
       <ng-container *ngIf="VCARD_FIELDS.includes(item.name)">
         {{

Frontend/src/app/features/dialogs/dialog-modules/license-dialog/license-dialog-content.component.ts

@@ -558,7 +558,7 @@ export class LicenseDialogContentComponent implements OnInit {
     }
 
     getLicenseUrlVersion(type: string) {
-        return this.nodeHelper.getLicenseUrlByString(type, this.ccVersion, this.ccCountry);
+        return this.nodeHelper.getLicenseUrlByString(type, this.ccVersion || '4.0', this.ccCountry);
     }
 
     getLicenseIcon() {