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
@katkav
katkav committed Apr 15, 2020
2 parents 1600ac4 + 80661cc commit e3dbcd4
Show file tree
Hide file tree
Showing 91 changed files with 9,259 additions and 1,324 deletions.
1 change: 1 addition & 0 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AssignmentPopup.html
View file
Expand Up @@ -9,6 +9,7 @@
<form wicket:id="form">
<div wicket:id="tabsPanel"/>

<div wicket:id="warningMessage" class="form-control-static" />
<p align="right">
<a class="btn btn-default btn-sm" wicket:id="cancelButton"/>
<a class="btn btn-default btn-sm" wicket:id="assignButton"/>
Expand Down
963 changes: 487 additions & 476 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AssignmentPopup.java
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
View file
Expand Up @@ -160,7 +160,7 @@ private void initLayout() {

}

private LoadableModel<Search> initSearchModel(){
protected LoadableModel<Search> initSearchModel(){
return new LoadableModel<Search>(false) {

private static final long serialVersionUID = 1L;
Expand Down Expand Up @@ -192,7 +192,7 @@ public Search load() {
};
}

private String getSearchByNameParameterValue() {
protected String getSearchByNameParameterValue() {
PageParameters parameters = getPageBase().getPageParameters();
if (parameters == null) {
return null;
Expand Down Expand Up @@ -628,7 +628,7 @@ protected String getStorageKey(){
return key;
}

private PageStorage getPageStorage(String storageKey){
protected PageStorage getPageStorage(String storageKey){
PageStorage storage = getSession().getSessionStorage().getPageStorageMap().get(storageKey);
if (storage == null) {
storage = getSession().getSessionStorage().initPageStorage(storageKey);
Expand Down
5 changes: 5 additions & 0 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
View file
Expand Up @@ -569,6 +569,11 @@ protected ObjectQuery addFilterToContentQuery(ObjectQuery query){
});
return tabs;
}

@Override
protected IModel<String> getWarningMessageModel(){
return createStringResource("PageAdminObjectDetails.button.changeArchetype.warningMessage");
}
};

changeArchetypePopup.setOutputMarkupPlaceholderTag(true);
Expand Down
3 changes: 2 additions & 1 deletion ...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCaseWorkItems.java
View file
Expand Up @@ -64,7 +64,8 @@ protected void onInitialize(){
}

private void initLayout() {
CaseWorkItemsPanel workItemsPanel = new CaseWorkItemsPanel(ID_CASE_WORK_ITEMS_TABLE, CaseWorkItemsPanel.View.FULL_LIST) {
CaseWorkItemsPanel workItemsPanel = new CaseWorkItemsPanel(ID_CASE_WORK_ITEMS_TABLE, CaseWorkItemsPanel.View.FULL_LIST,
pageParameters) {
private static final long serialVersionUID = 1L;

@Override
Expand Down
44 changes: 40 additions & 4 deletions ...ui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java
View file
Expand Up @@ -6,14 +6,12 @@
*/
package com.evolveum.midpoint.web.page.admin.resources;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.*;

import javax.xml.namespace.QName;

import com.evolveum.midpoint.gui.api.component.PendingOperationPanel;
import com.evolveum.midpoint.gui.api.model.LoadableModel;
import com.evolveum.midpoint.model.api.authentication.CompiledObjectCollectionView;
import com.evolveum.midpoint.prism.delta.*;
import com.evolveum.midpoint.prism.path.ItemPath;
Expand All @@ -22,10 +20,13 @@
import com.evolveum.midpoint.schema.constants.ObjectTypes;
import com.evolveum.midpoint.util.MiscUtil;
import com.evolveum.midpoint.web.component.menu.cog.ButtonInlineMenuItem;
import com.evolveum.midpoint.web.component.search.SearchItem;
import com.evolveum.midpoint.web.component.search.SearchValue;
import com.evolveum.midpoint.web.component.util.SelectableBean;
import com.evolveum.midpoint.web.page.admin.server.PageTask;
import com.evolveum.midpoint.web.page.admin.server.PageTasks;
import com.evolveum.midpoint.web.security.util.SecurityUtils;
import com.evolveum.midpoint.web.session.PageStorage;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;

import org.apache.commons.lang.StringUtils;
Expand Down Expand Up @@ -294,6 +295,41 @@ protected ObjectQuery createContentQuery() {
return queryFactory.createQuery(queryFactory.createAnd(filters));
}

@Override
protected LoadableModel<Search> initSearchModel() {
return new LoadableModel<Search>(false) {

private static final long serialVersionUID = 1L;

@Override
public Search load() {
String storageKey = getStorageKey();
Search search = null;
if (org.apache.commons.lang3.StringUtils.isNotEmpty(storageKey)) {
PageStorage storage = getPageStorage(storageKey);
if (storage != null) {
search = storage.getSearch();
}
}
Search newSearch = createSearch();
if (search == null
|| !search.getAvailableDefinitions().containsAll(newSearch.getAvailableDefinitions())) {
search = newSearch;
}

String searchByName = getSearchByNameParameterValue();
if (searchByName != null) {
for (SearchItem item : search.getItems()) {
if (ItemPath.create(ObjectType.F_NAME).equivalent(item.getPath())) {
item.setValues(Collections.singletonList(new SearchValue(searchByName)));
}
}
}
return search;
}
};
}

@Override
protected Search createSearch() {
return ResourceContentPanel.this.createSearch();
Expand Down
57 changes: 44 additions & 13 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTask.java
View file
Expand Up @@ -4,13 +4,16 @@
import java.util.Collection;
import java.util.Collections;

import com.evolveum.midpoint.web.component.dialog.ConfirmationPanel;

import org.apache.wicket.Page;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.StringResourceModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;

import com.evolveum.midpoint.gui.api.GuiStyleConstants;
Expand Down Expand Up @@ -63,6 +66,8 @@
import com.evolveum.midpoint.web.util.TaskOperationUtils;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;

import static com.evolveum.midpoint.web.component.data.column.ColumnUtils.createStringResource;

@PageDescriptor(
urls = {
@Url(mountUrl = "/admin/task", matchUrlForSecurity = "/admin/task")
Expand Down Expand Up @@ -349,12 +354,25 @@ private void createCleanupPerformanceButton(RepeatingView repeatingView) {

@Override
public void onClick(AjaxRequestTarget target) {
try {
deleteItem(TaskType.F_OPERATION_STATS);
} catch (SchemaException e){
LOGGER.error("Cannot clear task results: {}", e.getMessage());
}
saveTaskChanges(target);
ConfirmationPanel dialog = new ConfirmationPanel(getMainPopupBodyId(), createStringResource("operationalButtonsPanel.cleanupEnvironmentalPerformance.confirmation")) {
private static final long serialVersionUID = 1L;

@Override
public StringResourceModel getTitle() {
return createStringResource("pageUsers.message.confirmActionPopupTitle");
}

@Override
public void yesPerformed(AjaxRequestTarget target) {
try {
deleteItem(TaskType.F_OPERATION_STATS);
} catch (SchemaException e){
LOGGER.error("Cannot clear task results: {}", e.getMessage());
}
saveTaskChanges(target);
}
};
showMainPopup(dialog, target);
}
};
cleanupPerformance.add(AttributeAppender.append("class", "btn btn-default btn-margin-left btn-sm"));
Expand All @@ -368,13 +386,26 @@ private void createCleanupResultsButton(RepeatingView repeatingView) {

@Override
public void onClick(AjaxRequestTarget target) {
try {
deleteItem(TaskType.F_RESULT);
deleteItem(TaskType.F_RESULT_STATUS);
} catch (SchemaException e){
LOGGER.error("Cannot clear task results: {}", e.getMessage());
}
saveTaskChanges(target);
ConfirmationPanel dialog = new ConfirmationPanel(getMainPopupBodyId(), createStringResource("operationalButtonsPanel.cleanupEnvironmentalPerformance.confirmation")) {
private static final long serialVersionUID = 1L;

@Override
public StringResourceModel getTitle() {
return createStringResource("pageUsers.message.confirmActionPopupTitle");
}

@Override
public void yesPerformed(AjaxRequestTarget target) {
try {
deleteItem(TaskType.F_RESULT);
deleteItem(TaskType.F_RESULT_STATUS);
} catch (SchemaException e){
LOGGER.error("Cannot clear task results: {}", e.getMessage());
}
saveTaskChanges(target);
}
};
showMainPopup(dialog, target);
}
};
cleanupResults.add(new VisibleBehaviour(this::isNotRunning));
Expand Down
133 changes: 0 additions & 133 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.html
View file

This file was deleted.

12 changes: 9 additions & 3 deletions infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/RawType.java
View file
Expand Up @@ -265,10 +265,16 @@ public PrismValue getAlreadyParsedValue() {

public <T> T getParsedRealValue(@NotNull Class<T> clazz) throws SchemaException {
if (parsed != null) {
if (clazz.isAssignableFrom(parsed.getRealValue().getClass())) {
return (T) parsed.getRealValue();
Object realValue = parsed.getRealValue();
if (realValue != null) {
if (clazz.isAssignableFrom(realValue.getClass())) {
//noinspection unchecked
return (T) realValue;
} else {
throw new IllegalArgumentException("Parsed value ("+realValue.getClass()+") is not assignable to "+clazz);
}
} else {
throw new IllegalArgumentException("Parsed value ("+parsed.getClass()+") is not assignable to "+clazz);
return null; // strange but possible
}
} else if (xnode != null) {
return prismContext.parserFor(xnode.toRootXNode()).parseRealValue(clazz);
Expand Down
10 changes: 2 additions & 8 deletions infra/prism-impl/pom.xml
View file
Expand Up @@ -48,14 +48,8 @@
<artifactId>jaxb-xjc</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-wsdl</artifactId>
<exclusions>
<exclusion>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
Expand Down

0 comments on commit e3dbcd4

Please sign in to comment.