Merge remote-tracking branch 'refs/remotes/origin/master'

Evolveum · Apr 26, 2024 · 20c8abd · 20c8abd
2 parents 0124bae + b171beb
commit 20c8abd
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 51 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/...ain/java/com/evolveum/midpoint/gui/impl/prism/panel/ResourceAttributeDefinitionPanel.java b/...ain/java/com/evolveum/midpoint/gui/impl/prism/panel/ResourceAttributeDefinitionPanel.java
@@ -9,18 +9,20 @@
 
 import com.evolveum.midpoint.gui.api.prism.wrapper.ResourceAttributeWrapper;
 
-import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.model.IModel;
 
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 
+import java.io.Serial;
+
 /**
  * @author katkav
  */
 public class ResourceAttributeDefinitionPanel<T> extends PrismPropertyPanel<T> {
 
-    private static final long serialVersionUID = 1L;
+    @Serial private static final long serialVersionUID = 1L;
     private static final Trace LOGGER = TraceManager.getTrace(ResourceAttributeDefinitionPanel.class);
 
     private static final String ID_HEADER = "header";
@@ -36,7 +38,14 @@ public ResourceAttributeDefinitionPanel(String id, IModel<ResourceAttributeWrapp
 
     @Override
     protected ItemHeaderPanel createHeaderPanel() {
-        return new ResourceAttributeDefinitionHeaderPanel<>(ID_HEADER, getResourceAttributeDefinitionModel());
+        return new ResourceAttributeDefinitionHeaderPanel<>(ID_HEADER, getResourceAttributeDefinitionModel()) {
+            @Serial private static final long serialVersionUID = 1L;
+
+            @Override
+            protected void refreshPanel(AjaxRequestTarget target) {
+                target.add(ResourceAttributeDefinitionPanel.this);
+            }
+        };
     }
 
     private IModel<ResourceAttributeWrapper<T>> getResourceAttributeDefinitionModel(){

diff --git a/...n/java/com/evolveum/midpoint/web/page/admin/reports/component/ImportReportPopupPanel.html b/...n/java/com/evolveum/midpoint/web/page/admin/reports/component/ImportReportPopupPanel.html
@@ -10,60 +10,48 @@
 <wicket:panel>
     <form wicket:id="mainForm">
 
-    <div class="feedbackContainer">
-        <div wicket:id="popupFeedback" class="messagePanel"/>
-    </div>
+        <div class="feedbackContainer">
+            <div wicket:id="popupFeedback" class="messagePanel"/>
+        </div>
         <h3 style="margin-left: 20px;">
             <wicket:message key="ImportReportPopupPanel.title"/>
         </h3>
-        <div class="prims-properties">
-            <div style="background-color: #f9f9f9;">
-                <div style="margin-left: 0px; margin-right: 0px;" class="row prism-property">
-                    <div class="col-xs-4 prism-property-label">
-                        <span style="text-decoration: none;">
-                            <wicket:message key="ImportReportPopupPanel.reportDataName"/>
-                        </span>
-                    </div>
-                    <div class="col-xs-8 prism-property-value">
-                        <div class="row">
-                            <div wicket:id="reportDataName"/>
-                        </div>
-                    </div>
+        <div class="prism-properties">
+            <div class="prism-property mb-3">
+                <div class="w-100 mb-2">
+                    <span>
+                        <wicket:message key="ImportReportPopupPanel.reportDataName"/>
+                    </span>
+                </div>
+                <div class="w-100 prism-property-value">
+                    <div wicket:id="reportDataName"/>
                 </div>
             </div>
-            <div>
-                <div style="margin-left: 0px; margin-right: 0px;" class="row prism-property">
-                    <div class="col-xs-4 prism-property-label">
-                        <span style="text-decoration: none;">
-                            <wicket:message key="ImportReportPopupPanel.importFile"/>
-                        </span>
-                    </div>
-                    <div class="col-xs-8 prism-property-value">
-                        <div class="row">
-                            <input wicket:id="choseFile" type="file"/>
-                        </div>
-                    </div>
+            <div class="prism-property mb-3">
+                <div class="w-100 mb-2">
+                    <span style="text-decoration: none;">
+                        <wicket:message key="ImportReportPopupPanel.importFile"/>
+                    </span>
+                </div>
+                <div class="w-100 prism-property-value">
+                    <input wicket:id="choseFile" type="file"/>
                 </div>
             </div>
-            <div style="background-color: #f9f9f9;">
-                <div style="margin-left: 0px; margin-right: 0px;" class="row prism-property">
-                    <div class="col-xs-4 prism-property-label">
-                        <span style="text-decoration: none;">
-                            <wicket:message key="ImportReportPopupPanel.fileAsString"/>
-                        </span>
-                    </div>
-                    <div class="col-xs-8 prism-property-value">
-                        <div class="row">
-                            <div wicket:id="fileAsString"/>
-                        </div>
-                    </div>
+            <div class="prism-property mb-3">
+                <div class="w-100 mb-2">
+                    <span style="text-decoration: none;">
+                        <wicket:message key="ImportReportPopupPanel.fileAsString"/>
+                    </span>
+                </div>
+                <div class="w-100 prism-property-value">
+                    <div wicket:id="fileAsString"/>
                 </div>
             </div>
         </div>
-        <p align="right">
-            <a class="btn btn-default btn-sm" wicket:id="cancel"/>
+        <div class="row justify-content-end mr-2">
+            <a class="btn btn-default btn-sm mr-3" wicket:id="cancel"/>
             <a class="btn btn-primary btn-sm" wicket:id="import"/>
-        </p>
+        </div>
     </form>
 
 </wicket:panel>

diff --git a/...n/java/com/evolveum/midpoint/web/page/admin/reports/component/ImportReportPopupPanel.java b/...n/java/com/evolveum/midpoint/web/page/admin/reports/component/ImportReportPopupPanel.java
@@ -270,7 +270,7 @@ public int getWidth() {
 
     @Override
     public int getHeight() {
-        return 100;
+        return 600;
     }
 
     @Override

diff --git a/release-notes.adoc b/release-notes.adoc
@@ -383,6 +383,8 @@ The complete new set of initial objects is in the `config/initial-objects` direc
 _Actions required:_ Please review the changes and apply them appropriately to your configuration. Ninja can help with updating existing initial objects during upgrade procedure using `initial-objects` command.
 For more information see xref:/midpoint/reference/deployment/ninja/upgrade-with-ninja/#initial-objects[here].
 
+* 250-object-collection-resource.xml: The `All resources` object collection was updated with a filter to exclude resource templates.
+* 251-object-collection-resource-up.xml: The `Resources up` object collection was updated with a filter to exclude resource templates.
 // * References to removed `category`, `handlerUri`, and `reportOutputOid` properties of tasks were deleted: from task archetypes and from GUI configurations.
 // See https://github.com/Evolveum/midpoint/commit/1fe4b60057d040f7424523cf24194bfcb7920f90[1fe4b6], https://github.com/Evolveum/midpoint/commit/b5a331b377a4fff0dbabd82e64da60f0b8c96c2b[b5a331], and https://github.com/Evolveum/midpoint/commit/6887e980c48e45a5ae22642932ed22e0c8b5f665[6887e9].
 //

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"/>