Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · Jun 14, 2022 · 8f365e3 · 8f365e3
2 parents d99efda + 979ecca
commit 8f365e3
Show file tree

Hide file tree

Showing 45 changed files with 1,156 additions and 388 deletions.
diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/api/DefaultGuiConfigurationCompiler.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/api/DefaultGuiConfigurationCompiler.java
@@ -145,6 +145,7 @@ public void postProcess(CompiledGuiProfile compiledGuiProfile) {
         compileDefaultDetailsPages(compiledGuiProfile);
         mergeCollectionViewsWithDefault(compiledGuiProfile);
         processShadowPanels(compiledGuiProfile);
+        processResourcePanels(compiledGuiProfile);
     }
 
     private void compileDefaultDetailsPages(CompiledGuiProfile compiledGuiProfile) {
@@ -273,6 +274,41 @@ private void processShadowPanels(CompiledGuiProfile compiledGuiProfile) {
         }
     }
 
+    private void processResourcePanels(CompiledGuiProfile compiledGuiProfile) {
+        List<ContainerPanelConfigurationType> resourcePanels = new ArrayList<>();
+        for (Class<?> clazz : getPanelInstanceClasses()) {
+            for (PanelInstance instance : getPanelInstancesAnnotations(clazz)) {
+                if (instance == null) {
+                    continue;
+                }
+                if (!instance.applicableForType().equals(ResourceType.class)) {
+                    continue;
+                }
+
+                if (compiledGuiProfile.getObjectDetails() == null) {
+                    compiledGuiProfile.setObjectDetails(new GuiObjectDetailsSetType());
+                }
+                ContainerPanelConfigurationType resourcePanel = compileContainerPanelConfiguration(clazz, ResourceType.class, instance);
+                resourcePanels.add(resourcePanel);
+            }
+        }
+
+        if (compiledGuiProfile.getObjectDetails() == null) {
+            compiledGuiProfile.setObjectDetails(new GuiObjectDetailsSetType());
+        }
+
+        if (compiledGuiProfile.getObjectDetails().getResourceDetailsPage().isEmpty()) {
+            compiledGuiProfile.getObjectDetails().getResourceDetailsPage().add(new GuiResourceDetailsPageType());
+        }
+
+        for (GuiResourceDetailsPageType resourceDetailsPage : compiledGuiProfile.getObjectDetails().getResourceDetailsPage()) {
+            List<ContainerPanelConfigurationType> mergedPanels =
+                    adminGuiConfigurationMergeManager.mergeContainerPanelConfigurationType(resourcePanels, resourceDetailsPage.getPanel());
+            resourceDetailsPage.getPanel().clear();
+            resourceDetailsPage.getPanel().addAll(mergedPanels);
+        }
+    }
+
     private synchronized void fillInPanelsMap() {
         if (!PANELS_MAP.isEmpty()) {
             return;
@@ -367,7 +403,8 @@ private void addDetails(GuiObjectDetailsSetType detailsSet, Class<? extends Cont
             return;
         }
 
-        if (QNameUtil.match(details.getType(), ShadowType.COMPLEX_TYPE)) {
+        if (QNameUtil.match(details.getType(), ShadowType.COMPLEX_TYPE)
+                || QNameUtil.match(details.getType(), ResourceType.COMPLEX_TYPE)) {
             return;
         }
 

diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/gui/api/component/wizard/BasicWizardPanel.html b/...in-gui/src/main/java/com/evolveum/midpoint/gui/api/component/wizard/BasicWizardPanel.html
@@ -12,9 +12,6 @@ <h2 class="mb-3" wicket:id="text"/>
         <h5 class="text-secondary mb-5" wicket:id="subText"/>
 
         <wicket:child/>
-        <!-- todo remove -->
-        <div wicket:id="content"/>
-
         <div class="d-flex gap-3 justify-content-center mt-5">
             <a class="btn btn-outline-primary" wicket:id="back">
                 <i class="fas fa-arrow-left mr-2"></i>

diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/gui/api/component/wizard/BasicWizardPanel.java b/...in-gui/src/main/java/com/evolveum/midpoint/gui/api/component/wizard/BasicWizardPanel.java
@@ -7,9 +7,10 @@
 
 package com.evolveum.midpoint.gui.api.component.wizard;
 
+import com.evolveum.midpoint.web.component.AjaxSubmitButton;
+import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
 
-import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.behavior.AttributeAppender;
@@ -18,7 +19,6 @@
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 
-import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 
 /**
  * @author lskublik
@@ -29,7 +29,6 @@ public class BasicWizardPanel<T> extends WizardStepPanel<T> {
 
     private static final String ID_TEXT = "text";
     private static final String ID_SUBTEXT = "subText";
-    private static final String ID_CONTENT = "content";
     private static final String ID_BACK = "back";
     private static final String ID_NEXT = "next";
     private static final String ID_NEXT_LABEL = "nextLabel";
@@ -57,8 +56,6 @@ private void initLayout() {
         secondaryText.add(new VisibleBehaviour(() -> getSubTextModel().getObject() != null));
         add(secondaryText);
 
-        add(createContentPanel(ID_CONTENT));
-
         AjaxLink back = new AjaxLink<>(ID_BACK) {
 
             @Override
@@ -72,12 +69,17 @@ public void onClick(AjaxRequestTarget target) {
         back.add(AttributeAppender.append("class", () -> !back.isEnabledInHierarchy() ? "disabled" : null));
         add(back);
 
-        AjaxLink next = new AjaxLink<>(ID_NEXT) {
+        AjaxSubmitButton next = new AjaxSubmitButton(ID_NEXT) {
 
             @Override
-            public void onClick(AjaxRequestTarget target) {
+            public void onSubmit(AjaxRequestTarget target) {
                 onNextPerformed(target);
             }
+
+            @Override
+            protected void onError(AjaxRequestTarget target) {
+                updateFeedbackPanels(target);
+            }
         };
         next.add(getNextBehaviour());
         next.setOutputMarkupId(true);
@@ -92,7 +94,10 @@ public void onClick(AjaxRequestTarget target) {
         next.add(nextLabel);
     }
 
-    protected Component createContentPanel(String id) {
+    protected void updateFeedbackPanels(AjaxRequestTarget target) {
+    }
+
+    protected WebMarkupContainer createContentPanel(String id) {
         return new WebMarkupContainer(id);
     }
 
@@ -124,7 +129,10 @@ protected void onBackPerformed(AjaxRequestTarget target) {
             target.add(getWizard().getPanel());
             return;
         }
+        onBackAfterWizardPerformed(target);
+    }
 
+    protected void onBackAfterWizardPerformed(AjaxRequestTarget target) {
         getPageBase().redirectBack();
     }
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/wizard/WizardPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/wizard/WizardPanel.java
@@ -75,7 +75,6 @@ private void initLayout() {
 
         WebMarkupContainer header = new WebMarkupContainer(ID_HEADER);
         header.setOutputMarkupId(true);
-        header.add(getVisibilityOfStepsHeader());
         add(header);
 
         ListView<IModel<String>> steps = new ListView<>(ID_STEPS, () -> wizardModel.getSteps().stream().map(s -> s.getTitle()).collect(Collectors.toList())) {
@@ -149,11 +148,6 @@ public boolean isEnabled() {
         addOrReplace(new WebMarkupContainer(ID_CONTENT_BODY));
     }
 
-    @NotNull
-    protected VisibleEnableBehaviour getVisibilityOfStepsHeader() {
-        return VisibleEnableBehaviour.ALWAYS_VISIBLE_ENABLED;
-    }
-
     public WizardStep getCurrentPanel() {
         return wizardModel.getActiveStep();
     }

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -5509,6 +5509,15 @@ private static PrismReferenceValue findResourceReference(PrismPropertyWrapper<QN
         }
     }
 
+    public static ContainerPanelConfigurationType getContainerConfiguration(GuiObjectDetailsPageType pageConfig, String panelType) {
+        Optional<ContainerPanelConfigurationType> config = pageConfig
+                .getPanel()
+                .stream()
+                .filter(containerConfig -> panelType.equals(containerConfig.getPanelType()))
+                .findFirst();
+        return config.isEmpty() ? null : config.get();
+    }
+
     /**
      * only for 'old' object details pages. Should be removed after only new design will be present.
      */

diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/message/FeedbackLabels.html b/...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/message/FeedbackLabels.html
@@ -0,0 +1,15 @@
+<!--
+  ~ Copyright (c) 2010-2014 Evolveum
+  ~
+  ~ This work is dual-licensed under the Apache License 2.0
+  ~ and European Union Public License. See LICENSE file for details.
+  -->
+<html xmlns:wicket="http://wicket.apache.org">
+<body>
+<wicket:panel>
+    <wicket:container wicket:id="list">
+        <span class="invalid-feedback d-block" wicket:id="message"/>
+    </wicket:container>
+</wicket:panel>
+</body>
+</html>
diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/message/FeedbackLabels.java b/...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/message/FeedbackLabels.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2010-2014 Evolveum and contributors
+ *
+ * This work is dual-licensed under the Apache License 2.0
+ * and European Union Public License. See LICENSE file for details.
+ */
+
+package com.evolveum.midpoint.gui.impl.component.message;
+
+import com.evolveum.midpoint.web.component.message.FeedbackAlerts;
+import com.evolveum.midpoint.web.component.message.FeedbackListView;
+import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
+import org.apache.wicket.feedback.FeedbackMessage;
+import org.apache.wicket.feedback.FeedbackMessagesModel;
+import org.apache.wicket.feedback.IFeedback;
+import org.apache.wicket.feedback.IFeedbackMessageFilter;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.PropertyModel;
+
+import java.util.List;
+
+/**
+ * @author lazyman
+ */
+public class FeedbackLabels extends FeedbackAlerts {
+
+    private static final String ID_LIST = "list";
+    private static final String ID_MESSAGE = "message";
+
+    public FeedbackLabels(String id) {
+        super(id);
+    }
+
+    protected void initLayout() {
+        ListView<FeedbackMessage> list = new ListView<>(ID_LIST, new FeedbackMessagesModel(this)) {
+            @Override
+            protected void populateItem(ListItem<FeedbackMessage> item) {
+                item.add(
+                        new Label(ID_MESSAGE, new PropertyModel<>(item.getModel(), "message")));
+            }
+        };
+        list.add(new VisibleEnableBehaviour() {
+
+            @Override
+            public boolean isVisible() {
+                return hasMessages();
+            }
+        });
+        add(list);
+    }
+
+    protected ListView<FeedbackMessage> getFeedbackListView() {
+        return (ListView<FeedbackMessage>) get(ID_LIST);
+    }
+
+}
diff --git a/...n/java/com/evolveum/midpoint/gui/impl/factory/panel/DefaultContainerablePanelFactory.java b/...n/java/com/evolveum/midpoint/gui/impl/factory/panel/DefaultContainerablePanelFactory.java
@@ -36,6 +36,9 @@ public void register() {
 
     @Override
     public org.apache.wicket.Component createPanel(PrismContainerPanelContext<C> panelCtx) {
+        if (FormPanelType.VERTICAL.equals(panelCtx.getFormType())) {
+
+        }
         return new DefaultContainerablePanel<>(panelCtx.getComponentId(), panelCtx.getValueWrapper(), panelCtx.getSettings());
     }
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/FormPanelType.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/FormPanelType.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2010-2022 Evolveum and contributors
+ *
+ * This work is dual-licensed under the Apache License 2.0
+ * and European Union Public License. See LICENSE file for details.
+ */
+package com.evolveum.midpoint.gui.impl.factory.panel;
+
+/**
+ * @author lskublik
+ */
+public enum FormPanelType {
+    VERTICAL,
+    HORIZONTAL;
+
+    public static FormPanelType getDefault() {
+        return HORIZONTAL;
+    }
+}
diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/ItemPanelContext.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/ItemPanelContext.java
@@ -41,6 +41,8 @@ public abstract class ItemPanelContext<T, IW extends ItemWrapper<?, ?>> implemen
     private ExpressionValidator<T> expressionValidator;
     private FeedbackAlerts feedback;
 
+    private FormPanelType formType = FormPanelType.getDefault();
+
     public ItemPanelContext(IModel<IW> itemWrapper) {
         this.itemWrapper = itemWrapper;
     }
@@ -159,4 +161,11 @@ public void setForm(Form<?> form) {
         this.form = form;
     }
 
+    public FormPanelType getFormType() {
+        return formType;
+    }
+
+    public void setFormType(FormPanelType formType) {
+        this.formType = formType;
+    }
 }