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

metaventis-build · metaventis-build · commit bcbed93666d0 · 2025-02-19T12:31:51.000Z
diff --git a/Backend/services/core/src/main/java/org/edu_sharing/service/search/SearchServiceElastic.java b/Backend/services/core/src/main/java/org/edu_sharing/service/search/SearchServiceElastic.java
@@ -201,10 +201,12 @@ public BoolQuery.Builder getPermissionsQuery(BoolQuery.Builder builder, String f
     }
 
     public BoolQuery.Builder getPermissionsQuery(BoolQuery.Builder audienceQueryBuilder, String field, Set<String> authorities) {
-        audienceQueryBuilder.minimumShouldMatch("1");
+        BoolQuery.Builder bool = QueryBuilders.bool();
+        bool.minimumShouldMatch("1");
         for (String a : authorities) {
-            audienceQueryBuilder.should(should -> should.match(match -> match.field(field).query(a)));
+            bool.should(should -> should.match(match -> match.field(field).query(a)));
         }
+        audienceQueryBuilder.must(bool.build()._toQuery());
         return audienceQueryBuilder;
     }
 
@@ -685,7 +687,6 @@ BoolQuery.Builder getGlobalConditions(List<String> authorityScope, List<String>
             BoolQuery.Builder permissionsFilter = QueryBuilders.bool().must(must -> must.bool(queryGlobalConditionsFactory::apply));
             String user = serviceRegistry.getAuthenticationService().getCurrentUserName();
             permissionsFilter.should(should -> should.match(match -> match.field("owner").query(user)));
-            permissionsFilter.minimumShouldMatch("1");
             for (String permission : permissions) {
                 permissionsFilter.should(s -> s.bool(bool -> getPermissionsQuery(bool, "permissions." + permission)));
             }
diff --git a/Backend/services/core/src/test/java/org/edu_sharing/service/search/SearchServiceElasticTest.java b/Backend/services/core/src/test/java/org/edu_sharing/service/search/SearchServiceElasticTest.java
@@ -72,25 +72,28 @@ void getGlobalConditions() {
         SearchServiceElasticTestUtils.assertQuery(
                 "{\n" +
                         "  \"bool\": {\n" +
-                        "    \"minimum_should_match\": \"1\",\n" +
                         "    \"must\": [\n" +
                         "      {\n" +
                         "        \"bool\": {\n" +
-                        "          \"minimum_should_match\": \"1\",\n" +
                         "          \"must\": [\n" +
                         "            {\n" +
-                        "              \"match\": {\n" +
-                        "                \"nodeRef.storeRef.protocol\": {\n" +
-                        "                  \"query\": \"workspace\"\n" +
-                        "                }\n" +
+                        "              \"bool\": {\n" +
+                        "                \"minimum_should_match\": \"1\",\n" +
+                        "                \"should\": [\n" +
+                        "                  {\n" +
+                        "                    \"match\": {\n" +
+                        "                      \"permissions.read\": {\n" +
+                        "                        \"query\": \"scope\"\n" +
+                        "                      }\n" +
+                        "                    }\n" +
+                        "                  }\n" +
+                        "                ]\n" +
                         "              }\n" +
-                        "            }\n" +
-                        "          ],\n" +
-                        "          \"should\": [\n" +
+                        "            },\n" +
                         "            {\n" +
                         "              \"match\": {\n" +
-                        "                \"permissions.read\": {\n" +
-                        "                  \"query\": \"scope\"\n" +
+                        "                \"nodeRef.storeRef.protocol\": {\n" +
+                        "                  \"query\": \"workspace\"\n" +
                         "                }\n" +
                         "              }\n" +
                         "            }\n" +
@@ -115,34 +118,40 @@ void getGlobalConditions() {
                         "      },\n" +
                         "      {\n" +
                         "        \"bool\": {\n" +
-                        "          \"minimum_should_match\": \"1\",\n" +
-                        "          \"should\": [\n" +
-                        "            {\n" +
-                        "              \"match\": {\n" +
-                        "                \"permissions.read\": {\n" +
-                        "                  \"query\": \"test_group1\"\n" +
-                        "                }\n" +
-                        "              }\n" +
-                        "            },\n" +
-                        "            {\n" +
-                        "              \"match\": {\n" +
-                        "                \"permissions.read\": {\n" +
-                        "                  \"query\": \"GROUP_EVERYONE\"\n" +
-                        "                }\n" +
-                        "              }\n" +
-                        "            },\n" +
-                        "            {\n" +
-                        "              \"match\": {\n" +
-                        "                \"permissions.read\": {\n" +
-                        "                  \"query\": \"tester\"\n" +
-                        "                }\n" +
-                        "              }\n" +
-                        "            },\n" +
+                        "          \"must\": [\n" +
                         "            {\n" +
-                        "              \"match\": {\n" +
-                        "                \"permissions.read\": {\n" +
-                        "                  \"query\": \"test_group2\"\n" +
-                        "                }\n" +
+                        "              \"bool\": {\n" +
+                        "                \"minimum_should_match\": \"1\",\n" +
+                        "                \"should\": [\n" +
+                        "                  {\n" +
+                        "                    \"match\": {\n" +
+                        "                      \"permissions.read\": {\n" +
+                        "                        \"query\": \"test_group1\"\n" +
+                        "                      }\n" +
+                        "                    }\n" +
+                        "                  },\n" +
+                        "                  {\n" +
+                        "                    \"match\": {\n" +
+                        "                      \"permissions.read\": {\n" +
+                        "                        \"query\": \"GROUP_EVERYONE\"\n" +
+                        "                      }\n" +
+                        "                    }\n" +
+                        "                  },\n" +
+                        "                  {\n" +
+                        "                    \"match\": {\n" +
+                        "                      \"permissions.read\": {\n" +
+                        "                        \"query\": \"tester\"\n" +
+                        "                      }\n" +
+                        "                    }\n" +
+                        "                  },\n" +
+                        "                  {\n" +
+                        "                    \"match\": {\n" +
+                        "                      \"permissions.read\": {\n" +
+                        "                        \"query\": \"test_group2\"\n" +
+                        "                      }\n" +
+                        "                    }\n" +
+                        "                  }\n" +
+                        "                ]\n" +
                         "              }\n" +
                         "            }\n" +
                         "          ]\n" +
diff --git a/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-chips/mds-editor-widget-chips.component.scss b/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-chips/mds-editor-widget-chips.component.scss
@@ -3,8 +3,16 @@
 mat-form-field {
     width: 100%;
 }
+/**
+       prevent to long text from overflow the widget
+*/
+mat-chip {
+    max-width: 225px;
+}
 .mat-chip-label {
-    @include limitLineLength(200px);
+    @include limitLineLength(180px);
+    display: inline-flex;
+    flex-grow: 1;
 }
 
 .input-wrapper {

Original file line number	Diff line number	Diff line change
`@@ -201,10 +201,12 @@ public BoolQuery.Builder getPermissionsQuery(BoolQuery.Builder builder, String f`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`public BoolQuery.Builder getPermissionsQuery(BoolQuery.Builder audienceQueryBuilder, String field, Set<String> authorities) {`
`204`		`- audienceQueryBuilder.minimumShouldMatch("1");`
	`204`	`+ BoolQuery.Builder bool = QueryBuilders.bool();`
	`205`	`+ bool.minimumShouldMatch("1");`
`205`	`206`	`for (String a : authorities) {`
`206`		`- audienceQueryBuilder.should(should -> should.match(match -> match.field(field).query(a)));`
	`207`	`+ bool.should(should -> should.match(match -> match.field(field).query(a)));`
`207`	`208`	`}`
	`209`	`+ audienceQueryBuilder.must(bool.build()._toQuery());`
`208`	`210`	`return audienceQueryBuilder;`
`209`	`211`	`}`
`210`	`212`
`@@ -685,7 +687,6 @@ BoolQuery.Builder getGlobalConditions(List<String> authorityScope, List<String>`
`685`	`687`	`BoolQuery.Builder permissionsFilter = QueryBuilders.bool().must(must -> must.bool(queryGlobalConditionsFactory::apply));`
`686`	`688`	`String user = serviceRegistry.getAuthenticationService().getCurrentUserName();`
`687`	`689`	`permissionsFilter.should(should -> should.match(match -> match.field("owner").query(user)));`
`688`		`- permissionsFilter.minimumShouldMatch("1");`
`689`	`690`	`for (String permission : permissions) {`
`690`	`691`	`permissionsFilter.should(s -> s.bool(bool -> getPermissionsQuery(bool, "permissions." + permission)));`
`691`	`692`	`}`