Converted some initial objects to use Axiom Query

Evolveum · Mar 28, 2022 · 7c5d98a · 7c5d98a
1 parent 24271a3
commit 7c5d98a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 34 deletions.
diff --git a/gui/admin-gui/src/main/resources/initial-objects/251-object-collection-resource-up.xml b/gui/admin-gui/src/main/resources/initial-objects/251-object-collection-resource-up.xml
@@ -30,10 +30,7 @@
     </assignment>
     <type>ResourceType</type>
     <filter>
-        <q:equal>
-            <q:path>operationalState/lastAvailabilityStatus</q:path>
-            <q:value>up</q:value>
-        </q:equal>
+        <q:text>operationalState/lastAvailabilityStatus = "up"</q:text>
     </filter>
     <domain>
         <collectionRef oid="00000000-0000-0000-0001-000000000006" type="c:ObjectCollectionType"/>

diff --git a/gui/admin-gui/src/main/resources/initial-objects/260-object-collection-task-all.xml b/gui/admin-gui/src/main/resources/initial-objects/260-object-collection-task-all.xml
@@ -12,8 +12,6 @@
     <name>All tasks</name>
     <type>TaskType</type>
     <filter>
-        <q:equal>
-            <q:path>parent</q:path>
-        </q:equal>
+        <q:text>parent not exists</q:text>>
     </filter>
 </objectCollection>
diff --git a/gui/admin-gui/src/main/resources/initial-objects/261-object-collection-task-active.xml b/gui/admin-gui/src/main/resources/initial-objects/261-object-collection-task-active.xml
@@ -30,15 +30,7 @@
     </assignment>
     <type>TaskType</type>
     <filter>
-        <q:and>
-            <q:equal>
-                <q:path>executionState</q:path>
-                <q:value>runnable</q:value>
-            </q:equal>
-            <q:equal>
-                <q:path>parent</q:path>
-            </q:equal>
-        </q:and>
+        <q:text>executionState = "runnable" and parent not exists</q:text>
     </filter>
     <domain>
         <collectionRef oid="00000000-0000-0000-0001-000000000007" type="c:ObjectCollectionType"/>

diff --git a/gui/admin-gui/src/main/resources/initial-objects/262-object-collection-task-report.xml b/gui/admin-gui/src/main/resources/initial-objects/262-object-collection-task-report.xml
@@ -12,23 +12,11 @@
     <name>Report tasks</name>
     <type>TaskType</type>
     <filter>
-        <q:or>
-            <q:ref>
-                <q:path>archetypeRef</q:path>
-                <q:value oid="00000000-0000-0000-0000-000000000507"/>
-            </q:ref>
-            <q:ref>
-                <q:path>archetypeRef</q:path>
-                <q:value oid="00000000-0000-0000-0000-000000000510"/>
-            </q:ref>
-            <q:ref>
-                <q:path>archetypeRef</q:path>
-                <q:value oid="00000000-0000-0000-0000-000000000511"/>
-            </q:ref>
-            <q:ref>
-                <q:path>archetypeRef</q:path>
-                <q:value oid="00000000-0000-0000-0000-000000000512"/>
-            </q:ref>
-        </q:or>
+        <text>
+            archetypeRef matches (oid = "00000000-0000-0000-0000-000000000507")
+            or archetypeRef matches (oid = "00000000-0000-0000-0000-000000000510")
+            or archetypeRef matches (oid = "00000000-0000-0000-0000-000000000511")
+            or archetypeRef matches (oid = "00000000-0000-0000-0000-000000000512")
+        </text>
     </filter>
 </objectCollection>