Projections cleanup

Evolveum · Sep 17, 2021 · f54d6b1 · f54d6b1
1 parent 930061c
commit f54d6b1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 27 deletions.
diff --git a/...c/main/java/com/evolveum/midpoint/gui/impl/component/MultivalueContainerDetailsPanel.html b/...c/main/java/com/evolveum/midpoint/gui/impl/component/MultivalueContainerDetailsPanel.html
@@ -8,13 +8,11 @@
       xmlns:wicket="http://wicket.apache.org">
 <body>
 <wicket:panel>
-    <div style="border-bottom: 2px solid #ddd; padding-top: 20px;">
         <wicket:child />
         <div wicket:id="displayName"/>
         <div class="top-level-prism-container">
             <div wicket:id="details" class="nav-tabs-custom"> </div>
         </div>
-     </div>
  </wicket:panel>
 </body>
 </html>
diff --git a/...java/com/evolveum/midpoint/gui/impl/page/admin/focus/component/FocusProjectionsPanel.java b/...java/com/evolveum/midpoint/gui/impl/page/admin/focus/component/FocusProjectionsPanel.java
@@ -112,19 +112,8 @@ public class FocusProjectionsPanel<F extends FocusType> extends AbstractObjectMa
 
     private static final Trace LOGGER = TraceManager.getTrace(FocusProjectionsPanel.class);
 
-//    private final LoadableModel<List<ShadowWrapper>> projectionModel;
-
     public FocusProjectionsPanel(String id, FocusDetailsModels<F> focusModel, ContainerPanelConfigurationType config) {
         super(id, focusModel, config);
-
-//        this.projectionModel = new LoadableModel<>(false) {
-//            private static final long serialVersionUID = 1L;
-//
-//            @Override
-//            protected List<ShadowWrapper> load() {
-//                return loadShadowWrappers();
-//            }
-//        };
     }
 
     private PrismObjectDefinition<ShadowType> getShadowDefinition() {
@@ -301,7 +290,7 @@ public ObjectFilter transformToFilter() {
                     return null; // let the default behavior to take their chance
                 }
 
-                return getPrismContext().queryFor(ShadowType.class)
+                return PrismContext.get().queryFor(ShadowType.class)
                         .not()
                         .item(ShadowType.F_DEAD)
                         .eq(true)
@@ -411,7 +400,7 @@ private List<IColumn<PrismContainerValueWrapper<ShadowType>, String>> initBasicC
 
         List<IColumn<PrismContainerValueWrapper<ShadowType>, String>> columns = new ArrayList<>();
         columns.add(new CheckBoxHeaderColumn<>());
-        columns.add(new CompositedIconColumn<PrismContainerValueWrapper<ShadowType>>(Model.of("")) {
+        columns.add(new CompositedIconColumn<>(Model.of("")) {
 
             private static final long serialVersionUID = 1L;
 
@@ -449,7 +438,7 @@ public String getCssClass() {
                 return "col-xs-1";
             }
         });
-        columns.add(new PrismContainerWrapperColumn<ShadowType>(shadowDef, ShadowType.F_PENDING_OPERATION, getPageBase()) {
+        columns.add(new PrismContainerWrapperColumn<>(shadowDef, ShadowType.F_PENDING_OPERATION, getPageBase()) {
             @Override
             public String getCssClass() {
                 return "col-xs-2";

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/ShadowPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/ShadowPanel.html
@@ -8,25 +8,23 @@
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
-    <div class="col-md-12">
-        <div class="top-level-prism-container">
-            <div wicket:id="attributes"/>
-        </div>
-        <wicket:enclosure child="associations">
+
+    <div wicket:id="attributes"/>
+
+    <wicket:enclosure child="associations">
         <div class="top-level-prism-container">
             <div wicket:id="associations"/>
         </div>
-        </wicket:enclosure>
-        <wicket:enclosure child="activation">
+    </wicket:enclosure>
+    <wicket:enclosure child="activation">
         <div class="top-level-prism-container">
             <div wicket:id="activation"/>
         </div>
-        </wicket:enclosure>
-        <wicket:enclosure child="password">
+    </wicket:enclosure>
+    <wicket:enclosure child="password">
         <div class="top-level-prism-container">
             <div wicket:id="password"/>
         </div>
-        </wicket:enclosure>
-    </div>
+    </wicket:enclosure>
 </wicket:panel>
 </html>