Merge remote-tracking branch 'origin/feature/removing-activiti' into …

…feature/removing-activiti
Evolveum · Mar 13, 2019 · bb61b01 · bb61b01
2 parents 1652f8e + 2c7748d
commit bb61b01
Show file tree

Hide file tree

Showing 34 changed files with 1,118 additions and 500 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/ComponentConstants.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/ComponentConstants.java
@@ -45,6 +45,12 @@ public class ComponentConstants {
     public static final QName UI_FOCUS_TAB_POLICY_RULES = new QName(NS_COMPONENTS_PREFIX, "focusTabPolicyRules");
     public static final String UI_FOCUS_TAB_POLICY_RULES_URL = QNameUtil.qNameToUri(UI_FOCUS_TAB_POLICY_RULES);
 
+    public static final QName UI_CASE_TAB_WORKITEMS = new QName(NS_COMPONENTS_PREFIX, "caseTabWorkitems");
+    public static final String UI_CASE_TAB_WORKITEMS_URL = QNameUtil.qNameToUri(UI_CASE_TAB_WORKITEMS);
+
+    public static final QName UI_CASE_TAB_EVENTS = new QName(NS_COMPONENTS_PREFIX, "caseTabEvents");
+    public static final String UI_CASE_TAB_EVENTS_URL = QNameUtil.qNameToUri(UI_CASE_TAB_EVENTS);
+
     public static final QName UI_FOCUS_TAB_APPLICABLE_POLICIES = new QName(NS_COMPONENTS_PREFIX, "focusTabApplicablePolicies");
     public static final String UI_FOCUS_TAB_APPLICABLE_POLICIES_URL = QNameUtil.qNameToUri(UI_FOCUS_TAB_APPLICABLE_POLICIES);
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/FocusTabVisibleBehavior.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/FocusTabVisibleBehavior.java
@@ -53,15 +53,11 @@ public class FocusTabVisibleBehavior<O extends ObjectType> extends VisibleEnable
 
     private IModel<PrismObject<O>> objectModel;
     private String uiAuthorizationUrl;
-    private boolean visibleOnHistoryPage = false;
-    private boolean isHistoryPage = false;
     private PageBase pageBase;
 
-    public FocusTabVisibleBehavior(IModel<PrismObject<O>> objectModel, String uiAuthorizationUrl, boolean visibleOnHistoryPage, boolean isHistoryPage, PageBase pageBase) {
+    public FocusTabVisibleBehavior(IModel<PrismObject<O>> objectModel, String uiAuthorizationUrl, PageBase pageBase) {
         this.objectModel = objectModel;
         this.uiAuthorizationUrl = uiAuthorizationUrl;
-        this.visibleOnHistoryPage = visibleOnHistoryPage;
-        this.isHistoryPage = isHistoryPage;
         this.pageBase = pageBase;
     }
 
@@ -94,13 +90,13 @@ public boolean isVisible() {
         // find all object form definitions for specified type, if there is none we'll show all default tabs
         List<ObjectFormType> forms = findObjectForm(config, object);
         if (forms.isEmpty()) {
-            return !isHistoryPage || visibleOnHistoryPage;
+            return true;
         }
 
         // we'll try to find includeDefault, if there is includeDefault=true, we can return true (all tabs visible)
         for (ObjectFormType form : forms) {
             if (BooleanUtils.isTrue(form.isIncludeDefaultForms())) {
-                return !isHistoryPage || visibleOnHistoryPage;
+                return true;
             }
         }
 
@@ -111,7 +107,7 @@ public boolean isVisible() {
             }
 
             if (ObjectUtils.equals(uiAuthorizationUrl, spec.getPanelUri())) {
-                return !isHistoryPage || visibleOnHistoryPage;
+                return true;
             }
         }
 

diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/gui/api/util/HistoryPageTabVisibleBehavior.java b/...n-gui/src/main/java/com/evolveum/midpoint/gui/api/util/HistoryPageTabVisibleBehavior.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010-2019 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.util;
+
+import com.evolveum.midpoint.gui.api.page.PageBase;
+import com.evolveum.midpoint.prism.PrismObject;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
+import org.apache.wicket.model.IModel;
+
+/**
+ * Created by honchar.
+ */
+public class HistoryPageTabVisibleBehavior<O extends ObjectType> extends FocusTabVisibleBehavior<O>{
+    private static final long serialVersionUID = 1L;
+
+    private boolean visibleOnHistoryPage = false;
+    private boolean isHistoryPage = false;
+
+    public HistoryPageTabVisibleBehavior(IModel<PrismObject<O>> objectModel, String uiAuthorizationUrl, boolean visibleOnHistoryPage, PageBase pageBase) {
+        super(objectModel, uiAuthorizationUrl, pageBase);
+        this.visibleOnHistoryPage = visibleOnHistoryPage;
+    }
+
+    @Override
+    public boolean isVisible() {
+        return super.isVisible() && visibleOnHistoryPage;
+    }
+}
diff --git a/.../src/main/java/com/evolveum/midpoint/gui/impl/component/MultivalueContainerListPanel.html b/.../src/main/java/com/evolveum/midpoint/gui/impl/component/MultivalueContainerListPanel.html
@@ -19,20 +19,10 @@
 <wicket:panel>
     <div wicket:id="items" class="main-form-panel">
         <div class="row" wicket:id="search"/>
-           <!--  <div wicket:id="relationContainer" class="col-xs-6">
-                <label class="col-xs-2 prism-property" ><wicket:message key="AbstractRoleAssignmentPanel.relationLabel" /></label>
-                <div class="col-xs-3" wicket:id="relation" />
-            </div>
-            <div class="col-xs-3 pull-right">
-                <div class="btn btn-default pull-right" wicket:id="showAllAssignmentsButton" />
-            </div>-->
-
         <div class="row" >
             <div class="col-md-12" wicket:id="itemsTable"  style="margin: 5px 0;"/>
         </div>
-        <!--  <div>
-            <div class="btn btn-success btn-sm" wicket:id="newItemButton"/>
-        </div>  -->
+        <wicket:child />
     </div>
 </wicket:panel>
 </html>
diff --git a/.../src/main/java/com/evolveum/midpoint/gui/impl/component/MultivalueContainerListPanel.java b/.../src/main/java/com/evolveum/midpoint/gui/impl/component/MultivalueContainerListPanel.java
@@ -24,6 +24,7 @@
 import com.evolveum.midpoint.web.component.MultifunctionalButton;
 import com.evolveum.midpoint.web.component.menu.cog.ButtonInlineMenuItem;
 import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItemAction;
+import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.DisplayType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.IconType;
 import org.apache.wicket.AttributeModifier;
@@ -79,8 +80,6 @@ public abstract class MultivalueContainerListPanel<C extends Containerable, S ex
 	private static final String ID_ITEMS_TABLE = "itemsTable";
 	public static final String ID_SEARCH_ITEM_PANEL = "search";
 
-	public static final String ID_DETAILS = "details";
-
 	private static final Trace LOGGER = TraceManager.getTrace(MultivalueContainerListPanel.class);
 
 	private TableId tableId;
@@ -92,21 +91,24 @@ public MultivalueContainerListPanel(String id, IModel<ContainerWrapper<C>> model
 		super(id, model);
 		this.tableId = tableId;
 		this.pageStorage = pageStorage;
-		
+
 		searchModel = new LoadableModel<Search>(false) {
-			
+
 			private static final long serialVersionUID = 1L;
 
 			@Override
 			protected Search load() {
+				if (model == null || model.getObject() == null){
+					return null;
+				}
 				PrismContainerDefinition<C> containerDef = model.getObject().getItemDefinition();
 		    	List<SearchItemDefinition> availableDefs = initSearchableItems(containerDef);
-		    	
+
 		    	Search search = new Search(model.getObject().getItem().getCompileTimeClass(), availableDefs);
 				return search;
 			}
 
-			
+
 		};
 	}
 
@@ -115,27 +117,20 @@ protected Search load() {
 	@Override
 	protected void onInitialize() {
 		super.onInitialize();
-
-
-
+
 		initPaging();
 		initLayout();
 	}
 
 	private void initLayout() {
 
 		initListPanel();
-
-		initCustomLayout();
-
 		setOutputMarkupId(true);
 
 	}
 
 	protected abstract void initPaging();
-
-	protected abstract void initCustomLayout();
-
+
 	private void initListPanel() {
 		WebMarkupContainer itemsContainer = new WebMarkupContainer(ID_ITEMS);
 		itemsContainer.setOutputMarkupId(true);
@@ -319,8 +314,13 @@ protected void searchPerformed(ObjectQuery query, AjaxRequestTarget target) {
 				MultivalueContainerListPanel.this.searchPerformed(query, target);
 			}
 		};
+		searchPanel.add(new VisibleBehaviour(() -> isSearchEnabled()));
 		return searchPanel;
 	}
+
+	protected boolean isSearchEnabled(){
+		return true;
+	}
 
 	private void searchPerformed(ObjectQuery query, AjaxRequestTarget target) {
 
@@ -385,7 +385,7 @@ public String getObject() {
 	protected abstract List<ContainerValueWrapper<C>> postSearch(List<ContainerValueWrapper<C>> items);
 
 	private ObjectQuery createProviderQuery() {
-		ObjectQuery searchQuery = getQuery();
+		ObjectQuery searchQuery = isSearchEnabled() ? getQuery() : null;
 
 		ObjectQuery customQuery = createQuery();
 

diff --git a/...om/evolveum/midpoint/gui/impl/component/MultivalueContainerListPanelWithDetailsPanel.html b/...om/evolveum/midpoint/gui/impl/component/MultivalueContainerListPanelWithDetailsPanel.html
@@ -16,24 +16,7 @@
 
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
-<wicket:panel>
-    <div wicket:id="items" class="main-form-panel">
-        <div class="row" wicket:id="search"/>
-           <!--  <div wicket:id="relationContainer" class="col-xs-6">
-                <label class="col-xs-2 prism-property" ><wicket:message key="AbstractRoleAssignmentPanel.relationLabel" /></label>
-                <div class="col-xs-3" wicket:id="relation" />
-            </div>
-            <div class="col-xs-3 pull-right">
-                <div class="btn btn-default pull-right" wicket:id="showAllAssignmentsButton" />
-            </div>-->
-
-        <div class="row" >
-            <div class="col-md-12" wicket:id="itemsTable"  style="margin: 5px 0;"/>
-        </div>
-        <!--  <div>
-            <div class="btn btn-success btn-sm" wicket:id="newItemButton"/>
-        </div>  -->
-    </div>
+<wicket:extend>
     <div wicket:id="details">
     	<div wicket:id="itemsDetails">
     		<div wicket:id="itemDetails" />
@@ -46,5 +29,5 @@
         	</div>
     	</div>
     </div>
-</wicket:panel>
+</wicket:extend>
 </html>
diff --git a/...om/evolveum/midpoint/gui/impl/component/MultivalueContainerListPanelWithDetailsPanel.java b/...om/evolveum/midpoint/gui/impl/component/MultivalueContainerListPanelWithDetailsPanel.java
@@ -46,7 +46,6 @@ public abstract class MultivalueContainerListPanelWithDetailsPanel<C extends Con
 
 	public static final String ID_ITEMS_DETAILS = "itemsDetails";
 	public static final String ID_ITEM_DETAILS = "itemDetails";
-	public static final String ID_SEARCH_ITEM_PANEL = "search";
 
 	public static final String ID_DETAILS = "details";
 
@@ -65,15 +64,9 @@ public MultivalueContainerListPanelWithDetailsPanel(String id, IModel<ContainerW
 	@Override
 	protected void onInitialize() {
 		super.onInitialize();
-	}
-
-	@Override
-	protected void initCustomLayout() {
-
 		initDetailsPanel();
-
 	}
-	
+
 	public void setItemDetailsVisible(boolean itemDetailsVisible) {
 		this.itemDetailsVisible = itemDetailsVisible;
 	}
@@ -93,7 +86,7 @@ public boolean isVisible() {
 			}
 		});
 
-		add(details);
+		getItemContainer().add(details);
 
 		ListView<ContainerValueWrapper<C>> itemDetailsView = new ListView<ContainerValueWrapper<C>>(MultivalueContainerListPanelWithDetailsPanel.ID_ITEMS_DETAILS,
 				new IModel<List<ContainerValueWrapper<C>>>() {

diff --git a/...um/midpoint/gui/impl/page/admin/configuration/component/LoggingConfigurationTabPanel.java b/...um/midpoint/gui/impl/page/admin/configuration/component/LoggingConfigurationTabPanel.java
@@ -176,11 +176,6 @@ protected List<IColumn<ContainerValueWrapper<ClassLoggerConfigurationType>, Stri
 				return initLoggersBasicColumns();
 			}
 
-			@Override
-			protected void initCustomLayout() {
-
-			}
-
 			@Override
 			protected void itemPerformedForDefaultAction(AjaxRequestTarget target,
 					IModel<ContainerValueWrapper<ClassLoggerConfigurationType>> rowModel,

diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/web/component/data/IconedObjectNamePanel.html b/...min-gui/src/main/java/com/evolveum/midpoint/web/component/data/IconedObjectNamePanel.html
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright (c) 2010-2019 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.
+  -->
+
+<!DOCTYPE html>
+<html xmlns:wicket="http://wicket.apache.org">
+<wicket:panel>
+    <div class="row">
+        <div wicket:id="icon" />
+        <div wicket:id="name" />
+    </div>
+</wicket:panel>
+</html>