andi-huber commented on code in PR #3516:
URL: https://github.com/apache/causeway/pull/3516#discussion_r3272979433
##########
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/_MembersAsColumns.java:
##########
@@ -18,99 +18,113 @@
*/
package org.apache.causeway.core.metamodel.spec.impl;
+import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Optional;
import java.util.stream.Stream;
+import org.jspecify.annotations.NonNull;
+
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.layout.component.PropertyLayoutData;
import org.apache.causeway.applib.services.tablecol.TableColumnOrderService;
import
org.apache.causeway.applib.services.tablecol.TableColumnVisibilityService;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.commons.internal.collections._Maps;
-import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.functions._Predicates;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
+import
org.apache.causeway.core.metamodel.facets.collections.layout.columnorder.ColumnOrderPatchingFacet;
import org.apache.causeway.core.metamodel.facets.object.grid.GridFacet;
-import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.causeway.core.metamodel.util.WhereContexts;
+import
org.apache.causeway.core.metamodel.spec.feature.ObjectAssociationContainer.ColumnQuery;
-import static org.apache.causeway.applib.annotation.Where.PARENTED_TABLES;
-import static org.apache.causeway.applib.annotation.Where.STANDALONE_TABLES;
-
-import lombok.Getter;
-import org.jspecify.annotations.NonNull;
-import lombok.RequiredArgsConstructor;
+record _MembersAsColumns(
+ boolean isColumnOrderPatchingEnabled,
+ Can<TableColumnVisibilityService> tableColumnVisibilityServices,
+ Can<TableColumnOrderService> tableColumnOrderServices) {
-@RequiredArgsConstructor
-class _MembersAsColumns implements HasMetaModelContext {
+ _MembersAsColumns(final MetaModelContext mmc) {
+ this(
+ mmc.getSystemEnvironment().isPrototyping(),
+
mmc.getServiceRegistry().select(TableColumnVisibilityService.class),
+
mmc.getServiceRegistry().select(TableColumnOrderService.class));
+ }
- @Getter(onMethod_ = {@Override})
- private final MetaModelContext metaModelContext;
-
- public final Stream<ObjectAction> streamActionsForColumnRendering(
+ public Stream<ObjectAction> streamActionsForColumnRendering(
final ObjectSpecification elementType,
final Identifier memberIdentifier) {
- if(elementType.isValue()) return Stream.empty();
+ if(elementType.isValue())
+ return Stream.empty();
return elementType.streamRuntimeActions(MixedIn.INCLUDED)
-
.filter(ObjectAction.Predicates.visibleAccordingToHiddenFacet(WhereContexts.collectionVariant(memberIdentifier)))
+
.filter(ObjectAction.Predicates.visibleAccordingToHiddenFacet(Where.STANDALONE_TABLES))
Review Comment:
needs fixing: using STANDALONE always here is wrong
also we cannot determine STANDALONE vs PARENTED from just the Identifier as
we did previously; I believe we need the information explicitly
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
