Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@mederly
mederly committed Feb 25, 2022
2 parents 2db9d3f + 749275a commit f21878b
Show file tree
Hide file tree
Showing 25 changed files with 395 additions and 527 deletions.
2 changes: 1 addition & 1 deletion ...dmin-gui/src/main/java/com/evolveum/midpoint/gui/api/DefaultGuiConfigurationCompiler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ private void addPanelTypeConfiguration(Class<?> clazz, ContainerPanelConfigurati
config.setType(def.getTypeName());
}
}
createDefaultVirtualContainer(config, panelType.defaultContainerPath(), false);
createDefaultVirtualContainer(config, panelType.defaultContainerPath(), null);

if (panelType.experimental() && BooleanUtils.isNotTrue(experimentalFeaturesEnabled)) {
config.setVisibility(UserInterfaceElementVisibilityType.HIDDEN);
Expand Down
4 changes: 4 additions & 0 deletions ...ui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/AbstractPageObjectDetails.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,10 @@ public void replacePanel(ContainerPanelConfigurationType config, AjaxRequestTarg
target.add(form);
target.add(getFeedbackPanel());
} catch (Throwable e) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Can't instantiate panel based on config\n {}", config.debugDump(), e);
}

error("Cannot instantiate panel, " + e.getMessage());
target.add(getFeedbackPanel());
}
Expand Down
56 changes: 29 additions & 27 deletions ...va/com/evolveum/midpoint/gui/impl/page/admin/cases/component/CorrelationContextPanel.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,34 +7,36 @@
-->

<wicket:panel xmlns:wicket="http://wicket.apache.org">
<table class="table table-bordered">
<tr>
<th></th>
<wicket:container wicket:id="headers">
<th><span wicket:id="header"></span></th>
</wicket:container>
</tr>
<tr>
<th>Action</th>
<wicket:container wicket:id="actions">
<td><a class="btn btn-primary btn-sm" wicket:id="action">
<span wicket:id="actionLabel"></span>
</a></td>
</wicket:container>
</tr>
<tr>
<th>Name</th>
<wicket:container wicket:id="names">
<td wicket:id="name"></td>
</wicket:container>
</tr>
<wicket:container wicket:id="rows">
<div class="box box-info">
<table class="table table-bordered table-striped">
<tr>
<th></th>
<wicket:container wicket:id="headers">
<th><span wicket:id="header"></span></th>
</wicket:container>
</tr>
<tr>
<th><span wicket:id="attrName"></span></th>
<wicket:container wicket:id="columns">
<td wicket:id="column"></td>
<th>Action</th>
<wicket:container wicket:id="actions">
<td><a class="btn btn-primary btn-sm" wicket:id="action">
<span wicket:id="actionLabel"></span>
</a></td>
</wicket:container>
</tr>
</wicket:container>
</table>
<tr>
<th>Name</th>
<wicket:container wicket:id="names">
<td wicket:id="name"></td>
</wicket:container>
</tr>
<wicket:container wicket:id="rows">
<tr>
<th><span wicket:id="attrName"></span></th>
<wicket:container wicket:id="columns">
<td wicket:id="column"></td>
</wicket:container>
</tr>
</wicket:container>
</table>
</div>
</wicket:panel>
2 changes: 1 addition & 1 deletion ...va/com/evolveum/midpoint/gui/impl/page/admin/cases/component/CorrelationContextPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

@PanelType(name = "correlationContext")
@PanelInstance(identifier = "correlationContext",
display = @PanelDisplay(label = "PageCase.correlationContextPanel", order = 40))
display = @PanelDisplay(label = "PageCase.correlationContextPanel", order = 1))
public class CorrelationContextPanel extends AbstractObjectMainPanel<CaseType, CaseDetailsModels> {

private static final Trace LOGGER = TraceManager.getTrace(CorrelationContextDto.class);
Expand Down
6 changes: 3 additions & 3 deletions ...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/cases/component/Match.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
public enum Match {

NOT_APPLICABLE(""),
NONE("bg-red disabled color-palette"),
PARTIAL("bg-yellow disabled color-palette"),
FULL("bg-green disabled color-palette");
NONE("danger disabled color-palette"),
PARTIAL("warning disabled color-palette"),
FULL("success disabled color-palette");

private final String css;

Expand Down
23 changes: 9 additions & 14 deletions ...om/evolveum/midpoint/gui/impl/page/admin/systemconfiguration/PageSystemConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,6 @@

package com.evolveum.midpoint.gui.impl.page.admin.systemconfiguration;

import java.util.Arrays;
import java.util.List;

import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;

import com.evolveum.midpoint.authentication.api.authorization.AuthorizationAction;
import com.evolveum.midpoint.authentication.api.authorization.PageDescriptor;
import com.evolveum.midpoint.authentication.api.authorization.Url;
Expand All @@ -31,10 +22,18 @@
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.web.component.CompositedIconButtonDto;
import com.evolveum.midpoint.web.component.MultiCompositedButtonPanel;
import com.evolveum.midpoint.web.page.admin.configuration.PageInternals;
import com.evolveum.midpoint.xml.ns._public.common.common_3.DisplayType;
import com.evolveum.prism.xml.ns._public.types_3.PolyStringType;

import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;

import java.util.Arrays;
import java.util.List;

/**
* @author lazyman
* @author skublik
Expand Down Expand Up @@ -68,10 +67,6 @@ public PageSystemConfiguration() {
private void initLayout() {
IModel<List<CompositedIconButtonDto>> model = Model.ofList(Arrays.asList(
createCompositedButton("fa fa-wrench", PageSystemBasic.class),
// createCompositedButton("Object policies", "fa fa-umbrella", PageObjectPoliciesConfiguration.class)
// createCompositedButton("Global policy rule", "fa fa-eye", PageGlobalPolicyRule.class)
// createCompositedButton("Global projection policy", "fa fa-globe", PageGlobalProjectionPolicy.class)
// createCompositedButton("Cleanup policy", "fa fa-eraser", PageCleanupPolicy.class)
createCompositedButton("fa fa-camera", PageSystemPolicies.class),
createCompositedButton("fa fa-envelope", PageSystemNotification.class),
createCompositedButton("fa fa-file-text", PageSystemLogging.class),
Expand Down
14 changes: 0 additions & 14 deletions ...olveum/midpoint/gui/impl/page/admin/systemconfiguration/page/PageAccessCertification.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,4 @@ public PageAccessCertification(PrismObject<SystemConfigurationType> object) {
public Class<? extends Containerable> getDetailsType() {
return AccessCertificationConfigurationType.class;
}

// @Override
// protected List<ITab> createTabs() {
// List<ITab> tabs = new ArrayList<>();
// tabs.add(new PanelTab(createStringResource("pageSystemConfiguration.accessCertification.title")) {
//
// @Override
// public WebMarkupContainer createPanel(String panelId) {
// return createContainerPanel(panelId, getObjectModel(), SystemConfigurationType.F_ACCESS_CERTIFICATION, AccessCertificationConfigurationType.COMPLEX_TYPE);
// }
//
// });
// return tabs;
// }
}
32 changes: 22 additions & 10 deletions ...um/midpoint/gui/impl/page/admin/systemconfiguration/page/PageBaseSystemConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,11 @@
*/
package com.evolveum.midpoint.gui.impl.page.admin.systemconfiguration.page;

import javax.xml.namespace.QName;

import com.evolveum.midpoint.model.api.authentication.CompiledGuiProfile;

import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;

import com.evolveum.midpoint.gui.api.GuiStyleConstants;
import com.evolveum.midpoint.gui.impl.page.admin.assignmentholder.AssignmentHolderDetailsModel;
import com.evolveum.midpoint.gui.impl.page.admin.assignmentholder.PageAssignmentHolderDetails;
import com.evolveum.midpoint.gui.impl.util.GuiImplUtil;
import com.evolveum.midpoint.model.api.authentication.CompiledGuiProfile;
import com.evolveum.midpoint.prism.Containerable;
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.util.logging.Trace;
Expand All @@ -26,6 +20,11 @@
import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemConfigurationType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemObjectsType;

import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;

import javax.xml.namespace.QName;
import java.util.Arrays;
import java.util.List;

Expand Down Expand Up @@ -58,7 +57,7 @@ protected Panel createSummaryPanel(String id, IModel<SystemConfigurationType> mo

@Override
protected String getDefaultIconCssClass() {
return null;
return getSummaryIconCssClass();
}

@Override
Expand All @@ -70,9 +69,22 @@ protected String getIconBoxAdditionalCssClass() {
protected String getBoxAdditionalCssClass() {
return null;
}

@Override
protected IModel<String> getDisplayNameModel() {
return getPageTitleModel();
}
};
}

protected String getSummaryIconCssClass() {
return GuiStyleConstants.CLASS_SYSTEM_CONFIGURATION_ICON;
}

protected IModel<String> getSummaryDisplayNameModel() {
return getPageTitleModel();
}

@Override
protected String getObjectOidParameter() {
return SystemObjectsType.SYSTEM_CONFIGURATION.value();
Expand All @@ -87,7 +99,7 @@ protected GuiObjectDetailsPageType loadDetailsPageConfiguration(PrismObject<Syst
CompiledGuiProfile profile = getModelServiceLocator().getCompiledGuiProfile();
try {
GuiObjectDetailsPageType defaultPageConfig = null;
for (Class<?extends Containerable> clazz : getAllDetailsTypes()) {
for (Class<? extends Containerable> clazz : getAllDetailsTypes()) {
QName type = GuiImplUtil.getContainerableTypeName(clazz);
if (defaultPageConfig == null) {
defaultPageConfig = profile.findObjectDetailsConfiguration(type);
Expand Down
19 changes: 2 additions & 17 deletions ...om/evolveum/midpoint/gui/impl/page/admin/systemconfiguration/page/PageRoleManagement.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,18 @@
*/
package com.evolveum.midpoint.gui.impl.page.admin.systemconfiguration.page;

import org.apache.wicket.request.mapper.parameter.PageParameters;

import com.evolveum.midpoint.authentication.api.authorization.AuthorizationAction;
import com.evolveum.midpoint.authentication.api.authorization.PageDescriptor;
import com.evolveum.midpoint.authentication.api.authorization.Url;
import com.evolveum.midpoint.authentication.api.util.AuthConstants;
import com.evolveum.midpoint.prism.Containerable;
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.security.api.AuthorizationConstants;
import com.evolveum.midpoint.xml.ns._public.common.common_3.AdminGuiConfigurationType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleManagementConfigurationType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemConfigurationType;

import org.apache.wicket.request.mapper.parameter.PageParameters;

@PageDescriptor(
urls = {
@Url(mountUrl = "/admin/config/system/roleManagement"),
Expand Down Expand Up @@ -51,18 +50,4 @@ public Class<? extends Containerable> getDetailsType() {
return RoleManagementConfigurationType.class;
}

// @Override
// protected List<ITab> createTabs() {
// List<ITab> tabs = new ArrayList<>();
// tabs.add(new AbstractTab(createStringResource("pageSystemConfiguration.roleManagement.title")) {
//
// private static final long serialVersionUID = 1L;
//
// @Override
// public WebMarkupContainer getPanel(String panelId) {
// return createContainerPanel(panelId, getObjectModel(), SystemConfigurationType.F_ROLE_MANAGEMENT, RoleManagementConfigurationType.COMPLEX_TYPE);
// }
// });
// return tabs;
// }
}
76 changes: 5 additions & 71 deletions ...om/evolveum/midpoint/gui/impl/page/admin/systemconfiguration/page/PageSystemAdminGui.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,15 @@

package com.evolveum.midpoint.gui.impl.page.admin.systemconfiguration.page;

import com.evolveum.midpoint.authentication.api.authorization.AuthorizationAction;
import com.evolveum.midpoint.authentication.api.authorization.PageDescriptor;
import com.evolveum.midpoint.authentication.api.authorization.Url;
import com.evolveum.midpoint.authentication.api.util.AuthConstants;

import com.evolveum.midpoint.prism.Containerable;
import com.evolveum.midpoint.prism.PrismObject;

import com.evolveum.midpoint.security.api.AuthorizationConstants;
import com.evolveum.midpoint.authentication.api.authorization.AuthorizationAction;
import com.evolveum.midpoint.authentication.api.authorization.PageDescriptor;
import com.evolveum.midpoint.authentication.api.authorization.Url;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
import com.evolveum.midpoint.xml.ns._public.common.common_3.AdminGuiConfigurationType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemConfigurationType;

import org.apache.wicket.request.mapper.parameter.PageParameters;

Expand Down Expand Up @@ -51,69 +50,4 @@ public PageSystemAdminGui(PrismObject<SystemConfigurationType> object) {
public Class<? extends Containerable> getDetailsType() {
return AdminGuiConfigurationType.class;
}

// @Override
// protected List<ITab> createTabs() {
// List<ITab> tabs = new ArrayList<>();
//
// PrismContainerWrapperModel<SystemConfigurationType, AdminGuiConfigurationType> adminGuiModel = PrismContainerWrapperModel.fromContainerWrapper(getObjectModel(), SystemConfigurationType.F_ADMIN_GUI_CONFIGURATION);
//
// tabs.add(new AbstractTab(createStringResource("User dashboard links details")) {
//
// private static final long serialVersionUID = 1L;
//
// @Override
// public WebMarkupContainer getPanel(String panelId) {
// return createContainerPanel(panelId, adminGuiModel, AdminGuiConfigurationType.F_USER_DASHBOARD_LINK, RichHyperlinkType.COMPLEX_TYPE);
// }
// });
//
// tabs.add(new AbstractTab(createStringResource("Object collection views")) {
//
// private static final long serialVersionUID = 1L;
//
// @Override
// public WebMarkupContainer getPanel(String panelId) {
//// return new AdminGuiObjectCollectionViewsPanel(panelId,
//// PrismContainerWrapperModel.fromContainerWrapper(getObjectModel(), ItemPath.create(SystemConfigurationType.F_ADMIN_GUI_CONFIGURATION, AdminGuiConfigurationType.F_OBJECT_COLLECTION_VIEWS, GuiObjectListViewsType.F_OBJECT_COLLECTION_VIEW)));
// return createContainerPanel(panelId, adminGuiModel, AdminGuiConfigurationType.F_OBJECT_COLLECTION_VIEWS, GuiObjectListViewsType.COMPLEX_TYPE);
// }
// });
//
// tabs.add(new AbstractTab(createStringResource("Object details")) {
//
// private static final long serialVersionUID = 1L;
//
// @Override
// public WebMarkupContainer getPanel(String panelId) {
// return createContainerPanel(panelId, adminGuiModel, AdminGuiConfigurationType.F_OBJECT_DETAILS, GuiObjectDetailsSetType.COMPLEX_TYPE);
// }
// });
//
//
// tabs.add(new AbstractTab(createStringResource("Additional menu link")) {
//
// private static final long serialVersionUID = 1L;
//
// @Override
// public WebMarkupContainer getPanel(String panelId) {
// return createContainerPanel(panelId, adminGuiModel, AdminGuiConfigurationType.F_ADDITIONAL_MENU_LINK, RichHyperlinkType.COMPLEX_TYPE);
// }
// });
//
// tabs.add(new AbstractTab(createStringResource("Configurable user dashboard")) {
//
// private static final long serialVersionUID = 1L;
//
// @Override
// public WebMarkupContainer getPanel(String panelId) {
// return createContainerPanel(panelId, adminGuiModel, AdminGuiConfigurationType.F_CONFIGURABLE_USER_DASHBOARD, ConfigurableUserDashboardType.COMPLEX_TYPE);
// }
// });
//
//
// return tabs;
// }


}

0 comments on commit f21878b

Please sign in to comment.