Skip to content

Commit

Permalink
MID-9278 added display=regular to few paths marked lately with operat…
Browse files Browse the repository at this point in the history 
…ional annotation, also added support for display=regular to prism wrappers
  • Loading branch information
@1azyman
1azyman committed Nov 30, 2023
1 parent 55dbbb3 commit 0f1d12c
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 1 deletion.
6 changes: 6 additions & 0 deletions .../src/main/java/com/evolveum/midpoint/gui/impl/factory/wrapper/ItemWrapperFactoryImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,12 @@ boolean skipCreateWrapper(ItemDefinition<?> def, ItemStatus status, WrapperConte
}

protected boolean canCreateWrapper(ItemDefinition<?> def, ItemStatus status, WrapperContext context, boolean isEmptyValue) {
DisplayHint hint = def.getDisplay();
if (hint == DisplayHint.REGULAR) {
return true;
} else if (hint == DisplayHint.HIDDEN) {
return false;
}
if (def.isOperational() && !context.isCreateOperational()) {
LOGGER.trace("Skipping creating wrapper for {}, because it is operational.", def.getItemName());
return false;
Expand Down
3 changes: 3 additions & 0 deletions infra/schema/src/main/resources/xml/ns/public/common/common-provisioning-3.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@
<xsd:appinfo>
<a:operational>true</a:operational>
<a:alwaysUseForEquals/>
<a:display>regular</a:display>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -99,6 +100,7 @@
</a:diagram>
<a:operational>true</a:operational>
<a:alwaysUseForEquals/>
<a:display>regular</a:display>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down Expand Up @@ -2958,6 +2960,7 @@
<xsd:appinfo>
<a:operational>true</a:operational>
<a:alwaysUseForEquals/>
<a:display>regular</a:display>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down
19 changes: 19 additions & 0 deletions infra/schema/src/main/resources/xml/ns/public/common/common-tasks-3.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@
</xsd:documentation>
<xsd:appinfo>
<a:operational>true</a:operational>
<a:display>regular</a:display>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -220,6 +221,7 @@
<xsd:appinfo>
<a:since>3.8</a:since>
<a:operational>true</a:operational>
<a:display>regular</a:display>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -232,6 +234,7 @@
<xsd:appinfo>
<a:since>4.3</a:since>
<a:operational>true</a:operational>
<a:display>regular</a:display>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -243,6 +246,7 @@
</xsd:documentation>
<xsd:appinfo>
<a:operational>true</a:operational>
<a:display>regular</a:display>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -257,6 +261,7 @@
<xsd:appinfo>
<a:displayName>TaskType.nodeAsObserved</a:displayName>
<a:operational>true</a:operational>
<a:display>regular</a:display>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down Expand Up @@ -293,6 +298,7 @@
</xsd:documentation>
<xsd:appinfo>
<a:operational>true</a:operational>
<a:display>regular</a:display>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -305,6 +311,7 @@
<xsd:appinfo>
<a:displayName>TaskType.resultStatus</a:displayName>
<a:operational>true</a:operational>
<a:display>regular</a:display>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -327,6 +334,7 @@
</xsd:documentation>
<xsd:appinfo>
<a:operational>true</a:operational>
<a:display>regular</a:display>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -338,6 +346,7 @@
</xsd:documentation>
<xsd:appinfo>
<a:operational>true</a:operational>
<a:display>regular</a:display>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -350,6 +359,7 @@
</xsd:documentation>
<xsd:appinfo>
<a:operational>true</a:operational>
<a:display>regular</a:display>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -376,6 +386,7 @@
</xsd:documentation>
<xsd:appinfo>
<a:operational>true</a:operational>
<a:display>regular</a:display>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -391,6 +402,7 @@
<xsd:appinfo>
<a:since>3.5</a:since>
<a:operational>true</a:operational>
<a:display>regular</a:display>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -404,6 +416,7 @@
<xsd:appinfo>
<a:displayName>TaskType.progress</a:displayName>
<a:operational>true</a:operational>
<a:display>regular</a:display>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -414,6 +427,7 @@
</xsd:documentation>
<xsd:appinfo>
<a:operational>true</a:operational>
<a:display>regular</a:display>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -426,6 +440,7 @@
</xsd:documentation>
<xsd:appinfo>
<a:operational>true</a:operational>
<a:display>regular</a:display>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -446,6 +461,7 @@
<a:deprecated>true</a:deprecated>
<a:deprecatedSince>4.4</a:deprecatedSince>
<a:operational>true</a:operational>
<a:display>regular</a:display>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down Expand Up @@ -524,6 +540,7 @@
<a:deprecatedSince>4.4</a:deprecatedSince>
<a:removedSince>4.8</a:removedSince>
<a:operational>true</a:operational>
<a:display>regular</a:display>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down Expand Up @@ -614,6 +631,7 @@
<xsd:appinfo>
<a:since>3.8</a:since>
<a:operational>true</a:operational>
<a:display>regular</a:display>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -633,6 +651,7 @@
<xsd:appinfo>
<a:since>4.8</a:since>
<a:operational>true</a:operational>
<a:display>regular</a:display>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down
3 changes: 2 additions & 1 deletion model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/Visualizer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,8 @@ private <C extends Containerable> void visualizeContainerDelta(ContainerDelta<C>
if (delta.isEmpty()) {
return;
}
if (delta.getDefinition() != null && delta.getDefinition().isOperational() && !context.isIncludeOperationalItems()) {
PrismContainerDefinition def = delta.getDefinition();
if (def != null && def.isOperational() && !context.isIncludeOperationalItems() && def.getDisplay() != DisplayHint.REGULAR) {
return;
}
Collection<PrismContainerValue<C>> valuesToAdd;
Expand Down

0 comments on commit 0f1d12c

Please sign in to comment.