GitLab

at 2022-12-11T20:43:15+01:00

UI - When saving open data, only update reference once

UI - Use now two method to fill NodeUpdater (using the same does not work for the after update since we just ask the property on dto, but we also need to know if there is a such data!)

UI - Use correct property name in ps-logbook-Activity (use now catches instead of set)

Service - Always add statistics in any Activity.set reference when using a such decorator

Merge branch 'feature/issue_2574_tree' into develop
Lors de la sauvegarde d'une activité, l'arbre est replié mais surtout on perd sur ces fils les statistiques
- Closes #2574

         }

         getEditNode().setId(id);

     }

-

-    public DataDtoReference updateReference(ContentOpenableUINavigationContext context, String id) {

-        this.reference = context.getReference(getReference().getReferenceType(), id, decorator);

-        return getReference();

-    }

 }
         boolean notPersisted = getInitializer().isNotPersisted();

         NavigationNode parent = getParent();

         int oldPosition = parent.getIndex(this);

-        DataDtoReference reference = getInitializer().updateReference(getContext(), id);

         if (notPersisted) {

             getInitializer().updateEditNodeId(id);

             getInitializer().updateSelectNodeId(id);

         }

         // reload node data

         reloadNodeData();

+        DataDtoReference reference = getInitializer().getReference();

 

         if (notPersisted) {

             dirty();

 import fr.ird.observe.client.datasource.editor.api.content.data.open.actions.SaveContentOpenableUIAdapter;

 import fr.ird.observe.client.datasource.editor.api.navigation.NavigationTree;

 import fr.ird.observe.dto.data.ll.logbook.ActivityDto;

+import fr.ird.observe.dto.data.ll.logbook.ActivityReference;

 

 /**

  * Created on 8/29/14.

                 .then(new SaveContentOpenableUIAdapter<>(ActivityDto::isSetEnabled, ActivityUI::getAddSet) {

                     @Override

                     protected void afterNodeUpdated(DataSourceEditor dataSourceEditor, ActivityUI ui, NavigationTree tree, ContentOpenableUINavigationNode node, boolean notPersisted, ActivityDto bean) {

-                        ActivityUINavigationCapability.fillBuilder(NodeChildrenUpdate.afterUpdate(node, bean)).update();

+                        ActivityReference reference = (ActivityReference) node.getReference();

+                        bean.setStatistics(reference.statistics());

+                        ActivityUINavigationCapability.fillAfterBuilder(NodeChildrenUpdate.afterUpdate(node, bean)).update();

                         super.afterNodeUpdated(dataSourceEditor, ui, tree, node, notPersisted, bean);

                     }

                 })

     }

 

     public List<String> generateText(ActivityDto originalBean, ActivityDto editBean) {

-        return ActivityUINavigationCapability.fillBuilder(NodeChildrenUpdate.beforeUpdate(states.source(), originalBean, editBean))

+        return ActivityUINavigationCapability.fillBeforeBuilder(NodeChildrenUpdate.beforeUpdate(states.source(), originalBean, editBean))

                 .getMessagesForNodesToRemove();

     }

 }
 import fr.ird.observe.client.datasource.editor.api.content.data.open.actions.SaveContentOpenableUIAdapter;

 import fr.ird.observe.client.datasource.editor.api.navigation.NavigationTree;

 import fr.ird.observe.dto.data.ll.observation.ActivityDto;

+import fr.ird.observe.dto.data.ll.observation.ActivityReference;

 

 /**

  * Created on 8/29/14.

                 .then(new SaveContentOpenableUIAdapter<>(ActivityDto::isSetEnabled, ActivityUI::getAddSet) {

                     @Override

                     protected void afterNodeUpdated(DataSourceEditor dataSourceEditor, ActivityUI ui, NavigationTree tree, ContentOpenableUINavigationNode node, boolean notPersisted, ActivityDto bean) {

-                        ActivityUINavigationCapability.fillBuilder(NodeChildrenUpdate.afterUpdate(node, bean)).update();

+                        ActivityReference reference = (ActivityReference) node.getReference();

+                        bean.setStatistics(reference.statistics());

+                        ActivityUINavigationCapability.fillAfterBuilder(NodeChildrenUpdate.afterUpdate(node, bean)).update();

                         super.afterNodeUpdated(dataSourceEditor, ui, tree, node, notPersisted, bean);

                     }

                 })

     }

 

     public List<String> generateText(ActivityDto originalBean, ActivityDto editBean) {

-        return ActivityUINavigationCapability.fillBuilder(NodeChildrenUpdate.beforeUpdate(states.source(), originalBean, editBean)).getMessagesForNodesToRemove();

+        return ActivityUINavigationCapability.fillBeforeBuilder(NodeChildrenUpdate.beforeUpdate(states.source(), originalBean, editBean)).getMessagesForNodesToRemove();

     }

 

 }
-0_setEnabled??=fr.ird.observe.client.datasource.editor.ps.data.logbook.ActivityCatchUINavigationNode

+0_catchesEnabled??=fr.ird.observe.client.datasource.editor.ps.data.logbook.ActivityCatchUINavigationNode

 1*=fr.ird.observe.client.datasource.editor.ps.data.logbook.FloatingObjectUINavigationNode
 import fr.ird.observe.client.datasource.editor.api.navigation.NavigationTree;

 import fr.ird.observe.client.datasource.editor.ps.ObservePsKeyStrokes;

 import fr.ird.observe.dto.data.ps.logbook.ActivityDto;

+import fr.ird.observe.dto.data.ps.logbook.ActivityReference;

 import fr.ird.observe.dto.referential.ps.common.VesselActivityReference;

 import io.ultreia.java4all.i18n.I18n;

 

 

                     @Override

                     protected void afterNodeUpdated(DataSourceEditor dataSourceEditor, ActivityUI ui, NavigationTree tree, ContentOpenableUINavigationNode node, boolean notPersisted, ActivityDto bean) {

-                        ActivityUINavigationCapability.fillBuilder(NodeChildrenUpdate.afterUpdate(node, bean)).update();

+                        ActivityReference reference = (ActivityReference) node.getReference();

+                        bean.setStatistics(reference.statistics());

+                        ActivityUINavigationCapability.fillAfterBuilder(NodeChildrenUpdate.afterUpdate(node, bean)).update();

                         super.afterNodeUpdated(dataSourceEditor, ui, tree, node, notPersisted, bean);

                     }

                 })

     }

 

     public List<String> generateText(ActivityDto originalBean, ActivityDto editBean) {

-        return ActivityUINavigationCapability.fillBuilder(NodeChildrenUpdate.beforeUpdate(states.source(), originalBean, editBean))

+        return ActivityUINavigationCapability.fillBeforeBuilder(NodeChildrenUpdate.beforeUpdate(states.source(), originalBean, editBean))

                 .getMessagesForNodesToRemove();

     }

 }
 import fr.ird.observe.client.datasource.editor.api.navigation.NavigationTree;

 import fr.ird.observe.dto.ProtectedIdsPs;

 import fr.ird.observe.dto.data.ps.observation.ActivityDto;

+import fr.ird.observe.dto.data.ps.observation.ActivityReference;

 import fr.ird.observe.dto.referential.ps.common.VesselActivityReference;

 

 import javax.swing.JLabel;

                 .then(new SaveContentOpenableUIAdapter<>(ActivityDto::isStrongSetOperation, ActivityUI::getAddSet) {

                     @Override

                     protected void afterNodeUpdated(DataSourceEditor dataSourceEditor, ActivityUI ui, NavigationTree tree, ContentOpenableUINavigationNode node, boolean notPersisted, ActivityDto bean) {

-                        ActivityUINavigationCapability.fillBuilder(NodeChildrenUpdate.afterUpdate(node, bean)).update();

+                        ActivityReference reference = (ActivityReference) node.getReference();

+                        bean.setStatistics(reference.statistics());

+                        ActivityUINavigationCapability.fillAfterBuilder(NodeChildrenUpdate.afterUpdate(node, bean)).update();

                         super.afterNodeUpdated(dataSourceEditor, ui, tree, node, notPersisted, bean);

                     }

                 })

     }

 

     public List<String> generateText(ActivityDto originalBean, ActivityDto editBean) {

-        return ActivityUINavigationCapability.fillBuilder(NodeChildrenUpdate.beforeUpdate(states.source(), originalBean, editBean))

+        return ActivityUINavigationCapability.fillBeforeBuilder(NodeChildrenUpdate.beforeUpdate(states.source(), originalBean, editBean))

                 .getMessagesForNodesToRemove();

     }

 }
     }

 

 

-    public String generateCapabilityUpdateNodeMethod(Class<?> mainDtoType, Set<String> availableProperties) {

+    public String generateCapabilityOnBeanToUpdateUpdateNodeMethod(Class<?> mainDtoType, Set<String> availableProperties) {

         switch (capacityNodeType) {

             case STATIC_WITH_PREDICATE: {

                 String beanPropertyName = getOptionalPredicate().orElseThrow();

                 return null;

         }

     }

+    public String generateCapabilityOnUpdatedBeanNodeUpdateNodeMethod(Class<?> mainDtoType, Set<String> availableProperties) {

+        switch (capacityNodeType) {

+            case STATIC_WITH_PREDICATE: {

+                String beanPropertyName = getOptionalPredicate().orElseThrow();

+                return String.format("                .onPredicate(d-> d.is%1$s() && d.get%2$sStatValue() > 0, %3$s.class)\n", beanPropertyName, Strings.removeEnd(beanPropertyName,"Enabled"), getNodeTypeSimpleName());

+            }

+            case REFERENCE_LIST:

+            case REFERENCE: {

+                String beanPropertyName = methodName.replace("UINavigationNode", "Enabled");

+                if (availableProperties.contains(Introspector.decapitalize(beanPropertyName))) {

+                    return String.format("                .onPredicate(d-> d.is%1$s() && d.get%2$sStatValue() > 0, %3$s.class)\n", beanPropertyName, Strings.removeEnd(beanPropertyName,"Enabled"), getNodeTypeSimpleName());

+                }

+            }

+            default:

+                return null;

+        }

+    }

 

     protected String getOptionalReferenceTypePackage() {

         return optionalReferenceType.getPackage().getName();

             "        super(node);\n" +

             "    }\n\n" +

             "}\n";

-    public static final String UPDATE_NODE_METHOD = "" +

-            "    public static NodeChildrenUpdate fillBuilder(NodeChildrenUpdate.BuilderStepAddPredicate<%1$s> builder) {\n" +

+    public static final String ON_BEAN_TO_UPDATE_NODE_METHOD = "" +

+            "    public static NodeChildrenUpdate fillBeforeBuilder(NodeChildrenUpdate.BuilderOnBeanToUpdate<%1$s> builder) {\n" +

+            "        return builder\n" +

+            "%2$s" +

+            "                .build();\n" +

+            "    }\n\n";

+    public static final String ON_UPDATED_BEAN_NODE_METHOD = "" +

+            "    public static NodeChildrenUpdate fillAfterBuilder(NodeChildrenUpdate.BuilderOnUpdatedBean<%1$s> builder) {\n" +

             "        return builder\n" +

             "%2$s" +

             "                .build();\n" +

         return String.format(template, generator.cleanClassName, createChildrenMethodBuilder);

     }

 

-    public static String generateNodeUpdaterMethod(GenerateJavaFileSupport generator, List<String> imports) {

+    public static String generateOnBeanToUpdateNodeUpdaterMethod(GenerateJavaFileSupport generator, List<String> imports) {

+        if (generator.capabilitiesDescriptor == null) {

+            return "";

+        }

+        Class<? extends BusinessDto> dtoType = generator.scopeBuilder.dtoType;

+        StringBuilder createChildrenMethodBuilder = new StringBuilder();

+        JavaBeanDefinition javaBeanDefinition = JavaBeanDefinitionStore.getDefinition(dtoType).orElseThrow();

+        Set<String> availableProperties = javaBeanDefinition.readProperties().map(JavaBeanPropertyDefinition::propertyName).collect(Collectors.toSet());

+        boolean used = false;

+        for (CapabilityDescriptor capabilityDescriptor : generator.capabilitiesDescriptor) {

+            String addNodeMethod = capabilityDescriptor.generateCapabilityOnBeanToUpdateUpdateNodeMethod(dtoType, availableProperties);

+            if (addNodeMethod != null) {

+                used = true;

+                createChildrenMethodBuilder.append(addNodeMethod);

+            }

+        }

+        if (used) {

+            imports.add(NodeChildrenUpdate.class.getName());

+            imports.add(dtoType.getName());

+            return String.format(ON_BEAN_TO_UPDATE_NODE_METHOD, dtoType.getSimpleName(), createChildrenMethodBuilder);

+

+        }

+        return "";

+    }

+

+    public static String generateOnUpdatedBeanNodeUpdaterMethod(GenerateJavaFileSupport generator, List<String> imports) {

         if (generator.capabilitiesDescriptor == null) {

             return "";

         }

         Set<String> availableProperties = javaBeanDefinition.readProperties().map(JavaBeanPropertyDefinition::propertyName).collect(Collectors.toSet());

         boolean used = false;

         for (CapabilityDescriptor capabilityDescriptor : generator.capabilitiesDescriptor) {

-            String addNodeMethod = capabilityDescriptor.generateCapabilityUpdateNodeMethod(dtoType, availableProperties);

+            String addNodeMethod = capabilityDescriptor.generateCapabilityOnUpdatedBeanNodeUpdateNodeMethod(dtoType, availableProperties);

             if (addNodeMethod != null) {

                 used = true;

                 createChildrenMethodBuilder.append(addNodeMethod);

         if (used) {

             imports.add(NodeChildrenUpdate.class.getName());

             imports.add(dtoType.getName());

-            return String.format(UPDATE_NODE_METHOD, dtoType.getSimpleName(), createChildrenMethodBuilder);

+            return String.format(ON_UPDATED_BEAN_NODE_METHOD, dtoType.getSimpleName(), createChildrenMethodBuilder);

 

         }

         return "";

     }

 

     public String generateNodeUpdaterMethod(List<String> imports) {

-        return generateNodeUpdaterMethod(generator, imports);

+        return generateOnBeanToUpdateNodeUpdaterMethod(generator, imports) + generateOnUpdatedBeanNodeUpdaterMethod(generator, imports);

     }

 

     public String generateGetModel() {

 import fr.ird.observe.entities.data.ll.common.Trip;

 import fr.ird.observe.entities.referential.common.DataQuality;

 import fr.ird.observe.entities.referential.common.Species;

+import fr.ird.observe.spi.decoration.DecoratorService;

 import fr.ird.observe.spi.service.ServiceContext;

 import io.ultreia.java4all.util.Dates;

 import org.apache.logging.log4j.LogManager;

 

 import java.util.Calendar;

 import java.util.Date;

-import java.util.function.BiConsumer;

 import java.util.stream.Collectors;

 

 /**

         }

     }

 

+    @Override

+    public ActivityReference toReference(ReferentialLocale referentialLocale, Activity entity, String classifier) {

+        ActivityReference reference = super.toReference(referentialLocale, entity, classifier);

+        if (entity != null && DecoratorService.WITH_STATS_CLASSIFIER.equals(classifier) && reference.getSet() != null) {

+            entity.getSet().buildStatistics(reference.getSet());

+        }

+        return reference;

+    }

+

     @Override

     public Form<ActivityDto> preCreate(ServiceContext context, Trip parent, Activity preCreated) {

         Activity lastActivity = Iterables.getLast(parent.getActivityLogbook(), null);

         }

         super.onSave(context, parent, entity, dto, needCopy);

     }

-

-    @Override

-    protected BiConsumer<Activity, ActivityReference> getChildrenExtraConsumer(Trip parent) {

-        return (e, r) -> {

-            if (r.getSet() != null) {

-                e.getSet().buildStatistics(r.getSet());

-            }

-        };

-    }

 }
 import fr.ird.observe.dto.data.ll.observation.ActivityDto;

 import fr.ird.observe.dto.data.ll.observation.ActivityReference;

 import fr.ird.observe.dto.form.Form;

+import fr.ird.observe.dto.referential.ReferentialLocale;

 import fr.ird.observe.entities.data.ll.common.Trip;

+import fr.ird.observe.spi.decoration.DecoratorService;

 import fr.ird.observe.spi.service.ServiceContext;

 import org.apache.logging.log4j.LogManager;

 import org.apache.logging.log4j.Logger;

 

 import java.util.Calendar;

 import java.util.Date;

-import java.util.function.BiConsumer;

 

 /**

  * Created on 10/05/2021.

 public class ActivitySpi extends GeneratedActivitySpi {

     private static final Logger log = LogManager.getLogger(ActivitySpi.class);

 

+    @Override

+    public ActivityReference toReference(ReferentialLocale referentialLocale, Activity entity, String classifier) {

+        ActivityReference reference = super.toReference(referentialLocale, entity, classifier);

+        if (entity != null && DecoratorService.WITH_STATS_CLASSIFIER.equals(classifier) && reference.getSet() != null) {

+            entity.getSet().buildStatistics(reference.getSet());

+        }

+        return reference;

+    }

+

     @Override

     public Form<ActivityDto> preCreate(ServiceContext context, Trip parent, Activity preCreated) {

         Activity lastActivity = Iterables.getLast(parent.getActivityObs(), null);

         super.onSave(context, parent, entity, dto, needCopy);

     }

 

-    @Override

-    protected BiConsumer<Activity, ActivityReference> getChildrenExtraConsumer(Trip parent) {

-        return (e, r) -> {

-            if (r.getSet() != null) {

-                e.getSet().buildStatistics(r.getSet());

-            }

-        };

-    }

 }
 import fr.ird.observe.dto.referential.common.SpeciesReference;

 import fr.ird.observe.entities.referential.common.FpaZone;

 import fr.ird.observe.entities.referential.common.Species;

+import fr.ird.observe.spi.decoration.DecoratorService;

 import fr.ird.observe.spi.service.ServiceContext;

 import io.ultreia.java4all.util.Dates;

 import org.apache.logging.log4j.LogManager;

         if (entity != null && entity.isFloatingObjectNotEmpty()) {

             reference.setFloatingObject(FloatingObject.SPI.toReferenceSet(referentialLocale, entity.getFloatingObject(), new Date(), classifier).toList());

         }

+        if (entity != null && DecoratorService.WITH_STATS_CLASSIFIER.equals(classifier) && reference.getSet() != null) {

+            entity.getSet().buildStatistics(reference.getSet());

+        }

         return reference;

     }

 

     protected BiConsumer<Activity, ActivityReference> getChildrenExtraConsumer(Route parent) {

         return (entity, reference) -> {

             reference.setDate(parent.getDate());

-            if (reference.getSet() != null) {

-                entity.getSet().buildStatistics(reference.getSet());

-            }

+//            if (reference.getSet() != null) {

+//                entity.getSet().buildStatistics(reference.getSet());

+//            }

         };

     }

...	...	@@ -135,9 +135,4 @@ public final class ContentOpenableUINavigationInitializer extends NavigationInit
135	135	}
136	136	getEditNode().setId(id);
137	137	}
138		-
139		- public DataDtoReference updateReference(ContentOpenableUINavigationContext context, String id) {
140		- this.reference = context.getReference(getReference().getReferenceType(), id, decorator);
141		- return getReference();
142		- }
143	138	}

...	...	@@ -51,7 +51,7 @@ public class ActivityUISavePredicate extends SavePredicateSupport<ActivityUIMode
51	51	}
52	52
53	53	public List<String> generateText(ActivityDto originalBean, ActivityDto editBean) {
54		- return ActivityUINavigationCapability.fillBuilder(NodeChildrenUpdate.beforeUpdate(states.source(), originalBean, editBean))
	54	+ return ActivityUINavigationCapability.fillBeforeBuilder(NodeChildrenUpdate.beforeUpdate(states.source(), originalBean, editBean))
55	55	.getMessagesForNodesToRemove();
56	56	}
57	57	}

...	...	@@ -51,7 +51,7 @@ public class ActivityUISavePredicate extends SavePredicateSupport<ActivityUIMode
51	51	}
52	52
53	53	public List<String> generateText(ActivityDto originalBean, ActivityDto editBean) {
54		- return ActivityUINavigationCapability.fillBuilder(NodeChildrenUpdate.beforeUpdate(states.source(), originalBean, editBean)).getMessagesForNodesToRemove();
	54	+ return ActivityUINavigationCapability.fillBeforeBuilder(NodeChildrenUpdate.beforeUpdate(states.source(), originalBean, editBean)).getMessagesForNodesToRemove();
55	55	}
56	56
57	57	}

...	...	@@ -52,7 +52,7 @@ public class ActivityUISavePredicate extends SavePredicateSupport<ActivityUIMode
52	52	}
53	53
54	54	public List<String> generateText(ActivityDto originalBean, ActivityDto editBean) {
55		- return ActivityUINavigationCapability.fillBuilder(NodeChildrenUpdate.beforeUpdate(states.source(), originalBean, editBean))
	55	+ return ActivityUINavigationCapability.fillBeforeBuilder(NodeChildrenUpdate.beforeUpdate(states.source(), originalBean, editBean))
56	56	.getMessagesForNodesToRemove();
57	57	}
58	58	}

...	...	@@ -52,7 +52,7 @@ public class ActivityUISavePredicate extends SavePredicateSupport<ActivityUIMode
52	52	}
53	53
54	54	public List<String> generateText(ActivityDto originalBean, ActivityDto editBean) {
55		- return ActivityUINavigationCapability.fillBuilder(NodeChildrenUpdate.beforeUpdate(states.source(), originalBean, editBean))
	55	+ return ActivityUINavigationCapability.fillBeforeBuilder(NodeChildrenUpdate.beforeUpdate(states.source(), originalBean, editBean))
56	56	.getMessagesForNodesToRemove();
57	57	}
58	58	}

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

16 changed files:

Changes: