refactor(ui-imports): sort all imports

AntaresSimulatorTeam · Nov 4, 2024 · 7c26066 · 7c26066
1 parent 1bb2a2d
commit 7c26066
Show file tree

Hide file tree

Showing 375 changed files with 2,652 additions and 1,844 deletions.
diff --git a/installer b/installer
diff --git a/webapp/.eslintrc.cjs b/webapp/.eslintrc.cjs
@@ -105,6 +105,5 @@ module.exports = {
         ],
       },
     ],
-    "simple-import-sort/exports": "error",
   },
 };
diff --git a/webapp/package.json b/webapp/package.json
@@ -9,6 +9,7 @@
     "coverage": "vitest run --coverage",
     "dev": "vite",
     "lint": "tsc --noEmit && eslint . --ext ts,tsx --report-unused-disable-directives",
+    "lint:fix": "eslint . --fix",
     "preview": "vite preview",
     "test": "vitest",
     "test:ui": "vitest --ui"

diff --git a/webapp/src/components/App/Api.tsx b/webapp/src/components/App/Api.tsx
@@ -12,11 +12,14 @@
  * This file is part of the Antares project.
  */
 
-import { Box } from "@mui/material";
 import SwaggerUI from "swagger-ui-react";
-import "swagger-ui-react/swagger-ui.css";
+
+import { Box } from "@mui/material";
+
 import { getConfig } from "@/services/config";
 
+import "swagger-ui-react/swagger-ui.css";
+
 function Api() {
   return (
     <Box

diff --git a/webapp/src/components/App/Data/DataListing.tsx b/webapp/src/components/App/Data/DataListing.tsx
@@ -13,10 +13,12 @@
  */
 
 import { memo } from "react";
-import { Typography, Box, styled } from "@mui/material";
 import AutoSizer from "react-virtualized-auto-sizer";
-import { FixedSizeList, areEqual, ListChildComponentProps } from "react-window";
+import { areEqual, FixedSizeList, ListChildComponentProps } from "react-window";
+
 import ArrowRightIcon from "@mui/icons-material/ArrowRight";
+import { Box, styled, Typography } from "@mui/material";
+
 import { MatrixDataSetDTO } from "@/common/types";
 
 const ROW_ITEM_SIZE = 45;

diff --git a/webapp/src/components/App/Data/DataPropsView.tsx b/webapp/src/components/App/Data/DataPropsView.tsx
@@ -13,10 +13,12 @@
  */
 
 import { useState } from "react";
+
 import { MatrixDataSetDTO, MatrixInfoDTO } from "@/common/types";
+import PropertiesView from "@/components/common/PropertiesView";
+
 import DataListing from "./DataListing";
 import { StyledListingBox } from "./styles";
-import PropertiesView from "@/components/common/PropertiesView";
 
 interface PropTypes {
   dataset: MatrixDataSetDTO[];

diff --git a/webapp/src/components/App/Data/DatasetCreationDialog.tsx b/webapp/src/components/App/Data/DatasetCreationDialog.tsx
@@ -12,27 +12,30 @@
  * This file is part of the Antares project.
  */
 
-import { useState, useEffect, forwardRef, ChangeEvent } from "react";
+import { ChangeEvent, forwardRef, useEffect, useState } from "react";
+import axios, { AxiosError } from "axios";
+import { useSnackbar } from "notistack";
+import { useTranslation } from "react-i18next";
+
+import HelpIcon from "@mui/icons-material/Help";
 import {
   Box,
-  TextField,
-  Typography,
   Button,
   Checkbox,
   Chip,
+  TextField,
   Tooltip,
+  Typography,
 } from "@mui/material";
-import { useSnackbar } from "notistack";
-import { useTranslation } from "react-i18next";
-import axios, { AxiosError } from "axios";
-import HelpIcon from "@mui/icons-material/Help";
-import { getGroups } from "@/services/api/user";
+
 import { GroupDTO, MatrixDataSetDTO } from "@/common/types";
-import { saveMatrix } from "./utils";
-import useEnqueueErrorSnackbar from "@/hooks/useEnqueueErrorSnackbar";
-import { BoxParamHeader, BoxParam, ParamTitle } from "./styles";
 import BasicDialog from "@/components/common/dialogs/BasicDialog";
 import SimpleLoader from "@/components/common/loaders/SimpleLoader";
+import useEnqueueErrorSnackbar from "@/hooks/useEnqueueErrorSnackbar";
+import { getGroups } from "@/services/api/user";
+
+import { BoxParam, BoxParamHeader, ParamTitle } from "./styles";
+import { saveMatrix } from "./utils";
 
 interface PropTypes {
   open: boolean;

diff --git a/webapp/src/components/App/Data/MatrixDialog.tsx b/webapp/src/components/App/Data/MatrixDialog.tsx
@@ -12,13 +12,14 @@
  * This file is part of the Antares project.
  */
 
-import { useState, useEffect } from "react";
+import { useEffect, useState } from "react";
 import { AxiosError } from "axios";
 import { useTranslation } from "react-i18next";
+
 import { MatrixInfoDTO, MatrixType } from "@/common/types";
-import { getMatrix } from "@/services/api/matrix";
-import useEnqueueErrorSnackbar from "@/hooks/useEnqueueErrorSnackbar";
 import DataViewerDialog from "@/components/common/dialogs/DataViewerDialog";
+import useEnqueueErrorSnackbar from "@/hooks/useEnqueueErrorSnackbar";
+import { getMatrix } from "@/services/api/matrix";
 
 interface PropTypes {
   matrixInfo: MatrixInfoDTO;

diff --git a/webapp/src/components/App/Data/index.tsx b/webapp/src/components/App/Data/index.tsx
@@ -12,33 +12,36 @@
  * This file is part of the Antares project.
  */
 
-import { useState, useEffect } from "react";
+import { useEffect, useState } from "react";
 import { AxiosError } from "axios";
 import { useSnackbar } from "notistack";
 import { useTranslation } from "react-i18next";
+
 import DeleteIcon from "@mui/icons-material/Delete";
-import StorageIcon from "@mui/icons-material/Storage";
-import { Box, Typography, IconButton, Tooltip } from "@mui/material";
-import EditIcon from "@mui/icons-material/Edit";
 import DownloadIcon from "@mui/icons-material/Download";
-import DataPropsView from "./DataPropsView";
+import EditIcon from "@mui/icons-material/Edit";
+import StorageIcon from "@mui/icons-material/Storage";
+import { Box, IconButton, Tooltip, Typography } from "@mui/material";
+
+import { MatrixDataSetDTO, MatrixInfoDTO } from "@/common/types";
+import ConfirmationDialog from "@/components/common/dialogs/ConfirmationDialog";
+import FileTable from "@/components/common/FileTable";
+import SimpleLoader from "@/components/common/loaders/SimpleLoader";
+import RootPage from "@/components/common/page/RootPage";
+import SplitView from "@/components/common/SplitView";
+import useEnqueueErrorSnackbar from "@/hooks/useEnqueueErrorSnackbar";
+import useAppSelector from "@/redux/hooks/useAppSelector";
+import { getAuthUser } from "@/redux/selectors";
 import {
   deleteDataSet,
   exportMatrixDataset,
-  getMatrixList,
   getExportMatrixUrl,
+  getMatrixList,
 } from "@/services/api/matrix";
-import { MatrixInfoDTO, MatrixDataSetDTO } from "@/common/types";
+
+import DataPropsView from "./DataPropsView";
 import DatasetCreationDialog from "./DatasetCreationDialog";
 import MatrixDialog from "./MatrixDialog";
-import useEnqueueErrorSnackbar from "@/hooks/useEnqueueErrorSnackbar";
-import { getAuthUser } from "@/redux/selectors";
-import useAppSelector from "@/redux/hooks/useAppSelector";
-import ConfirmationDialog from "@/components/common/dialogs/ConfirmationDialog";
-import FileTable from "@/components/common/FileTable";
-import SimpleLoader from "@/components/common/loaders/SimpleLoader";
-import RootPage from "@/components/common/page/RootPage";
-import SplitView from "@/components/common/SplitView";
 
 function Data() {
   const [t] = useTranslation();

diff --git a/webapp/src/components/App/Data/styles.ts b/webapp/src/components/App/Data/styles.ts
@@ -12,8 +12,8 @@
  * This file is part of the Antares project.
  */
 
-import { styled, Box, Typography } from "@mui/material";
 import DownloadIcon from "@mui/icons-material/Download";
+import { Box, styled, Typography } from "@mui/material";
 
 export const BoxParamHeader = styled(Box)({
   width: "100%",

diff --git a/webapp/src/components/App/Data/utils.tsx b/webapp/src/components/App/Data/utils.tsx
@@ -19,9 +19,9 @@ import {
   MatrixInfoDTO,
 } from "@/common/types";
 import {
+  createDataSet,
   createMatrixByImportation,
   updateDataSet,
-  createDataSet,
 } from "@/services/api/matrix";
 
 const updateMatrix = async (

diff --git a/webapp/src/components/App/Settings/Groups/Header.tsx b/webapp/src/components/App/Settings/Groups/Header.tsx
@@ -12,15 +12,18 @@
  * This file is part of the Antares project.
  */
 
-import { Box, Button } from "@mui/material";
-import GroupAddIcon from "@mui/icons-material/GroupAdd";
-import { useTranslation } from "react-i18next";
 import { useState } from "react";
+import { useTranslation } from "react-i18next";
+
+import GroupAddIcon from "@mui/icons-material/GroupAdd";
+import { Box, Button } from "@mui/material";
+
 import { GroupDetailsDTO } from "@/common/types";
-import CreateGroupDialog from "./dialog/CreateGroupDialog";
-import { isAuthUserAdmin } from "@/redux/selectors";
-import useAppSelector from "@/redux/hooks/useAppSelector";
 import SearchFE from "@/components/common/fieldEditors/SearchFE";
+import useAppSelector from "@/redux/hooks/useAppSelector";
+import { isAuthUserAdmin } from "@/redux/selectors";
+
+import CreateGroupDialog from "./dialog/CreateGroupDialog";
 
 interface Props {
   setSearchValue: (v: string) => void;

diff --git a/webapp/src/components/App/Settings/Groups/dialog/CreateGroupDialog.tsx b/webapp/src/components/App/Settings/Groups/dialog/CreateGroupDialog.tsx
@@ -12,20 +12,23 @@
  * This file is part of the Antares project.
  */
 
-import GroupAddIcon from "@mui/icons-material/GroupAdd";
 import { useSnackbar } from "notistack";
 import { useTranslation } from "react-i18next";
 import { usePromise as usePromiseWrapper } from "react-use";
+
+import GroupAddIcon from "@mui/icons-material/GroupAdd";
+
 import {
   GroupDetailsDTO,
   GroupDTO,
   RoleDetailsDTO,
   UserDTO,
 } from "@/common/types";
+import { SubmitHandlerPlus } from "@/components/common/Form/types";
 import useEnqueueErrorSnackbar from "@/hooks/useEnqueueErrorSnackbar";
 import { createGroup, createRole } from "@/services/api/user";
+
 import GroupFormDialog, { GroupFormDialogProps } from "./GroupFormDialog";
-import { SubmitHandlerPlus } from "@/components/common/Form/types";
 
 type InheritPropsToOmit = "title" | "titleIcon" | "onSubmit" | "onCancel";
 

diff --git a/webapp/src/components/App/Settings/Groups/dialog/GroupFormDialog/GroupForm.tsx b/webapp/src/components/App/Settings/Groups/dialog/GroupFormDialog/GroupForm.tsx
@@ -12,44 +12,46 @@
  * This file is part of the Antares project.
  */
 
-import { useTranslation } from "react-i18next";
 import { useMemo, useRef, useState } from "react";
+import { Controller, useFieldArray } from "react-hook-form";
+import { useTranslation } from "react-i18next";
+import { v4 as uuidv4 } from "uuid";
+
+import DeleteIcon from "@mui/icons-material/Delete";
+import GroupIcon from "@mui/icons-material/Group";
 import {
-  TextField,
-  Typography,
-  Paper,
-  Select,
-  MenuItem,
   Box,
   Button,
-  InputLabel,
+  CircularProgress,
   FormControl,
-  ListItem,
   IconButton,
+  InputLabel,
   List,
+  ListItem,
   ListItemButton,
   ListItemIcon,
   ListItemText,
-  CircularProgress,
+  MenuItem,
+  Paper,
+  Select,
   SelectChangeEvent,
+  TextField,
+  Typography,
 } from "@mui/material";
-import { Controller, useFieldArray } from "react-hook-form";
-import { v4 as uuidv4 } from "uuid";
-import DeleteIcon from "@mui/icons-material/Delete";
-import GroupIcon from "@mui/icons-material/Group";
-import { RoleType, UserDTO } from "@/common/types";
-import { roleToString, sortByName } from "@/services/utils";
-import usePromise from "@/hooks/usePromise";
-import { getGroups, getUsers } from "@/services/api/user";
-import { getAuthUser } from "@/redux/selectors";
-import useAppSelector from "@/redux/hooks/useAppSelector";
-import { validateString } from "@/utils/validation/string";
-import { UseFormReturnPlus } from "@/components/common/Form/types";
+
 import {
   RESERVED_GROUP_NAMES,
   RESERVED_USER_NAMES,
   ROLE_TYPE_KEYS,
 } from "@/common/contants";
+import { RoleType, UserDTO } from "@/common/types";
+import { UseFormReturnPlus } from "@/components/common/Form/types";
+import usePromise from "@/hooks/usePromise";
+import useAppSelector from "@/redux/hooks/useAppSelector";
+import { getAuthUser } from "@/redux/selectors";
+import { getGroups, getUsers } from "@/services/api/user";
+import { roleToString, sortByName } from "@/services/utils";
+import { validateString } from "@/utils/validation/string";
 
 function GroupForm(props: UseFormReturnPlus) {
   const {

diff --git a/webapp/src/components/App/Settings/Groups/dialog/GroupFormDialog/index.tsx b/webapp/src/components/App/Settings/Groups/dialog/GroupFormDialog/index.tsx
@@ -12,10 +12,11 @@
  * This file is part of the Antares project.
  */
 
+import { RoleType, UserDTO } from "@/common/types";
 import FormDialog, {
   FormDialogProps,
 } from "@/components/common/dialogs/FormDialog";
-import { RoleType, UserDTO } from "@/common/types";
+
 import GroupForm from "./GroupForm";
 
 export interface GroupFormDialogProps

diff --git a/webapp/src/components/App/Settings/Groups/dialog/UpdateGroupDialog.tsx b/webapp/src/components/App/Settings/Groups/dialog/UpdateGroupDialog.tsx
@@ -12,23 +12,27 @@
  * This file is part of the Antares project.
  */
 
-import EditIcon from "@mui/icons-material/Edit";
 import { useMemo } from "react";
-import { useTranslation } from "react-i18next";
-import { usePromise as usePromiseWrapper } from "react-use";
 import { useSnackbar } from "notistack";
 import * as R from "ramda";
+import { useTranslation } from "react-i18next";
+import { usePromise as usePromiseWrapper } from "react-use";
+
+import EditIcon from "@mui/icons-material/Edit";
+
 import { GroupDetailsDTO } from "@/common/types";
+import { SubmitHandlerPlus } from "@/components/common/Form/types";
+import useEnqueueErrorSnackbar from "@/hooks/useEnqueueErrorSnackbar";
 import {
   createRole,
   deleteUserRole,
   getRolesForGroup,
   updateGroup,
 } from "@/services/api/user";
-import useEnqueueErrorSnackbar from "@/hooks/useEnqueueErrorSnackbar";
-import GroupFormDialog, { GroupFormDialogProps } from "./GroupFormDialog";
+
 import { GroupEdit } from "..";
-import { SubmitHandlerPlus } from "@/components/common/Form/types";
+
+import GroupFormDialog, { GroupFormDialogProps } from "./GroupFormDialog";
 
 type InheritPropsToOmit =
   | "title"
+2 −1		src/antares_web_installer/gui/controller.py
+2 −12		src/antares_web_installer/gui/model.py
+0 −4		src/antares_web_installer/gui/mvc.py
+2 −8		src/antares_web_installer/gui/view.py
+2 −7		src/antares_web_installer/gui/widgets/frame.py
-Original file line number
+Diff line change
@@ Expand Up / @@ -105,6 +105,5 @@ module.exports = { @@
             ],
           },
         ],
-        "simple-import-sort/exports": "error",
       },
     };