Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Evolveum/midpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
@KaterynaHonchar
KaterynaHonchar committed Oct 4, 2021
2 parents 6b65c47 + 6780da3 commit ac82e4a
Show file tree
Hide file tree
Showing 43 changed files with 675 additions and 222 deletions.
56 changes: 30 additions & 26 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2010-2020 Evolveum and contributors
* Copyright (C) 2010-2021 Evolveum and contributors
*
* This work is dual-licensed under the Apache License 2.0
* and European Union Public License. See LICENSE file for details.
Expand All @@ -14,18 +14,11 @@
import javax.management.ObjectName;
import javax.xml.namespace.QName;

import com.evolveum.midpoint.gui.api.DefaultGuiConfigurationCompiler;
import com.evolveum.midpoint.gui.impl.component.menu.LeftMenuPanel;

import com.evolveum.midpoint.web.application.SimpleCounter;

import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Validate;
import org.apache.wicket.*;
import org.apache.wicket.ajax.AjaxChannel;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.devutils.debugbar.DebugBar;
Expand All @@ -52,13 +45,13 @@
import org.w3c.dom.Element;
import org.w3c.dom.Node;

import com.evolveum.midpoint.audit.api.AuditService;
import com.evolveum.midpoint.common.Clock;
import com.evolveum.midpoint.common.LocalizationService;
import com.evolveum.midpoint.common.configuration.api.MidpointConfiguration;
import com.evolveum.midpoint.common.validator.EventHandler;
import com.evolveum.midpoint.common.validator.EventResult;
import com.evolveum.midpoint.common.validator.LegacyValidator;
import com.evolveum.midpoint.gui.api.DefaultGuiConfigurationCompiler;
import com.evolveum.midpoint.gui.api.GuiStyleConstants;
import com.evolveum.midpoint.gui.api.SubscriptionType;
import com.evolveum.midpoint.gui.api.component.result.OpResult;
Expand All @@ -75,6 +68,7 @@
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.component.menu.LeftMenuPanel;
import com.evolveum.midpoint.gui.impl.error.ErrorPanel;
import com.evolveum.midpoint.gui.impl.prism.panel.ItemPanelSettings;
import com.evolveum.midpoint.gui.impl.prism.panel.PrismContainerValuePanel;
Expand All @@ -91,14 +85,16 @@
import com.evolveum.midpoint.prism.polystring.PolyString;
import com.evolveum.midpoint.prism.query.QueryConverter;
import com.evolveum.midpoint.repo.api.CacheDispatcher;
import com.evolveum.midpoint.repo.common.activity.CounterManager;
import com.evolveum.midpoint.repo.api.RepositoryService;
import com.evolveum.midpoint.repo.common.ObjectResolver;
import com.evolveum.midpoint.repo.common.activity.CounterManager;
import com.evolveum.midpoint.repo.common.expression.Expression;
import com.evolveum.midpoint.repo.common.expression.ExpressionEvaluationContext;
import com.evolveum.midpoint.repo.common.expression.ExpressionFactory;
import com.evolveum.midpoint.report.api.ReportManager;
import com.evolveum.midpoint.schema.*;
import com.evolveum.midpoint.schema.GetOperationOptionsBuilder;
import com.evolveum.midpoint.schema.RelationRegistry;
import com.evolveum.midpoint.schema.SchemaService;
import com.evolveum.midpoint.schema.constants.ExpressionConstants;
import com.evolveum.midpoint.schema.constants.SchemaConstants;
import com.evolveum.midpoint.schema.expression.VariablesMap;
Expand All @@ -123,21 +119,25 @@
import com.evolveum.midpoint.util.logging.Trace;
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.web.application.AsyncWebProcessManager;
import com.evolveum.midpoint.web.application.SimpleCounter;
import com.evolveum.midpoint.web.boot.Wro4jConfig;
import com.evolveum.midpoint.web.component.AjaxButton;
import com.evolveum.midpoint.web.component.breadcrumbs.Breadcrumb;
import com.evolveum.midpoint.web.component.breadcrumbs.BreadcrumbPageClass;
import com.evolveum.midpoint.web.component.breadcrumbs.BreadcrumbPageInstance;
import com.evolveum.midpoint.web.component.dialog.MainPopupDialog;
import com.evolveum.midpoint.web.component.dialog.Popupable;
import com.evolveum.midpoint.web.component.menu.*;
import com.evolveum.midpoint.web.component.menu.BaseMenuItem;
import com.evolveum.midpoint.web.component.menu.SideBarMenuItem;
import com.evolveum.midpoint.web.component.menu.UserMenuPanel;
import com.evolveum.midpoint.web.component.menu.top.LocalePanel;
import com.evolveum.midpoint.web.component.message.FeedbackAlerts;
import com.evolveum.midpoint.web.component.prism.ValueStatus;
import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
import com.evolveum.midpoint.web.page.login.PageLogin;
import com.evolveum.midpoint.web.page.self.*;
import com.evolveum.midpoint.web.page.self.PageAssignmentsList;
import com.evolveum.midpoint.web.page.self.PageSelf;
import com.evolveum.midpoint.web.security.MidPointApplication;
import com.evolveum.midpoint.web.security.MidPointAuthWebSession;
import com.evolveum.midpoint.web.security.WebApplicationConfiguration;
Expand Down Expand Up @@ -340,7 +340,7 @@ protected void onConfigure() {
}

protected void createBreadcrumb() {
BreadcrumbPageClass bc = new BreadcrumbPageClass(new IModel<String>() {
BreadcrumbPageClass bc = new BreadcrumbPageClass(new IModel<>() {
private static final long serialVersionUID = 1L;

@Override
Expand All @@ -353,7 +353,7 @@ public String getObject() {
}

protected void createInstanceBreadcrumb() {
BreadcrumbPageInstance bc = new BreadcrumbPageInstance(new IModel<String>() {
BreadcrumbPageInstance bc = new BreadcrumbPageInstance(new IModel<>() {
private static final long serialVersionUID = 1L;

@Override
Expand Down Expand Up @@ -688,7 +688,7 @@ private void initTitleLayout(WebMarkupContainer mainHeader) {
WebMarkupContainer pageTitle = new WebMarkupContainer(ID_PAGE_TITLE);
pageTitleContainer.add(pageTitle);

IModel<String> deploymentNameModel = new IModel<String>() {
IModel<String> deploymentNameModel = new IModel<>() {

private static final long serialVersionUID = 1L;

Expand All @@ -712,7 +712,7 @@ public String getObject() {
pageTitleReal.setRenderBodyOnly(true);
pageTitle.add(pageTitleReal);

IModel<List<Breadcrumb>> breadcrumbsModel = new IModel<List<Breadcrumb>>() {
IModel<List<Breadcrumb>> breadcrumbsModel = new IModel<>() {

private static final long serialVersionUID = 1L;

Expand All @@ -722,15 +722,15 @@ public List<Breadcrumb> getObject() {
}
};

ListView<Breadcrumb> breadcrumbs = new ListView<Breadcrumb>(ID_BREADCRUMB, breadcrumbsModel) {
ListView<Breadcrumb> breadcrumbs = new ListView<>(ID_BREADCRUMB, breadcrumbsModel) {

private static final long serialVersionUID = 1L;

@Override
protected void populateItem(ListItem<Breadcrumb> item) {
final Breadcrumb dto = item.getModelObject();

AjaxLink<String> bcLink = new AjaxLink<String>(ID_BC_LINK) {
AjaxLink<String> bcLink = new AjaxLink<>(ID_BC_LINK) {
private static final long serialVersionUID = 1L;

@Override
Expand Down Expand Up @@ -785,7 +785,7 @@ private void initCartButton(WebMarkupContainer mainHeader) {

@Override
public void onClick(AjaxRequestTarget ajaxRequestTarget) {
navigateToNext(new PageAssignmentsList(true));
navigateToNext(new PageAssignmentsList<>(true));
}
};
cartButton.setOutputMarkupId(true);
Expand Down Expand Up @@ -835,7 +835,7 @@ public String getObject() {
mainHeader.setOutputMarkupId(true);
add(mainHeader);

AjaxLink<String> logo = new AjaxLink<String>(ID_LOGO) {
AjaxLink<String> logo = new AjaxLink<>(ID_LOGO) {

private static final long serialVersionUID = 1L;

Expand All @@ -861,7 +861,7 @@ public boolean isEnabled() {
});
mainHeader.add(logo);

AjaxLink<String> customLogo = new AjaxLink<String>(ID_CUSTOM_LOGO) {
AjaxLink<String> customLogo = new AjaxLink<>(ID_CUSTOM_LOGO) {
private static final long serialVersionUID = 1L;

@Override
Expand All @@ -886,7 +886,7 @@ public boolean isVisible() {
navigation.setOutputMarkupId(true);
mainHeader.add(navigation);

IModel<IconType> logoModel = new IModel<IconType>() {
IModel<IconType> logoModel = new IModel<>() {

private static final long serialVersionUID = 1L;

Expand Down Expand Up @@ -1143,7 +1143,7 @@ public SessionStorage getSessionStorage() {
}

protected IModel<String> createPageTitleModel() {
return (IModel<String>) () -> {
return () -> {
BaseMenuItem activeMenu = getActiveMenu();
String pageTitleKey = null;
if (activeMenu != null) {
Expand Down Expand Up @@ -1194,7 +1194,7 @@ private Label getHeaderTitle() {
}

public IModel<String> getPageTitleModel() {
return (IModel) get(ID_TITLE).getDefaultModel();
return (IModel<String>) get(ID_TITLE).getDefaultModel();
}

public String getString(String resourceKey, Object... objects) {
Expand Down Expand Up @@ -1848,7 +1848,7 @@ public <IW extends ItemWrapper> Panel initItemPanel(String panelId, QName typeNa
public <C extends Containerable> Panel initContainerValuePanel(String id, IModel<PrismContainerValueWrapper<C>> model,
ItemPanelSettings settings) {
//TODO find from registry first
return new PrismContainerValuePanel<C, PrismContainerValueWrapper<C>>(id, model, settings) {
return new PrismContainerValuePanel<>(id, model, settings) {
@Override
protected boolean isRemoveButtonVisible() {
return false;
Expand All @@ -1875,4 +1875,8 @@ public Class<? extends Panel> findObjectPanel(String identifier) {
public SimpleCounter getCounterProvider(String identifier) {
return guiConfigurationRegistry.findCounter(identifier);
}

public boolean isNewRepo() {
return getRepositoryService().getRepositoryType().equals("Native");
}
}

0 comments on commit ac82e4a

Please sign in to comment.