Merge remote-tracking branch 'origin/master' into feature/user-search

Conflicts: gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UsersStorage.java
Evolveum · Sep 8, 2015 · 4a62589 · 4a62589
2 parents 3d53e9e + 8399ecd
commit 4a62589
Show file tree

Hide file tree

Showing 68 changed files with 3,777 additions and 1,544 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/ValueChoosePanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/ValueChoosePanel.html
@@ -0,0 +1,35 @@
+<!--
+  ~ Copyright (c) 2010-2013 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.
+  -->
+
+
+<html xmlns:wicket="http://wicket.apache.org">
+<wicket:panel>
+    <div wicket:id="showPopup" />
+
+          <div wicket:id="textWrapper">
+            <div class="input-group input-group-sm">
+                <span class="input-group-btn">
+                    <button wicket:id="edit" class="btn btn-primary" type="button">
+                        <wicket:message key="PageBase.button.edit" />
+                    </button>
+                </span>
+                <input type="text" class="form-control input-sm" wicket:id="text" />
+                <span class="text-danger" wicket:id="feedback" />
+            </div>
+        </div>
+
+</wicket:panel>
+</html>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/ValueChoosePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/ValueChoosePanel.java
@@ -0,0 +1,238 @@
+package com.evolveum.midpoint.web.component.form;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
+import org.apache.wicket.feedback.ComponentFeedbackMessageFilter;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.FeedbackPanel;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.IModel;
+
+import com.evolveum.midpoint.prism.PrismReferenceValue;
+import com.evolveum.midpoint.prism.query.ObjectQuery;
+import com.evolveum.midpoint.schema.util.ObjectTypeUtil;
+import com.evolveum.midpoint.util.logging.Trace;
+import com.evolveum.midpoint.util.logging.TraceManager;
+import com.evolveum.midpoint.web.component.form.multivalue.MultiValueChoosePanel;
+import com.evolveum.midpoint.web.component.util.SimplePanel;
+import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
+import com.evolveum.midpoint.web.page.admin.configuration.component.ChooseTypeDialog;
+import com.evolveum.midpoint.web.page.admin.roles.component.UserOrgReferenceChoosePanel;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.OrgType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
+
+public class ValueChoosePanel <T, C extends ObjectType> extends SimplePanel<T> {
+
+	private static final Trace LOGGER = TraceManager.getTrace(MultiValueChoosePanel.class);
+
+	private static final String ID_LABEL = "label";
+
+	private static final String ID_TEXT_WRAPPER = "textWrapper";
+	private static final String ID_TEXT = "text";
+	private static final String ID_FEEDBACK = "feedback";
+	private static final String ID_ADD = "add";
+	private static final String ID_REMOVE = "remove";
+	private static final String ID_BUTTON_GROUP = "buttonGroup";
+	private static final String ID_EDIT = "edit";
+
+	protected static final String MODAL_ID_CHOOSE_PANEL = "showPopup";
+
+	private static final String CLASS_MULTI_VALUE = "multivalue-form";
+
+	public ValueChoosePanel(String id, IModel<T> value, boolean required, Class<C> type) {
+		super(id, value);
+		setOutputMarkupId(true);
+
+		initLayout(value, required, type);
+	}
+
+	private void initLayout(final IModel<T> value, final boolean required, Class<C> type) {
+
+
+		WebMarkupContainer textWrapper = new WebMarkupContainer(ID_TEXT_WRAPPER);
+
+		TextField text = new TextField<>(ID_TEXT, createTextModel(value));
+		text.add(new AjaxFormComponentUpdatingBehavior("onblur") {
+			@Override
+			protected void onUpdate(AjaxRequestTarget ajaxRequestTarget) {
+			}
+		});
+		text.setRequired(required);
+		text.setEnabled(false);
+		textWrapper.add(text);
+
+		FeedbackPanel feedback = new FeedbackPanel(ID_FEEDBACK, new ComponentFeedbackMessageFilter(text));
+		textWrapper.add(feedback);
+
+		AjaxLink edit = new AjaxLink(ID_EDIT) {
+
+			@Override
+			public void onClick(AjaxRequestTarget target) {
+				editValuePerformed(target);
+			}
+		};
+		textWrapper.add(edit);
+		add(textWrapper);
+
+		initDialog(type);
+
+	}
+
+	  protected T createNewEmptyItem() throws InstantiationException, IllegalAccessException {
+	        return null;
+	    }
+
+	  protected void replaceIfEmpty(Object object) {
+		  boolean added = false;
+		 	  ObjectReferenceType ort = ObjectTypeUtil.createObjectRef((ObjectType) object);
+		 	  ort.setTargetName(((ObjectType) object).getName());
+			  getModel().setObject((T)ort.asReferenceValue());
+
+	  }
+
+	protected void initDialog(final Class<C> type) {
+
+		if (FocusType.class.equals(type)){
+			 initUserOrgDialog();
+         } else {
+        	 initGenericDialog(type);
+
+
+         }
+	}
+
+	private void initGenericDialog(Class<C> type){
+		ModalWindow dialog = new ChooseTypeDialog(MODAL_ID_CHOOSE_PANEL, type) {
+
+			@Override
+			protected void chooseOperationPerformed(AjaxRequestTarget target, ObjectType object) {
+				choosePerformed(target, (C) object);
+			}
+
+			@Override
+			protected ObjectQuery getDataProviderQuery() {
+				return createChooseQuery();
+			}
+
+			@Override
+			public boolean isSearchEnabled() {
+				return true;
+			}
+		};
+		add(dialog);
+	}
+
+	private void initUserOrgDialog(){
+		ModalWindow dialog = new ChooseTypeDialog(MODAL_ID_CHOOSE_PANEL, UserType.class){
+
+            @Override
+            protected void chooseOperationPerformed(AjaxRequestTarget target, ObjectType object){
+                choosePerformed(target, (C)object);
+            }
+
+            @Override
+            protected WebMarkupContainer createExtraContentContainer(String extraContentId) {
+                return new UserOrgReferenceChoosePanel(extraContentId, Boolean.FALSE){
+
+                    @Override
+                    protected void onReferenceTypeChangePerformed(AjaxRequestTarget target, Boolean newValue) {
+                        updateTableByTypePerformed(target, Boolean.FALSE.equals(newValue) ? UserType.class : OrgType.class);
+                    }
+                };
+            }
+        };
+        add(dialog);
+	}
+
+
+
+	protected ObjectQuery createChooseQuery() {
+		return null;
+	}
+
+	/**
+	 * @return css class for off-setting other values (not first, left to the
+	 *         first there is a label)
+	 */
+	protected String getOffsetClass() {
+		return "col-md-offset-4";
+	}
+
+	protected IModel<String> createTextModel(final IModel<T> model) {
+		return new AbstractReadOnlyModel<String>() {
+
+			@Override
+			public String getObject() {
+				PrismReferenceValue ort = (PrismReferenceValue) model.getObject();
+
+				return ort == null ? null : (ort.getTargetName() != null ? ort.getTargetName().getOrig() : ort.getOid());
+			}
+		};
+	}
+
+	protected void editValuePerformed(AjaxRequestTarget target) {
+		ModalWindow window = (ModalWindow) get(MODAL_ID_CHOOSE_PANEL);
+		ChooseTypeDialog dialog = (ChooseTypeDialog) window;
+		dialog.updateTablePerformed(target, createChooseQuery());
+		window.show(target);
+	}
+
+	/*
+	 * TODO - this method contains check, if chosen object already is not in
+	 * selected values array This is a temporary solution until we well be able
+	 * to create "already-chosen" query
+	 */
+	protected void choosePerformed(AjaxRequestTarget target, C object) {
+		choosePerformedHook(target, object);
+		ModalWindow window = (ModalWindow) get(MODAL_ID_CHOOSE_PANEL);
+		window.close(target);
+
+		 if(isObjectUnique(object)){
+			 replaceIfEmpty(object);
+		 }
+
+		if (LOGGER.isTraceEnabled()) {
+			LOGGER.trace("New object instance has been added to the model.");
+		}
+
+		target.add(this);
+	}
+
+
+	protected boolean isObjectUnique(C object) {
+
+		// for(T o: ){
+		PrismReferenceValue old = (PrismReferenceValue)getModelObject();
+		if (old == null || old.isEmpty()){
+			return true;
+		}
+		if (old.getOid().equals(object.getOid())) {
+			return false;
+		}
+		// }
+		return true;
+	}
+
+
+	/**
+	 * A custom code in form of hook that can be run on event of choosing new
+	 * object with this chooser component
+	 * */
+	protected void choosePerformedHook(AjaxRequestTarget target, C object) {
+	}
+
+}