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

Evolveum · Sep 18, 2023 · 1af9839 · 1af9839
2 parents 0fbf1fa + c7f388e
commit 1af9839
Show file tree

Hide file tree

Showing 25 changed files with 233 additions and 72 deletions.
diff --git a/gui/admin-gui/src/frontend/scss/details-menu.scss b/gui/admin-gui/src/frontend/scss/details-menu.scss
@@ -17,11 +17,44 @@
   //top: 0;
   right: 0;
   overflow-x: hidden;
-  padding-top: 16px;
+  //padding-top: 16px;
+  margin: 0;
+
+  & a > div > i.fas,
+  a > div > i.far,
+  a > div > i.fa,
+  a > div > i.fe {
+    min-width: 24px;
+    text-align: center;
+  }
+
+  & a > div > div {
+    min-width: 9rem;
+    max-width: 14rem;
+    padding-right: 0.75rem;
+    padding-left: 0.5rem;
+  }
+
+  & a .details-menu-items {
+    align-items: center;
+    //min-width: 42px;
+    justify-content: end;
+  }
+
+  & a .details-menu-items .details-caret {
+    width: 1.15rem;
+    line-height:normal;
+  }
 
   & > li.navigation-details {
     list-style: none;
-    margin: 0px 10px 0px 5px;
+    border-radius: 0.25rem;
+    overflow: hidden;
+    //margin: 0px 10px 0px 5px;
+
+    &:not(:last-child){
+      margin-bottom: 0.2rem;
+    }
 
     .navigation-details {
       display: none;
@@ -49,12 +82,15 @@
         display: block;
       }
 
-      > a > .fa-angle-left {
+      & > a .fa-angle-left {
         transform: rotate(270deg);
       }
     }
   }
 
+//.details-menu a>i.fa,.details-menu a>i.fe{width:20px}
+
+
   .details-menu {
     padding-top: 0px;
     background-color: $sidebar-light-submenu-bg;
@@ -169,12 +205,13 @@
 
 
 .details-menu a {
-  padding: 6px 8px 6px 5px;
   text-decoration: none;
   font-size: 15px;
   color: $sidebar-light-color;
   display: block;
   cursor: pointer;
+  padding: 8px 8px 8px 10px;
+  border-radius: 0.25rem;
 
   & > i {
     padding-right: 5px;
@@ -187,6 +224,10 @@
       width: 20px;
     }
   }
+  & .details-caret i {
+    width: 100%;
+    text-align: center;
+  }
 }
 
 .details-menu a:hover {
@@ -195,5 +236,9 @@
 }
 
 ul.details-menu {
-  padding-inline-start: 13px;
+  padding-inline-start: 0px;
+
+  & ul {
+    padding-inline-start: 13px;
+  }
 }
diff --git a/gui/admin-gui/src/frontend/scss/midpoint.scss b/gui/admin-gui/src/frontend/scss/midpoint.scss
@@ -1578,6 +1578,8 @@ fieldset.objectButtons {
   flex-direction: row;
   align-items: stretch;
   background-color: $white;
+  overflow: hidden;
+  box-shadow: 0 0 1px rgba(0,0,0,.125), 0 1px 3px rgba(0,0,0,.2);
 }
 
 .details-panel-navigation {
@@ -1944,3 +1946,12 @@ th.debug-list-buttons {
 .lh-2 {
   line-height: 1.5;
 }
+
+//Grouped classes with smooth-transition function
+.details-menu a,
+.details-menu a:hover,
+.nav-sidebar .nav-item > .nav-link,
+.nav-sidebar .nav-item > .nav-link:hover
+{
+  @include smooth-transition(0.08s);
+}
diff --git a/...i/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/DetailsNavigationPanel.html b/...i/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/DetailsNavigationPanel.html
@@ -12,13 +12,17 @@
         <ul class="details-menu">
             <wicket:container wicket:id="menu">
                 <li class="navigation-details" wicket:id="navLinkStyle">
-                    <a wicket:id="navItemLink" class="d-flex align-items-center" >
-                        <i class="mr-1" wicket:id="navItemIcon"></i>
-                        <span class="flex-grow-1 details-menu-label" wicket:id="navItem"></span>
-                        <span class="d-flex">
+                    <a wicket:id="navItemLink" class="d-flex align-items-center">
+                        <div class="d-flex flex-grow-1 mr-auto align-items-center">
+                            <i wicket:id="navItemIcon"></i>
+                            <div class="text-truncate" wicket:id="navItem"></div>
+                        </div>
+                        <div class="d-flex gap-1 flex-grow-1 details-menu-items align-items-center">
                             <span class="badge bg-blue" wicket:id="count"></span>
-                            <i class="fa fa-fw fa-angle-left" wicket:id="submenuLink"></i>
-                        </span>
+                            <span class="details-caret">
+                                <i class="fa fa-angle-left" wicket:id="submenuLink"></i>
+                            </span>
+                        </div>
                     </a>
                     <div wicket:id="subNavigation"/>
                 </li>

diff --git a/...i/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/DetailsNavigationPanel.java b/...i/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/DetailsNavigationPanel.java
@@ -140,7 +140,7 @@ protected void onError(AjaxRequestTarget target) {
                 target.add(getPageBase().getFeedbackPanel());
             }
         };
-
+        link.add(AttributeAppender.append("title", createButtonLabel(item.getModel())));
         addIcon(link, item);
         addLabel(link, item);
         addCount(link, item);

diff --git a/...ui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/AbstractPageObjectDetails.html b/...ui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/AbstractPageObjectDetails.html
@@ -20,7 +20,7 @@
 
                 <div class="details-panel">
                     <wicket:enclosure child="navigation">
-                        <div class="details-panel-navigation" wicket:id="navigation"/>
+                        <div class="details-panel-navigation p-2" wicket:id="navigation"/>
                     </wicket:enclosure>
                     <div class="details-panel-details-form" wicket:id="mainPanel"/>
                 </div>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageLogin.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageLogin.html
@@ -28,7 +28,7 @@
                 <wicket:message key="PageLogin.password"/>
             </label>
             <div class="input-group d-flex login-panel-control">
-                <input name="password" type="password" class="form-control form-control-sm d-flex flex-wrap gap-2">
+                <input name="password" type="password" autocomplete="off" class="form-control form-control-sm d-flex flex-wrap gap-2">
                 <div class="input-group-append">
                     <span class="input-group-text">
                         <i class="fas fa-lock"></i>

diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-tasks-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-tasks-3.xsd
@@ -6017,6 +6017,14 @@
                 <xsd:annotation>
                     <xsd:documentation>
                         Should the simulation result be created for the activity? If so, how?
+
+                        For native repository, the default is "yes, with the default settings" for simulation
+                        (full or shadow-level) mode and "no" for all other modes.
+
+                        For generic repository that does not support simulation results, the default is always "no".
+
+                        If you want to explicitly disable the creation of simulation result for simulation-mode activities,
+                        set "enabled" to "false" inside.
                     </xsd:documentation>
                     <xsd:appinfo>
                         <a:since>4.7</a:since>
@@ -6763,6 +6771,17 @@
             </xsd:appinfo>
         </xsd:annotation>
         <xsd:sequence>
+            <xsd:element name="enabled" type="xsd:boolean" minOccurs="0" default="true">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Is the creation of simulation result enabled?
+                        The default is "true" if this container is present.
+                    </xsd:documentation>
+                    <xsd:appinfo>
+                        <a:since>4.8</a:since>
+                    </xsd:appinfo>
+                </xsd:annotation>
+            </xsd:element>
             <xsd:element name="definition" type="tns:SimulationDefinitionType" minOccurs="0">
                 <xsd:annotation>
                     <xsd:documentation>
@@ -6774,8 +6793,6 @@
         </xsd:sequence>
     </xsd:complexType>
 
-
-
     <xsd:complexType name="BasicObjectSetType">
         <xsd:annotation>
             <xsd:documentation>

diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMapping.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMapping.java
@@ -3591,24 +3591,27 @@ public void test801PredefinedDelayedDelete() throws Exception {
         assertSuccess(result);
         assertDummyAccountActivation(RESOURCE_DUMMY_PREDEFINED_DD_NAME, USER_SHELDON_USERNAME, false);
 
-        assertShadow(findShadowByNameViaModel(
-                ShadowKindType.ACCOUNT,
-                "default",
-                USER_SHELDON_USERNAME,
-                getDummyResourceObject(RESOURCE_DUMMY_PREDEFINED_DD_NAME),
-                null,
-                task,
-                result), "shadow after")
+        // @formatter:off
+        assertShadow(
+                findShadowByNameViaModel(
+                        ShadowKindType.ACCOUNT,
+                        "default",
+                        USER_SHELDON_USERNAME,
+                        getDummyResourceObject(RESOURCE_DUMMY_PREDEFINED_DD_NAME),
+                        null,
+                        task,
+                        result), "shadow after")
                 .display()
                 .triggers()
-                .single()
-                .assertHandlerUri(RecomputeTriggerHandler.HANDLER_URI)
-                .assertOriginDescription(DelayedDeleteEvaluator.class.getSimpleName())
-                .assertTimestampFuture("P5D", 20000)
-                .end()
+                    .single()
+                        .assertHandlerUri(RecomputeTriggerHandler.HANDLER_URI)
+                        .assertOriginDescription(DelayedDeleteEvaluator.class.getSimpleName())
+                        .assertTimestampFuture("P5D", 20000)
+                    .end()
                 .end()
                 .asShadow()
                 .assertAdministrativeStatus(ActivationStatusType.DISABLED);
+        // @formatter:on
 
         when("override time to future and recompute user");
         assertDummyAccount(RESOURCE_DUMMY_PREDEFINED_DD_NAME, USER_SHELDON_USERNAME);

diff --git a/...l/model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/TestThresholds.java b/...l/model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/TestThresholds.java
@@ -27,6 +27,8 @@
 import com.evolveum.midpoint.util.exception.ObjectNotFoundException;
 import com.evolveum.midpoint.util.exception.SchemaException;
 
+import com.evolveum.midpoint.xml.ns._public.common.common_3.SimulationResultType;
+
 import org.jetbrains.annotations.NotNull;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.annotation.DirtiesContext.ClassMode;
@@ -184,6 +186,11 @@ public void test100ImportAdd10Simulate() throws Exception {
 
         assertCreated(0);
         assertTest100TaskAfterRepeatedExecution(importTask);
+
+        if (isNativeRepository()) {
+            and("there are no simulation results"); // MID-8936
+            assertNoRepoObjects(SimulationResultType.class);
+        }
     }
 
     abstract void assertTest100Task(TestObject<TaskType> importTask) throws SchemaException, ObjectNotFoundException;

diff --git a/model/model-intest/src/test/resources/simulation/task-user-recomputation-simulated.xml b/model/model-intest/src/test/resources/simulation/task-user-recomputation-simulated.xml
@@ -31,8 +31,5 @@
         <execution>
             <mode>preview</mode>
         </execution>
-        <reporting>
-            <simulationResult/>
-        </reporting>
     </activity>
 </task>
diff --git a/...l/model-intest/src/test/resources/tasks/thresholds/task-import-simulate-execute-multi.xml b/...l/model-intest/src/test/resources/tasks/thresholds/task-import-simulate-execute-multi.xml
@@ -29,7 +29,9 @@
                         </resourceObjects>
                     </import>
                 </work>
-                <executionMode>preview</executionMode>
+                <execution>
+                    <mode>preview</mode>
+                </execution>
                 <distribution>
                     <buckets>
                         <stringSegmentation>
@@ -50,6 +52,11 @@
                         </workersPerNode>
                     </workers>
                 </distribution>
+                <reporting>
+                    <simulationResult>
+                        <enabled>false</enabled>
+                    </simulationResult>
+                </reporting>
             </activity>
             <activity>
                 <order>2</order>

diff --git a/.../model-intest/src/test/resources/tasks/thresholds/task-import-simulate-execute-single.xml b/.../model-intest/src/test/resources/tasks/thresholds/task-import-simulate-execute-single.xml
@@ -28,7 +28,14 @@
                         </resourceObjects>
                     </import>
                 </work>
-                <executionMode>preview</executionMode>
+                <execution>
+                    <mode>preview</mode>
+                </execution>
+                <reporting>
+                    <simulationResult>
+                        <enabled>false</enabled>
+                    </simulationResult>
+                </reporting>
             </activity>
             <activity>
                 <order>2</order>
@@ -42,7 +49,9 @@
                         </resourceObjects>
                     </import>
                 </work>
-                <executionMode>full</executionMode>
+                <execution>
+                    <mode>full</mode>
+                </execution>
             </activity>
         </composition>
     </activity>

diff --git a/model/model-intest/src/test/resources/tasks/thresholds/task-import-simulate-multi.xml b/model/model-intest/src/test/resources/tasks/thresholds/task-import-simulate-multi.xml
@@ -25,7 +25,9 @@
                 </resourceObjects>
             </import>
         </work>
-        <executionMode>preview</executionMode>
+        <execution>
+            <mode>preview</mode>
+        </execution>
         <distribution>
             <buckets>
                 <stringSegmentation>
@@ -46,5 +48,10 @@
                 </workersPerNode>
             </workers>
         </distribution>
+        <reporting>
+            <simulationResult>
+                <enabled>false</enabled>
+            </simulationResult>
+        </reporting>
     </activity>
 </task>
diff --git a/model/model-intest/src/test/resources/tasks/thresholds/task-import-simulate-single.xml b/model/model-intest/src/test/resources/tasks/thresholds/task-import-simulate-single.xml
@@ -24,6 +24,13 @@
                 </resourceObjects>
             </import>
         </work>
-        <executionMode>preview</executionMode>
+        <execution>
+            <mode>preview</mode>
+        </execution>
+        <reporting>
+            <simulationResult>
+                <enabled>false</enabled>
+            </simulationResult>
+        </reporting>
     </activity>
 </task>
diff --git a/...intest/src/test/resources/tasks/thresholds/task-reconciliation-simulate-execute-multi.xml b/...intest/src/test/resources/tasks/thresholds/task-reconciliation-simulate-execute-multi.xml
@@ -30,6 +30,11 @@
                 <controlFlow>
                     <processingOption>process</processingOption>
                 </controlFlow>
+                <reporting>
+                    <simulationResult>
+                        <enabled>false</enabled>
+                    </simulationResult>
+                </reporting>
             </change>
             <change>
                 <reference>remainingShadowsPreview</reference>
@@ -46,6 +51,11 @@
                         </workersPerNode>
                     </workers>
                 </distribution>
+                <reporting>
+                    <simulationResult>
+                        <enabled>false</enabled>
+                    </simulationResult>
+                </reporting>
             </change>
             <change>
                 <reference>resourceObjects</reference>