CAUSEWAY-3815: CSS fix; also force new tab when collection is standalone

apache · Nov 26, 2024 · 053458f · 053458f
1 parent 18f5a57
commit 053458f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/...e/causeway/viewer/wicket/ui/components/actionlinks/serviceactions/ServiceActionsPanel.css b/...e/causeway/viewer/wicket/ui/components/actionlinks/serviceactions/ServiceActionsPanel.css
@@ -353,10 +353,6 @@
     padding-left: 39px;
 }
 
-.additionalLinkListDropDown .dropdown-menu > li > a {
-    padding-left: 0px;
-}
-
 .dropdown-menu > li > a.btn.btn-warning {
     text-align: start;
     border-radius: 0;

diff --git a/...wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java b/...wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
@@ -242,7 +242,7 @@ private void addActionsColumnIfRequired(
             final List<GenericColumn> columns) {
         var collectionModel = getModel();
         var memberIdentifier = collectionModel.getIdentifier();
-        ActionColumn.create(memberIdentifier, elementType).ifPresent(columns::add);
+        ActionColumn.create(memberIdentifier, elementType, collectionModel.getVariant()).ifPresent(columns::add);
     }
 
 }
diff --git a/...useway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ActionColumn.java b/...useway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ActionColumn.java
@@ -28,6 +28,7 @@
 import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
 import org.apache.causeway.viewer.wicket.model.models.ActionModel;
 import org.apache.causeway.viewer.wicket.model.models.ActionModel.ColumnActionModifier;
+import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel.Variant;
 import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
 import org.apache.causeway.viewer.wicket.model.models.interaction.coll.DataRowWkt;
 import org.apache.causeway.viewer.wicket.ui.components.actionlinks.entityactions.ActionLinksPanel;
@@ -42,26 +43,30 @@ public final class ActionColumn
 
     public static Optional<ActionColumn> create(
             @NonNull final Identifier featureId,
-            @NonNull final ObjectSpecification elementType) {
+            @NonNull final ObjectSpecification elementType,
+            @NonNull final Variant collectionVariant) {
+        var wktConfig = elementType.getMetaModelContext().getConfiguration().getViewer().getWicket();
+        if(!wktConfig.isActionColumnEnabled()) return Optional.empty();
+
         var actions = elementType.streamActionsForColumnRendering(featureId)
                 .collect(Can.toCan());
         if(actions.isEmpty()) return Optional.empty();
 
-        var wktConfig = elementType.getMetaModelContext().getConfiguration().getViewer().getWicket();
-        return wktConfig.isActionColumnEnabled()
-                ? Optional.of(new ActionColumn(elementType, actions))
-                : Optional.empty();
+        return Optional.of(new ActionColumn(elementType, actions, collectionVariant));
     }
 
     private final Can<String> actionIds;
     private transient Can<ObjectAction> actions;
+    private final Variant collectionVariant;
 
     private ActionColumn(
             final ObjectSpecification elementType,
-            final Can<ObjectAction> actionsForColumnRendering) {
+            final Can<ObjectAction> actionsForColumnRendering,
+            final Variant collectionVariant) {
         super(elementType, "Actions");
         this.actions = actionsForColumnRendering;
         this.actionIds = actions.map(ObjectAction::getId);
+        this.collectionVariant = collectionVariant;
     }
 
     @Override
@@ -88,6 +93,10 @@ protected Component createCellComponent(
     private ColumnActionModifier determineColumnActionModifier(
             final ObjectAction action,
             final ObjectSpecification collectionElementType) {
+
+        // refreshing of standalone collections currently not supported
+        if(collectionVariant.isStandalone()) return ColumnActionModifier.FORCE_NEW_BROWSER_WINDOW;
+
         return action.getElementType().isVoid()
                 || action.getElementType().isOfType(collectionElementType)
                 ? ColumnActionModifier.FORCE_STAY_ON_PAGE