Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@skublik
skublik committed Oct 11, 2021
2 parents 98140a4 + 2385d88 commit 240ff21
Show file tree
Hide file tree
Showing 9 changed files with 278 additions and 170 deletions.
2 changes: 1 addition & 1 deletion 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
Expand Up @@ -1876,7 +1876,7 @@ public SimpleCounter getCounterProvider(String identifier) {
return guiConfigurationRegistry.findCounter(identifier);
}

public boolean isNewRepo() {
public boolean isNativeRepo() {
return getRepositoryService().getRepositoryType().equals("Native");
}
}
68 changes: 34 additions & 34 deletions ...c/main/java/com/evolveum/midpoint/gui/impl/page/admin/task/component/TaskErrorsPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
import com.evolveum.midpoint.web.component.util.SelectableBean;
import com.evolveum.midpoint.web.page.admin.server.RefreshableTabPanel;
import com.evolveum.midpoint.web.page.admin.server.dto.TaskErrorSelectableBeanImpl;
import com.evolveum.midpoint.web.page.admin.server.dto.TaskErrorSelectableBeanImplNew;
import com.evolveum.midpoint.web.page.admin.server.dto.TaskErrorSelectableBeanImplOld;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;

/**
Expand All @@ -69,7 +69,7 @@ public TaskErrorsPanel(String id, TaskDetailsModel taskWrapperModel, ContainerPa
}

protected void initLayout() {
if (getPageBase().isNewRepo()) {
if (getPageBase().isNativeRepo()) {
initLayoutNew(); // New repo, searchContainers, see MID-7235
} else {
initLayoutOld(); // Old repo, searchObjects
Expand All @@ -81,7 +81,7 @@ private void initLayoutNew() {

@Override
protected String getDefaultSortParam() {
return TaskErrorSelectableBeanImplNew.F_ERROR_TIMESTAMP;
return TaskErrorSelectableBeanImpl.F_ERROR_TIMESTAMP;
}

@Override
Expand All @@ -91,7 +91,7 @@ protected SortOrder getDefaultSortOrder() {

@Override
public SelectableBean<OperationExecutionType> createDataObjectWrapper(OperationExecutionType obj) {
return new TaskErrorSelectableBeanImplNew(obj);
return new TaskErrorSelectableBeanImpl(obj);
}

@Override
Expand All @@ -105,7 +105,7 @@ protected List<ObjectOrdering> createObjectOrderings(SortParam<String> sortParam
if (sortParam != null && sortParam.getProperty() != null) {
OrderDirection order = sortParam.isAscending() ? OrderDirection.ASCENDING : OrderDirection.DESCENDING;
ItemPath ordering;
if (sortParam.getProperty().equals(TaskErrorSelectableBeanImplNew.F_ERROR_TIMESTAMP)) {
if (sortParam.getProperty().equals(TaskErrorSelectableBeanImpl.F_ERROR_TIMESTAMP)) {
ordering = ItemPath.create(OperationExecutionType.F_TIMESTAMP);
} else if (sortParam.getProperty().equals("name")) {
// TODO why is this "name" and not TaskErrorSelectableBeanImplNew.F_OBJECT_REF_NAME?
Expand All @@ -132,33 +132,33 @@ public Class<OperationExecutionType> getType() {
add(table);
}

private List<IColumn<TaskErrorSelectableBeanImplNew, String>> initColumnsNew() {
List<IColumn<TaskErrorSelectableBeanImplNew, String>> columns = new ArrayList<>();
columns.add(new PropertyColumn<>(createStringResource("pageTaskEdit.taskErros.objectName"), TaskErrorSelectableBeanImplNew.F_OBJECT_REF_NAME) {
private List<IColumn<TaskErrorSelectableBeanImpl, String>> initColumnsNew() {
List<IColumn<TaskErrorSelectableBeanImpl, String>> columns = new ArrayList<>();
columns.add(new PropertyColumn<>(createStringResource("pageTaskEdit.taskErros.objectName"), TaskErrorSelectableBeanImpl.F_OBJECT_REF_NAME) {
@Override
public String getSortProperty() {
return "name";
}
});
columns.add(new AbstractColumn<>(createStringResource("pageTaskEdit.taskErros.timestamp"), TaskErrorSelectableBeanImplNew.F_ERROR_TIMESTAMP) {
columns.add(new AbstractColumn<>(createStringResource("pageTaskEdit.taskErros.timestamp"), TaskErrorSelectableBeanImpl.F_ERROR_TIMESTAMP) {
private static final long serialVersionUID = 1L;

@Override
public void populateItem(Item<ICellPopulator<TaskErrorSelectableBeanImplNew>> cellItem, String componentId,
IModel<TaskErrorSelectableBeanImplNew> rowModel) {
public void populateItem(Item<ICellPopulator<TaskErrorSelectableBeanImpl>> cellItem, String componentId,
IModel<TaskErrorSelectableBeanImpl> rowModel) {
Label label = new Label(componentId, (IModel<String>) () ->
WebComponentUtil.getShortDateTimeFormattedValue(rowModel.getObject().getErrorTimestamp(), getPageBase()));
cellItem.add(label);
}
});
columns.add(new EnumPropertyColumn<>(createStringResource("pageTaskEdit.taskErros.status"), TaskErrorSelectableBeanImplNew.F_STATUS));
columns.add(new PropertyColumn<>(createStringResource("pageTaskEdit.taskErros.message"), TaskErrorSelectableBeanImplNew.F_MESSAGE));
columns.add(new EnumPropertyColumn<>(createStringResource("pageTaskEdit.taskErros.recordType"), TaskErrorSelectableBeanImplNew.F_RECORD_TYPE));
columns.add(new AjaxLinkColumn<>(createStringResource("pageTaskEdit.taskErros.realOwner"), TaskErrorSelectableBeanImplNew.F_REAL_OWNER_DESCRIPTION) {
columns.add(new EnumPropertyColumn<>(createStringResource("pageTaskEdit.taskErros.status"), TaskErrorSelectableBeanImpl.F_STATUS));
columns.add(new PropertyColumn<>(createStringResource("pageTaskEdit.taskErros.message"), TaskErrorSelectableBeanImpl.F_MESSAGE));
columns.add(new EnumPropertyColumn<>(createStringResource("pageTaskEdit.taskErros.recordType"), TaskErrorSelectableBeanImpl.F_RECORD_TYPE));
columns.add(new AjaxLinkColumn<>(createStringResource("pageTaskEdit.taskErros.realOwner"), TaskErrorSelectableBeanImpl.F_REAL_OWNER_DESCRIPTION) {

@Override
public void onClick(AjaxRequestTarget target, IModel<TaskErrorSelectableBeanImplNew> rowModel) {
TaskErrorSelectableBeanImplNew object = rowModel.getObject();
public void onClick(AjaxRequestTarget target, IModel<TaskErrorSelectableBeanImpl> rowModel) {
TaskErrorSelectableBeanImpl object = rowModel.getObject();
PrismObject<ObjectType> realOwner = object.getRealOwner();
WebComponentUtil.dispatchToObjectDetailsPage(
realOwner.getCompileTimeClass(), realOwner.getOid(), TaskErrorsPanel.this, false);
Expand All @@ -173,7 +173,7 @@ private void initLayoutOld() {

@Override
protected String getDefaultSortParam() {
return TaskErrorSelectableBeanImpl.F_ERROR_TIMESTAMP;
return TaskErrorSelectableBeanImplOld.F_ERROR_TIMESTAMP;
}

@Override
Expand All @@ -183,7 +183,7 @@ protected SortOrder getDefaultSortOrder() {

@Override
public SelectableBean<ObjectType> createDataObjectWrapper(ObjectType obj) {
return new TaskErrorSelectableBeanImpl<>(obj, getObjectWrapper().getOid());
return new TaskErrorSelectableBeanImplOld<>(obj, getObjectWrapper().getOid());
}

@Override
Expand All @@ -197,7 +197,7 @@ protected List<ObjectOrdering> createObjectOrderings(SortParam<String> sortParam
if (sortParam != null && sortParam.getProperty() != null) {
OrderDirection order = sortParam.isAscending() ? OrderDirection.ASCENDING : OrderDirection.DESCENDING;
ItemPath ordering;
if (sortParam.getProperty().equals(TaskErrorSelectableBeanImpl.F_ERROR_TIMESTAMP)) {
if (sortParam.getProperty().equals(TaskErrorSelectableBeanImplOld.F_ERROR_TIMESTAMP)) {
ordering = ItemPath.create("operationExecution", "timestamp");
} else {
ordering = ItemPath.create(new QName(SchemaConstantsGenerated.NS_COMMON, sortParam.getProperty()));
Expand All @@ -216,38 +216,38 @@ public Class<ObjectType> getType() {
}
};

BoxedTablePanel<TaskErrorSelectableBeanImpl<ObjectType>> table = new BoxedTablePanel<>(ID_TASK_ERRORS, provider, initColumnsOld());
BoxedTablePanel<TaskErrorSelectableBeanImplOld<ObjectType>> table = new BoxedTablePanel<>(ID_TASK_ERRORS, provider, initColumnsOld());
table.setOutputMarkupId(true);
add(table);
}

private List<IColumn<TaskErrorSelectableBeanImpl<ObjectType>, String>> initColumnsOld() {
List<IColumn<TaskErrorSelectableBeanImpl<ObjectType>, String>> columns = new ArrayList<>();
columns.add(new PropertyColumn<>(createStringResource("pageTaskEdit.taskErros.objectName"), TaskErrorSelectableBeanImpl.F_OBJECT_REF_NAME) {
private List<IColumn<TaskErrorSelectableBeanImplOld<ObjectType>, String>> initColumnsOld() {
List<IColumn<TaskErrorSelectableBeanImplOld<ObjectType>, String>> columns = new ArrayList<>();
columns.add(new PropertyColumn<>(createStringResource("pageTaskEdit.taskErros.objectName"), TaskErrorSelectableBeanImplOld.F_OBJECT_REF_NAME) {
@Override
public String getSortProperty() {
return "name";
}
});
columns.add(new AbstractColumn<>(createStringResource("pageTaskEdit.taskErros.timestamp"), TaskErrorSelectableBeanImpl.F_ERROR_TIMESTAMP) {
columns.add(new AbstractColumn<>(createStringResource("pageTaskEdit.taskErros.timestamp"), TaskErrorSelectableBeanImplOld.F_ERROR_TIMESTAMP) {
private static final long serialVersionUID = 1L;

@Override
public void populateItem(Item<ICellPopulator<TaskErrorSelectableBeanImpl<ObjectType>>> cellItem, String componentId,
IModel<TaskErrorSelectableBeanImpl<ObjectType>> rowModel) {
public void populateItem(Item<ICellPopulator<TaskErrorSelectableBeanImplOld<ObjectType>>> cellItem, String componentId,
IModel<TaskErrorSelectableBeanImplOld<ObjectType>> rowModel) {
Label label = new Label(componentId, (IModel<String>) () ->
WebComponentUtil.getShortDateTimeFormattedValue(rowModel.getObject().getErrorTimestamp(), getPageBase()));
cellItem.add(label);
}
});
columns.add(new EnumPropertyColumn<>(createStringResource("pageTaskEdit.taskErros.status"), TaskErrorSelectableBeanImpl.F_STATUS));
columns.add(new PropertyColumn<>(createStringResource("pageTaskEdit.taskErros.message"), TaskErrorSelectableBeanImpl.F_MESSAGE));
columns.add(new EnumPropertyColumn<>(createStringResource("pageTaskEdit.taskErros.recordType"), TaskErrorSelectableBeanImpl.F_RECORD_TYPE));
columns.add(new AjaxLinkColumn<>(createStringResource("pageTaskEdit.taskErros.realOwner"), TaskErrorSelectableBeanImpl.F_REAL_OWNER_DESCRIPTION) {
columns.add(new EnumPropertyColumn<>(createStringResource("pageTaskEdit.taskErros.status"), TaskErrorSelectableBeanImplOld.F_STATUS));
columns.add(new PropertyColumn<>(createStringResource("pageTaskEdit.taskErros.message"), TaskErrorSelectableBeanImplOld.F_MESSAGE));
columns.add(new EnumPropertyColumn<>(createStringResource("pageTaskEdit.taskErros.recordType"), TaskErrorSelectableBeanImplOld.F_RECORD_TYPE));
columns.add(new AjaxLinkColumn<>(createStringResource("pageTaskEdit.taskErros.realOwner"), TaskErrorSelectableBeanImplOld.F_REAL_OWNER_DESCRIPTION) {

@Override
public void onClick(AjaxRequestTarget target, IModel<TaskErrorSelectableBeanImpl<ObjectType>> rowModel) {
TaskErrorSelectableBeanImpl<ObjectType> object = rowModel.getObject();
public void onClick(AjaxRequestTarget target, IModel<TaskErrorSelectableBeanImplOld<ObjectType>> rowModel) {
TaskErrorSelectableBeanImplOld<ObjectType> object = rowModel.getObject();
PrismObject<ObjectType> realOwner = object.getRealOwner();
WebComponentUtil.dispatchToObjectDetailsPage(
realOwner.getCompileTimeClass(), realOwner.getOid(), TaskErrorsPanel.this, false);
Expand All @@ -258,7 +258,7 @@ public void onClick(AjaxRequestTarget target, IModel<TaskErrorSelectableBeanImpl
}

private ObjectQuery createContentQuery(String taskOid, PageBase pageBase) {
if (getPageBase().isNewRepo()) {
if (getPageBase().isNativeRepo()) {
return getPrismContext().queryFor(OperationExecutionType.class)
.item(OperationExecutionType.F_TASK_REF).ref(taskOid)
.and()
Expand Down

0 comments on commit 240ff21

Please sign in to comment.