feat(ui-adq): add new table form

AntaresSimulatorTeam · Jan 9, 2024 · 6454267 · 6454267
1 parent 931380e
commit 6454267
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 16 deletions.
diff --git a/webapp/public/locales/en/main.json b/webapp/public/locales/en/main.json
@@ -330,7 +330,8 @@
   "study.configuration.optimization.exportMps": "Export MPS",
   "study.configuration.optimization.unfeasibleProblemBehavior": "Unfeasible problem behavior",
   "study.configuration.optimization.simplexOptimizationRange": "Simplex optimization range",
-  "study.configuration.adequacyPatch.legend.general": "General",
+  "study.configuration.adequacyPatch.tab.general": "General",
+  "study.configuration.adequacyPatch.tab.perimeter": "Perimeter",
   "study.configuration.adequacyPatch.legend.localMatchingRule": "Local matching rule",
   "study.configuration.adequacyPatch.legend.curtailmentSharing": "Curtailment sharing",
   "study.configuration.adequacyPatch.legend.advanced": "Advanced",

diff --git a/webapp/public/locales/fr/main.json b/webapp/public/locales/fr/main.json
@@ -330,7 +330,8 @@
   "study.configuration.optimization.exportMps": "Export MPS",
   "study.configuration.optimization.unfeasibleProblemBehavior": "Unfeasible problem behavior",
   "study.configuration.optimization.simplexOptimizationRange": "Simplex optimization range",
-  "study.configuration.adequacyPatch.legend.general": "Générale",
+  "study.configuration.adequacyPatch.tab.general": "Général",
+  "study.configuration.adequacyPatch.tab.perimeter": "Périmètre",
   "study.configuration.adequacyPatch.legend.localMatchingRule": "Règle de correspondance locale",
   "study.configuration.adequacyPatch.legend.curtailmentSharing": "Partage de réduction",
   "study.configuration.adequacyPatch.legend.advanced": "Avancée",

diff --git a/webapp/src/components/App/Singlestudy/explore/Configuration/AdequacyPatch/Fields.tsx b/webapp/src/components/App/Singlestudy/explore/Configuration/AdequacyPatch/Fields.tsx
@@ -17,10 +17,7 @@ function Fields() {
 
   return (
     <Box>
-      <Fieldset
-        legend={t("study.configuration.adequacyPatch.legend.general")}
-        fullFieldWidth
-      >
+      <Fieldset fullFieldWidth>
         <SwitchFE
           label={t("study.configuration.adequacyPatch.enableAdequacyPatch")}
           name="enableAdequacyPatch"

diff --git a/webapp/src/components/App/Singlestudy/explore/Configuration/AdequacyPatch/index.tsx b/webapp/src/components/App/Singlestudy/explore/Configuration/AdequacyPatch/index.tsx
@@ -1,4 +1,5 @@
 import { useOutletContext } from "react-router";
+import { useTranslation } from "react-i18next";
 import { StudyMetadata } from "../../../../../../common/types";
 import Form from "../../../../../common/Form";
 import { SubmitHandlerPlus } from "../../../../../common/Form/types";
@@ -8,9 +9,12 @@ import {
   getAdequacyPatchFormFields,
   setAdequacyPatchFormFields,
 } from "./utils";
+import TableMode from "../../../../../common/TableMode";
+import TabsView from "../../../../../common/TabsView";
 
 function AdequacyPatch() {
   const { study } = useOutletContext<{ study: StudyMetadata }>();
+  const { t } = useTranslation();
 
   ////////////////////////////////////////////////////////////////
   // Event Handlers
@@ -27,16 +31,36 @@ function AdequacyPatch() {
   ////////////////////////////////////////////////////////////////
 
   return (
-    <Form
-      key={study.id}
-      config={{
-        defaultValues: () => getAdequacyPatchFormFields(study.id),
-      }}
-      onSubmit={handleSubmit}
-      enableUndoRedo
-    >
-      <Fields />
-    </Form>
+    <TabsView
+      items={[
+        {
+          label: t("study.configuration.adequacyPatch.tab.general"),
+          content: (
+            <Form
+              key={study.id}
+              config={{
+                defaultValues: () => getAdequacyPatchFormFields(study.id),
+              }}
+              onSubmit={handleSubmit}
+              enableUndoRedo
+            >
+              <Fields />
+            </Form>
+          ),
+        },
+        {
+          label: t("study.configuration.adequacyPatch.tab.perimeter"),
+          content: (
+            <TableMode
+              studyId={study.id}
+              type="area"
+              columns={["adequacyPatchMode"]}
+            />
+          ),
+        },
+      ]}
+      TabListProps={{ sx: { mt: -2 } }}
+    />
   );
 }