Merge remote-tracking branch 'origin/master' into feature/new-authent…

…ication-module
Evolveum · Jan 13, 2022 · addc376 · addc376
2 parents b7a0514 + bf476e9
commit addc376
Show file tree

Hide file tree

Showing 103 changed files with 3,203 additions and 1,964 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
@@ -53,7 +53,7 @@
     <link type="text/css" rel="stylesheet" href="wro/midpoint-theme.css"/>
 </head>
 
-<body wicket:id="body">
+<body wicket:id="body" class="fixed ">
     <div wicket:id="mainPopup"/>
     <div class="wrapper">
         <header wicket:id="mainHeader" class="main-header" style="max-height:550px;">

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
@@ -31,6 +31,8 @@
 import org.apache.wicket.feedback.FeedbackMessages;
 import org.apache.wicket.injection.Injector;
 import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
 import org.apache.wicket.markup.html.TransparentWebMarkupContainer;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.WebPage;

diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java b/...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java
@@ -30,6 +30,7 @@
 import org.apache.wicket.markup.html.panel.Fragment;
 import org.apache.wicket.markup.repeater.RepeatingView;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.model.StringResourceModel;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -116,7 +117,7 @@ public abstract class ContainerableListPanel<C extends Containerable, PO extends
 
     private final Class<C> defaultType;
 
-    private LoadableModel<Search<C>> searchModel;
+    private LoadableDetachableModel<Search<C>> searchModel;
 
     private Collection<SelectorOptions<GetOperationOptions>> options;
 
@@ -162,8 +163,8 @@ private void initSearchModel(){
         }
     }
 
-    protected LoadableModel<Search<C>> createSearchModel(){
-        return new LoadableModel<>(false) {
+    protected LoadableDetachableModel<Search<C>> createSearchModel(){
+        return new LoadableDetachableModel<>() {
 
             private static final long serialVersionUID = 1L;
 
@@ -214,6 +215,7 @@ public Search<C> load() {
                     }
                 }
                 if (storage != null) {
+
                     storage.setSearch(search);
                 }
                 return search;
@@ -380,7 +382,7 @@ public BoxedTablePanel<PO> getTable() {
     }
 
     public Class<C> getType() {
-        if (getSearchModel().isLoaded()) {
+        if (getSearchModel().isAttached()) {
             return getSearchModel().getObject().getTypeClass();
         }
         PageStorage storage = getPageStorage();
@@ -1111,7 +1113,7 @@ public void resetSearchModel(){
             storage.setPaging(null);
         }
 
-        searchModel.reset();
+//        searchModel.reset();
     }
 
     protected void saveSearchModel(ObjectPaging paging) {
@@ -1180,7 +1182,7 @@ public void setManualRefreshEnabled(Boolean manualRefreshEnabled) {
         this.manualRefreshEnabled = manualRefreshEnabled;
     }
 
-    protected LoadableModel<Search<C>> getSearchModel() {
+    protected LoadableDetachableModel<Search<C>> getSearchModel() {
         return searchModel;
     }
 

diff --git a/...ui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/AbstractPageObjectDetails.java b/...ui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/AbstractPageObjectDetails.java
@@ -26,6 +26,7 @@
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.markup.repeater.RepeatingView;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
 import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.util.string.StringValue;
@@ -108,8 +109,8 @@ protected ODM createObjectDetailsModels(PrismObject<O> object) {
         return (ODM) new ObjectDetailsModels<>(createPrismObjectModel(object), this);
     }
 
-    protected LoadableModel<PrismObject<O>> createPrismObjectModel(PrismObject<O> object) {
-        return new LoadableModel<>(false) {
+    protected LoadableDetachableModel<PrismObject<O>> createPrismObjectModel(PrismObject<O> object) {
+        return new LoadableDetachableModel<>() {
 
             @Override
             protected PrismObject<O> load() {
@@ -149,7 +150,7 @@ protected void initFragmentLayout() {
     }
 
     private Panel initSummaryPanel() {
-        LoadableModel<O> summaryModel = objectDetailsModels.getSummaryModel();
+        LoadableDetachableModel<O> summaryModel = objectDetailsModels.getSummaryModel();
         Panel summaryPanel = createSummaryPanel(ID_SUMMARY, summaryModel);
         summaryPanel.add(new VisibleBehaviour(() -> objectDetailsModels.getObjectStatus() != ItemStatus.ADDED));
         return summaryPanel;
@@ -484,7 +485,7 @@ public IModel<List<ContainerPanelConfigurationType>> getPanelConfigurations() {
     }
 
     public abstract Class<O> getType();
-    protected abstract Panel createSummaryPanel(String id, LoadableModel<O> summaryModel);
+    protected abstract Panel createSummaryPanel(String id, IModel<O> summaryModel);
 
     private MidpointForm getMainForm() {
         return (MidpointForm) get(createComponentPath(ID_DETAILS_VIEW, ID_MAIN_FORM));

diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/ObjectDetailsModels.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/ObjectDetailsModels.java
@@ -35,6 +35,8 @@
 import com.evolveum.midpoint.web.util.validation.SimpleValidationError;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
+import org.apache.wicket.model.LoadableDetachableModel;
+
 public class ObjectDetailsModels<O extends ObjectType> implements Serializable {
 
     private static final Trace LOGGER = TraceManager.getTrace(ObjectDetailsModels.class);
@@ -43,22 +45,22 @@ public class ObjectDetailsModels<O extends ObjectType> implements Serializable {
     protected static final String OPERATION_LOAD_PARENT_ORG = DOT_CLASS + "loadParentOrgs";
 
     private ModelServiceLocator modelServiceLocator;
-    private LoadableModel<PrismObject<O>> prismObjectModel;
+    private LoadableDetachableModel<PrismObject<O>> prismObjectModel;
 
     private LoadableModel<PrismObjectWrapper<O>> objectWrapperModel;
-    private LoadableModel<GuiObjectDetailsPageType> detailsPageConfigurationModel;
+    private LoadableDetachableModel<GuiObjectDetailsPageType> detailsPageConfigurationModel;
 
-    private LoadableModel<O> summaryModel;
+    private LoadableDetachableModel<O> summaryModel;
 
-    public ObjectDetailsModels(LoadableModel<PrismObject<O>> prismObjectModel, ModelServiceLocator serviceLocator) {
+    public ObjectDetailsModels(LoadableDetachableModel<PrismObject<O>> prismObjectModel, ModelServiceLocator serviceLocator) {
         this.prismObjectModel = prismObjectModel;
         this.modelServiceLocator = serviceLocator;
 
         objectWrapperModel = new LoadableModel<>(false) {
 
             @Override
             protected PrismObjectWrapper<O> load() {
-                PrismObject<O> prismObject = prismObjectModel.getObject();
+                PrismObject<O> prismObject = getPrismObject();//prismObjectModel.getObject();
 
                 PrismObjectWrapperFactory<O> factory = modelServiceLocator.findObjectWrapperFactory(prismObject.getDefinition());
                 Task task = modelServiceLocator.createSimpleTask("createWrapper");
@@ -79,14 +81,14 @@ protected PrismObjectWrapper<O> load() {
             }
         };
 
-        detailsPageConfigurationModel = new LoadableModel<>(false) {
+        detailsPageConfigurationModel = new LoadableDetachableModel<>() {
             @Override
             protected GuiObjectDetailsPageType load() {
-                return loadDetailsPageConfiguration(prismObjectModel.getObject()).clone();
+                return loadDetailsPageConfiguration(null).clone();
             }
         };
 
-        summaryModel = new LoadableModel<O>(false) {
+        summaryModel = new LoadableDetachableModel<O>() {
 
             @Override
             protected O load() {
@@ -144,11 +146,11 @@ protected PageBase getPageBase() {
     }
 
     protected GuiObjectDetailsPageType loadDetailsPageConfiguration(PrismObject<O> prismObject) {
-        return modelServiceLocator.getCompiledGuiProfile().findObjectDetailsConfiguration(prismObject.getDefinition().getTypeName());
+        return modelServiceLocator.getCompiledGuiProfile().findObjectDetailsConfiguration(getPrismObject().getDefinition().getTypeName());
     }
 
     //TODO change summary panels to wrappers?
-    public LoadableModel<O> getSummaryModel() {
+    public LoadableDetachableModel<O> getSummaryModel() {
         return summaryModel;
     }
 
@@ -282,10 +284,10 @@ protected List<ObjectDelta<? extends ObjectType>> getAdditionalModifyDeltas(Oper
 
 
     public void reset() {
-        prismObjectModel.reset();
+//        prismObjectModel.reset();
         objectWrapperModel.reset();
-        detailsPageConfigurationModel.reset();
-        summaryModel.reset();
+//        detailsPageConfigurationModel.reset();
+//        summaryModel.reset();
     }
 
     protected ModelServiceLocator getModelServiceLocator() {
@@ -305,10 +307,13 @@ public PrismObjectWrapper<O> getObjectWrapper() {
     }
 
     protected PrismObject<O> getPrismObject() {
+        if (!objectWrapperModel.isLoaded()) {
+            return prismObjectModel.getObject();
+        }
         return getObjectWrapper().getObject();
     }
 
-    public LoadableModel<GuiObjectDetailsPageType> getObjectDetailsPageConfiguration() {
+    public LoadableDetachableModel<GuiObjectDetailsPageType> getObjectDetailsPageConfiguration() {
         return detailsPageConfigurationModel;
     }