-
Notifications
You must be signed in to change notification settings - Fork 188
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of github.com:Evolveum/midpoint
- Loading branch information
Showing
13 changed files
with
244 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
...ui/src/main/java/com/evolveum/midpoint/web/component/data/column/AssignmentPathPanel.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| <!-- | ||
| ~ Copyright (c) 2010-2013 Evolveum | ||
| ~ | ||
| ~ This work is dual-licensed under the Apache License 2.0 | ||
| ~ and European Union Public License. See LICENSE file for details. | ||
| --> | ||
|
|
||
| <!DOCTYPE html> | ||
| <html xmlns:wicket="http://wicket.apache.org"> | ||
| <wicket:panel> | ||
| <div wicket:id="paths"> | ||
| <ul class="assignmentPath" wicket:id="path"/> | ||
| </div> | ||
| </wicket:panel> | ||
| </html> |
62 changes: 62 additions & 0 deletions
62
...ui/src/main/java/com/evolveum/midpoint/web/component/data/column/AssignmentPathPanel.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /* | ||
| * Copyright (C) 2023 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.web.component.data.column; | ||
|
|
||
| import com.evolveum.midpoint.gui.api.component.BasePanel; | ||
| import com.evolveum.midpoint.gui.api.util.WebComponentUtil; | ||
| import com.evolveum.midpoint.xml.ns._public.common.common_3.AbstractRoleType; | ||
| import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentPathSegmentType; | ||
| import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentPathType; | ||
|
|
||
| import org.apache.commons.collections4.CollectionUtils; | ||
| import org.apache.wicket.markup.html.basic.Label; | ||
| import org.apache.wicket.markup.html.list.ListItem; | ||
| import org.apache.wicket.markup.html.list.ListView; | ||
| import org.apache.wicket.model.IModel; | ||
| import org.apache.wicket.model.PropertyModel; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| public class AssignmentPathPanel extends BasePanel<List<AssignmentPathType>> { | ||
| private static final String ID_PATHS = "paths"; | ||
| private static final String ID_PATH = "path"; | ||
|
|
||
| public AssignmentPathPanel(String id, IModel<List<AssignmentPathType>> model) { | ||
| super(id, model); | ||
| } | ||
|
|
||
| @Override | ||
| protected void onInitialize() { | ||
| super.onInitialize(); | ||
| initLayout(); | ||
| } | ||
|
|
||
| private void initLayout() { | ||
|
|
||
| ListView<AssignmentPathType> assignmentPaths = new ListView<>(ID_PATHS, getModel()) { | ||
| @Override | ||
| protected void populateItem(ListItem<AssignmentPathType> listItem) { | ||
| listItem.add(new AssignmentPathSegmentPanel(ID_PATH, loadSegmentsModel(listItem.getModel()))); | ||
| } | ||
| }; | ||
| add(assignmentPaths); | ||
| } | ||
|
|
||
| private IModel<List<AssignmentPathSegmentType>> loadSegmentsModel(IModel<AssignmentPathType> assignmentModel) { | ||
| return () -> { | ||
| AssignmentPathType assignmentPathType = assignmentModel.getObject(); | ||
| List<AssignmentPathSegmentType> segments = assignmentPathType.getSegment(); | ||
| if (CollectionUtils.isEmpty(segments) || segments.size() == 1) { | ||
| return new ArrayList<>(); | ||
| } | ||
| return segments; | ||
| }; | ||
| } | ||
| } |
15 changes: 15 additions & 0 deletions
15
...main/java/com/evolveum/midpoint/web/component/data/column/AssignmentPathSegmentPanel.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| <!-- | ||
| ~ Copyright (c) 2010-2013 Evolveum | ||
| ~ | ||
| ~ This work is dual-licensed under the Apache License 2.0 | ||
| ~ and European Union Public License. See LICENSE file for details. | ||
| --> | ||
|
|
||
| <!DOCTYPE html> | ||
| <html xmlns:wicket="http://wicket.apache.org"> | ||
| <wicket:panel> | ||
| <li class="row" wicket:id="segments"> | ||
| <div class="col-10" wicket:id="segment"/> | ||
| </li> | ||
| </wicket:panel> | ||
| </html> |
53 changes: 53 additions & 0 deletions
53
...main/java/com/evolveum/midpoint/web/component/data/column/AssignmentPathSegmentPanel.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| /* | ||
| * Copyright (C) 2023 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.web.component.data.column; | ||
|
|
||
| import com.evolveum.midpoint.gui.api.component.BasePanel; | ||
| import com.evolveum.midpoint.gui.api.util.WebComponentUtil; | ||
| import com.evolveum.midpoint.xml.ns._public.common.common_3.AbstractRoleType; | ||
| import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentPathSegmentType; | ||
|
|
||
| import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentPathType; | ||
|
|
||
| import org.apache.commons.collections4.CollectionUtils; | ||
| import org.apache.wicket.markup.html.basic.Label; | ||
| import org.apache.wicket.markup.html.list.ListItem; | ||
| import org.apache.wicket.markup.html.list.ListView; | ||
| import org.apache.wicket.model.IModel; | ||
| import org.apache.wicket.model.Model; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| public class AssignmentPathSegmentPanel extends BasePanel<List<AssignmentPathSegmentType>> { | ||
| private static final String ID_SEGMENTS = "segments"; | ||
| private static final String ID_SEGMENT = "segment"; | ||
|
|
||
|
|
||
| public AssignmentPathSegmentPanel(String id, IModel<List<AssignmentPathSegmentType>> model) { | ||
| super(id, model); | ||
| } | ||
|
|
||
| @Override | ||
| protected void onInitialize() { | ||
| super.onInitialize(); | ||
| initLayout(); | ||
| } | ||
|
|
||
| private void initLayout() { | ||
|
|
||
| ListView<AssignmentPathSegmentType> segments = new ListView<>(ID_SEGMENTS, getModel()) { | ||
| @Override | ||
| protected void populateItem(ListItem<AssignmentPathSegmentType> listItem) { | ||
| listItem.add(new ObjectReferenceColumnPanel(ID_SEGMENT, () -> listItem.getModelObject().getTargetRef())); | ||
| } | ||
| }; | ||
| add(segments); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters