Skip to content

Commit

Permalink
detaching models for list pages (e.g. All users, All roles, ...)
Browse files Browse the repository at this point in the history
  • Loading branch information
katkav committed Mar 16, 2022
1 parent f84dc88 commit a023420
Show file tree
Hide file tree
Showing 23 changed files with 354 additions and 99 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
import java.util.*;

import com.evolveum.midpoint.gui.api.util.GuiDisplayTypeUtil;
import com.evolveum.midpoint.gui.impl.model.SelectableObjectModel;
import com.evolveum.midpoint.gui.impl.util.ObjectCollectionViewUtil;
import com.evolveum.midpoint.gui.impl.util.TableUtil;
import com.evolveum.midpoint.model.api.ModelExecuteOptions;
import com.evolveum.midpoint.model.common.util.DefaultColumnUtils;

Expand Down Expand Up @@ -520,19 +522,20 @@ public ExecuteChangeOptionsDto getExecuteOptions() {
* returns only this object.
*/
public List<O> isAnythingSelected(AjaxRequestTarget target, O selectedObject) {
List<O> users;
if (selectedObject != null) {
users = new ArrayList<>();
users.add(selectedObject);
} else {
users = getSelectedRealObjects();
if (users.isEmpty() && StringUtils.isNotEmpty(getNothingSelectedMessage())) {
warn(getNothingSelectedMessage());
target.add(getFeedbackPanel());
}
}

return users;
// List<SelectableObjectModel<UserType>> users;
// if (selectedObject != null) {
// users = new ArrayList<>();
// users.add(selectedObject);
// } else {
// users = (List<SelectableObjectModel<UserType>>) TableUtil.getSelectedModels(getTable().getDataTable());
// if (users.isEmpty() && StringUtils.isNotEmpty(getNothingSelectedMessage())) {
// warn(getNothingSelectedMessage());
// target.add(getFeedbackPanel());
// }
// }
//
// return users;
return new ArrayList<>();
}

protected String getNothingSelectedMessage() {
Expand All @@ -542,7 +545,7 @@ protected String getNothingSelectedMessage() {
public IModel<String> getConfirmationMessageModel(ColumnMenuAction action, String actionName){
if (action.getRowModel() == null) {
return createStringResource(getConfirmMessageKeyForSingleObject(),
actionName, getSelectedObjectsCount() );
actionName, TableUtil.getSelectedModels(getTable().getDataTable()).size() );
} else {
return createStringResource(getConfirmMessageKeyForMultiObject(),
actionName, ((ObjectType)((SelectableBean)action.getRowModel().getObject()).getValue()).getName());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1710,11 +1710,11 @@ public static <T extends Selectable> List<T> getSelectedData(Table table) {
BaseSortableDataProvider<T> provider = (BaseSortableDataProvider<T>) dataTable.getDataProvider();

List<T> selected = new ArrayList<>();
for (T bean : provider.getAvailableData()) {
if (bean.isSelected()) {
selected.add(bean);
}
}
// for (T bean : provider.getAvailableData()) {
// if (bean.isSelected()) {
// selected.add(bean);
// }
// }

return selected;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
/*
* Copyright (C) 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.
*/
package com.evolveum.midpoint.gui.impl.model;

import com.evolveum.midpoint.gui.api.page.PageBase;
import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.schema.GetOperationOptions;
import com.evolveum.midpoint.schema.SelectorOptions;
import com.evolveum.midpoint.schema.result.OperationResult;
import com.evolveum.midpoint.task.api.Task;
import com.evolveum.midpoint.web.component.util.SelectableBean;
import com.evolveum.midpoint.web.component.util.SelectableBeanImpl;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;

import org.apache.wicket.model.LoadableDetachableModel;

import java.util.Collection;

public abstract class SelectableObjectModel<O extends ObjectType> extends LoadableDetachableModel<O> implements SelectableRowModel<O> {

private String oid;
private Class<O> type;

private Collection<SelectorOptions<GetOperationOptions>> options;

private boolean selected;

public SelectableObjectModel(O object, Collection<SelectorOptions<GetOperationOptions>> options) {
super(object);
this.options = options;
this.oid = object.getOid();
this.type = (Class<O>) object.getClass();
}

// @Override
// protected O load() {
// PageBase pageBase = getPageBase();
// Task task = pageBase.createSimpleTask("load object");
// OperationResult result = task.getResult();
// PrismObject<O> object = WebModelServiceUtils.loadObject(type, oid, pageBase, task, result);
// result.computeStatusIfUnknown();
// SelectableBeanImpl selectableBean;
// if (object != null) {
// selectableBean = new SelectableBeanImpl<>(object.asObjectable());
// selectableBean.setSelected(selected);
// } else {
// selectableBean = new SelectableBeanImpl<>(null);
// }
// selectableBean.setResult(result);
//// return selectableBean;
// return object.asObjectable();
// }

@Override
protected void onDetach() {
if (isAttached()) {
O object = getObject();
// selected = seletableBean.isSelected();
// O object = seletableBean.getValue();
if (object != null) {
oid = object.getOid();
type = (Class<O>) object.getClass();
}
}
}

// protected PageBase getPageBase() {
// throw new UnsupportedOperationException("Must be implemented in caller.");
// }

public void setSelected(boolean selected) {
this.selected = selected;
}

public boolean isSelected() {
return selected;
}

public String getOid() {
if (isAttached()) {
getObject().getOid();
}
return oid;
}

public Class<O> getType() {
if (isAttached()) {
getObject().getClass();
}
return type;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.evolveum.midpoint.gui.impl.model;

import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;

public interface SelectableRowModel<T> extends IModel<T> {

boolean isSelected();
void setSelected(boolean selected);
}
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,8 @@ private List<MailServerConfiguration> getSelectedItems() {
BoxedTablePanel<MailServerConfiguration> itemsTable = getMailServersTable();
ListDataProvider<MailServerConfiguration> itemsProvider = (ListDataProvider<MailServerConfiguration>) itemsTable.getDataTable()
.getDataProvider();
return itemsProvider.getAvailableData().stream().filter(a -> a.isSelected()).collect(Collectors.toList());
// return itemsProvider.getAvailableData().stream().filter(a -> a.isSelected()).collect(Collectors.toList());
return new ArrayList<>();
}

private void mailServerEditPerformed(AjaxRequestTarget target, IModel<MailServerConfiguration> rowModel,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ protected WebMarkupContainer createHeader(String headerId) {
};

actionTable.setOutputMarkupId(true);
actionTable.add(new VisibleBehaviour(() -> !dataProvider.getAvailableData().isEmpty() || dataProvider.size() > 0));
// actionTable.add(new VisibleBehaviour(() -> !dataProvider.getAvailableData().isEmpty() || dataProvider.size() > 0));
add(actionTable);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package com.evolveum.midpoint.gui.impl.util;

import com.evolveum.midpoint.gui.impl.model.SelectableObjectModel;
import com.evolveum.midpoint.web.component.data.SelectableDataTable;

import com.evolveum.midpoint.web.component.util.SelectableBean;

import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;

import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.model.IModel;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;

import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;

public class TableUtil {

public static <T extends ObjectType> List<SelectableBean<T>> getSelectedModels(DataTable table) {
List<SelectableBean<T>> objects = new ArrayList<>();
table.visitChildren(SelectableDataTable.SelectableRowItem.class, new IVisitor<SelectableDataTable.SelectableRowItem<SelectableBean<T>>, Void>() {

@Override
public void component(SelectableDataTable.SelectableRowItem<SelectableBean<T>> row, IVisit<Void> visit) {
if (row.getModelObject().isSelected()) {
objects.add(row.getModel().getObject());
}
// SelectableObjectModel<T> model = (SelectableObjectModel<T>) row.getModel();
// if (model.isSelected()) {
// objects.add((SelectableObjectModel<T>) row.getModel());
// }
}
});
return objects;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ protected void populateItem(Item item) {
gridView.add(new VisibleEnableBehaviour(){
public boolean isVisible(){
BaseSortableDataProvider p = (BaseSortableDataProvider) GridViewComponent.this.getModelObject();
List<AssignmentEditorDto> l = p.getAvailableData();
return true;
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,10 @@ protected CompiledObjectCollectionView getCompiledObjectCollectionView() {
public void setCompiledObjectCollectionView(CompiledObjectCollectionView objectCollectionView) {
this.objectCollectionView = objectCollectionView;
}

@Override
public void detach() {
super.detach();
search.detach();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import java.util.*;
import javax.xml.namespace.QName;

import com.evolveum.midpoint.gui.impl.model.SelectableObjectModel;
import com.evolveum.midpoint.web.session.PageStorage;

import org.apache.commons.lang3.Validate;
Expand All @@ -20,6 +21,7 @@
import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;
import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.jetbrains.annotations.NotNull;

Expand Down Expand Up @@ -131,7 +133,7 @@ protected ModelAuditService getAuditService() {
return application.getAuditService();
}

public List<T> getAvailableData() {
protected List<T> getAvailableData() {
if (availableData == null) {
availableData = new ArrayList<>();
}
Expand Down Expand Up @@ -369,4 +371,10 @@ public void setExportSize(boolean exportSize) {
public boolean isUseCache() {
return useCache;
}

// @Override
// public void detach() {
// super.detach();
//// availableData = new ArrayList<>();
// }
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;

import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.jetbrains.annotations.NotNull;

/**
Expand Down Expand Up @@ -146,7 +147,7 @@ protected void handleNotSuccessOrHandledErrorInIterator(OperationResult result)
}

public W createDataObjectWrapper(PrismObject<O> obj) {
SelectableBeanImpl<O> selectable = new SelectableBeanImpl<>(obj.asObjectable());
SelectableBeanImpl<O> selectable = new SelectableBeanImpl<>(Model.of(obj.asObjectable()));
if (selected.contains(obj.asObjectable())) {
selectable.setSelected(true);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.jetbrains.annotations.NotNull;

import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
Expand Down Expand Up @@ -216,7 +217,7 @@ protected Iterator<SelectableBean<C>> handleNotSuccessOrHandledErrorInIterator(O
}

public SelectableBean<C> createDataObjectWrapper(C obj) {
SelectableBean<C> selectable = new SelectableBeanImpl<>(obj);
SelectableBean<C> selectable = new SelectableBeanImpl<>(Model.of(obj));

for (C s : selected) {
if (s.asPrismContainerValue().equivalent(obj.asPrismContainerValue())) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
import java.util.List;
import java.util.Set;

import com.evolveum.midpoint.gui.api.page.PageBase;
import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
import com.evolveum.midpoint.gui.impl.model.SelectableObjectModel;

import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
Expand Down Expand Up @@ -68,17 +72,20 @@ public List<SelectableBean<O>> createDataObjectWrappers(Class<? extends O> type,
}

public SelectableBean<O> createDataObjectWrapper(O obj) {
SelectableBean<O> selectable = new SelectableBeanImpl<>(obj);

if (!WebComponentUtil.isSuccessOrHandledError(obj.getFetchResult())) {
try {
if (obj.getFetchResult() != null && !OperationResultImportanceType.MINOR.equals(obj.getFetchResult().getImportance())) {
selectable.setResult(obj.getFetchResult());
}
} catch (SchemaException e) {
throw new SystemException(e.getMessage(), e);
SelectableObjectModel<O> model = new SelectableObjectModel<O>(obj, getOptions()) {
@Override
protected O load() {
PageBase pageBase = getPageBase();
Task task = pageBase.createSimpleTask("load object");
OperationResult result = task.getResult();
PrismObject<O> object = WebModelServiceUtils.loadObject(getType(), getOid(), getOptions(), pageBase, task, result);
result.computeStatusIfUnknown();
return object.asObjectable();
}
}
};
SelectableBean<O> selectable = new SelectableBeanImpl<>(model);
//TODO result

for (O s : getSelected()) {
if (s.getOid().equals(obj.getOid())) {
selectable.setSelected(true);
Expand Down Expand Up @@ -130,6 +137,18 @@ protected boolean isUseObjectCounting() {
return true;
}

@Override
public IModel<SelectableBean<O>> model(SelectableBean<O> object) {
return new Model<>(object);
// return new SelectableObjectModel<>(object) {
//
// @Override
// protected PageBase getPageBase() {
// return SelectableBeanObjectDataProvider.this.getPageBase();
// }
// };
}

protected boolean isMemberPanel() {
return isMemberPanel;
}
Expand All @@ -142,4 +161,10 @@ public void setIsMemberPanel(boolean isMemberPanel) {
protected List<O> searchObjects(Class<? extends O> type, ObjectQuery query, Collection<SelectorOptions<GetOperationOptions>> options, Task task, OperationResult result) throws CommonException {
return getModel().searchObjects(type, query, options, task, result).map(prismObject -> prismObject.asObjectable());
}

@Override
public void detach() {
super.detach();
getAvailableData().clear();
}
}

0 comments on commit a023420

Please sign in to comment.