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 index 22fcc05aac5..04a19e6d8ea 100644 --- 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 @@ -30,7 +30,6 @@ import com.evolveum.midpoint.gui.api.util.ModelServiceLocator; import com.evolveum.midpoint.gui.api.util.WebComponentUtil; import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils; -import com.evolveum.midpoint.gui.impl.page.admin.configuration.component.SystemConfigPanelNew; import com.evolveum.midpoint.model.api.*; import com.evolveum.midpoint.model.api.expr.MidpointFunctions; import com.evolveum.midpoint.model.api.validator.ResourceValidator; @@ -1534,18 +1533,6 @@ protected List createMenuItems() { return menus; } -// private MainMenuItem createSystemConfigurationItems() { -// MainMenuItem item = new MainMenuItem(GuiStyleConstants.CLASS_SYSTEM_CONFIGURATION_ICON_COLORED, -// createStringResource("PageAdmin.menu.top.configuration.basic.new"), PageSystemConfigurationNew.class); -// -// addMenuItem(item, "PageAdmin.menu.top.configuration.basic", SystemConfigPanelNew.class); -// addMenuItem(item, "PageAdmin.menu.top.configuration.objectPolicy", PageUsers.class); -// addMenuItem(item, "PageAdmin.menu.top.users.list", PageUsers.class); -// -// addUsersViewMenuItems(item.getItems()); -// -// return item; -// } private void createConfigurationMenu(SideBarMenuItem item) { addMainMenuItem(item, "fa fa-bullseye", "PageAdmin.menu.top.configuration.bulkActions", PageBulkAction.class); @@ -1559,53 +1546,40 @@ private void createConfigurationMenu(SideBarMenuItem item) { PageDebugView.class, null, createVisibleDisabledBehaviorForEditMenu(PageDebugView.class)); debugs.getItems().add(menu); - MainMenuItem systemItemNew = addMainMenuItem(item, "fa fa-cog", "PageAdmin.menu.top.configuration.basic.new", null); + MainMenuItem systemItemNew = addMainMenuItem(item, "fa fa-cog", "PageAdmin.menu.top.configuration.basic", null); - addSystemMenuItemNew(systemItemNew, "PageAdmin.menu.top.configuration.basic", - PageSystemConfigurationNew.CONFIGURATION_TAB_BASIC); - addSystemMenuItemNew(systemItemNew, "PageAdmin.menu.top.configuration.objectPolicy", - PageSystemConfigurationNew.CONFIGURATION_TAB_OBJECT_POLICY); - addSystemMenuItemNew(systemItemNew, "PageAdmin.menu.top.configuration.globalPolicyRule", - PageSystemConfigurationNew.CONFIGURATION_TAB_GLOBAL_POLICY_RULE); - addSystemMenuItemNew(systemItemNew, "PageAdmin.menu.top.configuration.globalAccountSynchronization", - PageSystemConfigurationNew.CONFIGURATION_TAB_GLOBAL_ACCOUNT_SYNCHRONIZATION); - addSystemMenuItemNew(systemItemNew, "PageAdmin.menu.top.configuration.cleanupPolicy", - PageSystemConfigurationNew.CONFIGURATION_TAB_CLEANUP_POLICY); - addSystemMenuItemNew(systemItemNew, "PageAdmin.menu.top.configuration.notifications", - PageSystemConfigurationNew.CONFIGURATION_TAB_NOTIFICATION); - addSystemMenuItemNew(systemItemNew, "PageAdmin.menu.top.configuration.logging", - PageSystemConfigurationNew.CONFIGURATION_TAB_LOGGING); - addSystemMenuItemNew(systemItemNew, "PageAdmin.menu.top.configuration.profiling", - PageSystemConfigurationNew.CONFIGURATION_TAB_PROFILING); - addSystemMenuItemNew(systemItemNew, "PageAdmin.menu.top.configuration.adminGui", - PageSystemConfigurationNew.CONFIGURATION_TAB_ADMIN_GUI); - addSystemMenuItemNew(systemItemNew, "PageAdmin.menu.top.configuration.workflow", - PageSystemConfigurationNew.CONFIGURATION_TAB_WORKFLOW); - addSystemMenuItemNew(systemItemNew, "PageAdmin.menu.top.configuration.roleManagement", - PageSystemConfigurationNew.CONFIGURATION_TAB_ROLE_MANAGEMENT); - addSystemMenuItemNew(systemItemNew, "PageAdmin.menu.top.configuration.internals", - PageSystemConfigurationNew.CONFIGURATION_TAB_INTERNALS); - addSystemMenuItemNew(systemItemNew, "PageAdmin.menu.top.configuration.deploymentInformation", - PageSystemConfigurationNew.CONFIGURATION_TAB_DEPLOYMENT_INFORMATION); - addSystemMenuItemNew(systemItemNew, "PageAdmin.menu.top.configuration.accessCertification", - PageSystemConfigurationNew.CONFIGURATION_TAB_ACCESS_CERTIFICATION); - addSystemMenuItemNew(systemItemNew, "PageAdmin.menu.top.configuration.infrastructure", - PageSystemConfigurationNew.CONFIGURATION_TAB_INFRASTRUCTURE); - addSystemMenuItemNew(systemItemNew, "PageAdmin.menu.top.configuration.fullTextSearch", - PageSystemConfigurationNew.CONFIGURATION_TAB_FULL_TEXT_SEARCH); - - MainMenuItem systemItem = addMainMenuItem(item, "fa fa-cog", "PageAdmin.menu.top.configuration.basic", null); - - addSystemMenuItem(systemItem, "PageAdmin.menu.top.configuration.basic", + addSystemMenuItem(systemItemNew, "PageAdmin.menu.top.configuration.basic", PageSystemConfiguration.CONFIGURATION_TAB_BASIC); - addSystemMenuItem(systemItem, "PageAdmin.menu.top.configuration.notifications", + addSystemMenuItem(systemItemNew, "PageAdmin.menu.top.configuration.objectPolicy", + PageSystemConfiguration.CONFIGURATION_TAB_OBJECT_POLICY); + addSystemMenuItem(systemItemNew, "PageAdmin.menu.top.configuration.globalPolicyRule", + PageSystemConfiguration.CONFIGURATION_TAB_GLOBAL_POLICY_RULE); + addSystemMenuItem(systemItemNew, "PageAdmin.menu.top.configuration.globalAccountSynchronization", + PageSystemConfiguration.CONFIGURATION_TAB_GLOBAL_ACCOUNT_SYNCHRONIZATION); + addSystemMenuItem(systemItemNew, "PageAdmin.menu.top.configuration.cleanupPolicy", + PageSystemConfiguration.CONFIGURATION_TAB_CLEANUP_POLICY); + addSystemMenuItem(systemItemNew, "PageAdmin.menu.top.configuration.notifications", PageSystemConfiguration.CONFIGURATION_TAB_NOTIFICATION); - addSystemMenuItem(systemItem, "PageAdmin.menu.top.configuration.logging", + addSystemMenuItem(systemItemNew, "PageAdmin.menu.top.configuration.logging", PageSystemConfiguration.CONFIGURATION_TAB_LOGGING); - addSystemMenuItem(systemItem, "PageAdmin.menu.top.configuration.profiling", + addSystemMenuItem(systemItemNew, "PageAdmin.menu.top.configuration.profiling", PageSystemConfiguration.CONFIGURATION_TAB_PROFILING); - addSystemMenuItem(systemItem, "PageAdmin.menu.top.configuration.adminGui", + addSystemMenuItem(systemItemNew, "PageAdmin.menu.top.configuration.adminGui", PageSystemConfiguration.CONFIGURATION_TAB_ADMIN_GUI); + addSystemMenuItem(systemItemNew, "PageAdmin.menu.top.configuration.workflow", + PageSystemConfiguration.CONFIGURATION_TAB_WORKFLOW); + addSystemMenuItem(systemItemNew, "PageAdmin.menu.top.configuration.roleManagement", + PageSystemConfiguration.CONFIGURATION_TAB_ROLE_MANAGEMENT); + addSystemMenuItem(systemItemNew, "PageAdmin.menu.top.configuration.internals", + PageSystemConfiguration.CONFIGURATION_TAB_INTERNALS); + addSystemMenuItem(systemItemNew, "PageAdmin.menu.top.configuration.deploymentInformation", + PageSystemConfiguration.CONFIGURATION_TAB_DEPLOYMENT_INFORMATION); + addSystemMenuItem(systemItemNew, "PageAdmin.menu.top.configuration.accessCertification", + PageSystemConfiguration.CONFIGURATION_TAB_ACCESS_CERTIFICATION); + addSystemMenuItem(systemItemNew, "PageAdmin.menu.top.configuration.infrastructure", + PageSystemConfiguration.CONFIGURATION_TAB_INFRASTRUCTURE); + addSystemMenuItem(systemItemNew, "PageAdmin.menu.top.configuration.fullTextSearch", + PageSystemConfiguration.CONFIGURATION_TAB_FULL_TEXT_SEARCH); addMainMenuItem(item, "fa fa-archive", "PageAdmin.menu.top.configuration.internals", PageInternals.class); addMainMenuItem(item, "fa fa-search", "PageAdmin.menu.top.configuration.repoQuery", PageRepositoryQuery.class); @@ -1620,8 +1594,6 @@ private void addSystemMenuItem(MainMenuItem mainItem, String key, int tabIndex) params.add(PageSystemConfiguration.SELECTED_TAB_INDEX, tabIndex); MenuItem menu = new MenuItem(createStringResource(key), PageSystemConfiguration.class, params, null) { - private static final long serialVersionUID = 1L; - @Override public boolean isMenuActive(WebPage page) { if (!PageSystemConfiguration.class.equals(page.getClass())) { @@ -1634,24 +1606,6 @@ public boolean isMenuActive(WebPage page) { }; mainItem.getItems().add(menu); } - - private void addSystemMenuItemNew(MainMenuItem mainItem, String key, int tabIndex) { - PageParameters params = new PageParameters(); - params.add(PageSystemConfigurationNew.SELECTED_TAB_INDEX, tabIndex); - MenuItem menu = new MenuItem(createStringResource(key), PageSystemConfigurationNew.class, params, null) { - - @Override - public boolean isMenuActive(WebPage page) { - if (!PageSystemConfigurationNew.class.equals(page.getClass())) { - return false; - } - - int index = getSelectedTabForNewConfiguration(page); - return tabIndex == index ? true : false; - } - }; - mainItem.getItems().add(menu); - } private MainMenuItem addMainMenuItem(SideBarMenuItem item, String icon, String key, Class page) { MainMenuItem mainItem = new MainMenuItem(icon, createStringResource(key), page); @@ -1803,17 +1757,6 @@ private int getSelectedTabForConfiguration(WebPage page) { return StringUtils.isNumeric(value) ? Integer.parseInt(value) : PageSystemConfiguration.CONFIGURATION_TAB_BASIC; } - - private int getSelectedTabForNewConfiguration(WebPage page) { - PageParameters params = page.getPageParameters(); - StringValue val = params.get(PageSystemConfigurationNew.SELECTED_TAB_INDEX); - String value = null; - if (val != null && !val.isNull()) { - value = val.toString(); - } - - return StringUtils.isNumeric(value) ? Integer.parseInt(value) : PageSystemConfigurationNew.CONFIGURATION_TAB_BASIC; - } private void createSelfServiceMenu(SideBarMenuItem menu) { addMainMenuItem(menu, GuiStyleConstants.CLASS_ICON_DASHBOARD, "PageAdmin.menu.selfDashboard", diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/form/TriStateFormGroup.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/form/TriStateFormGroup.html index 148a527a1f9..bf41e16e54a 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/form/TriStateFormGroup.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/form/TriStateFormGroup.html @@ -17,15 +17,15 @@ -
+
*
-
-
+
+
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/form/TriStateFormGroup.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/form/TriStateFormGroup.java index 595b241d15c..5819d5e34c0 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/form/TriStateFormGroup.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/form/TriStateFormGroup.java @@ -47,19 +47,31 @@ public class TriStateFormGroup extends BasePanel { private static final String ID_TOOLTIP = "tooltip"; private static final String ID_REQUIRED = "required"; private static final String ID_FEEDBACK = "feedback"; + private static final String ID_PROPERTY_LABEL = "propertyLabel"; + private static final String ID_ROW = "row"; + public TriStateFormGroup(String id, IModel value, IModel label, String labelCssClass, String textCssClass, boolean required, boolean isSimilarAsPropertyPanel) { + this(id, value, label, null, false, labelCssClass, textCssClass, required, isSimilarAsPropertyPanel); + } + public TriStateFormGroup(String id, IModel value, IModel label, String labelCssClass, String textCssClass, boolean required) { - this(id, value, label, null, false, labelCssClass, textCssClass, required); + this(id, value, label, null, false, labelCssClass, textCssClass, required, false); + } + + public TriStateFormGroup(String id, IModel value, IModel label, String tooltipKey, + boolean isTooltipInModal, String labelCssClass, String textCssClass, boolean required) { + this(id, value, label, null, false, labelCssClass, textCssClass, required, false); } public TriStateFormGroup(String id, IModel value, IModel label, String tooltipKey, - boolean isTooltipInModal, String labelCssClass, String textCssClass, boolean required) { + boolean isTooltipInModal, String labelCssClass, String textCssClass, boolean required, boolean isSimilarAsPropertyPanel) { super(id, value); - initLayout(label, tooltipKey, isTooltipInModal, labelCssClass, textCssClass, required); + initLayout(label, tooltipKey, isTooltipInModal, labelCssClass, textCssClass, required, isSimilarAsPropertyPanel); } - private void initLayout(IModel label, final String tooltipKey, boolean isTooltipInModal, String labelCssClass, String textCssClass, boolean required) { + private void initLayout(IModel label, final String tooltipKey, boolean isTooltipInModal, String labelCssClass, String textCssClass, + boolean required, boolean isSimilarAsPropertyPanel) { WebMarkupContainer labelContainer = new WebMarkupContainer(ID_LABEL_CONTAINER); add(labelContainer); Label l = new Label(ID_LABEL, label); @@ -67,6 +79,11 @@ private void initLayout(IModel label, final String tooltipKey, boolean i if (StringUtils.isNotEmpty(labelCssClass)) { labelContainer.add(AttributeAppender.prepend("class", labelCssClass)); } + if(isSimilarAsPropertyPanel) { + labelContainer.add(AttributeAppender.prepend("class", " col-xs-2 prism-property-label ")); + } else { + labelContainer.add(AttributeAppender.prepend("class", " control-label ")); + } labelContainer.add(l); Label tooltipLabel = new Label(ID_TOOLTIP, new Model<>()); @@ -98,11 +115,19 @@ public boolean isVisible() { }); labelContainer.add(requiredContainer); + WebMarkupContainer propertyLabel = new WebMarkupContainer(ID_PROPERTY_LABEL); + WebMarkupContainer rowLabel = new WebMarkupContainer(ID_ROW); WebMarkupContainer valueWrapper = new WebMarkupContainer(ID_VALUE_WRAPPER); if (StringUtils.isNotEmpty(textCssClass)) { valueWrapper.add(AttributeAppender.prepend("class", textCssClass)); } - add(valueWrapper); + if(isSimilarAsPropertyPanel) { + propertyLabel.add(AttributeAppender.prepend("class", " col-md-10 prism-property-value ")); + rowLabel.add(AttributeAppender.prepend("class", " row ")); + } + propertyLabel.add(rowLabel); + rowLabel.add(valueWrapper); + add(propertyLabel); TriStateComboPanel triStateCombo = new TriStateComboPanel(ID_VALUE, getModel());; valueWrapper.add(triStateCombo); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/NotificationConfigTabPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/NotificationConfigTabPanel.html index a0d4aa8d4f7..b92e16e9244 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/NotificationConfigTabPanel.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/NotificationConfigTabPanel.html @@ -56,7 +56,7 @@
-
+
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/NotificationConfigTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/NotificationConfigTabPanel.java index 736ce61d254..94fa4d8e5e7 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/NotificationConfigTabPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/NotificationConfigTabPanel.java @@ -148,13 +148,13 @@ protected void initLayout() { mailConfigType = (MailConfigurationType)mailConfig.getValues().get(0).getValue().getRealValue(); - add(new TextFormGroup(ID_DEFAULT_FROM, new PropertyModel(mailConfigType, "defaultFrom"), createStringResource(mailConfig.getItemDefinition().getTypeName().getLocalPart() + ".defaultFrom"), "", getInputCssClass(), false)); + add(new TextFormGroup(ID_DEFAULT_FROM, new PropertyModel(mailConfigType, "defaultFrom"), createStringResource(mailConfig.getItemDefinition().getTypeName().getLocalPart() + ".defaultFrom"), "", getInputCssClass(), false, true)); - add(new TextFormGroup(ID_REDIRECT_TO_FILE, new PropertyModel(mailConfigType, "redirectToFile"), createStringResource(mailConfig.getItemDefinition().getTypeName().getLocalPart() + ".redirectToFile"), "", getInputCssClass(), false)); + add(new TextFormGroup(ID_REDIRECT_TO_FILE, new PropertyModel(mailConfigType, "redirectToFile"), createStringResource(mailConfig.getItemDefinition().getTypeName().getLocalPart() + ".redirectToFile"), "", getInputCssClass(), false, true)); - add(new TextFormGroup(ID_LOG_TO_FILE, new PropertyModel(mailConfigType, "logToFile"), createStringResource(mailConfig.getItemDefinition().getTypeName().getLocalPart() + ".logToFile"), "", getInputCssClass(), false)); + add(new TextFormGroup(ID_LOG_TO_FILE, new PropertyModel(mailConfigType, "logToFile"), createStringResource(mailConfig.getItemDefinition().getTypeName().getLocalPart() + ".logToFile"), "", getInputCssClass(), false, true)); - add(new TriStateFormGroup(ID_DEBUG, new PropertyModel(mailConfigType, "debug"), createStringResource(mailConfig.getItemDefinition().getTypeName().getLocalPart() + ".debug"), "", getInputCssClass(), false)); + add(new TriStateFormGroup(ID_DEBUG, new PropertyModel(mailConfigType, "debug"), createStringResource(mailConfig.getItemDefinition().getTypeName().getLocalPart() + ".debug"), "", getInputCssClass(), false, true)); add(createHeader(ID_MAIL_SERVER_CONFIG_HEADER, MailServerConfigurationType.COMPLEX_TYPE.getLocalPart() + ".details")); @@ -191,7 +191,7 @@ public void onClick(AjaxRequestTarget target) { }; item.add(removeButton); - TextFormGroup name = new TextFormGroup(ID_FILE_NAME, fileConfigType != null ? new PropertyModel(fileConfigType, "name") : Model.of(""), createStringResource(fileConfigType == null ? "" : (fileConfigType.COMPLEX_TYPE.getLocalPart() + ".name")), "", getInputCssClass(), false); + TextFormGroup name = new TextFormGroup(ID_FILE_NAME, fileConfigType != null ? new PropertyModel(fileConfigType, "name") : Model.of(""), createStringResource(fileConfigType == null ? "" : (fileConfigType.COMPLEX_TYPE.getLocalPart() + ".name")), "", getInputCssClass(), false, true); name.getField().add(new OnChangeAjaxBehavior() { private static final long serialVersionUID = 1L; @@ -203,7 +203,7 @@ protected void onUpdate(AjaxRequestTarget target) { }); item.add(name); - TextFormGroup file = new TextFormGroup(ID_FILE_PATH, fileConfigType != null ? new PropertyModel(fileConfigType, "file") : Model.of(""), createStringResource(fileConfigType == null ? "" : (fileConfigType.COMPLEX_TYPE.getLocalPart() + ".file")), "", getInputCssClass(), false); + TextFormGroup file = new TextFormGroup(ID_FILE_PATH, fileConfigType != null ? new PropertyModel(fileConfigType, "file") : Model.of(""), createStringResource(fileConfigType == null ? "" : (fileConfigType.COMPLEX_TYPE.getLocalPart() + ".file")), "", getInputCssClass(), false, true); file.getField().add(new OnChangeAjaxBehavior() { private static final long serialVersionUID = 1L; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/ObjectPolicyConfigurationTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/ObjectPolicyConfigurationTabPanel.java index 93d89c578d8..888d56ed10d 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/ObjectPolicyConfigurationTabPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/ObjectPolicyConfigurationTabPanel.java @@ -62,7 +62,7 @@ import com.evolveum.midpoint.web.component.prism.ValueWrapper; import com.evolveum.midpoint.web.component.search.SearchFactory; import com.evolveum.midpoint.web.component.search.SearchItemDefinition; -import com.evolveum.midpoint.web.page.admin.configuration.PageSystemConfigurationNew; +import com.evolveum.midpoint.web.page.admin.configuration.PageSystemConfiguration; import com.evolveum.midpoint.web.session.PageStorage; import com.evolveum.midpoint.web.session.UserProfileStorage; import com.evolveum.midpoint.web.session.UserProfileStorage.TableId; @@ -94,12 +94,12 @@ protected void onInitialize() { super.onInitialize(); PageParameters params = getPage().getPageParameters(); - StringValue val = params.get(PageSystemConfigurationNew.SELECTED_TAB_INDEX); + StringValue val = params.get(PageSystemConfiguration.SELECTED_TAB_INDEX); String value = null; if (val != null && !val.isNull()) { - params.remove(params.getPosition(PageSystemConfigurationNew.SELECTED_TAB_INDEX)); + params.remove(params.getPosition(PageSystemConfiguration.SELECTED_TAB_INDEX)); } - params.set(PageSystemConfigurationNew.SELECTED_TAB_INDEX, PageSystemConfigurationNew.CONFIGURATION_TAB_OBJECT_POLICY); + params.set(PageSystemConfiguration.SELECTED_TAB_INDEX, PageSystemConfiguration.CONFIGURATION_TAB_OBJECT_POLICY); initLayout(); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/ProfilingConfigurationTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/ProfilingConfigurationTabPanel.java index 41fa9cf2a65..c2423d31bb5 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/ProfilingConfigurationTabPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/ProfilingConfigurationTabPanel.java @@ -16,85 +16,37 @@ package com.evolveum.midpoint.gui.impl.page.admin.configuration.component; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.apache.commons.lang.StringUtils; -import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; -import org.apache.wicket.markup.html.form.DropDownChoice; import org.apache.wicket.markup.html.form.EnumChoiceRenderer; -import org.apache.wicket.markup.html.list.ListItem; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; import com.evolveum.midpoint.gui.api.component.BasePanel; -import com.evolveum.midpoint.gui.api.component.DisplayNamePanel; -import com.evolveum.midpoint.gui.api.model.LoadableModel; -import com.evolveum.midpoint.gui.api.page.PageBase; import com.evolveum.midpoint.gui.api.util.WebComponentUtil; import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils; -import com.evolveum.midpoint.gui.impl.component.MultivalueContainerDetailsPanel; -import com.evolveum.midpoint.gui.impl.component.MultivalueContainerListPanel; -import com.evolveum.midpoint.gui.impl.component.MultivalueContainerListPanelWithDetailsPanel; -import com.evolveum.midpoint.gui.impl.component.data.column.EditableLinkPropertyWrapperColumn; -import com.evolveum.midpoint.gui.impl.component.data.column.EditablePropertyWrapperColumn; -import com.evolveum.midpoint.prism.PrismContainer; -import com.evolveum.midpoint.prism.PrismContainerDefinition; -import com.evolveum.midpoint.prism.PrismContainerValue; import com.evolveum.midpoint.prism.path.ItemPath; -import com.evolveum.midpoint.prism.query.AllFilter; -import com.evolveum.midpoint.prism.query.ObjectPaging; -import com.evolveum.midpoint.prism.query.ObjectQuery; -import com.evolveum.midpoint.prism.query.TypeFilter; -import com.evolveum.midpoint.task.api.Task; import com.evolveum.midpoint.util.logging.Trace; import com.evolveum.midpoint.util.logging.TraceManager; -import com.evolveum.midpoint.web.component.data.column.CheckBoxHeaderColumn; -import com.evolveum.midpoint.web.component.data.column.IconColumn; -import com.evolveum.midpoint.web.component.data.column.InlineMenuButtonColumn; -import com.evolveum.midpoint.web.component.data.column.LinkColumn; import com.evolveum.midpoint.web.component.form.DropDownFormGroup; import com.evolveum.midpoint.web.component.form.Form; -import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem; -import com.evolveum.midpoint.web.component.prism.ContainerValuePanel; import com.evolveum.midpoint.web.component.prism.ContainerValueWrapper; import com.evolveum.midpoint.web.component.prism.ContainerWrapper; -import com.evolveum.midpoint.web.component.prism.ContainerWrapperFactory; import com.evolveum.midpoint.web.component.prism.ItemVisibility; -import com.evolveum.midpoint.web.component.prism.ItemWrapper; -import com.evolveum.midpoint.web.component.prism.ObjectWrapper; -import com.evolveum.midpoint.web.component.prism.PrismContainerHeaderPanel; import com.evolveum.midpoint.web.component.prism.PrismContainerPanel; import com.evolveum.midpoint.web.component.prism.PrismPropertyPanel; import com.evolveum.midpoint.web.component.prism.PropertyWrapper; -import com.evolveum.midpoint.web.component.search.SearchFactory; -import com.evolveum.midpoint.web.component.search.SearchItemDefinition; -import com.evolveum.midpoint.web.model.ContainerWrapperFromObjectWrapperModel; -import com.evolveum.midpoint.web.page.admin.configuration.component.EmptyOnChangeAjaxFormUpdatingBehavior; -import com.evolveum.midpoint.web.page.admin.configuration.dto.ProfilingLevel; -import com.evolveum.midpoint.web.session.PageStorage; -import com.evolveum.midpoint.web.session.UserProfileStorage; -import com.evolveum.midpoint.web.session.UserProfileStorage.TableId; -import com.evolveum.midpoint.xml.ns._public.common.common_3.AppenderConfigurationType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.AreaCategoryType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.AuditingConfigurationType; +import com.evolveum.midpoint.web.component.prism.ValueWrapper; +import com.evolveum.midpoint.xml.ns._public.common.common_3.AbstractLoggerConfigurationType; import com.evolveum.midpoint.xml.ns._public.common.common_3.ClassLoggerConfigurationType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.FileAppenderConfigurationType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.LifecycleStateModelType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.LifecycleStateType; import com.evolveum.midpoint.xml.ns._public.common.common_3.LoggingConfigurationType; import com.evolveum.midpoint.xml.ns._public.common.common_3.LoggingLevelType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectPolicyConfigurationType; import com.evolveum.midpoint.xml.ns._public.common.common_3.ProfilingConfigurationType; import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemConfigurationType; /** * @author skublik */ + public class ProfilingConfigurationTabPanel extends BasePanel> { private static final long serialVersionUID = 1L; @@ -104,33 +56,35 @@ public class ProfilingConfigurationTabPanel extends BasePanel> loggingModel; + - public ProfilingConfigurationTabPanel(String id, IModel> model) { - super(id, model); + public ProfilingConfigurationTabPanel(String id, IModel> profilingModel, IModel> loggingModel) { + super(id, profilingModel); + this.loggingModel = loggingModel; } @Override protected void onInitialize() { - super.onInitialize(); - initLayout(); + super.onInitialize(); + initLayout(); + } + + private IModel> getLoggingModel() { + return loggingModel; + } + + private IModel> getProfilingModel() { + return getModel(); } protected void initLayout() { - PrismContainerPanel profilingPanel = new PrismContainerPanel(ID_PROFILING, getModel(), true, new Form<>("form"), null, getPageBase()); + PrismContainerPanel profilingPanel = new PrismContainerPanel(ID_PROFILING, getProfilingModel(), true, new Form<>("form"), null, getPageBase()); add(profilingPanel); - ObjectWrapper systemConf= WebModelServiceUtils.loadSystemConfigurationAsObjectWrapper(getPageBase()); -// ContainerWrapperFromObjectWrapperModel modelLoggingConfig = new ContainerWrapperFromObjectWrapperModel<>(new Model>(systemConf), -// new ItemPath(SystemConfigurationType.F_LOGGING)); - IModel> loggerModel = - new ContainerWrapperFromObjectWrapperModel(Model.of(systemConf), new ItemPath(SystemConfigurationType.F_LOGGING, LoggingConfigurationType.F_CLASS_LOGGER)); + IModel> loggerModel = new Model>(getLoggingModel().getObject().findContainerWrapper(new ItemPath(SystemConfigurationType.F_LOGGING, LoggingConfigurationType.F_CLASS_LOGGER))); ContainerValueWrapper profilingLogger = null; @@ -145,22 +99,33 @@ protected void initLayout() { profilingLogger = WebModelServiceUtils.createNewItemContainerValueWrapper(getPageBase(), loggerModel); ((ClassLoggerConfigurationType)profilingLogger.getContainerValue().getRealValue()).setPackage(LOGGER_PROFILING); } - ClassLoggerConfigurationType realValueLogger = ((ClassLoggerConfigurationType)profilingLogger.getContainerValue().getRealValue()); - ProfilingLevel profilingLevel = ProfilingLevel.fromLoggerLevelType(realValueLogger.getLevel()); + PropertyWrapper levelProperty = (PropertyWrapper)profilingLogger.findPropertyWrapper(ClassLoggerConfigurationType.F_LEVEL); +// ClassLoggerConfigurationType realValueLogger = ((ClassLoggerConfigurationType)profilingLogger.getContainerValue().getValue()); + ValueWrapper level = levelProperty.getValues().get(0); + +// ProfilingLevel profilingLevel = ProfilingLevel.fromLoggerLevelType(level); - DropDownFormGroup dropDownProfilingLevel = new DropDownFormGroup<>(ID_PROFILING_LOGGER_LEVEL, new Model(profilingLevel) { + DropDownFormGroup dropDownProfilingLevel = new DropDownFormGroup<>(ID_PROFILING_LOGGER_LEVEL, new Model() { private static final long serialVersionUID = 1L; + private PropertyModel levelModel = new PropertyModel(level, "value.value"); + + @Override + public ProfilingLevel getObject() { + return ProfilingLevel.fromLoggerLevelType(levelModel.getObject()); + } + @Override public void setObject(ProfilingLevel object) { super.setObject(object); - realValueLogger.setLevel(ProfilingLevel.toLoggerLevelType(object)); + LOGGER.info("XXXXXXXXXXXX levelModel: " + levelModel); + levelModel.setObject(ProfilingLevel.toLoggerLevelType(object)); } }, WebComponentUtil.createReadonlyModelFromEnum(ProfilingLevel.class), new EnumChoiceRenderer<>(this), createStringResource("LoggingConfigPanel.subsystem.level"), - "", getInputCssClass(), false); + "", getInputCssClass(), false, true); add(dropDownProfilingLevel); PropertyWrapper appenders = (PropertyWrapper)profilingLogger.findPropertyWrapper(ClassLoggerConfigurationType.F_APPENDER); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/ProfilingLevel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/ProfilingLevel.java similarity index 96% rename from gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/ProfilingLevel.java rename to gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/ProfilingLevel.java index 2d180fe81ac..23c3ee92e39 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/ProfilingLevel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/ProfilingLevel.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.evolveum.midpoint.web.page.admin.configuration.dto; +package com.evolveum.midpoint.gui.impl.page.admin.configuration.component; import com.evolveum.midpoint.xml.ns._public.common.common_3.LoggingLevelType; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/StandardLoggerType.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/StandardLoggerType.java similarity index 95% rename from gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/StandardLoggerType.java rename to gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/StandardLoggerType.java index ca2df357145..b4e5d03216d 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/StandardLoggerType.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/StandardLoggerType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.evolveum.midpoint.web.page.admin.configuration.dto; +package com.evolveum.midpoint.gui.impl.page.admin.configuration.component; /** * @author shood diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/SystemConfigPanelNew.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/SystemConfigPanel.html similarity index 100% rename from gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/SystemConfigPanelNew.html rename to gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/SystemConfigPanel.html diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/SystemConfigPanelNew.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/SystemConfigPanel.java similarity index 92% rename from gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/SystemConfigPanelNew.java rename to gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/SystemConfigPanel.java index 4e6cb0d4e43..81148266f50 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/SystemConfigPanelNew.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/SystemConfigPanel.java @@ -38,16 +38,16 @@ /** * @author skublik */ -public class SystemConfigPanelNew extends BasePanel> { +public class SystemConfigPanel extends BasePanel> { private static final long serialVersionUID = 1L; - private static final Trace LOGGER = TraceManager.getTrace(SystemConfigPanelNew.class); + private static final Trace LOGGER = TraceManager.getTrace(SystemConfigPanel.class); private static final String ID_SYSTEM_CONFIG = "basicSystemConfiguration"; - public SystemConfigPanelNew(String id, IModel> model) { + public SystemConfigPanel(String id, IModel> model) { super(id, model); setOutputMarkupId(true); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigurationSummaryPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/SystemConfigurationSummaryPanel.java similarity index 93% rename from gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigurationSummaryPanel.java rename to gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/SystemConfigurationSummaryPanel.java index 38d0f267670..35d68a7692f 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigurationSummaryPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/SystemConfigurationSummaryPanel.java @@ -1,4 +1,4 @@ -package com.evolveum.midpoint.web.page.admin.configuration.component; +package com.evolveum.midpoint.gui.impl.page.admin.configuration.component; import org.apache.wicket.model.IModel; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/AceEditorFormGroup.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/AceEditorFormGroup.html index c3834b9d805..e078bdd2ac8 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/AceEditorFormGroup.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/AceEditorFormGroup.html @@ -18,7 +18,7 @@ -