@gridsuite/commons-ui 0.283.0 → 0.284.0

package/dist/features/index.js

@@ -290,7 +290,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, containsReferenceModification, fetchSubModificationsForExpandedRows, findAllLoadedCompositeModifications, findDepth, findModificationInTree, formatToComposedModification, isCompositeModification, isReferenceModification, mergeSubModificationsIntoTree, moveSubModificationInTree, removeUuidsFromTree, updateModificationFieldInTree, updateSubModificationsOfACompositeInTree } from "./network-modification-table/utils.js";
+import { MAX_COMPOSITE_NESTING_DEPTH, collectApplicabilities, containsReferenceModification, fetchSubModificationsForExpandedRows, findAllLoadedCompositeModifications, findDepth, findModificationInTree, formatToComposedModification, isCompositeModification, isReferenceModification, mergeSubModificationsIntoTree, moveSubModificationInTree, removeUuidsFromTree, toMessageValues, 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";
@@ -772,6 +772,7 @@ export {
   byFilterDeletionFormSchema,
   byFilterDeletionFormToDto,
   clearSelectedGlobalFiltersFromTableState,
+  collectApplicabilities,
   compareStepsWithPreviousValues,
   computeHighTapPosition,
   computeQ0,
@@ -1094,6 +1095,7 @@ export {
   toBeEstimatedEmptyFormData,
   toFormValuesContingencyListsInfos,
   toFormValuesLimitReductions,
+  toMessageValues,
   toModificationProperties,
   toReactiveCapabilityCurveChoiceForGeneratorCreation,
   toReactiveCapabilityCurveChoiceForGeneratorModification,

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

@@ -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, containsReferenceModification, fetchSubModificationsForExpandedRows, findAllLoadedCompositeModifications, findDepth, findModificationInTree, formatToComposedModification, isCompositeModification, isReferenceModification, mergeSubModificationsIntoTree, moveSubModificationInTree, removeUuidsFromTree, updateModificationFieldInTree, updateSubModificationsOfACompositeInTree } from "./utils.js";
+import { MAX_COMPOSITE_NESTING_DEPTH, collectApplicabilities, containsReferenceModification, fetchSubModificationsForExpandedRows, findAllLoadedCompositeModifications, findDepth, findModificationInTree, formatToComposedModification, isCompositeModification, isReferenceModification, mergeSubModificationsIntoTree, moveSubModificationInTree, removeUuidsFromTree, toMessageValues, updateModificationFieldInTree, updateSubModificationsOfACompositeInTree } from "./utils.js";
 export {
   AUTO_EXTENSIBLE_COLUMNS,
   BASE_MODIFICATION_TABLE_COLUMNS,
@@ -48,6 +48,7 @@ export {
   SelectHeaderRenderer,
   SwitchCell,
   SwitchCellRenderer,
+  collectApplicabilities,
   computeTagMinSize,
   containsReferenceModification,
   createCellBorderColor,
@@ -71,6 +72,7 @@ export {
   moveSubModificationInTree,
   networkModificationTableStyles,
   removeUuidsFromTree,
+  toMessageValues,
   updateModificationFieldInTree,
   updateSubModificationsOfACompositeInTree,
   useModificationsDragAndDrop

package/dist/features/network-modification-table/network-modifications-table.d.ts

@@ -1,8 +1,8 @@
-import { default as React, Dispatch, SetStateAction } from 'react';
+import { default as React } from 'react';
 import { ColumnDef } from '@tanstack/react-table';
 import { UUID } from 'node:crypto';
 import { NetworkModificationEditorNameHeaderProps } from './renderers';
-import { ExcludedNetworkModifications, RootNetworkRowInfo, ComposedModificationMetadata, NetworkModificationMetadata } from '../../utils';
+import { RootNetworkRowInfo, ComposedModificationMetadata, NetworkModificationMetadata } from '../../utils';
 interface NetworkModificationsTableProps extends Omit<NetworkModificationEditorNameHeaderProps, 'modificationCount'> {
     modifications: NetworkModificationMetadata[];
     handleCellClick: (modification: ComposedModificationMetadata) => void;
@@ -18,9 +18,7 @@ interface NetworkModificationsTableProps extends Omit<NetworkModificationEditorN
     currentNodeId?: UUID;
     currentRootNetworkUuid?: UUID;
     rootNetworks?: RootNetworkRowInfo[];
-    modificationsToExclude?: ExcludedNetworkModifications[];
-    setModificationsToExclude?: Dispatch<SetStateAction<ExcludedNetworkModifications[]>>;
     isDisabled?: boolean;
 }
-export declare function NetworkModificationsTable({ modifications, handleCellClick, isRowDragDisabled, onRowDragStart, onRowDragEnd, onSelectedRowsChange, columns, highlightedModificationUuid, modificationToEditLabel, modificationUuidsToReset, studyUuid, currentNodeId, currentRootNetworkUuid, rootNetworks, modificationsToExclude, setModificationsToExclude, isDisabled, isImpactedByNotification, notificationMessageId, isFetchingModifications, pendingState, }: Readonly<NetworkModificationsTableProps>): React.JSX.Element;
+export declare function NetworkModificationsTable({ modifications, handleCellClick, isRowDragDisabled, onRowDragStart, onRowDragEnd, onSelectedRowsChange, columns, highlightedModificationUuid, modificationToEditLabel, modificationUuidsToReset, studyUuid, currentNodeId, currentRootNetworkUuid, rootNetworks, isDisabled, isImpactedByNotification, notificationMessageId, isFetchingModifications, pendingState, }: Readonly<NetworkModificationsTableProps>): React.JSX.Element;
 export {};

package/dist/features/network-modification-table/network-modifications-table.js

@@ -8,7 +8,7 @@ import { MODIFICATION_ROW_HEIGHT, networkModificationTableStyles, createHeaderCe
 import { AUTO_EXTENSIBLE_COLUMNS } from "./columns-definition.js";
 import { useModificationsDragAndDrop } from "./use-modifications-drag-and-drop.js";
 import { useModificationsSelection } from "./use-modifications-selection.js";
-import { formatToComposedModification, findDepth, MAX_COMPOSITE_NESTING_DEPTH, mergeSubModificationsIntoTree, removeUuidsFromTree, findAllLoadedCompositeModifications, fetchSubModificationsForExpandedRows, isCompositeModification, isReferenceModification } from "./utils.js";
+import { formatToComposedModification, collectApplicabilities, findDepth, MAX_COMPOSITE_NESTING_DEPTH, mergeSubModificationsIntoTree, removeUuidsFromTree, findAllLoadedCompositeModifications, fetchSubModificationsForExpandedRows, isCompositeModification, isReferenceModification } from "./utils.js";
 import "@mui/icons-material";
 import "react-intl";
 import "../../utils/conversionUtils.js";
@@ -34,8 +34,6 @@ function NetworkModificationsTable({
   currentNodeId = void 0,
   currentRootNetworkUuid,
   rootNetworks,
-  modificationsToExclude,
-  setModificationsToExclude,
   isDisabled = false,
   isImpactedByNotification,
   notificationMessageId,
@@ -48,6 +46,14 @@ function NetworkModificationsTable({
   const [composedModifications, setComposedModifications] = useState(
     formatToComposedModification(modifications)
   );
+  const rootNetworksRef = useRef(rootNetworks);
+  useEffect(() => {
+    rootNetworksRef.current = rootNetworks;
+  }, [rootNetworks]);
+  const [applicabilities, setApplicabilities] = useState({});
+  useEffect(() => {
+    setApplicabilities(collectApplicabilities(composedModifications, rootNetworksRef.current));
+  }, [composedModifications]);
   const composedModificationsRef = useRef(composedModifications);
   useEffect(() => {
     composedModificationsRef.current = composedModifications;
@@ -118,8 +124,8 @@ function NetworkModificationsTable({
       },
       modifications: {
         count: modifications.length,
-        toExclude: modificationsToExclude,
-        setToExclude: setModificationsToExclude
+        applicabilities,
+        setApplicabilities
       },
       interaction: {
         lastClickedRowId,
@@ -141,8 +147,8 @@ function NetworkModificationsTable({
       currentRootNetworkUuid,
       rootNetworks,
       modifications.length,
-      modificationsToExclude,
-      setModificationsToExclude,
+      applicabilities,
+      setApplicabilities,
       lastClickedRowId,
       handleRowSelected,
       modificationToEditLabelRef,

package/dist/features/network-modification-table/renderers/cell-renderers.js

@@ -83,7 +83,7 @@ function RootNetworkHeaderRenderer({ column, table }) {
 function RootNetworkCellRenderer({ row, column, table }) {
   const { meta } = table.options;
   const rootNetwork = meta?.context.rootNetworks?.find((r) => r.rootNetworkUuid === column.id);
-  if (!rootNetwork || !meta?.modifications.toExclude || !meta.modifications.setToExclude) {
+  if (!rootNetwork || !meta?.modifications.applicabilities || !meta.modifications.setApplicabilities) {
     return null;
   }
   return /* @__PURE__ */ jsx(Box, { sx: createRootNetworkChipCellSx(row.original.activated), children: /* @__PURE__ */ jsx(
@@ -93,8 +93,8 @@ function RootNetworkCellRenderer({ row, column, table }) {
       studyUuid: meta?.context.studyUuid ?? null,
       currentNodeId: meta?.context.currentNodeId,
       rootNetwork,
-      modificationsToExclude: meta.modifications.toExclude,
-      setModificationsToExclude: meta.modifications.setToExclude,
+      applicabilities: meta.modifications.applicabilities,
+      setApplicabilities: meta.modifications.setApplicabilities,
       isDisabled: meta?.status.isDisabled
     }
   ) });

package/dist/features/network-modification-table/renderers/name-cell.js

@@ -62,7 +62,7 @@ import "../../../components/composite/report/report-treeview/treeview-item.js";
 import "../../../components/composite/report/report-viewer/context/report-viewer-context.js";
 import { networkModificationTableStyles, createModificationNameCellStyle, createNameCellLabelBoxSx, createNameCellRootStyle } from "../network-modification-table-styles.js";
 import { DepthBox } from "./depth-box.js";
-import { isCompositeModification } from "../utils.js";
+import { isCompositeModification, toMessageValues } from "../utils.js";
 const MIN_CHAR_WIDTH = 30;
 function measureTextPx(text, font) {
   const ctx = document.createElement("canvas").getContext("2d");
@@ -84,7 +84,10 @@ function NameCell({ row, table, onChange }) {
     (modification, formatBold = true) => {
       return intl.formatMessage(
         { id: `network_modifications.${modification.messageType}` },
-        { ...modification, ...computeLabel(modification, formatBold) }
+        {
+          ...toMessageValues(modification),
+          ...computeLabel(modification, formatBold)
+        }
       );
     },
     [computeLabel, intl]

package/dist/features/network-modification-table/renderers/root-network-chip-cell.d.ts

@@ -1,13 +1,13 @@
 import { default as React, SetStateAction } from 'react';
 import { UUID } from 'node:crypto';
-import { ComposedModificationMetadata, ExcludedNetworkModifications, RootNetworkRowInfo } from '../../../utils';
+import { ComposedModificationMetadata, NetworkModificationApplicabilities, RootNetworkRowInfo } from '../../../utils';
 export interface RootNetworkChipCellProps {
     data: ComposedModificationMetadata;
     studyUuid: UUID | null;
     currentNodeId?: UUID;
     rootNetwork: RootNetworkRowInfo;
-    modificationsToExclude: ExcludedNetworkModifications[];
-    setModificationsToExclude: React.Dispatch<SetStateAction<ExcludedNetworkModifications[]>>;
+    applicabilities: NetworkModificationApplicabilities;
+    setApplicabilities: React.Dispatch<SetStateAction<NetworkModificationApplicabilities>>;
     isDisabled?: boolean;
 }
 export declare function RootNetworkChipCell(props: RootNetworkChipCellProps): React.JSX.Element;

package/dist/features/network-modification-table/renderers/root-network-chip-cell.js

@@ -14,33 +14,16 @@ import "localized-countries/data/fr";
 import "localized-countries/data/en";
 import { useSnackMessage } from "../../../hooks/useSnackMessage.js";
 import "react-hook-form";
-function getUpdatedExcludedModifications(prev, rootNetworkUuid, modificationUuid) {
-  const exists = prev.some((item) => item.rootNetworkUuid === rootNetworkUuid);
-  if (exists) {
-    let newStatus = false;
-    const nextExcluded = prev.map((modif) => {
-      if (modif.rootNetworkUuid !== rootNetworkUuid) {
-        return modif;
-      }
-      const isExcluded = modif.modificationUuidsToExclude.includes(modificationUuid);
-      const newModificationUuidsToExclude = isExcluded ? modif.modificationUuidsToExclude.filter((id) => id !== modificationUuid) : [...modif.modificationUuidsToExclude, modificationUuid];
-      newStatus = isExcluded;
-      return {
-        ...modif,
-        modificationUuidsToExclude: newModificationUuidsToExclude
-      };
-    });
-    return { nextExcluded, newStatus };
-  }
+function isApplicableOn(applicabilities, modificationUuid, rootNetworkUuid) {
+  return applicabilities[modificationUuid]?.[rootNetworkUuid] ?? true;
+}
+function setApplicability(prevApplicabilities, modificationUuid, rootNetworkUuid, applicable) {
   return {
-    nextExcluded: [
-      ...prev,
-      {
-        rootNetworkUuid,
-        modificationUuidsToExclude: [modificationUuid]
-      }
-    ],
-    newStatus: false
+    ...prevApplicabilities,
+    [modificationUuid]: {
+      ...prevApplicabilities[modificationUuid],
+      [rootNetworkUuid]: applicable
+    }
   };
 }
 function RootNetworkChipCell(props) {
@@ -49,43 +32,35 @@ function RootNetworkChipCell(props) {
     studyUuid,
     currentNodeId,
     rootNetwork,
-    modificationsToExclude,
-    setModificationsToExclude,
+    applicabilities,
+    setApplicabilities,
     isDisabled = false
   } = props;
   const [isLoading, setIsLoading] = useState(false);
   const { snackError } = useSnackMessage();
   const modificationUuid = data.uuid;
   const isReferenceModificationOrInsideOne = data.type === ModificationType.MODIFICATION_REFERENCE || data.childFromShared;
-  const isModificationActivated = useMemo(() => {
-    if (rootNetwork.isCreating) {
-      return true;
-    }
-    const excludedSet = new Set(
-      modificationsToExclude.find((item) => item.rootNetworkUuid === rootNetwork.rootNetworkUuid)?.modificationUuidsToExclude || []
-    );
-    return !excludedSet.has(modificationUuid);
-  }, [modificationUuid, modificationsToExclude, rootNetwork.rootNetworkUuid, rootNetwork.isCreating]);
+  const isModificationApplicable = useMemo(() => {
+    return isApplicableOn(applicabilities, modificationUuid, rootNetwork.rootNetworkUuid);
+  }, [modificationUuid, applicabilities, rootNetwork.rootNetworkUuid]);
   const handleModificationActivationByRootNetwork = useCallback(() => {
     if (!studyUuid || !currentNodeId) {
       return;
     }
     setIsLoading(true);
-    const { nextExcluded, newStatus } = getUpdatedExcludedModifications(
-      modificationsToExclude,
-      rootNetwork.rootNetworkUuid,
-      modificationUuid
+    const newApplicability = !isModificationApplicable;
+    setApplicabilities(
+      (prev) => setApplicability(prev, modificationUuid, rootNetwork.rootNetworkUuid, newApplicability)
     );
-    setModificationsToExclude(nextExcluded);
     updateModificationStatusByRootNetwork(
       studyUuid,
       currentNodeId,
       rootNetwork.rootNetworkUuid,
       modificationUuid,
-      newStatus
+      newApplicability
     ).catch((error) => {
-      setModificationsToExclude(
-        (prev) => getUpdatedExcludedModifications(prev, rootNetwork.rootNetworkUuid, modificationUuid).nextExcluded
+      setApplicabilities(
+        (prev) => setApplicability(prev, modificationUuid, rootNetwork.rootNetworkUuid, isModificationApplicable)
       );
       snackWithFallback(snackError, error, { headerId: "modificationActivationByRootNetworkError" });
     }).finally(() => {
@@ -95,9 +70,9 @@ function RootNetworkChipCell(props) {
     modificationUuid,
     studyUuid,
     currentNodeId,
-    modificationsToExclude,
+    isModificationApplicable,
     rootNetwork.rootNetworkUuid,
-    setModificationsToExclude,
+    setApplicabilities,
     snackError
   ]);
   return /* @__PURE__ */ jsx(
@@ -105,8 +80,8 @@ function RootNetworkChipCell(props) {
     {
       label: rootNetwork.tag,
       tooltipMessage: rootNetwork.name,
-      isActivated: isModificationActivated,
-      isDisabled: isLoading || isDisabled || isReferenceModificationOrInsideOne,
+      isActivated: isModificationApplicable,
+      isDisabled: isLoading || isDisabled || isReferenceModificationOrInsideOne || rootNetwork.isCreating,
       onClick: handleModificationActivationByRootNetwork
     }
   );

package/dist/features/network-modification-table/row/drag-row-clone.js

@@ -13,6 +13,7 @@ import "localized-countries/data/fr";
 import "localized-countries/data/en";
 import "notistack";
 import "react-hook-form";
+import { toMessageValues } from "../utils.js";
 function DragCloneRow({ row }) {
   const intl = useIntl();
   const { computeLabel } = useModificationLabelComputer();
@@ -20,7 +21,10 @@ function DragCloneRow({ row }) {
     (modification, formatBold = true) => {
       return intl.formatMessage(
         { id: `network_modifications.${modification.messageType}` },
-        { ...modification, ...computeLabel(modification, formatBold) }
+        {
+          ...toMessageValues(modification),
+          ...computeLabel(modification, formatBold)
+        }
       );
     },
     [computeLabel, intl]

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

@@ -1,8 +1,19 @@
 import { Dispatch, SetStateAction } from 'react';
 import { UUID } from 'node:crypto';
-import { ComposedModificationMetadata, NetworkModificationMetadata } from '../../utils';
+import { ComposedModificationMetadata, NetworkModificationApplicabilities, NetworkModificationMetadata, RootNetworkRowInfo } from '../../utils';
 export declare const MAX_COMPOSITE_NESTING_DEPTH = 5;
+export declare function collectApplicabilities(modifications: ComposedModificationMetadata[], rootNetworks?: RootNetworkRowInfo[]): NetworkModificationApplicabilities;
 export declare const formatToComposedModification: (modifications: NetworkModificationMetadata[]) => ComposedModificationMetadata[];
+export declare function toMessageValues(modification: NetworkModificationMetadata): {
+    uuid: UUID;
+    type: import('../..').ModificationType;
+    date: Date;
+    stashed: boolean;
+    activated: boolean;
+    description: string;
+    messageType: string;
+    messageValues: string;
+};
 export declare function isCompositeModification(modification: ComposedModificationMetadata | undefined): boolean;
 export declare function isReferenceModification(modification: ComposedModificationMetadata | undefined): boolean;
 export declare function containsReferenceModification(modification: ComposedModificationMetadata | undefined): boolean;

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

@@ -5,6 +5,29 @@ import "react/jsx-runtime";
 import "@mui/icons-material";
 import { getNetworkModificationsFromComposite, fetchNetworkModification } from "../../services/networkModification.js";
 const MAX_COMPOSITE_NESTING_DEPTH = 5;
+function toApplicabilityByRootNetworkUuid(applicabilityByRootNetworkTag, uuidByTag) {
+  return Object.entries(applicabilityByRootNetworkTag ?? {}).reduce((applicability, [tag, applicable]) => {
+    const rootNetworkUuid = uuidByTag.get(tag);
+    return rootNetworkUuid ? { ...applicability, [rootNetworkUuid]: applicable } : applicability;
+  }, {});
+}
+function collectApplicabilitiesByUuid(modifications, uuidByTag) {
+  return modifications.reduce(
+    (applicabilities, modification) => ({
+      ...applicabilities,
+      [modification.uuid]: toApplicabilityByRootNetworkUuid(
+        modification.applicabilityByRootNetworkTag,
+        uuidByTag
+      ),
+      ...collectApplicabilitiesByUuid(modification.subModifications, uuidByTag)
+    }),
+    {}
+  );
+}
+function collectApplicabilities(modifications, rootNetworks = []) {
+  const uuidByTag = new Map(rootNetworks.map((rootNetwork) => [rootNetwork.tag, rootNetwork.rootNetworkUuid]));
+  return collectApplicabilitiesByUuid(modifications, uuidByTag);
+}
 const formatToComposedModification = (modifications) => {
   return modifications.map((modification) => ({
     ...modification,
@@ -12,6 +35,10 @@ const formatToComposedModification = (modifications) => {
     rowKey: crypto.randomUUID()
   }));
 };
+function toMessageValues(modification) {
+  const { applicabilityByRootNetworkTag, ...messageValues } = modification;
+  return messageValues;
+}
 function isCompositeModification(modification) {
   return modification?.type === MODIFICATION_TYPES.COMPOSITE_MODIFICATION.type;
 }
@@ -226,6 +253,7 @@ async function fetchSubModificationsForExpandedRows(expandedRowKeys, mods, setMo
 }
 export {
   MAX_COMPOSITE_NESTING_DEPTH,
+  collectApplicabilities,
   containsReferenceModification,
   fetchSubModificationsForExpandedRows,
   findAllLoadedCompositeModifications,
@@ -237,6 +265,7 @@ export {
   mergeSubModificationsIntoTree,
   moveSubModificationInTree,
   removeUuidsFromTree,
+  toMessageValues,
   updateModificationFieldInTree,
   updateSubModificationsOfACompositeInTree
 };

package/dist/features/topBar/UserInformationDialog.js

@@ -61,33 +61,33 @@ function UserInformationDialog({ openDialog, userProfile, onClose }) {
               ` ${userDetails?.numberCasesUsed}`,
               " )"
             ] })
-          ] }) })
+          ] }) }),
+          /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/number-of-builds-per-user" }) }) }),
+          /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { children: userDetails?.maxAllowedBuilds }) })
         ] }),
-        /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", sx: styles.quotasTypography, children: /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/quotas-per-study" }) }),
+        /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", sx: styles.quotasTypography, children: /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/quotas-per-execution" }) }),
         /* @__PURE__ */ jsxs(Grid, { container: true, spacing: 2, children: [
-          /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/number-of-builds-per-study" }) }) }),
-          /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { children: userDetails?.maxAllowedBuilds }) }),
-          /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/number-of-loadflow-per-study" }) }) }),
+          /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/number-of-loadflow-per-user" }) }) }),
           /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { children: userDetails?.maxAllowedLoadflow }) }),
-          /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/number-of-security-per-study" }) }) }),
+          /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/number-of-security-per-user" }) }) }),
           /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { children: userDetails?.maxAllowedSecurity }) }),
-          /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/number-of-sensitivity-per-study" }) }) }),
+          /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/number-of-sensitivity-per-user" }) }) }),
           /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { children: userDetails?.maxAllowedSensitivity }) }),
-          /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/number-of-shortCircuit-per-study" }) }) }),
+          /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/number-of-shortCircuit-per-user" }) }) }),
           /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { children: userDetails?.maxAllowedShortCircuit }) }),
-          /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/number-of-voltageInit-per-study" }) }) }),
+          /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/number-of-voltageInit-per-user" }) }) }),
           /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { children: userDetails?.maxAllowedVoltageInit }) }),
-          /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/number-of-pccMin-per-study" }) }) }),
+          /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/number-of-pccMin-per-user" }) }) }),
           /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { children: userDetails?.maxAllowedPccMin }) }),
-          /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/number-of-stateEstimation-per-study" }) }) }),
+          /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/number-of-stateEstimation-per-user" }) }) }),
           /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { children: userDetails?.maxAllowedStateEstimation }) }),
-          /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/number-of-balanceAdjustement-per-study" }) }) }),
+          /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/number-of-balanceAdjustement-per-user" }) }) }),
           /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { children: userDetails?.maxAllowedBalanceAdjustement }) }),
-          /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/number-of-dynamicSimulation-per-study" }) }) }),
+          /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/number-of-dynamicSimulation-per-user" }) }) }),
           /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { children: userDetails?.maxAllowedDynamicSimulation }) }),
-          /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/number-of-dynamicSecurity-per-study" }) }) }),
+          /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/number-of-dynamicSecurity-per-user" }) }) }),
           /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { children: userDetails?.maxAllowedDynamicSecurity }) }),
-          /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/number-of-dynamicMargin-per-study" }) }) }),
+          /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/number-of-dynamicMargin-per-user" }) }) }),
           /* @__PURE__ */ jsx(Grid, { size: 6, children: /* @__PURE__ */ jsx(Typography, { children: userDetails?.maxAllowedDynamicMargin }) })
         ] })
       ] })

package/dist/index.js

@@ -486,7 +486,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, containsReferenceModification, fetchSubModificationsForExpandedRows, findAllLoadedCompositeModifications, findDepth, findModificationInTree, formatToComposedModification, isCompositeModification, isReferenceModification, mergeSubModificationsIntoTree, moveSubModificationInTree, removeUuidsFromTree, updateModificationFieldInTree, updateSubModificationsOfACompositeInTree } from "./features/network-modification-table/utils.js";
+import { MAX_COMPOSITE_NESTING_DEPTH, collectApplicabilities, containsReferenceModification, fetchSubModificationsForExpandedRows, findAllLoadedCompositeModifications, findDepth, findModificationInTree, formatToComposedModification, isCompositeModification, isReferenceModification, mergeSubModificationsIntoTree, moveSubModificationInTree, removeUuidsFromTree, toMessageValues, 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";
@@ -1398,6 +1398,7 @@ export {
   cardErrorBoundaryFr,
   catchErrorHandler,
   clearSelectedGlobalFiltersFromTableState,
+  collectApplicabilities,
   commonButtonEn,
   commonButtonFr,
   compareStepsWithPreviousValues,
@@ -1951,6 +1952,7 @@ export {
   toFloatOrNullValue,
   toFormValuesContingencyListsInfos,
   toFormValuesLimitReductions,
+  toMessageValues,
   toModificationOperation,
   toModificationProperties,
   toNestedGlobalSelectors,

package/dist/services/networkModification.d.ts

@@ -23,4 +23,4 @@ export declare function updateNetworkModificationsMetadata(modificationUuids: UU
 export declare function getNetworkModificationsFromComposite(compositeModificationUuids: string[], onlyMetadata?: boolean): Promise<Record<UUID, NetworkModificationMetadata[]>>;
 export declare function moveModification(studyUuid: UUID | null, nodeUuid: UUID | undefined, modificationUuid: UUID, sourceContainer: ModificationContainer, targetContainer: ModificationContainer, beforeUuid: UUID | null): Promise<Response>;
 export declare function setModificationMetadata(studyUuid: UUID | null, nodeUuid: UUID | undefined, modificationUuid: UUID | undefined, metadata: Partial<NetworkModificationMetadata | ComposedModificationMetadata>): Promise<Response>;
-export declare function updateModificationStatusByRootNetwork(studyUuid: UUID, nodeUuid: UUID, rootNetworkUuid: UUID, modificationUuid: UUID, activated: boolean): Promise<Response>;
+export declare function updateModificationStatusByRootNetwork(studyUuid: UUID, nodeUuid: UUID, rootNetworkUuid: UUID, modificationUuid: UUID, applicable: boolean): Promise<Response>;

package/dist/services/networkModification.js

@@ -87,9 +87,9 @@ function setModificationMetadata(studyUuid, nodeUuid, modificationUuid, metadata
     body: JSON.stringify(metadata)
   });
 }
-function updateModificationStatusByRootNetwork(studyUuid, nodeUuid, rootNetworkUuid, modificationUuid, activated) {
+function updateModificationStatusByRootNetwork(studyUuid, nodeUuid, rootNetworkUuid, modificationUuid, applicable) {
   const urlSearchParams = new URLSearchParams();
-  urlSearchParams.append("activated", String(activated));
+  urlSearchParams.append("applicable", String(applicable));
   urlSearchParams.append("uuids", String([modificationUuid]));
   const url = `${getStudyUrlWithNodeUuidAndRootNetworkUuid(studyUuid, nodeUuid, rootNetworkUuid)}/network-modifications?${urlSearchParams.toString()}`;
   console.debug(url);

package/dist/translations/en/topBarEn.d.ts

@@ -45,21 +45,21 @@ export declare const topBarEn: {
     'user-information-dialog/profile': string;
     'user-information-dialog/no-profile': string;
     'user-information-dialog/quotas': string;
-    'user-information-dialog/quotas-per-study': string;
+    'user-information-dialog/quotas-per-execution': string;
     'user-information-dialog/number-of-cases-or-studies': string;
     'user-information-dialog/used': string;
-    'user-information-dialog/number-of-builds-per-study': string;
-    'user-information-dialog/number-of-loadflow-per-study': string;
-    'user-information-dialog/number-of-security-per-study': string;
-    'user-information-dialog/number-of-sensitivity-per-study': string;
-    'user-information-dialog/number-of-shortCircuit-per-study': string;
-    'user-information-dialog/number-of-voltageInit-per-study': string;
-    'user-information-dialog/number-of-pccMin-per-study': string;
-    'user-information-dialog/number-of-stateEstimation-per-study': string;
-    'user-information-dialog/number-of-balanceAdjustement-per-study': string;
-    'user-information-dialog/number-of-dynamicSimulation-per-study': string;
-    'user-information-dialog/number-of-dynamicSecurity-per-study': string;
-    'user-information-dialog/number-of-dynamicMargin-per-study': string;
+    'user-information-dialog/number-of-builds-per-user': string;
+    'user-information-dialog/number-of-loadflow-per-user': string;
+    'user-information-dialog/number-of-security-per-user': string;
+    'user-information-dialog/number-of-sensitivity-per-user': string;
+    'user-information-dialog/number-of-shortCircuit-per-user': string;
+    'user-information-dialog/number-of-voltageInit-per-user': string;
+    'user-information-dialog/number-of-pccMin-per-user': string;
+    'user-information-dialog/number-of-stateEstimation-per-user': string;
+    'user-information-dialog/number-of-balanceAdjustement-per-user': string;
+    'user-information-dialog/number-of-dynamicSimulation-per-user': string;
+    'user-information-dialog/number-of-dynamicSecurity-per-user': string;
+    'user-information-dialog/number-of-dynamicMargin-per-user': string;
     'user-settings-dialog/title': string;
     'user-settings-dialog/label-developer-mode': string;
     'user-settings-dialog/warning-developer-mode': string;

package/dist/translations/en/topBarEn.js

@@ -39,21 +39,21 @@ const topBarEn = {
   "user-information-dialog/profile": "Profile",
   "user-information-dialog/no-profile": "No profile",
   "user-information-dialog/quotas": "User quotas",
-  "user-information-dialog/quotas-per-study": "User quotas per study",
+  "user-information-dialog/quotas-per-execution": "User quotas per execution",
   "user-information-dialog/number-of-cases-or-studies": "Number of cases or studies",
   "user-information-dialog/used": "Used",
-  "user-information-dialog/number-of-builds-per-study": "Number of builds",
-  "user-information-dialog/number-of-loadflow-per-study": "Number of loadflow",
-  "user-information-dialog/number-of-security-per-study": "Number of security analysis",
-  "user-information-dialog/number-of-sensitivity-per-study": "Number of sensitivity analysis",
-  "user-information-dialog/number-of-shortCircuit-per-study": "Number of short circuit",
-  "user-information-dialog/number-of-voltageInit-per-study": "Number of voltage initialization",
-  "user-information-dialog/number-of-pccMin-per-study": "Number of PCC N-1",
-  "user-information-dialog/number-of-stateEstimation-per-study": "Number of state estimation",
-  "user-information-dialog/number-of-balanceAdjustement-per-study": "Number of balance adjustment",
-  "user-information-dialog/number-of-dynamicSimulation-per-study": "Number of dynamic simulations",
-  "user-information-dialog/number-of-dynamicSecurity-per-study": "Number of dynamic security analysis",
-  "user-information-dialog/number-of-dynamicMargin-per-study": "Number of dynamic margin",
+  "user-information-dialog/number-of-builds-per-user": "Number of builds",
+  "user-information-dialog/number-of-loadflow-per-user": "Number of loadflow",
+  "user-information-dialog/number-of-security-per-user": "Number of security analysis",
+  "user-information-dialog/number-of-sensitivity-per-user": "Number of sensitivity analysis",
+  "user-information-dialog/number-of-shortCircuit-per-user": "Number of short circuit",
+  "user-information-dialog/number-of-voltageInit-per-user": "Number of voltage initialization",
+  "user-information-dialog/number-of-pccMin-per-user": "Number of PCC N-1",
+  "user-information-dialog/number-of-stateEstimation-per-user": "Number of state estimation",
+  "user-information-dialog/number-of-balanceAdjustement-per-user": "Number of balance adjustment",
+  "user-information-dialog/number-of-dynamicSimulation-per-user": "Number of dynamic simulations",
+  "user-information-dialog/number-of-dynamicSecurity-per-user": "Number of dynamic security analysis",
+  "user-information-dialog/number-of-dynamicMargin-per-user": "Number of dynamic margin",
   "user-settings-dialog/title": "User settings",
   "user-settings-dialog/label-developer-mode": "Developer mode",
   "user-settings-dialog/warning-developer-mode": "Some of the features are not complete, so they may not work as expected. To hide these features, disable developer mode."

package/dist/translations/fr/topBarFr.d.ts

@@ -45,21 +45,21 @@ export declare const topBarFr: {
     'user-information-dialog/profile': string;
     'user-information-dialog/no-profile': string;
     'user-information-dialog/quotas': string;
-    'user-information-dialog/quotas-per-study': string;
+    'user-information-dialog/quotas-per-execution': string;
     'user-information-dialog/number-of-cases-or-studies': string;
     'user-information-dialog/used': string;
-    'user-information-dialog/number-of-builds-per-study': string;
-    'user-information-dialog/number-of-loadflow-per-study': string;
-    'user-information-dialog/number-of-security-per-study': string;
-    'user-information-dialog/number-of-sensitivity-per-study': string;
-    'user-information-dialog/number-of-shortCircuit-per-study': string;
-    'user-information-dialog/number-of-voltageInit-per-study': string;
-    'user-information-dialog/number-of-pccMin-per-study': string;
-    'user-information-dialog/number-of-stateEstimation-per-study': string;
-    'user-information-dialog/number-of-balanceAdjustement-per-study': string;
-    'user-information-dialog/number-of-dynamicSimulation-per-study': string;
-    'user-information-dialog/number-of-dynamicSecurity-per-study': string;
-    'user-information-dialog/number-of-dynamicMargin-per-study': string;
+    'user-information-dialog/number-of-builds-per-user': string;
+    'user-information-dialog/number-of-loadflow-per-user': string;
+    'user-information-dialog/number-of-security-per-user': string;
+    'user-information-dialog/number-of-sensitivity-per-user': string;
+    'user-information-dialog/number-of-shortCircuit-per-user': string;
+    'user-information-dialog/number-of-voltageInit-per-user': string;
+    'user-information-dialog/number-of-pccMin-per-user': string;
+    'user-information-dialog/number-of-stateEstimation-per-user': string;
+    'user-information-dialog/number-of-balanceAdjustement-per-user': string;
+    'user-information-dialog/number-of-dynamicSimulation-per-user': string;
+    'user-information-dialog/number-of-dynamicSecurity-per-user': string;
+    'user-information-dialog/number-of-dynamicMargin-per-user': string;
     'user-settings-dialog/title': string;
     'user-settings-dialog/label-developer-mode': string;
     'user-settings-dialog/warning-developer-mode': string;

package/dist/translations/fr/topBarFr.js

@@ -39,21 +39,21 @@ const topBarFr = {
   "user-information-dialog/profile": "Profil",
   "user-information-dialog/no-profile": "Pas de profil",
   "user-information-dialog/quotas": "Quotas",
-  "user-information-dialog/quotas-per-study": "Quotas par étude",
+  "user-information-dialog/quotas-per-execution": "Quotas par exécution",
   "user-information-dialog/number-of-cases-or-studies": "Nombre situations ou études",
   "user-information-dialog/used": "Utilisé",
-  "user-information-dialog/number-of-builds-per-study": "Nombre de réalisations",
-  "user-information-dialog/number-of-loadflow-per-study": "Nombre de calculs de répartition",
-  "user-information-dialog/number-of-security-per-study": "Nombre d'analyses de sécurité",
-  "user-information-dialog/number-of-sensitivity-per-study": "Nombre d'analyses de sensibilité",
-  "user-information-dialog/number-of-shortCircuit-per-study": "Nombre de calculs de court-circuit",
-  "user-information-dialog/number-of-voltageInit-per-study": "Nombre d'initialisations du plan de tension",
-  "user-information-dialog/number-of-pccMin-per-study": "Nombre de PCC N-1",
-  "user-information-dialog/number-of-stateEstimation-per-study": "Nombre d'estimations d'état",
-  "user-information-dialog/number-of-balanceAdjustement-per-study": "Nombre d'équilibrages bilan",
-  "user-information-dialog/number-of-dynamicSimulation-per-study": "Nombre de simulations dynamiques",
-  "user-information-dialog/number-of-dynamicSecurity-per-study": "Nombre d'analyses de sécurité dynamiques",
-  "user-information-dialog/number-of-dynamicMargin-per-study": "Nombre de calculs de marge dynamiques",
+  "user-information-dialog/number-of-builds-per-user": "Nombre de réalisations",
+  "user-information-dialog/number-of-loadflow-per-user": "Nombre de calculs de répartition",
+  "user-information-dialog/number-of-security-per-user": "Nombre d'analyses de sécurité",
+  "user-information-dialog/number-of-sensitivity-per-user": "Nombre d'analyses de sensibilité",
+  "user-information-dialog/number-of-shortCircuit-per-user": "Nombre de calculs de court-circuit",
+  "user-information-dialog/number-of-voltageInit-per-user": "Nombre d'initialisations du plan de tension",
+  "user-information-dialog/number-of-pccMin-per-user": "Nombre de PCC N-1",
+  "user-information-dialog/number-of-stateEstimation-per-user": "Nombre d'estimations d'état",
+  "user-information-dialog/number-of-balanceAdjustement-per-user": "Nombre d'équilibrages bilan",
+  "user-information-dialog/number-of-dynamicSimulation-per-user": "Nombre de simulations dynamiques",
+  "user-information-dialog/number-of-dynamicSecurity-per-user": "Nombre d'analyses de sécurité dynamiques",
+  "user-information-dialog/number-of-dynamicMargin-per-user": "Nombre de calculs de marge dynamiques",
   "user-settings-dialog/title": "Paramètres utilisateur",
   "user-settings-dialog/label-developer-mode": "Mode développeur",
   "user-settings-dialog/warning-developer-mode": "Certaines fonctionnalités ne sont pas complètes et peuvent donc ne pas fonctionner comme prévu. Pour masquer ces fonctionnalités, désactivez le mode développeur."

package/dist/utils/types/network-modification-metadata.d.ts

@@ -9,6 +9,7 @@ export interface NetworkModificationMetadata {
     description: string;
     messageType: string;
     messageValues: string;
+    applicabilityByRootNetworkTag?: Record<string, boolean>;
 }
 export interface BasicComposedModificationMetadata extends NetworkModificationMetadata {
     subModifications: ComposedModificationMetadata[];

package/dist/utils/types/network-modification-types.d.ts

@@ -7,10 +7,11 @@ export type AttributeModification<T> = {
     value?: T;
     op: OperationType;
 };
-export interface ExcludedNetworkModifications {
-    rootNetworkUuid: UUID;
-    modificationUuidsToExclude: UUID[];
-}
+/**
+ * Applicability of each network modification per root network, keyed by root network uuid: a root network
+ * without an entry is applicable. The modifications carry it keyed by tag, which is resolved to the root network uuid.
+ */
+export type NetworkModificationApplicabilities = Record<UUID, Record<UUID, boolean>>;
 export interface RootNetworkRowInfo {
     rootNetworkUuid: UUID;
     name: string;

package/package.json

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