npm - @gridsuite/commons-ui - Versions diffs - 0.277.0 → 0.278.0 - Mend

@gridsuite/commons-ui 0.277.0 → 0.278.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/dist/features/index.js CHANGED Viewed

@@ -270,7 +270,7 @@ import { SelectHeaderCell } from "./network-modification-table/renderers/select-
 import { SwitchCell } from "./network-modification-table/renderers/switch-cell.js";
 import { DragCloneRow } from "./network-modification-table/row/drag-row-clone.js";
 import { ModificationRow } from "./network-modification-table/row/modification-row.js";
-import { MAX_COMPOSITE_NESTING_DEPTH, fetchSubModificationsForExpandedRows, findAllLoadedCompositeModifications, findDepth, findModificationInTree, formatToComposedModification, isCompositeModification, isReferenceModification, isTargetChildOfReference, mergeSubModificationsIntoTree, moveSubModificationInTree, removeUuidsFromTree, updateModificationFieldInTree, updateSubModificationsOfACompositeInTree } from "./network-modification-table/utils.js";
+import { MAX_COMPOSITE_NESTING_DEPTH, containsReferenceModification, fetchSubModificationsForExpandedRows, findAllLoadedCompositeModifications, findDepth, findModificationInTree, formatToComposedModification, isCompositeModification, isReferenceModification, mergeSubModificationsIntoTree, moveSubModificationInTree, removeUuidsFromTree, updateModificationFieldInTree, updateSubModificationsOfACompositeInTree } from "./network-modification-table/utils.js";
 import { AnnouncementBanner } from "./announcement/AnnouncementBanner.js";
 import { AnnouncementNotification } from "./announcement/AnnouncementNotification.js";
 import { useGlobalAnnouncement } from "./announcement/useGlobalAnnouncement.js";
@@ -719,6 +719,7 @@ export {
   computeRatioTapChangerRegulationMode,
   computeSwitchedOnValue,
   computeTagMinSize,
+  containsReferenceModification,
   convertFilterValues,
   convertLimitsToOperationalLimitsGroupFormSchema,
   convertToLineSegmentInfos,
@@ -924,7 +925,6 @@ export {
   isEditingGlobalFilter,
   isProcessType,
   isReferenceModification,
-  isTargetChildOfReference,
   isValidComputingType,
   isValidContingencyRow,
   italicFontTextField,

package/dist/features/network-modification-table/index.js CHANGED Viewed

@@ -14,7 +14,7 @@ import { SelectHeaderCell } from "./renderers/select-header-cell.js";
 import { SwitchCell } from "./renderers/switch-cell.js";
 import { DragCloneRow } from "./row/drag-row-clone.js";
 import { ModificationRow } from "./row/modification-row.js";
-import { MAX_COMPOSITE_NESTING_DEPTH, fetchSubModificationsForExpandedRows, findAllLoadedCompositeModifications, findDepth, findModificationInTree, formatToComposedModification, isCompositeModification, isReferenceModification, isTargetChildOfReference, mergeSubModificationsIntoTree, moveSubModificationInTree, removeUuidsFromTree, updateModificationFieldInTree, updateSubModificationsOfACompositeInTree } from "./utils.js";
+import { MAX_COMPOSITE_NESTING_DEPTH, containsReferenceModification, fetchSubModificationsForExpandedRows, findAllLoadedCompositeModifications, findDepth, findModificationInTree, formatToComposedModification, isCompositeModification, isReferenceModification, mergeSubModificationsIntoTree, moveSubModificationInTree, removeUuidsFromTree, updateModificationFieldInTree, updateSubModificationsOfACompositeInTree } from "./utils.js";
 export {
   AUTO_EXTENSIBLE_COLUMNS,
   BASE_MODIFICATION_TABLE_COLUMNS,
@@ -49,6 +49,7 @@ export {
   SwitchCell,
   SwitchCellRenderer,
   computeTagMinSize,
+  containsReferenceModification,
   createCellBorderColor,
   createCellContentWrapperSx,
   createCellStyle,
@@ -66,7 +67,6 @@ export {
   formatToComposedModification,
   isCompositeModification,
   isReferenceModification,
-  isTargetChildOfReference,
   mergeSubModificationsIntoTree,
   moveSubModificationInTree,
   networkModificationTableStyles,

package/dist/features/network-modification-table/row/modification-row.js CHANGED Viewed

@@ -6,7 +6,7 @@ import { Draggable } from "@hello-pangea/dnd";
 import { useIntl } from "react-intl";
 import { BASE_MODIFICATION_TABLE_COLUMNS, AUTO_EXTENSIBLE_COLUMNS } from "../columns-definition.js";
 import { COLUMNS_WITHOUT_BORDER, createCellContentWrapperSx, createCellStyle, createRowSx, networkModificationTableStyles } from "../network-modification-table-styles.js";
-import { isCompositeModification, isReferenceModification, isTargetChildOfReference } from "../utils.js";
+import { isCompositeModification, isReferenceModification } from "../utils.js";
 import "../../../utils/conversionUtils.js";
 import "../../../utils/types/equipmentType.js";
 import "@mui/icons-material";
@@ -30,84 +30,76 @@ function ModificationRow({
     },
     [handleCellClick, row.original]
   );
-  return /* @__PURE__ */ jsx(
-    Draggable,
-    {
-      draggableId: row.id,
-      index: virtualRow.index,
-      isDragDisabled: isRowDragDisabled || isTargetChildOfReference(row),
-      children: (provided, snapshot) => {
-        const { style, ...draggablePropsWithoutStyle } = provided.draggableProps;
-        return /* @__PURE__ */ jsx(
-          TableRow,
-          {
-            ref: provided.innerRef,
-            ...draggablePropsWithoutStyle,
-            "data-row-id": row.id,
-            sx: mergeSx(
-              networkModificationTableStyles.tableRow,
-              createRowSx(
-                theme,
-                isHighlighted,
-                snapshot.isDragging,
-                virtualRow,
-                row.depth,
-                isCompositeModification(row.original) || isReferenceModification(row.original)
-              )
-            ),
-            children: row.getVisibleCells().map((cell) => {
-              const isNameColumn = cell.column.id === BASE_MODIFICATION_TABLE_COLUMNS.NAME.id;
-              const isDragHandle = cell.column.id === BASE_MODIFICATION_TABLE_COLUMNS.DRAG_HANDLE.id;
-              const isCheckboxColumn = cell.column.id === BASE_MODIFICATION_TABLE_COLUMNS.SELECT.id;
-              const cellContent = flexRender(cell.column.columnDef.cell, cell.getContext());
-              const cellWithoutBorders = (isExpanded || row.depth > 0) && COLUMNS_WITHOUT_BORDER.has(cell.column.columnDef.id ?? "");
-              if (isDragHandle) {
-                return /* @__PURE__ */ jsx(
-                  TableCell,
+  return /* @__PURE__ */ jsx(Draggable, { draggableId: row.id, index: virtualRow.index, isDragDisabled: isRowDragDisabled, children: (provided, snapshot) => {
+    const { style, ...draggablePropsWithoutStyle } = provided.draggableProps;
+    return /* @__PURE__ */ jsx(
+      TableRow,
+      {
+        ref: provided.innerRef,
+        ...draggablePropsWithoutStyle,
+        "data-row-id": row.id,
+        sx: mergeSx(
+          networkModificationTableStyles.tableRow,
+          createRowSx(
+            theme,
+            isHighlighted,
+            snapshot.isDragging,
+            virtualRow,
+            row.depth,
+            isCompositeModification(row.original) || isReferenceModification(row.original)
+          )
+        ),
+        children: row.getVisibleCells().map((cell) => {
+          const isNameColumn = cell.column.id === BASE_MODIFICATION_TABLE_COLUMNS.NAME.id;
+          const isDragHandle = cell.column.id === BASE_MODIFICATION_TABLE_COLUMNS.DRAG_HANDLE.id;
+          const isCheckboxColumn = cell.column.id === BASE_MODIFICATION_TABLE_COLUMNS.SELECT.id;
+          const cellContent = flexRender(cell.column.columnDef.cell, cell.getContext());
+          const cellWithoutBorders = (isExpanded || row.depth > 0) && COLUMNS_WITHOUT_BORDER.has(cell.column.columnDef.id ?? "");
+          if (isDragHandle) {
+            return /* @__PURE__ */ jsx(
+              TableCell,
+              {
+                sx: createCellStyle(cell, AUTO_EXTENSIBLE_COLUMNS.includes(cell.column.id)),
+                children: /* @__PURE__ */ jsx(
+                  Box,
                   {
-                    sx: createCellStyle(cell, AUTO_EXTENSIBLE_COLUMNS.includes(cell.column.id)),
-                    children: /* @__PURE__ */ jsx(
-                      Box,
-                      {
-                        sx: createCellContentWrapperSx(theme, cellWithoutBorders),
-                        ...provided.dragHandleProps,
-                        "aria-label": intl.formatMessage({ id: "moveModification" }),
-                        children: cellContent
-                      }
-                    )
-                  },
-                  cell.id
-                );
-              }
-              if (isCheckboxColumn) {
-                return /* @__PURE__ */ jsx(
-                  TableCell,
-                  {
-                    sx: createCellStyle(cell, AUTO_EXTENSIBLE_COLUMNS.includes(cell.column.id)),
-                    onClick: () => handleCellClickCallback(cell.column.id),
-                    children: /* @__PURE__ */ jsx(Box, { sx: createCellContentWrapperSx(theme, cellWithoutBorders), children: cellContent })
-                  },
-                  cell.id
-                );
-              }
-              return /* @__PURE__ */ jsx(
-                TableCell,
-                {
-                  sx: createCellStyle(cell, AUTO_EXTENSIBLE_COLUMNS.includes(cell.column.id)),
-                  onClick: () => handleCellClickCallback(cell.column.id),
-                  children: isNameColumn ? (
-                    // NameCell owns its own borders entirely
-                    flexRender(cell.column.columnDef.cell, cell.getContext())
-                  ) : /* @__PURE__ */ jsx(Box, { sx: createCellContentWrapperSx(theme, cellWithoutBorders), children: cellContent })
-                },
-                cell.id
-              );
-            })
+                    sx: createCellContentWrapperSx(theme, cellWithoutBorders),
+                    ...provided.dragHandleProps,
+                    "aria-label": intl.formatMessage({ id: "moveModification" }),
+                    children: cellContent
+                  }
+                )
+              },
+              cell.id
+            );
+          }
+          if (isCheckboxColumn) {
+            return /* @__PURE__ */ jsx(
+              TableCell,
+              {
+                sx: createCellStyle(cell, AUTO_EXTENSIBLE_COLUMNS.includes(cell.column.id)),
+                onClick: () => handleCellClickCallback(cell.column.id),
+                children: /* @__PURE__ */ jsx(Box, { sx: createCellContentWrapperSx(theme, cellWithoutBorders), children: cellContent })
+              },
+              cell.id
+            );
           }
-        );
+          return /* @__PURE__ */ jsx(
+            TableCell,
+            {
+              sx: createCellStyle(cell, AUTO_EXTENSIBLE_COLUMNS.includes(cell.column.id)),
+              onClick: () => handleCellClickCallback(cell.column.id),
+              children: isNameColumn ? (
+                // NameCell owns its own borders entirely
+                flexRender(cell.column.columnDef.cell, cell.getContext())
+              ) : /* @__PURE__ */ jsx(Box, { sx: createCellContentWrapperSx(theme, cellWithoutBorders), children: cellContent })
+            },
+            cell.id
+          );
+        })
       }
-    }
-  );
+    );
+  } });
 }
 export {
   ModificationRow

package/dist/features/network-modification-table/use-modifications-drag-and-drop.js CHANGED Viewed

@@ -7,7 +7,7 @@ import "@hello-pangea/dnd";
 import "react-intl";
 import "./columns-definition.js";
 import { DROP_FORBIDDEN_INDICATOR_BOTTOM, DROP_FORBIDDEN_INDICATOR_TOP, DROP_INDICATOR_BOTTOM, DROP_INDICATOR_TOP } from "./network-modification-table-styles.js";
-import { isCompositeModification, isReferenceModification, isTargetChildOfReference, MAX_COMPOSITE_NESTING_DEPTH, findModificationInTree, moveSubModificationInTree } from "./utils.js";
+import { isCompositeModification, isReferenceModification, MAX_COMPOSITE_NESTING_DEPTH, findModificationInTree, containsReferenceModification, moveSubModificationInTree } from "./utils.js";
 import "../../utils/conversionUtils.js";
 import { snackWithFallback } from "../../utils/error.js";
 import "../../utils/types/equipmentType.js";
@@ -55,7 +55,7 @@ const useModificationsDragAndDrop = ({
 }) => {
   const { snackError } = useSnackMessage();
   const { rows } = table.getRowModel();
-  const computeTargetDepth = useCallback(
+  const computeIsDraggingDown = useCallback(
     (sourceRow, targetRow) => {
       const sourceRowIndex = table.getRowModel().flatRows.findIndex((row) => {
         return row.id === sourceRow.id;
@@ -63,26 +63,35 @@ const useModificationsDragAndDrop = ({
       const targetRowIndex = table.getRowModel().flatRows.findIndex((row) => {
         return row.id === targetRow.id;
       });
-      const isDraggingDown = sourceRowIndex < targetRowIndex;
-      return isCompositeModification(targetRow.original) && targetRow.getIsExpanded() && isDraggingDown ? targetRow.depth + 1 : targetRow.depth;
+      return sourceRowIndex < targetRowIndex;
     },
     [table]
   );
+  const computeTargetDepth = useCallback(
+    (sourceRow, targetRow) => {
+      const isDraggingDown = computeIsDraggingDown(sourceRow, targetRow);
+      return isCompositeModification(targetRow.original) && targetRow.getIsExpanded() && isDraggingDown ? targetRow.depth + 1 : targetRow.depth;
+    },
+    [computeIsDraggingDown]
+  );
   const isDropForbidden = useCallback(
     (sourceRow, targetRow) => {
-      if (isCompositeModification(sourceRow.original)) {
-        if (isReferenceModification(targetRow.original) || isTargetChildOfReference(targetRow)) {
-          return true;
-        }
+      const sourceIsCompositeOrReference = isCompositeModification(sourceRow.original) || isReferenceModification(sourceRow.original);
+      if (sourceIsCompositeOrReference) {
         const targetDepth = computeTargetDepth(sourceRow, targetRow);
-        return (sourceRow.original.maxDepth ?? 0) + targetDepth > MAX_COMPOSITE_NESTING_DEPTH || !!(isCompositeModification(sourceRow.original) && findModificationInTree(targetRow.id, [sourceRow.original]));
-      }
-      if (isReferenceModification(sourceRow.original) || isReferenceModification(targetRow.original) || isTargetChildOfReference(targetRow)) {
-        return true;
+        const exceedsNestingLimit = (sourceRow.original.maxDepth ?? 0) + targetDepth > MAX_COMPOSITE_NESTING_DEPTH;
+        const isSelfDrop = !!findModificationInTree(targetRow.id, [sourceRow.original]);
+        const isDraggingDown = computeIsDraggingDown(sourceRow, targetRow);
+        const entersTargetRowItself = (isCompositeModification(targetRow.original) || isReferenceModification(targetRow.original)) && targetRow.getIsExpanded() && isDraggingDown;
+        const enteringParent = entersTargetRowItself ? targetRow.original : targetRow.getParentRow()?.original;
+        const sourceCarriesReference = isReferenceModification(sourceRow.original) || containsReferenceModification(sourceRow.original);
+        const enteringSharedSubtree = isReferenceModification(enteringParent) || enteringParent?.childFromShared === true;
+        const isReferenceIntoReference = sourceCarriesReference && enteringSharedSubtree;
+        return exceedsNestingLimit || isSelfDrop || isReferenceIntoReference;
       }
       return false;
     },
-    [computeTargetDepth]
+    [computeTargetDepth, computeIsDraggingDown]
   );
   const handleDragUpdate = useCallback(
     (update) => {
@@ -125,7 +134,7 @@ const useModificationsDragAndDrop = ({
       const sourceCompositeRowKey = sourceParent?.id ?? null;
       const sourceContainerId = sourceParent?.original.uuid ?? null;
       const isDraggingDown = destination.index > source.index;
-      const droppingIntoExpandedComposite = isDraggingDown && targetRow.getIsExpanded();
+      const droppingIntoExpandedComposite = isDraggingDown && isCompositeModification(targetRow.original) && targetRow.getIsExpanded();
       const isSubRowInvolved = sourceRow.depth > 0 || targetRow.depth > 0;
       const targetComposite = resolveTargetComposite(droppingIntoExpandedComposite, targetRow);
       const targetContainerId = targetComposite.uuid;

package/dist/features/network-modification-table/utils.d.ts CHANGED Viewed

@@ -5,9 +5,7 @@ export declare const MAX_COMPOSITE_NESTING_DEPTH = 5;
 export declare const formatToComposedModification: (modifications: NetworkModificationMetadata[]) => ComposedModificationMetadata[];
 export declare function isCompositeModification(modification: ComposedModificationMetadata | undefined): boolean;
 export declare function isReferenceModification(modification: ComposedModificationMetadata | undefined): boolean;
-export declare function isTargetChildOfReference(targetRow: {
-    original: ComposedModificationMetadata;
-}): boolean;
+export declare function containsReferenceModification(modification: ComposedModificationMetadata | undefined): boolean;
 export declare function findDepth(mods: ComposedModificationMetadata[], uuid: UUID, currentDepth?: number): number;
 export declare function removeUuidsFromTree(mods: ComposedModificationMetadata[], uuidsToRemove: Set<string>): ComposedModificationMetadata[];
 /**

package/dist/features/network-modification-table/utils.js CHANGED Viewed

@@ -18,6 +18,14 @@ function isCompositeModification(modification) {
 function isReferenceModification(modification) {
   return modification?.type === MODIFICATION_TYPES.MODIFICATION_REFERENCE.type;
 }
+function containsReferenceModification(modification) {
+  if (!modification) {
+    return false;
+  }
+  return modification.subModifications.some(
+    (sub) => isReferenceModification(sub) || containsReferenceModification(sub)
+  );
+}
 function normalizeReferenceChild(child) {
   return {
     ...child,
@@ -25,12 +33,6 @@ function normalizeReferenceChild(child) {
     messageValues: child.messageValues ?? "{}"
   };
 }
-function isTargetChildOfReference(targetRow) {
-  if (targetRow.original.childFromShared === true) {
-    return true;
-  }
-  return false;
-}
 function extractReferenceChildren(detail) {
   const referenceInfos = detail?.referenceInfos;
   if (!referenceInfos) {
@@ -224,6 +226,7 @@ async function fetchSubModificationsForExpandedRows(expandedRowKeys, mods, setMo
 }
 export {
   MAX_COMPOSITE_NESTING_DEPTH,
+  containsReferenceModification,
   fetchSubModificationsForExpandedRows,
   findAllLoadedCompositeModifications,
   findDepth,
@@ -231,7 +234,6 @@ export {
   formatToComposedModification,
   isCompositeModification,
   isReferenceModification,
-  isTargetChildOfReference,
   mergeSubModificationsIntoTree,
   moveSubModificationInTree,
   removeUuidsFromTree,

package/dist/index.js CHANGED Viewed

@@ -466,7 +466,7 @@ import { SelectHeaderCell } from "./features/network-modification-table/renderer
 import { SwitchCell } from "./features/network-modification-table/renderers/switch-cell.js";
 import { DragCloneRow } from "./features/network-modification-table/row/drag-row-clone.js";
 import { ModificationRow } from "./features/network-modification-table/row/modification-row.js";
-import { MAX_COMPOSITE_NESTING_DEPTH, fetchSubModificationsForExpandedRows, findAllLoadedCompositeModifications, findDepth, findModificationInTree, formatToComposedModification, isCompositeModification, isReferenceModification, isTargetChildOfReference, mergeSubModificationsIntoTree, moveSubModificationInTree, removeUuidsFromTree, updateModificationFieldInTree, updateSubModificationsOfACompositeInTree } from "./features/network-modification-table/utils.js";
+import { MAX_COMPOSITE_NESTING_DEPTH, containsReferenceModification, fetchSubModificationsForExpandedRows, findAllLoadedCompositeModifications, findDepth, findModificationInTree, formatToComposedModification, isCompositeModification, isReferenceModification, mergeSubModificationsIntoTree, moveSubModificationInTree, removeUuidsFromTree, updateModificationFieldInTree, updateSubModificationsOfACompositeInTree } from "./features/network-modification-table/utils.js";
 import { AnnouncementBanner } from "./features/announcement/AnnouncementBanner.js";
 import { AnnouncementNotification } from "./features/announcement/AnnouncementNotification.js";
 import { useGlobalAnnouncement } from "./features/announcement/useGlobalAnnouncement.js";
@@ -1348,6 +1348,7 @@ export {
   computeSwitchedOnValue,
   computeTagMinSize,
   computeTolerance,
+  containsReferenceModification,
   convertFilterValues,
   convertInputValue,
   convertLimitsToOperationalLimitsGroupFormSchema,
@@ -1712,7 +1713,6 @@ export {
   isProcessType,
   isReferenceModification,
   isStudyMetadata,
-  isTargetChildOfReference,
   isValidComputingType,
   isValidContingencyRow,
   italicFontTextField,

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "@gridsuite/commons-ui",
-    "version": "0.277.0",
+    "version": "0.278.0",
     "description": "common react components for gridsuite applications",
     "author": "gridsuite team",
     "homepage": "https://github.com/gridsuite",