Merge branch 'master' of https://github.com/Evolveum/midpoint into sc…

…hrodinger-testing
Evolveum · Jul 18, 2018 · 84ea6d7 · 84ea6d7
2 parents 88e0504 + a35c1dd
commit 84ea6d7
Show file tree

Hide file tree

Showing 91 changed files with 2,007 additions and 904 deletions.
diff --git a/...rc/main/java/com/evolveum/midpoint/gui/api/component/AbstractAssignmentPopupTabPanel.java b/...rc/main/java/com/evolveum/midpoint/gui/api/component/AbstractAssignmentPopupTabPanel.java
@@ -37,6 +37,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -49,8 +50,8 @@ public abstract class AbstractAssignmentPopupTabPanel<O extends ObjectType> exte
     private static final String DOT_CLASS = AbstractAssignmentPopupTabPanel.class.getName();
 
     public AbstractAssignmentPopupTabPanel(String id, ObjectTypes type){
-        super(id, type);
+        super(id);
     }
 
-    protected abstract Set<AssignmentType> getSelectedAssignmentsList();
+    protected abstract Map<String, AssignmentType> getSelectedAssignmentsMap();
 }
diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AbstractPopupTabPanel.html b/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AbstractPopupTabPanel.html
@@ -15,6 +15,7 @@
   -->
 
 <wicket:panel xmlns:wicket="http://wicket.apache.org">
-    <div wicket:id="objectListPanel" />
     <wicket:child />
+    <div wicket:id="objectListPanel" />
+    <div wicket:id="parametersPanel" />
 </wicket:panel>
diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AbstractPopupTabPanel.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AbstractPopupTabPanel.java
@@ -15,12 +15,16 @@
  */
 package com.evolveum.midpoint.gui.api.component;
 
+import com.evolveum.midpoint.gui.api.model.LoadableModel;
 import com.evolveum.midpoint.prism.query.ObjectQuery;
 import com.evolveum.midpoint.schema.constants.ObjectTypes;
 import com.evolveum.midpoint.web.component.util.SelectableBean;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
+import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.panel.Fragment;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 
@@ -34,25 +38,30 @@ public abstract class AbstractPopupTabPanel<O extends ObjectType> extends BasePa
     private static final long serialVersionUID = 1L;
 
     private static final String ID_OBJECT_LIST_PANEL = "objectListPanel";
+    private static final String ID_PARAMETERS_PANEL = "parametersPanel";
+    protected static final String ID_PARAMETERS_PANEL_FRAGMENT = "parametersPanelFragment";
 
-    protected ObjectTypes type;
     protected List<O> preSelectedObjects = new ArrayList<>();
 
-    public AbstractPopupTabPanel(String id, ObjectTypes type){
+    public AbstractPopupTabPanel(String id){
         super(id);
-        this.type = type;
-//        this.selectedObjects = selectedObjects;
     }
 
     @Override
     protected void onInitialize(){
         super.onInitialize();
+        setOutputMarkupId(true);
         add(initObjectListPanel());
-        initParametersPanel();
+
+        Fragment parametersPanelFragment = new Fragment(ID_PARAMETERS_PANEL, ID_PARAMETERS_PANEL_FRAGMENT, this);
+        parametersPanelFragment.setOutputMarkupId(true);
+
+        initParametersPanel(parametersPanelFragment);
+        add(parametersPanelFragment);
     }
 
-    private PopupObjectListPanel initObjectListPanel(){
-        PopupObjectListPanel<O> listPanel = new PopupObjectListPanel<O>(ID_OBJECT_LIST_PANEL, (Class)type.getClassDefinition(),
+    protected Component initObjectListPanel(){
+        PopupObjectListPanel<O> listPanel = new PopupObjectListPanel<O>(ID_OBJECT_LIST_PANEL, (Class)getObjectType().getClassDefinition(),
                 null, true, getPageBase(), getPreselectedObjects()) {
 
             private static final long serialVersionUID = 1L;
@@ -87,22 +96,22 @@ public boolean isVisible(){
         return listPanel;
     }
 
-    protected abstract void initParametersPanel();
+    protected abstract void initParametersPanel(Fragment parametersPanel);
 
     protected List<O> getPreselectedObjects(){
         return preSelectedObjects;
     }
 
     protected List<O> getSelectedObjectsList(){
-        PopupObjectListPanel objectListPanel = getObjectListPanel();
+        PopupObjectListPanel objectListPanel = (PopupObjectListPanel)getObjectListPanel();
         if (objectListPanel == null){
             return new ArrayList();
         }
         return objectListPanel.getSelectedObjects();
     }
 
-    protected PopupObjectListPanel getObjectListPanel(){
-        return (PopupObjectListPanel)get(ID_OBJECT_LIST_PANEL);
+    protected Component getObjectListPanel(){
+        return get(ID_OBJECT_LIST_PANEL);
     }
 
     protected void onSelectionPerformed(AjaxRequestTarget target){}
@@ -119,7 +128,5 @@ protected boolean isObjectListPanelVisible(){
         return true;
     }
 
-    public ObjectTypes getType() {
-        return type;
-    }
+    protected abstract ObjectTypes getObjectType();
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AssignmentPopup.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AssignmentPopup.java
@@ -29,9 +29,10 @@
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.model.StringResourceModel;
+import org.apache.wicket.protocol.http.ClientProperties;
+import org.apache.wicket.protocol.http.WebSession;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
 /**
  * Created by honchar.
@@ -83,26 +84,22 @@ public void onClick(AjaxRequestTarget target) {
 
             @Override
             public void onClick(AjaxRequestTarget target) {
-                List<AssignmentType> newAssignmentsList = new ArrayList<>();
-//                List<AssignmentType> newOrgTypeAssignmentsList = new ArrayList<>();
+                Map<String, AssignmentType> selectedAssignmentsMap = new HashMap<>();
 
                 tabs.forEach(panelTab -> {
                     WebMarkupContainer assignmentPanel = ((CountablePanelTab)panelTab).getPanel();
                     if (assignmentPanel == null){
                         return;
                     }
-//                    if (assignmentPanel instanceof OrgTypeAssignmentPopupTabPanel){
-//                        if (newOrgTypeAssignmentsList.isEmpty()) {
-//                            newOrgTypeAssignmentsList.addAll(((AbstractAssignmentPopupTabPanel) assignmentPanel).getSelectedAssignmentsList());
-//                            return;
-//                        } else {
-//                            return;
-//                        }
-//                    }
-                    newAssignmentsList.addAll(((AbstractAssignmentPopupTabPanel)assignmentPanel).getSelectedAssignmentsList());
+
+                    (((AbstractAssignmentPopupTabPanel) assignmentPanel).getSelectedAssignmentsMap()).forEach((k, v) ->
+                            selectedAssignmentsMap.putIfAbsent((String)k, (AssignmentType) v));
+
+
                 });
-//                newAssignmentsList.addAll(newOrgTypeAssignmentsList);
-                addPerformed(target, newAssignmentsList);
+                List assignments = new ArrayList<>();
+                assignments.addAll(Arrays.asList(selectedAssignmentsMap.values().toArray()));
+                addPerformed(target, assignments);
             }
         };
         addButton.setOutputMarkupId(true);
@@ -128,6 +125,11 @@ public WebMarkupContainer createPanel(String panelId) {
                             protected void onSelectionPerformed(AjaxRequestTarget target){
                                 tabLabelPanelUpdate(target);
                             }
+
+                            @Override
+                            protected ObjectTypes getObjectType(){
+                                return ObjectTypes.ROLE;
+                            }
                         };
                     }
 
@@ -144,14 +146,19 @@ public String getCount() {
 
                     @Override
                     public WebMarkupContainer createPanel(String panelId) {
-                        return new OrgTypeAssignmentPopupTabPanel(panelId, false){
+                        return new FocusTypeAssignmentPopupTabPanel(panelId, ObjectTypes.ORG){
                             private static final long serialVersionUID = 1L;
 
                             @Override
                             protected void onSelectionPerformed(AjaxRequestTarget target){
                                 tabLabelPanelUpdate(target);
                             }
 
+                            @Override
+                            protected ObjectTypes getObjectType(){
+                                return ObjectTypes.ORG;
+                            }
+
                             @Override
                             protected List<OrgType> getPreselectedObjects(){
                                 return selectedOrgsList;
@@ -173,7 +180,7 @@ public String getCount() {
 
             @Override
             public WebMarkupContainer createPanel(String panelId) {
-                return new OrgTypeAssignmentPopupTabPanel(panelId, true){
+                return new OrgTreeAssignmentPopupTabPanel(panelId){
                     private static final long serialVersionUID = 1L;
 
                     @Override
@@ -204,6 +211,11 @@ public WebMarkupContainer createPanel(String panelId) {
                         return new FocusTypeAssignmentPopupTabPanel(panelId, ObjectTypes.SERVICE){
                             private static final long serialVersionUID = 1L;
 
+                            @Override
+                            protected ObjectTypes getObjectType(){
+                                return ObjectTypes.SERVICE;
+                            }
+
                             @Override
                             protected void onSelectionPerformed(AjaxRequestTarget target){
                                 tabLabelPanelUpdate(target);
@@ -265,11 +277,21 @@ protected void addPerformed(AjaxRequestTarget target, List newAssignmentsList) {
     }
 
     public int getWidth(){
-        return 900;
+        return 80;
     }
 
     public int getHeight(){
-        return 1200;
+        return 80;
+    }
+
+    @Override
+    public String getWidthUnit(){
+        return "%";
+    }
+
+    @Override
+    public String getHeightUnit(){
+        return "%";
     }
 
     public StringResourceModel getTitle(){

diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ChooseMemberForOrgPopup.java b/...in-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ChooseMemberForOrgPopup.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2010-2018 Evolveum
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.evolveum.midpoint.gui.api.component;
+
+import com.evolveum.midpoint.gui.api.component.tabs.CountablePanelTab;
+import com.evolveum.midpoint.schema.constants.ObjectTypes;
+import com.evolveum.midpoint.schema.constants.RelationTypes;
+
+/**
+ * Created by honchar
+ */
+
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.OrgType;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.extensions.markup.html.tabs.ITab;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public abstract class ChooseMemberForOrgPopup<O extends ObjectType> extends ChooseMemberPopup<O, OrgType> {
+    private static final long serialVersionUID = 1L;
+
+    public ChooseMemberForOrgPopup(String id, List<RelationTypes> availableRelationList){
+        super(id, availableRelationList);
+    }
+
+    @Override
+    protected List<ITab> createAssignmentTabs() {
+        List<ITab> tabs = super.createAssignmentTabs();
+        tabs.add(new CountablePanelTab(getPageBase().createStringResource("chooseMemberForOrgPopup.otherTypesLabel"), null) {
+
+            private static final long serialVersionUID = 1L;
+
+            @Override
+            public WebMarkupContainer createPanel(String panelId) {
+                return new MultiTypesMemberPopupTabPanel(panelId, availableRelationList){
+                    private static final long serialVersionUID = 1L;
+
+                    @Override
+                    protected void onSelectionPerformed(AjaxRequestTarget target){
+                        tabLabelPanelUpdate(target);
+                    }
+
+                    @Override
+                    protected OrgType getAbstractRoleTypeObject(){
+                        return ChooseMemberForOrgPopup.this.getAssignmentTargetRefObject();
+                    }
+                };
+            }
+
+            @Override
+            public String getCount() {
+                return Integer.toString(getTabPanelSelectedCount(getPanel()));
+            }
+        });
+        return tabs;
+    }
+
+}
diff --git a/...gui/api/component/ChooseMembersPopup.html → .../gui/api/component/ChooseMemberPopup.html b/...gui/api/component/ChooseMembersPopup.html → .../gui/api/component/ChooseMemberPopup.html