members popup panel for orgtree page

Evolveum · Jul 13, 2018 · 258571b · 258571b
1 parent 65002de
commit 258571b
Show file tree

Hide file tree

Showing 19 changed files with 412 additions and 134 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
@@ -50,7 +50,7 @@ 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 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,13 +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;
 
@@ -35,24 +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;
     }
 
     @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 Component 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,7 +96,7 @@ public boolean isVisible(){
         return listPanel;
     }
 
-    protected abstract void initParametersPanel();
+    protected abstract void initParametersPanel(Fragment parametersPanel);
 
     protected List<O> getPreselectedObjects(){
         return preSelectedObjects;
@@ -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
@@ -123,6 +123,11 @@ public WebMarkupContainer createPanel(String panelId) {
                             protected void onSelectionPerformed(AjaxRequestTarget target){
                                 tabLabelPanelUpdate(target);
                             }
+
+                            @Override
+                            protected ObjectTypes getObjectType(){
+                                return ObjectTypes.ROLE;
+                            }
                         };
                     }
 
@@ -147,6 +152,11 @@ protected void onSelectionPerformed(AjaxRequestTarget target){
                                 tabLabelPanelUpdate(target);
                             }
 
+                            @Override
+                            protected ObjectTypes getObjectType(){
+                                return ObjectTypes.ORG;
+                            }
+
                             @Override
                             protected List<OrgType> getPreselectedObjects(){
                                 return selectedOrgsList;
@@ -199,6 +209,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);

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/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ChooseMemberPopup.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ChooseMemberPopup.java
@@ -60,7 +60,7 @@ public abstract class ChooseMemberPopup<O extends ObjectType, T extends Abstract
     private static final String ID_FORM = "form";
 
     private List<OrgType> selectedOrgsList = new ArrayList<>();
-    private List<RelationTypes> availableRelationList;
+    protected List<RelationTypes> availableRelationList;
 
     public ChooseMemberPopup(String id, List<RelationTypes> availableRelationList){
         super(id);
@@ -107,7 +107,7 @@ public void onClick(AjaxRequestTarget target) {
                     }
 
                     MemberPopupTabPanel memberPanel = (MemberPopupTabPanel) tabPanel;
-                    executeMemberOperation(memberPanel.getType().getTypeQName(), createInOidQuery(memberPanel.getSelectedObjectsList()),
+                    executeMemberOperation(memberPanel.getObjectType().getTypeQName(), createInOidQuery(memberPanel.getSelectedObjectsList()),
                            memberPanel.prepareDelta(), target);
                 });
                 ChooseMemberPopup.this.getPageBase().hideMainPopup(target);
@@ -123,20 +123,57 @@ protected List<ITab> createAssignmentTabs() {
         VisibleEnableBehaviour authorization = new VisibleEnableBehaviour(){
         };
 
+        tabs.add(new CountablePanelTab(getPageBase().createStringResource("ObjectTypes.USER"), authorization) {
+
+            private static final long serialVersionUID = 1L;
+
+            @Override
+            public WebMarkupContainer createPanel(String panelId) {
+                return new MemberPopupTabPanel(panelId, availableRelationList){
+                    private static final long serialVersionUID = 1L;
+
+                    @Override
+                    protected void onSelectionPerformed(AjaxRequestTarget target){
+                        tabLabelPanelUpdate(target);
+                    }
+
+                    @Override
+                    protected ObjectTypes getObjectType(){
+                        return ObjectTypes.USER;
+                    }
+
+                    @Override
+                    protected T getAbstractRoleTypeObject(){
+                        return ChooseMemberPopup.this.getAssignmentTargetRefObject();
+                    }
+                };
+            }
+
+            @Override
+            public String getCount() {
+                return Integer.toString(getTabPanelSelectedCount(getPanel()));
+            }
+        });
+
         tabs.add(new CountablePanelTab(getPageBase().createStringResource("ObjectTypes.ROLE"), authorization) {
 
             private static final long serialVersionUID = 1L;
 
             @Override
             public WebMarkupContainer createPanel(String panelId) {
-                return new MemberPopupTabPanel(panelId, ObjectTypes.ROLE, availableRelationList){
+                return new MemberPopupTabPanel(panelId, availableRelationList){
                     private static final long serialVersionUID = 1L;
 
                     @Override
                     protected void onSelectionPerformed(AjaxRequestTarget target){
                         tabLabelPanelUpdate(target);
                     }
 
+                    @Override
+                    protected ObjectTypes getObjectType(){
+                        return ObjectTypes.ROLE;
+                    }
+
                     @Override
                     protected T getAbstractRoleTypeObject(){
                         return ChooseMemberPopup.this.getAssignmentTargetRefObject();
@@ -157,14 +194,19 @@ public String getCount() {
 
                     @Override
                     public WebMarkupContainer createPanel(String panelId) {
-                        return new MemberPopupTabPanel(panelId, ObjectTypes.ORG, availableRelationList){
+                        return new MemberPopupTabPanel(panelId, availableRelationList){
                             private static final long serialVersionUID = 1L;
 
                             @Override
                             protected void onSelectionPerformed(AjaxRequestTarget target){
                                 tabLabelPanelUpdate(target);
                             }
 
+                            @Override
+                            protected ObjectTypes getObjectType(){
+                                return ObjectTypes.ORG;
+                            }
+
                             @Override
                             protected T getAbstractRoleTypeObject(){
                                 return ChooseMemberPopup.this.getAssignmentTargetRefObject();
@@ -224,14 +266,19 @@ public String getCount() {
 
                     @Override
                     public WebMarkupContainer createPanel(String panelId) {
-                        return new MemberPopupTabPanel(panelId, ObjectTypes.SERVICE, availableRelationList){
+                        return new MemberPopupTabPanel(panelId, availableRelationList){
                             private static final long serialVersionUID = 1L;
 
                             @Override
                             protected T getAbstractRoleTypeObject(){
                                 return ChooseMemberPopup.this.getAssignmentTargetRefObject();
                             }
 
+                            @Override
+                            protected ObjectTypes getObjectType(){
+                                return ObjectTypes.SERVICE;
+                            }
+
                             @Override
                             protected void onSelectionPerformed(AjaxRequestTarget target){
                                 tabLabelPanelUpdate(target);
@@ -249,14 +296,14 @@ public String getCount() {
         return tabs;
     }
 
-    private int getTabPanelSelectedCount(WebMarkupContainer panel){
+    protected int getTabPanelSelectedCount(WebMarkupContainer panel){
         if (panel != null && panel instanceof MemberPopupTabPanel){
             return ((MemberPopupTabPanel) panel).getSelectedObjectsList().size();
         }
         return 0;
     }
 
-    private void tabLabelPanelUpdate(AjaxRequestTarget target){
+    protected void tabLabelPanelUpdate(AjaxRequestTarget target){
         target.add(getTabbedPanel());
     }
 

diff --git a/...c/main/java/com/evolveum/midpoint/gui/api/component/FocusTypeAssignmentPopupTabPanel.html b/...c/main/java/com/evolveum/midpoint/gui/api/component/FocusTypeAssignmentPopupTabPanel.html
@@ -17,23 +17,29 @@
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:extend>
-    <wicket:child />
-    <div class="form-inline">
-        <div class="row">
-            <div class="col-md-4">
-                <label><wicket:message key="AssignmentPanel.newAssignmentParameters" /></label>
-            </div>
-        </div>
-        <div wicket:id="relationContainer" class="row">
-            <div class="form-group col-md-12">
-                <div class="col-md-1" >
-                    <div><wicket:message key="AssignmentEditorPanel.relation"/></div>
+    <wicket:child/>
+    <wicket:fragment wicket:id="parametersPanelFragment">
+        <div class="form-inline">
+            <div class="row">
+                <div class="col-md-4">
+                    <label>
+                        <wicket:message key="AssignmentPanel.newAssignmentParameters"/>
+                    </label>
                 </div>
-                <div class="col-md-3" >
-                    <span wicket:id="relation"/>
+            </div>
+            <div wicket:id="relationContainer" class="row">
+                <div class="form-group col-md-12">
+                    <div class="col-md-1">
+                        <div>
+                            <wicket:message key="AssignmentEditorPanel.relation"/>
+                        </div>
+                    </div>
+                    <div class="col-md-3">
+                        <span wicket:id="relation"/>
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
+    </wicket:fragment>
 </wicket:extend>
 </html>