save

AntaresSimulatorTeam · Feb 20, 2024 · fd06634 · fd06634
1 parent e2c5e47
commit fd06634
Show file tree

Hide file tree

Showing 39 changed files with 404 additions and 474 deletions.
diff --git a/...rc/components/App/Singlestudy/Commands/Edition/DraggableCommands/CommandListItem/style.ts b/...rc/components/App/Singlestudy/Commands/Edition/DraggableCommands/CommandListItem/style.ts
@@ -1,6 +1,5 @@
 import { Accordion, Box, styled } from "@mui/material";
 import DeleteIcon from "@mui/icons-material/HighlightOff";
-import { PAPER_BACKGROUND_NO_TRANSPARENCY } from "../../../../../../../theme";
 
 export const ItemContainer = styled(Box, {
   shouldForwardProp: (prop) => prop !== "onTopVisible",
@@ -15,7 +14,6 @@ export const DraggableAccorderon = styled(Accordion, {
 })<{ isDragging?: boolean }>(({ theme, isDragging }) => ({
   flex: 1,
   boxSizing: "border-box",
-  backgroundColor: PAPER_BACKGROUND_NO_TRANSPARENCY,
   ...(isDragging
     ? {
         borderColor: theme.palette.secondary.main,

diff --git a/webapp/src/components/App/Singlestudy/HomeView/InformationView/Notes/DetailsList.tsx b/webapp/src/components/App/Singlestudy/HomeView/InformationView/Notes/DetailsList.tsx
@@ -22,7 +22,6 @@ function DetailsList({ items }: Props) {
     <List
       sx={{
         width: 1,
-        backgroundColor: "#222333",
       }}
     >
       {items.map((item) => (

diff --git a/webapp/src/components/App/Singlestudy/HomeView/InformationView/Notes/utils.ts b/webapp/src/components/App/Singlestudy/HomeView/InformationView/Notes/utils.ts
@@ -4,7 +4,7 @@ import { ContentState, convertToRaw, EditorState } from "draft-js";
 import draftToHtml from "draftjs-to-html";
 import { convertFromHTML } from "draft-convert";
 import { Element as XMLElement, js2xml, xml2json } from "xml-js";
-import theme from "../../../../../../theme";
+import theme from "../../../../theme";
 
 interface BlockMap {
   from: string;
@@ -588,9 +588,9 @@ export const convertSize = (bytes: number): string => {
 
 const sizeRanges = [
   { limit: 0, color: "default" }, // Size is unknown or not calculated
-  { limit: 5 * BYTES_PER_GB, color: theme.palette.success.main }, // Size is 0 to 5 GB
-  { limit: 25 * BYTES_PER_GB, color: theme.palette.warning.main }, // Size is 5 GB to 25 GB
-  { limit: Infinity, color: theme.palette.error.main }, // Size is 25 GB and above
+  { limit: 5 * BYTES_PER_GB, color: "palette.success.main" }, // Size is 0 to 5 GB
+  { limit: 25 * BYTES_PER_GB, color: "palette.warning.main" }, // Size is 5 GB to 25 GB
+  { limit: Infinity, color: "palette.error.main" }, // Size is 25 GB and above
 ];
 
 export const getColorForSize = (bytes: number): string => {

diff --git a/webapp/src/components/App/Singlestudy/NavHeader/Actions.tsx b/webapp/src/components/App/Singlestudy/NavHeader/Actions.tsx
@@ -124,18 +124,11 @@ function Actions({
         />
       </Tooltip>
       {isManaged ? (
-        <Chip
-          label={t("study.managedStudy")}
-          variant="filled"
-          color="info"
-          size="small"
-        />
+        <Chip label={t("study.managedStudy")} color="info" size="small" />
       ) : (
-        <Chip label={study.workspace} variant="filled" size="small" />
+        <Chip label={study.workspace} size="small" />
       )}
-      {study.tags?.map((tag) => (
-        <Chip key={tag} label={tag} variant="filled" size="small" />
-      ))}
+      {study.tags?.map((tag) => <Chip key={tag} label={tag} size="small" />)}
       {isExplorer && (
         <Button
           size="small"

diff --git a/webapp/src/components/App/Singlestudy/NavHeader/index.tsx b/webapp/src/components/App/Singlestudy/NavHeader/index.tsx
@@ -12,7 +12,7 @@ import DeleteOutlinedIcon from "@mui/icons-material/DeleteOutlined";
 import EditOutlinedIcon from "@mui/icons-material/EditOutlined";
 import { useTranslation } from "react-i18next";
 import { StudyMetadata, VariantTree } from "../../../../common/types";
-import { STUDIES_HEIGHT_HEADER } from "../../../../theme";
+import { STUDIES_HEIGHT_HEADER } from "../../theme";
 import { archiveStudy, unarchiveStudy } from "../../../../services/api/study";
 import { deleteStudy } from "../../../../redux/ducks/studies";
 import LauncherDialog from "../../Studies/LauncherDialog";

diff --git a/webapp/src/components/App/Singlestudy/UpgradeDialog.tsx b/webapp/src/components/App/Singlestudy/UpgradeDialog.tsx
@@ -62,7 +62,6 @@ function UpgradeDialog({ study, onClose, open }: Props) {
           <SelectFE
             name="version"
             label="Version"
-            variant="filled"
             options={versionOptions}
             control={control}
           />

diff --git a/webapp/src/components/App/Singlestudy/explore/Configuration/General/Fields.tsx b/webapp/src/components/App/Singlestudy/explore/Configuration/General/Fields.tsx
@@ -141,7 +141,6 @@ function Fields(props: Props) {
         <NumberFE
           name="firstDay"
           label={t("study.configuration.general.firstDay")}
-          variant="filled"
           control={control}
           rules={{
             deps: "lastDay",
@@ -151,7 +150,6 @@ function Fields(props: Props) {
         <NumberFE
           name="lastDay"
           label={t("study.configuration.general.lastDay")}
-          variant="filled"
           control={control}
           rules={{
             deps: "firstDay",
@@ -160,12 +158,7 @@ function Fields(props: Props) {
         />
       </Fieldset>
       <Fieldset legend={t("study.configuration.general.legend.calendar")}>
-        <StringFE
-          name="horizon"
-          label="Horizon"
-          variant="filled"
-          control={control}
-        />
+        <StringFE name="horizon" label="Horizon" control={control} />
         <SelectFE
           name="firstMonth"
           label={t("study.configuration.general.year")}
@@ -207,7 +200,6 @@ function Fields(props: Props) {
           <NumberFE
             name="nbYears"
             label={t("study.configuration.general.nbYears")}
-            variant="filled"
             control={control}
             rules={{
               validate: handleNbYearsValidation,

diff --git a/...ndingConstraints/BindingConstView/AddConstraintTermDialog/AddConstraintTermForm/index.tsx b/...ndingConstraints/BindingConstView/AddConstraintTermDialog/AddConstraintTermForm/index.tsx
@@ -43,7 +43,6 @@ export default function AddConstraintTermForm(props: Props) {
             <NumberFE
               name="weight"
               label={t("study.modelization.bindingConst.weight")}
-              variant="filled"
               control={control}
               rules={{
                 required: t("form.field.required") as string,
@@ -76,7 +75,6 @@ export default function AddConstraintTermForm(props: Props) {
                   <NumberFE
                     name="offset"
                     label={t("study.modelization.bindingConst.offset")}
-                    variant="filled"
                     control={control}
                     rules={{
                       required: t("form.field.required") as string,

diff --git a/...lestudy/explore/Modelization/BindingConstraints/BindingConstView/ConstraintTerm/index.tsx b/...lestudy/explore/Modelization/BindingConstraints/BindingConstView/ConstraintTerm/index.tsx
@@ -80,7 +80,6 @@ export default function ConstraintItem(props: Props) {
         left={
           <TextField
             label={t("study.modelization.bindingConst.weight")}
-            variant="filled"
             type="number"
             value={weight}
             onChange={(e) => handleChange("weight", e.target.value)}
@@ -113,7 +112,6 @@ export default function ConstraintItem(props: Props) {
               <OffsetInput onRemove={() => handleChange("offset", null)}>
                 <TextField
                   label={t("study.modelization.bindingConst.offset")}
-                  variant="filled"
                   type="number"
                   value={offset}
                   onChange={(e) => handleChange("offset", e.target.value)}

diff --git a/...re/Modelization/BindingConstraints/BindingConstView/constraintviews/ConstraintElement.tsx b/...re/Modelization/BindingConstraints/BindingConstView/constraintviews/ConstraintElement.tsx
@@ -22,7 +22,6 @@ export default function ConstraintElement(props: ElementProps) {
       <ConstraintElementHeader>
         <Typography
           sx={{
-            color: "grey.400",
             fontSize: "16px",
           }}
         >

diff --git a/...lestudy/explore/Modelization/BindingConstraints/BindingConstView/constraintviews/style.ts b/...lestudy/explore/Modelization/BindingConstraints/BindingConstView/constraintviews/style.ts
@@ -1,11 +1,9 @@
 import { Box, Paper, styled } from "@mui/material";
-import { PAPER_BACKGROUND_NO_TRANSPARENCY } from "../../../../../../../../theme";
 
 export const ConstraintElementRoot = styled(Paper)(({ theme }) => ({
   display: "flex",
   flexDirection: "column",
   padding: theme.spacing(1),
-  backgroundColor: PAPER_BACKGROUND_NO_TRANSPARENCY,
 }));
 
 export const ConstraintElementHeader = styled(Box)(({ theme }) => ({

diff --git a/webapp/src/components/App/Singlestudy/explore/Modelization/Map/Areas/AreaConfig.tsx b/webapp/src/components/App/Singlestudy/explore/Modelization/Map/Areas/AreaConfig.tsx
@@ -84,7 +84,6 @@ function AreaConfig(props: Props) {
           <TextField
             sx={{ mt: 1 }}
             label={t("study.modelization.map.areaName")}
-            variant="filled"
             value={currentArea.name}
             disabled
           />

diff --git a/...nts/App/Singlestudy/explore/Modelization/Map/MapConfig/Districts/UpdateDistrictDialog.tsx b/...nts/App/Singlestudy/explore/Modelization/Map/MapConfig/Districts/UpdateDistrictDialog.tsx
@@ -91,7 +91,6 @@ function UpdateDistrictDialog(props: Props) {
           <SelectFE
             name="districtId"
             label={t("study.modelization.map.districts")}
-            variant="filled"
             options={districtsOptions}
             control={control}
             onChange={(e) => {

diff --git a/...omponents/App/Singlestudy/explore/Modelization/Map/MapConfig/Layers/UpdateLayerDialog.tsx b/...omponents/App/Singlestudy/explore/Modelization/Map/MapConfig/Layers/UpdateLayerDialog.tsx
@@ -91,7 +91,6 @@ function UpdateLayerDialog(props: Props) {
           <SelectFE
             name="layerId"
             label={t("Layers")}
-            variant="filled"
             options={layersOptions}
             control={control}
             onChange={(e) =>

diff --git a/webapp/src/components/App/Singlestudy/explore/Xpansion/Candidates/CandidateForm.tsx b/webapp/src/components/App/Singlestudy/explore/Xpansion/Candidates/CandidateForm.tsx
@@ -129,7 +129,6 @@ function CandidateForm(props: PropType) {
         <Fields>
           <TextField
             label={t("global.name")}
-            variant="filled"
             value={currentCandidate?.name || ""}
             onChange={(e) => handleChange("name", e.target.value)}
           />
@@ -154,7 +153,6 @@ function CandidateForm(props: PropType) {
           <TextField
             type="number"
             label={t("xpansion.annualCost")}
-            variant="filled"
             value={currentCandidate?.["annual-cost-per-mw"] || ""}
             onChange={(e) =>
               handleChange("annual-cost-per-mw", parseFloat(e.target.value))
@@ -163,7 +161,6 @@ function CandidateForm(props: PropType) {
           <TextField
             type="number"
             label={t("xpansion.alreadyICapacity")}
-            variant="filled"
             value={currentCandidate?.["already-installed-capacity"] || ""}
             onChange={(e) =>
               handleChange(
@@ -206,7 +203,6 @@ function CandidateForm(props: PropType) {
                 sx={{ mr: 2 }}
                 type="number"
                 label={t("xpansion.unitSize")}
-                variant="filled"
                 value={currentCandidate?.["unit-size"] || ""}
                 onChange={(e) =>
                   handleChange("unit-size", parseFloat(e.target.value))
@@ -215,7 +211,6 @@ function CandidateForm(props: PropType) {
               <TextField
                 type="number"
                 label={t("xpansion.maxUnits")}
-                variant="filled"
                 value={currentCandidate?.["max-units"] || ""}
                 onChange={(e) =>
                   handleChange("max-units", parseFloat(e.target.value))
@@ -227,7 +222,6 @@ function CandidateForm(props: PropType) {
             <TextField
               type="number"
               label={t("xpansion.maxInvestments")}
-              variant="filled"
               value={currentCandidate?.["max-investment"] || ""}
               onChange={(e) =>
                 handleChange("max-investment", parseFloat(e.target.value))

diff --git a/webapp/src/components/App/Singlestudy/explore/Xpansion/Settings/SettingsForm.tsx b/webapp/src/components/App/Singlestudy/explore/Xpansion/Settings/SettingsForm.tsx
@@ -129,7 +129,6 @@ function SettingsForm(props: PropType) {
           <TextField
             type="number"
             label={t("xpansion.maxIteration")}
-            variant="filled"
             value={currentSettings.max_iteration}
             onChange={(e) => handleChange("max_iteration", e.target.value)}
             sx={{ mb: 1 }}
@@ -138,7 +137,6 @@ function SettingsForm(props: PropType) {
           <TextField
             type="number"
             label={t("xpansion.optimalityGap")}
-            variant="filled"
             value={currentSettings.optimality_gap}
             onChange={(e) =>
               handleChange("optimality_gap", parseFloat(e.target.value))
@@ -149,7 +147,6 @@ function SettingsForm(props: PropType) {
           <TextField
             type="number"
             label={t("xpansion.relativeGap")}
-            variant="filled"
             value={currentSettings.relative_gap}
             onChange={(e) =>
               handleChange("relative_gap", parseFloat(e.target.value))
@@ -160,7 +157,6 @@ function SettingsForm(props: PropType) {
           <TextField
             type="number"
             label={t("xpansion.relaxedOptimalityGap")}
-            variant="filled"
             value={currentSettings.relaxed_optimality_gap}
             onChange={(e) =>
               handleChange("relaxed_optimality_gap", e.target.value)
@@ -185,7 +181,7 @@ function SettingsForm(props: PropType) {
           {/* <TextField
             type="number"
             label={t("xpansion.timeLimit")}
-            variant="filled"
+            
             value={Math.round((currentSettings.timelimit || 1e12) / 3600)}
             onChange={(e) =>
               handleChange(
@@ -198,7 +194,6 @@ function SettingsForm(props: PropType) {
           <TextField
             type="number"
             label={t("xpansion.separationParameter")}
-            variant="filled"
             value={currentSettings.separation_parameter}
             onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
               handleChange("separation_parameter", parseFloat(e.target.value))
@@ -209,7 +204,6 @@ function SettingsForm(props: PropType) {
           <TextField
             type="number"
             label={t("xpansion.batchSize")}
-            variant="filled"
             value={currentSettings.batch_size}
             onChange={(e) =>
               handleChange("batch_size", parseInt(e.target.value, 10))
@@ -220,7 +214,6 @@ function SettingsForm(props: PropType) {
           <TextField
             type="number"
             label={t("xpansion.logLevel")}
-            variant="filled"
             value={currentSettings.log_level}
             onChange={(e) =>
               handleChange("log_level", parseInt(e.target.value, 10))
@@ -343,7 +336,6 @@ function SettingsForm(props: PropType) {
                 e.target.value as string[],
               )
             }
-            variant="filled"
             options={candidates}
           />
         </Box>

diff --git a/webapp/src/components/App/Studies/ExportModal/ExportFilter/Filter/index.tsx b/webapp/src/components/App/Studies/ExportModal/ExportFilter/Filter/index.tsx
@@ -73,14 +73,12 @@ function Filter(props: PropTypes) {
       <TextField
         label={t("study.filterIn")}
         value={filterInValue}
-        variant="filled"
         onChange={(event) => setFilterInValue(event.target.value)}
         sx={{ m: 0, mb: 2, width: "95%" }}
       />
       <TextField
         label={t("study.filterOut")}
         value={filterOutValue}
-        variant="filled"
         onChange={(event) => setFilterOutValue(event.target.value)}
         sx={{ m: 0, mb: 2, width: "95%" }}
       />

diff --git a/webapp/src/components/App/Studies/ExportModal/ExportFilter/TagSelect/index.tsx b/webapp/src/components/App/Studies/ExportModal/ExportFilter/TagSelect/index.tsx
@@ -25,7 +25,6 @@ function TagSelect(props: PropTypes) {
         <TextField
           label={label}
           value={value}
-          variant="filled"
           onChange={(event) => setValue(event.target.value)}
           sx={{ m: 0, mr: 1, flex: 1 }}
         />

diff --git a/webapp/src/components/App/Studies/FilterDrawer.tsx b/webapp/src/components/App/Studies/FilterDrawer.tsx
@@ -4,7 +4,7 @@ import Toolbar from "@mui/material/Toolbar";
 import Divider from "@mui/material/Divider";
 import { Button, Drawer, List, ListItem, Typography } from "@mui/material";
 import { useEffect, useRef } from "react";
-import { STUDIES_FILTER_WIDTH } from "../../../theme";
+import { STUDIES_FILTER_WIDTH } from "../theme";
 import useAppSelector from "../../../redux/hooks/useAppSelector";
 import {
   getGroups,
@@ -93,7 +93,6 @@ function FilterDrawer(props: Props) {
           flexDirection="column"
           flexWrap="nowrap"
           boxSizing="border-box"
-          color="white"
         >
           <Typography sx={{ color: "grey.500", fontSize: "0.9em", mb: 2 }}>
             {t("global.filter").toUpperCase()}
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,7 +22,6 @@ function DetailsList({ items }: Props) { @@
         <List
           sx={{
             width: 1,
-            backgroundColor: "#222333",
           }}
         >
           {items.map((item) => (
@@ Expand Down @@