GitLab

at 2022-09-11T17:53:48+02:00

Client - (on delete - reset) Bien gérer le repositionnement dans l'arbre de navigation d'une marée suite à une sauvegarde si le critère a été modifié (See #2225)

Client - decorate missing groupBy node dto - See #2225

Client - (on update) Bien gérer le repositionnement dans l'arbre de navigation d'une marée suite à une sauvegarde si le critère a été modifié (See #2225)

Merge branch 'feature/features/navigation_tree_review_limit_cases' into develop

Close #2225

     @Override

     public void removeChildren(NavigationUI navigationUI, OldParent parentNode, Set<String> ids) {

         super.removeChildren(navigationUI, parentNode, ids);

-        RootNavigationInitializer initializer = (RootNavigationInitializer) parentNode.getRoot().getInitializer();

+        NavigationNode rootNode = parentNode.getRoot();

+        RootNavigationInitializer initializer = (RootNavigationInitializer) rootNode.getInitializer();

         boolean removeGroupBy = parentNode.getChildCount() == 0 && !initializer.getRequest().isLoadEmptyGroupBy();

         if (removeGroupBy) {

             parentNode.removeFromParent();

+            if (rootNode.isNotLeaf()) {

+                navigationUI.getTree().selectFirstNode();

+            }

         }

         NavigationUIHandler.updateStatistics(navigationUI, removeGroupBy ? -1 : 0, -ids.size());

     }

 import fr.ird.observe.client.datasource.editor.api.content.ContentUI;

 import fr.ird.observe.client.datasource.editor.api.content.ContentUIHandler;

 import fr.ird.observe.client.datasource.editor.api.content.ContentUIModel;

+import fr.ird.observe.client.datasource.editor.api.content.data.rlist.ContentRootListUINavigationNode;

 import fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUI;

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

 import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationNode;

+import fr.ird.observe.client.datasource.editor.api.navigation.tree.root.RootNavigationInitializer;

 

 /**

  * Created on 19/10/2020.

             NavigationTree tree = handler.getNavigationTree();

             NavigationNode parentNode = tree.getSelectedNode().getParent();

             tree.getSelectedNode().removeFromParent();

+            if (parentNode instanceof ContentRootListUINavigationNode) {

+                NavigationNode rootNode = parentNode.getRoot();

+                RootNavigationInitializer initializer = (RootNavigationInitializer) rootNode.getInitializer();

+                boolean removeGroupBy = parentNode.getChildCount() == 0 && !initializer.getRequest().isLoadEmptyGroupBy();

+                if (removeGroupBy) {

+                    parentNode.removeFromParent();

+                    if (rootNode.isNotLeaf()) {

+                        tree.selectFirstNode();

+                    }

+                    return;

+                }

+            }

             tree.reloadAndSelectSafeNode(parentNode);

         }

     }

  */

 public final class ContentRootOpenableUINavigationInitializer extends NavigationInitializer<ContentRootOpenableUINavigationContext> {

 

-    private final Supplier<? extends DataGroupByDto<?>> parentReference;

+    private Supplier<? extends DataGroupByDto<?>> parentReference;

     private DataDtoReference reference;

     private Decorator decorator;

 

         return getSelectId() == null;

     }

 

+    public void setParentReference(Supplier<? extends DataGroupByDto<?>> parentReference) {

+        this.parentReference = Objects.requireNonNull(parentReference);

+    }

+

     public void setReference(DataDtoReference reference) {

         this.reference = Objects.requireNonNull(reference);

     }

 

 import fr.ird.observe.client.datasource.editor.api.DataSourceEditor;

 import fr.ird.observe.client.datasource.editor.api.content.actions.save.SaveUIAdapter;

+import fr.ird.observe.client.datasource.editor.api.content.data.rlist.ContentRootListUINavigationNode;

 import fr.ird.observe.client.datasource.editor.api.content.data.ropen.ContentRootOpenableUI;

 import fr.ird.observe.client.datasource.editor.api.content.data.ropen.ContentRootOpenableUIModel;

 import fr.ird.observe.client.datasource.editor.api.content.data.ropen.ContentRootOpenableUINavigationNode;

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

 import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationNode;

 import fr.ird.observe.client.datasource.editor.api.navigation.tree.capability.ReferenceContainerCapability;

+import fr.ird.observe.client.datasource.editor.api.navigation.tree.root.RootNavigationNode;

+import fr.ird.observe.dto.data.DataGroupByDto;

 import fr.ird.observe.dto.data.RootOpenableDto;

 import fr.ird.observe.dto.reference.DataDtoReference;

 import org.apache.logging.log4j.LogManager;

 import org.apache.logging.log4j.Logger;

 

+import java.util.Objects;

+

 /**

  * Created on 16/10/2020.

  *

         ui.stopEdit();

 

         ContentRootOpenableUINavigationNode node = model.getSource();

+

+        // get old groupBy dto

+        @SuppressWarnings("unchecked") DataGroupByDto<D> oldGroupByDto = (DataGroupByDto<D>) node.getParentReference();

+

+        // new groupBy value

+        String newGroupByValue = oldGroupByDto.definition().toGroupByValue(bean, ((RootNavigationNode) node.getRoot()).getInitializer().getRequest().getGroupByFlavor());

+        // is groupBy has changed?

+        boolean groupByChanged = !Objects.equals(oldGroupByDto.getFilterValue(), newGroupByValue);

         // We need to inject ot node the new reference (it could does not know the id if not persisted)

         // As I prefer to use a unique code (for persisted or not, keep it like this)

-        updateReference(node, bean.getId());

+        updateReference(node, bean.getId(), oldGroupByDto, groupByChanged ? newGroupByValue : null);

 

         NavigationTree tree = dataSourceEditor.getNavigationUI().getTree();

         tree.reSelectSafeNodeThen(node, () -> {

         });

     }

 

-

-    public void updateReference(ContentRootOpenableUINavigationNode node, String id) {

+    public void updateReference(ContentRootOpenableUINavigationNode node,

+                                String id,

+                                DataGroupByDto<D> oldGroupByDto,

+                                String newGroupByValue) {

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

         NavigationNode parent = node.getParent();

-        int oldPosition = parent.getIndex(node);

+        boolean groupByChanged = newGroupByValue != null;

+        if (groupByChanged) {

+            // groupBy has changed (remove node from parent)

+            RootNavigationNode rootNode = (RootNavigationNode) node.getRoot();

+            node.removeFromParent();

+            // remove old parent node if navigation tree config requires it

+            boolean removeGroupBy = parent.getChildCount() == 0 && !rootNode.getInitializer().getRequest().isLoadEmptyGroupBy();

+            if (removeGroupBy) {

+                parent.removeFromParent();

+            } else {

+                // update old parent to root

+                parent.reloadNodeDataToRoot();

+            }

+            // find new parent

+            parent = rootNode.findChildById(newGroupByValue, true);

+            // update parent reference in node

+            DataGroupByDto<?> parentReference = ((ContentRootListUINavigationNode) parent).getInitializer().getParentReference();

+            node.getInitializer().setParentReference(() -> parentReference);

+        }

+

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

         if (notPersisted) {

             node.getInitializer().updateEditNodeId(id);

         }

 

         ReferenceContainerCapability<?> capability = (ReferenceContainerCapability<?>) parent.getCapability();

-        int newPosition = capability.getNodePosition(reference);

-        if (oldPosition != newPosition) {

-            log.info(String.format("Move node from: %d to %d", oldPosition, newPosition));

-            parent.moveNode(node, newPosition);

+        if (groupByChanged) {

+            if (parent.isNotLoaded()) {

+                // will load all children even the updated one

+                parent.populateChildrenIfNotLoaded();

+            } else {

+                // need to add updated node

+                int newPosition = capability.getNodePosition(reference);

+                log.info(String.format("Change groupBy node from: %s to %s (position: %d)", oldGroupByDto.getFilterValue(), newGroupByValue, newPosition));

+                parent.insert(node, newPosition);

+            }

+        } else {

+            int oldPosition = parent.getIndex(node);

+            int newPosition = capability.getNodePosition(reference);

+            if (oldPosition != newPosition) {

+                log.info(String.format("Move node from: %d to %d", oldPosition, newPosition));

+                parent.moveNode(node, newPosition);

+            }

         }

-

         // repaint selected node and his children

         node.nodeChangedDeep();

 

         return result;

     }

 

-    public <N extends NavigationNode> N findChildByTypeWithNoCreate(Class<N> childType, String id) {

-        return super.findChildByType(childType, id);

-    }

-

     protected NavigationNode createMissingNode(String id) {

         // limit case : node does not exist (was empty previously), need to create it

         DataGroupByDto<?> reference = getInitializer().getNavigationResult().getGroupBy(id);

         if (reference == null) {

             ToolkitTreeFlatModelRootRequest request = getInitializer().getRequest();

             reference = getDataSourcesManager().getMainDataSource().getRootOpenableService().getGroupByDtoValue(getInitializer().getNavigationResult().getData().getType(), new DataGroupByParameter(request.getGroupByName(), request.getGroupByFlavor(), id));

+            getDecoratorService().installDecorator(reference);

         }

         NavigationNode result = getCapability().createChildNode(reference);

         int position = getCapability().getNodePosition(reference);

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

Commits:

5 changed files:

Changes: