fix for 9586 Admin Dashboard - resource templates

Evolveum · Apr 26, 2024 · 7ebf57b · 7ebf57b
1 parent 71bde93
commit 7ebf57b
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 4 deletions.
diff --git a/config/initial-objects/object-collection/250-object-collection-resource-all.xml b/config/initial-objects/object-collection/250-object-collection-resource-all.xml
@@ -7,7 +7,13 @@
   -->
 
 <objectCollection xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-                  oid="00000000-0000-0000-0001-000000000006">
+        xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3"
+        oid="00000000-0000-0000-0001-000000000006">
     <name>All resources</name>
     <type>ResourceType</type>
+    <filter>
+        <q:text>archetypeRef not matches (oid = "00000000-0000-0000-0000-000000000703")
+            and template != true and abstract != true
+        </q:text>
+    </filter>
 </objectCollection>
diff --git a/config/initial-objects/object-collection/251-object-collection-resource-up.xml b/config/initial-objects/object-collection/251-object-collection-resource-up.xml
@@ -31,7 +31,10 @@
     </assignment>
     <type>ResourceType</type>
     <filter>
-        <q:text>operationalState/lastAvailabilityStatus = "up"</q:text>
+        <q:text>operationalState/lastAvailabilityStatus = "up"
+            and archetypeRef not matches (oid = "00000000-0000-0000-0000-000000000703")
+            and template != true and abstract != true
+        </q:text>
     </filter>
     <domain>
         <collectionRef oid="00000000-0000-0000-0001-000000000006" type="c:ObjectCollectionType"/>

diff --git a/release-notes.adoc b/release-notes.adoc
@@ -33,6 +33,10 @@ The {release-version} release brings security, stability and miscellaneous bugfi
 ** Fixed issue with reporting of errors during search objects in table by axiom query. See bug:MID-9499[] and bug:MID-9400[].
 ** Fixed icon of case outcome in column of table. See bug:MID-9533[].
 
+* Changes in initial objects:
+** 250-object-collection-resource.xml: `All resources` object collection was updated with a filter to exclude resource templates.
+** 251-object-collection-resource-up.xml: `Resources up` object collection was updated with a filter to exclude resource templates.
+
 To see full list of fixes see https://support.evolveum.com/projects/midpoint/work_packages?query_props=%7B%22c%22%3A%5B%22id%22%2C%22subject%22%2C%22type%22%2C%22status%22%2C%22priority%22%2C%22assignee%22%2C%22customField6%22%5D%2C%22hi%22%3Afalse%2C%22g%22%3A%22%22%2C%22is%22%3Atrue%2C%22tv%22%3Afalse%2C%22hla%22%3A%5B%22status%22%2C%22priority%22%5D%2C%22t%22%3A%22priority%3Adesc%2Cid%3Aasc%22%2C%22f%22%3A%5B%7B%22n%22%3A%22customField6%22%2C%22o%22%3A%22%3D%22%2C%22v%22%3A%5B%2281%22%5D%7D%5D%2C%22ts%22%3A%22PT0S%22%2C%22pp%22%3A20%2C%22pa%22%3A1%7D[Evolveum Issue Tracker]
 
 == Changes With Respect To Version 4.8.1

diff --git a/...c/main/resources/initial-objects/object-collection/250-object-collection-resource-all.xml b/...c/main/resources/initial-objects/object-collection/250-object-collection-resource-all.xml
@@ -7,7 +7,13 @@
   -->
 
 <objectCollection xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-                  oid="00000000-0000-0000-0001-000000000006">
+        xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3"
+        oid="00000000-0000-0000-0001-000000000006">
     <name>All resources</name>
     <type>ResourceType</type>
+    <filter>
+        <q:text>archetypeRef not matches (oid = "00000000-0000-0000-0000-000000000703")
+            and template != true and abstract != true
+        </q:text>
+    </filter>
 </objectCollection>
diff --git a/...rc/main/resources/initial-objects/object-collection/251-object-collection-resource-up.xml b/...rc/main/resources/initial-objects/object-collection/251-object-collection-resource-up.xml
@@ -31,7 +31,10 @@
     </assignment>
     <type>ResourceType</type>
     <filter>
-        <q:text>operationalState/lastAvailabilityStatus = "up"</q:text>
+        <q:text>operationalState/lastAvailabilityStatus = "up"
+            and archetypeRef not matches (oid = "00000000-0000-0000-0000-000000000703")
+            and template != true and abstract != true
+        </q:text>
     </filter>
     <domain>
         <collectionRef oid="00000000-0000-0000-0001-000000000006" type="c:ObjectCollectionType"/>