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 Sep 29, 2022
2 parents 0c85b47 + 52dddcf commit 55f72db
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 27 deletions.
2 changes: 1 addition & 1 deletion ...eum/midpoint/gui/impl/page/admin/systemconfiguration/component/GuiObjectDetailsPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ protected IModel<String> createHeaderModel() {

@Override
protected IModel<String> getDescriptionLabelModel() {
return () -> getModelObject().getType().getLocalPart();
return () -> getModelObject().getType() != null ? getModelObject().getType().getLocalPart() : "";
}

@Override
Expand Down
3 changes: 2 additions & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/PageRequestAccess.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@
<body>
<wicket:extend>

<div wicket:id="sample"/>


<form wicket:id="mainForm" class="d-flex justify-content-center">
<div class="request-access-wizard" wicket:id="wizard"/>
<div wicket:id="sample"/>
</form>
</wicket:extend>
</body>
Expand Down
55 changes: 30 additions & 25 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/PageRequestAccess.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@
import com.evolveum.midpoint.gui.api.page.PageBase;
import com.evolveum.midpoint.gui.api.prism.ItemStatus;
import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerValueWrapper;
import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerWrapper;
import com.evolveum.midpoint.gui.api.prism.wrapper.PrismObjectWrapper;
import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
import com.evolveum.midpoint.gui.api.util.WebPrismUtil;
import com.evolveum.midpoint.gui.impl.component.AssignmentsDetailsPanel;
import com.evolveum.midpoint.gui.impl.prism.panel.SingleContainerPanel;
import com.evolveum.midpoint.prism.PrismContainerDefinition;
import com.evolveum.midpoint.prism.PrismContainerValue;
Expand Down Expand Up @@ -101,50 +104,52 @@ private void initLayout() {
wizard.setOutputMarkupId(true);
mainForm.add(wizard);

// todo remove, test to somehow show assignment/extension in form =================
add(new WebMarkupContainer("sample"));

// ContainerPanelConfigurationType c = new ContainerPanelConfigurationType();
// c.identifier("sample-panel");
// c.type(AssignmentType.COMPLEX_TYPE);
// c.panelType("formPanel");
// VirtualContainersSpecificationType vcs =
// c.beginContainer()
// .beginDisplay()
// .label("Exxxxx")
// .end();
// vcs.identifier("some-identifier");
// vcs.beginItem().path(new ItemPathType(ItemPath.create(AssignmentType.F_EXTENSION))).end();
//
// // fake assignment created for this test.
// final AssignmentType assigment = new AssignmentType();
//

// IModel<PrismContainerValueWrapper<AssignmentType>> model = new LoadableModel<>(false) {
// @Override
// protected PrismContainerValueWrapper load() {
// try {
// Task task = PageRequestAccess.this.getPageTask();
// OperationResult result = task.getResult();
//
// PrismContainerValue value = assigment.asPrismContainerValue();
// PrismContext.get().adopt(value);
// PrismContainerDefinition def = PrismContext.get().getSchemaRegistry().findContainerDefinitionByCompileTimeClass(AssignmentType.class);
// PrismContainerWrapperFactory factory = PageRequestAccess.this.findContainerWrapperFactory(def);
//virtaul containers are now collected for Objects, not containers, therefore empty user is created here
// UserType user = new UserType();
// final AssignmentType assigment = new AssignmentType();
// user.getAssignment().add(assigment);
// PrismObjectWrapperFactory<UserType> userWrapperFactory = PageRequestAccess.this.findObjectWrapperFactory(user.asPrismObject().getDefinition());
//
// WrapperContext context = new WrapperContext(task, result);
//
// ContainerPanelConfigurationType c = new ContainerPanelConfigurationType();
// c.identifier("sample-panel");
// c.type(AssignmentType.COMPLEX_TYPE);
// c.panelType("formPanel");
// VirtualContainersSpecificationType vcs =
// c.beginContainer()
// .beginDisplay()
// .label("Exxxxx")
// .end();
// vcs.identifier("some-identifier");
// vcs.beginItem().path(new ItemPathType(ItemPath.create(AssignmentType.F_EXTENSION))).end();
// context.setDetailsPageTypeConfiguration(Arrays.asList(c));
// context.setCreateIfEmpty(true);

//create whole wrapper, instead of only the concrete container value wrapper
// PrismObjectWrapper<UserType> userWrapper = userWrapperFactory.createObjectWrapper(user.asPrismObject(), ItemStatus.NOT_CHANGED, context);
//
// PrismContainerWrapper<AssignmentType> assignmentWrapper = userWrapper.findContainer(UserType.F_ASSIGNMENT);
// return assignmentWrapper.getValues().iterator().next();
//
// return factory.createContainerValueWrapper(null, value, ValueStatus.NOT_CHANGED, context);
// } catch (Exception ex) {
// ex.printStackTrace();
// }
// return null;
// }
// };
//
// SingleContainerPanel container = new SingleContainerPanel("sample", model, c);
// addOrReplace(container);
//maybe we can use assignmentDetailsPanel here with some improvemenets, such as hiding condition? so it will be the same as in the admin interface?
// AssignmentsDetailsPanel container = new AssignmentsDetailsPanel("sample", model, false, c);
// mainForm.add(container);
}

private List<WizardStep> createSteps() {
Expand Down
9 changes: 9 additions & 0 deletions gui/admin-gui/src/main/resources/initial-objects/000-system-configuration.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@
</icon>
</display>
<action>
<name>my-history-widget-action</name>
<target>
<pageClass>com.evolveum.midpoint.gui.impl.page.self.PageUserSelfProfile</pageClass>
<panelType>history</panelType>
Expand All @@ -208,6 +209,7 @@
</icon>
</display>
<action>
<name>my-accesses-widget-action</name>
<target>
<pageClass>com.evolveum.midpoint.gui.impl.page.self.PageUserSelfProfile</pageClass>
<panelType>allAssignments</panelType>
Expand All @@ -231,6 +233,7 @@
</icon>
</display>
<action>
<name>my-requests-widget-action</name>
<target>
<pageClass>com.evolveum.midpoint.gui.impl.page.self.PageUserSelfProfile</pageClass>
<panelType>focusCases</panelType>
Expand All @@ -254,6 +257,7 @@
</icon>
</display>
<action>
<name>my-workitems-widget-action</name>
<target>
<pageClass>com.evolveum.midpoint.web.page.admin.cases.PageCaseWorkItems</pageClass>
</target>
Expand All @@ -276,6 +280,7 @@
</icon>
</display>
<action>
<name>my-accounts-widget-action</name>
<target>
<pageClass>com.evolveum.midpoint.gui.impl.page.self.PageUserSelfProfile</pageClass>
<panelType>projections</panelType>
Expand All @@ -302,6 +307,7 @@
</display>
<panelType>statisticWidget</panelType>
<action>
<name>profile-widget-action</name>
<target>
<pageClass>com.evolveum.midpoint.gui.impl.page.self.PageUserSelfProfile</pageClass>
</target>
Expand All @@ -326,6 +332,7 @@
</display>
<panelType>statisticWidget</panelType>
<action>
<name>credentials-widget-action</name>
<target>
<pageClass>com.evolveum.midpoint.gui.impl.page.self.credentials.PageSelfCredentials</pageClass>
</target>
Expand All @@ -349,6 +356,7 @@
</display>
<panelType>statisticWidget</panelType>
<action>
<name>list-users-widget-action</name>
<target>
<pageClass>com.evolveum.midpoint.web.page.admin.users.PageUsers</pageClass>
</target>
Expand All @@ -372,6 +380,7 @@
</display>
<panelType>statisticWidget</panelType>
<action>
<name>list-resources-widget-action</name>
<target>
<pageClass>com.evolveum.midpoint.web.page.admin.resources.PageResources</pageClass>
</target>
Expand Down

0 comments on commit 55f72db

Please sign in to comment.