Merge branch 'release/2.17.0' into dev

webapp/public/locales/en/main.json

@@ -748,5 +748,11 @@
   "results.error.jobs": "Failed to retrieve study launch jobs",
   "results.error.outputs": "Failed to retrieve study output list",
   "results.noOutputs": "No outputs",
-  "results.question.deleteOutput": "Are you sure you want to delete the output {{outputname}}?"
+  "results.question.deleteOutput": "Are you sure you want to delete the output {{outputname}}?",
+  "tableMode.type.areas": "Areas",
+  "tableMode.type.links": "Links",
+  "tableMode.type.thermals": "Thermals",
+  "tableMode.type.renewables": "Renewables",
+  "tableMode.type.st-storages": "Short-Term Storages",
+  "tableMode.type.binding-constraints": "Binding Constraints"
 }

webapp/public/locales/fr/main.json

@@ -748,5 +748,11 @@
   "results.error.jobs": "Erreur lors de la récupération des tâches de lancement",
   "results.error.outputs": "Erreur lors de la récupération des sorties de l'étude",
   "results.noOutputs": "Aucune sorties",
-  "results.question.deleteOutput": "Êtes-vous sûr de vouloir supprimer le résultat de simulation {{outputname}} ?"
+  "results.question.deleteOutput": "Êtes-vous sûr de vouloir supprimer le résultat de simulation {{outputname}} ?",
+  "tableMode.type.areas": "Zones",
+  "tableMode.type.links": "Liens",
+  "tableMode.type.thermals": "Thermiques",
+  "tableMode.type.renewables": "Renouvelables",
+  "tableMode.type.st-storages": "Stockages court terme",
+  "tableMode.type.binding-constraints": "Contraintes couplantes"
 }

webapp/src/components/App/Settings/Groups/dialog/GroupFormDialog/GroupForm.tsx

@@ -115,6 +115,7 @@ function GroupForm(props: UseFormReturnPlus) {
             validateString(v, {
               existingValues: existingGroups,
               excludedValues: RESERVED_GROUP_NAMES,
+              editedValue: defaultValues?.name, // prevent false duplicates on update form
             }),
         })}
       />

webapp/src/components/App/Singlestudy/explore/TableModeList/dialogs/TableTemplateFormDialog.tsx

@@ -30,6 +30,15 @@ function TableTemplateFormDialog(props: TableTemplateFormDialogProps) {
     [templates],
   );
 
+  const typeOptions = useMemo(
+    () =>
+      TABLE_MODE_TYPES.map((type) => ({
+        value: type,
+        label: t(`tableMode.type.${type}`),
+      })),
+    [t],
+  );
+
   ////////////////////////////////////////////////////////////////
   // JSX
   ////////////////////////////////////////////////////////////////
@@ -43,7 +52,7 @@ function TableTemplateFormDialog(props: TableTemplateFormDialogProps) {
       onSubmit={onSubmit}
       onCancel={onCancel}
     >
-      {({ control, resetField, getValues }) => (
+      {({ control, setValue, getValues }) => (
         <Box
           sx={{
             display: "flex",
@@ -67,15 +76,15 @@ function TableTemplateFormDialog(props: TableTemplateFormDialogProps) {
           />
           <SelectFE
             label={t("study.type")}
-            options={TABLE_MODE_TYPES}
+            options={typeOptions}
             variant="outlined"
-            onChange={() => resetField("columns")}
+            onChange={() => setValue("columns", [])}
             name="type"
             control={control}
           />
           <ListFE
             label={t("study.columns")}
-            options={getTableColumnsForType(getValues("type"))}
+            options={[...getTableColumnsForType(getValues("type"))]}
             getOptionLabel={startCase}
             name="columns"
             control={control}

webapp/src/components/common/fieldEditors/ListFE/index.tsx

@@ -42,9 +42,9 @@ import {
 import { makeLabel, makeListItems } from "./utils";
 
 interface ListFEProps<TItem, TOption> {
-  defaultValue?: readonly TItem[];
-  value?: readonly TItem[];
-  options: readonly TOption[];
+  defaultValue?: TItem[];
+  value?: TItem[];
+  options?: TOption[];
   label?: string;
   getOptionLabel?: (option: TOption) => string;
   getValueLabel?: (value: TItem) => string;
@@ -64,7 +64,7 @@ function ListFE<TItem, TOption>(props: ListFEProps<TItem, TOption>) {
     value,
     defaultValue,
     label,
-    options,
+    options = [],
     getOptionLabel = makeLabel,
     getValueLabel = makeLabel,
     optionToItem = (option: TOption) => option as unknown as TItem,

webapp/src/services/api/studies/tableMode/constants.ts

@@ -1,20 +1,30 @@
-const AREAS = "areas";
-const LINKS = "links";
-const THERMALS = "thermals";
-const RENEWABLES = "renewables";
-const ST_STORAGES = "st-storages";
-const BINDING_CONSTRAINTS = "binding-constraints";
+const AREA = "areas";
+const LINK = "links";
+const THERMAL = "thermals";
+const RENEWABLE = "renewables";
+const ST_STORAGE = "st-storages";
+const BINDING_CONSTRAINT = "binding-constraints";
 
 export const TABLE_MODE_TYPES = [
-  AREAS,
-  LINKS,
-  THERMALS,
-  RENEWABLES,
-  BINDING_CONSTRAINTS,
+  AREA,
+  LINK,
+  THERMAL,
+  RENEWABLE,
+  ST_STORAGE,
+  BINDING_CONSTRAINT,
 ] as const;
 
+// Deprecated types (breaking change from v2.16.8)
+export const TABLE_MODE_TYPES_ALIASES = {
+  area: AREA,
+  link: LINK,
+  cluster: THERMAL,
+  renewable: RENEWABLE,
+  "binding constraint": BINDING_CONSTRAINT,
+};
+
 export const TABLE_MODE_COLUMNS_BY_TYPE = {
-  [AREAS]: [
+  [AREA]: [
     "nonDispatchablePower",
     "dispatchableHydroPower",
     "otherDispatchablePower",
@@ -27,7 +37,7 @@ export const TABLE_MODE_COLUMNS_BY_TYPE = {
     // Since v8.3
     "adequacyPatchMode",
   ],
-  [LINKS]: [
+  [LINK]: [
     "hurdlesCost",
     "loopFlow",
     "usePhaseShifter",
@@ -40,7 +50,7 @@ export const TABLE_MODE_COLUMNS_BY_TYPE = {
     "filterSynthesis",
     "filterYearByYear",
   ],
-  [THERMALS]: [
+  [THERMAL]: [
     "group",
     "enabled",
     "unitCount",
@@ -79,15 +89,15 @@ export const TABLE_MODE_COLUMNS_BY_TYPE = {
     "efficiency",
     "variableOMCost",
   ],
-  [RENEWABLES]: [
+  [RENEWABLE]: [
     // Since v8.1
     "group",
     "enabled",
     "tsInterpretation",
     "unitCount",
     "nominalCapacity",
   ],
-  [ST_STORAGES]: [
+  [ST_STORAGE]: [
     // Since v8.6
     "group",
     "injectionNominalCapacity",
@@ -99,7 +109,7 @@ export const TABLE_MODE_COLUMNS_BY_TYPE = {
     // Since v8.8
     "enabled",
   ],
-  [BINDING_CONSTRAINTS]: [
+  [BINDING_CONSTRAINT]: [
     "enabled",
     "timeStep",
     "operator",

webapp/src/services/utils/localStorage.ts

@@ -4,6 +4,7 @@ import { UserInfo } from "../../common/types";
 import { TableTemplate } from "../../components/App/Singlestudy/explore/TableModeList/utils";
 import { StudiesSortConf, StudiesState } from "../../redux/ducks/studies";
 import { UIState } from "../../redux/ducks/ui";
+import { TABLE_MODE_TYPES_ALIASES } from "../api/studies/tableMode/constants";
 
 export enum StorageKey {
   Version = "version",
@@ -46,7 +47,18 @@ function getItem<T extends StorageKey>(key: T): TypeFromKey[T] | null {
     if (serializedState === null) {
       return null;
     }
-    return JSON.parse(serializedState);
+    const res = JSON.parse(serializedState);
+
+    // Convert deprecated types to new ones (breaking change from v2.16.8)
+    if (key === StorageKey.StudiesModelTableModeTemplates) {
+      return res.map((template: Record<string, unknown>) => ({
+        ...template,
+        // @ts-expect-error To ignore error TS2551
+        type: TABLE_MODE_TYPES_ALIASES[template.type] ?? template.type,
+      }));
+    }
+
+    return res;
   } catch (err) {
     return null;
   }