diff --git a/src/App.jsx b/src/App.jsx index cf32f89bccdead61506d4b26a08ab261f051bcf6..c80fca55c1b530ae8a76a3b0aa33383b3275f53c 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -2,6 +2,8 @@ import { useContext, useEffect } from "react"; import { Navigate, Route, Routes, BrowserRouter } from "react-router-dom"; import { StyledEngineProvider, CssBaseline } from "@mui/material"; import { ThemeProvider } from "@mui/material/styles"; +import { SnackbarProvider } from "notistack"; +import { AppErrorBoundary, GlobalAppBarContext } from "@ess-ics/ce-ui-common"; import { theme } from "./style/Theme"; import { IOCListView } from "./views/IOC/IOCListView"; import { NavigationMenu } from "./components/navigation/NavigationMenu"; @@ -11,10 +13,8 @@ import { UserProvider } from "./api/UserProvider"; import { HostListView } from "./views/host/HostListView"; import { HostDetailsAccessControl } from "./views/host/details/HostDetailsAccessControl"; import { HelpView } from "./views/help/HelpView"; -import { SnackbarProvider } from "notistack"; import { TokenRenew } from "./components/auth/TokenRenew"; import { NotFoundView } from "./components/navigation/NotFoundView"; -import { AppErrorBoundary, GlobalAppBarContext } from "@ess-ics/ce-ui-common"; import { LoginView } from "./views/login/LoginView"; import { JobLogAccessControl } from "./views/jobs/JobLogAccessControl"; import { RecordListView } from "./views/records/RecordListView"; diff --git a/src/api/APIProvider.jsx b/src/api/APIProvider.jsx index dcea6b92ebb5b0b9fea51ed75d18c4245cdc03ca..e42837520de4b715cf6549538075eb3207a2b8a3 100644 --- a/src/api/APIProvider.jsx +++ b/src/api/APIProvider.jsx @@ -4,8 +4,8 @@ */ import { APIProvider } from "@ess-ics/ce-ui-common"; import { node, arrayOf, oneOfType } from "prop-types"; -import env from "../config/env"; import { apiContext } from "./DeployApi"; +import env from "../config/env"; const propTypes = { /** Elements used as children */ diff --git a/src/api/APIProvider.spec.jsx b/src/api/APIProvider.spec.jsx index c67d3f967f930ad3b13365a610f108043181486e..a67bd8386abbd3fdf3e33763271b185937577e72 100644 --- a/src/api/APIProvider.spec.jsx +++ b/src/api/APIProvider.spec.jsx @@ -1,7 +1,7 @@ import { useContext } from "react"; +import { SnackbarProvider } from "notistack"; import { apiContext } from "./DeployApi"; import { DeployAPIProvider } from "./APIProvider"; -import { SnackbarProvider } from "notistack"; function AppHarness({ children }) { return ( diff --git a/src/api/UserProvider.spec.jsx b/src/api/UserProvider.spec.jsx index f35e60c1eb42fa0ec345dab4eee0a0f7649c2e3e..694323e4566ec8933554ebd51eceeea016c8a948 100644 --- a/src/api/UserProvider.spec.jsx +++ b/src/api/UserProvider.spec.jsx @@ -1,8 +1,8 @@ import { useContext } from "react"; -import { DeployAPIProvider } from "./APIProvider"; -import { UserProvider } from "./UserProvider"; import { userContext } from "@ess-ics/ce-ui-common"; import { SnackbarProvider } from "notistack"; +import { DeployAPIProvider } from "./APIProvider"; +import { UserProvider } from "./UserProvider"; function AppHarness({ children }) { return ( diff --git a/src/components/IOC/ChangeHostAdmin/ChangeHostAdmin.jsx b/src/components/IOC/ChangeHostAdmin/ChangeHostAdmin.jsx index ed1335c99ea028f6e5870e1c6d16c244f1337872..cab11f68aa3dc02eb59750452397191872e3c37e 100644 --- a/src/components/IOC/ChangeHostAdmin/ChangeHostAdmin.jsx +++ b/src/components/IOC/ChangeHostAdmin/ChangeHostAdmin.jsx @@ -1,5 +1,4 @@ import { useState, useEffect, useCallback, useContext, useMemo } from "react"; -import { AccessControl } from "../../auth/AccessControl"; import { ConfirmationDialog, useAPIMethod } from "@ess-ics/ce-ui-common"; import { Box, @@ -12,6 +11,7 @@ import { Alert, Autocomplete } from "@mui/material"; +import { AccessControl } from "../../auth/AccessControl"; import { useTypingTimer } from "../../common/SearchBoxFilter/TypingTimer"; import { apiContext } from "../../../api/DeployApi"; diff --git a/src/components/IOC/CreateIOC/CreateIOC.jsx b/src/components/IOC/CreateIOC/CreateIOC.jsx index 27592d9cdf4401738c420bc4f1dc8c2319543efe..7485950ba99d055448f2677e070b90f5fae4eb22 100644 --- a/src/components/IOC/CreateIOC/CreateIOC.jsx +++ b/src/components/IOC/CreateIOC/CreateIOC.jsx @@ -1,12 +1,6 @@ import { useMemo, useEffect, useState, useContext } from "react"; import { useNavigate } from "react-router-dom"; -import { useTypingTimer } from "../../common/SearchBoxFilter/TypingTimer"; -import { useCustomSnackbar } from "../../common/snackbar"; -import { RepositoryOptions } from "./RepositoryOptions"; -import { WITHOUT_REPO } from "./RepositoryType"; -import { RepositoryName } from "./RepositoryName"; import { RootPaper, useAPIMethod } from "@ess-ics/ce-ui-common"; - import { Alert, Autocomplete, @@ -17,6 +11,12 @@ import { TextField, Typography } from "@mui/material"; +import { RepositoryOptions } from "./RepositoryOptions"; +import { WITHOUT_REPO } from "./RepositoryType"; +import { RepositoryName } from "./RepositoryName"; +import { useTypingTimer } from "../../common/SearchBoxFilter/TypingTimer"; +import { useCustomSnackbar } from "../../common/snackbar"; + import { apiContext } from "../../../api/DeployApi"; import { getErrorMessage } from "../../common/Helper"; diff --git a/src/components/IOC/DeployIOC/DeployIOC.jsx b/src/components/IOC/DeployIOC/DeployIOC.jsx index d355e4981ec8d2f09479ba7b5c7a642d49b86f2e..0fdafd258de779b9f20ec345b23e672b47623e3e 100644 --- a/src/components/IOC/DeployIOC/DeployIOC.jsx +++ b/src/components/IOC/DeployIOC/DeployIOC.jsx @@ -1,8 +1,8 @@ import { useContext, useState, useEffect } from "react"; import { Navigate } from "react-router-dom"; +import { useAPIMethod } from "@ess-ics/ce-ui-common"; import { IOCDeployDialog } from "../IOCDeployDialog"; import { apiContext } from "../../../api/DeployApi"; -import { useAPIMethod } from "@ess-ics/ce-ui-common"; import { getErrorMessage } from "../../common/Helper"; // Process component diff --git a/src/components/IOC/IOCDelete/IOCDelete.jsx b/src/components/IOC/IOCDelete/IOCDelete.jsx index 15fa9fef47909dcada58164872693f97633db4f3..951dee72a2b9c5cf2540397f9bfab99b8f939567 100644 --- a/src/components/IOC/IOCDelete/IOCDelete.jsx +++ b/src/components/IOC/IOCDelete/IOCDelete.jsx @@ -1,9 +1,9 @@ import { useState, useEffect, useCallback, useContext, useMemo } from "react"; import { useNavigate } from "react-router-dom"; -import { useCustomSnackbar } from "../../common/snackbar"; import { Box, Button, Grid, Tooltip, Typography } from "@mui/material"; import { ConfirmDangerActionDialog, useAPIMethod } from "@ess-ics/ce-ui-common"; import Alert from "@mui/material/Alert"; +import { useCustomSnackbar } from "../../common/snackbar"; import { AccessControl } from "../../auth/AccessControl"; import { apiContext } from "../../../api/DeployApi"; diff --git a/src/components/IOC/IOCDetails/IOCDetails.jsx b/src/components/IOC/IOCDetails/IOCDetails.jsx index c9289725e92c9de177cf8977640cd1176d380587..788df40cafbad417dde4aabaacf794e653f7d40d 100644 --- a/src/components/IOC/IOCDetails/IOCDetails.jsx +++ b/src/components/IOC/IOCDetails/IOCDetails.jsx @@ -1,11 +1,11 @@ import { useMemo, useContext } from "react"; -import { apiContext } from "../../../api/DeployApi"; import { Grid, Box, Stack, Typography } from "@mui/material"; import { KeyValueTable, useAPIMethod, AlertBannerList } from "@ess-ics/ce-ui-common"; +import { apiContext } from "../../../api/DeployApi"; import { IOCStatus } from "../IOCStatus"; import { AccessControl } from "../../auth/AccessControl"; diff --git a/src/components/IOC/IOCLiveStatus/IOCLiveStatus.jsx b/src/components/IOC/IOCLiveStatus/IOCLiveStatus.jsx index 6201c5f6603a30e061b6f0a0b74e6df8af98991b..438717f9e21a59ee9308ad3579d20b10a7f8a07c 100644 --- a/src/components/IOC/IOCLiveStatus/IOCLiveStatus.jsx +++ b/src/components/IOC/IOCLiveStatus/IOCLiveStatus.jsx @@ -5,12 +5,12 @@ import { InternalLink, EmptyValue } from "@ess-ics/ce-ui-common"; +import { useSearchParams } from "react-router-dom"; import { IOCDetails } from "../IOCDetails"; import { LokiPanel } from "../../common/Loki/LokiPanel"; import { RecordSearch } from "../../records/RecordSearch"; import { GitRefLink } from "../../common/Git/GitRefLink"; import { AccessControl } from "../../auth/AccessControl"; -import { useSearchParams } from "react-router-dom"; export function IOCLiveStatus({ ioc }) { const [searchParams] = useSearchParams(); diff --git a/src/components/IOC/IOCManage/IOCManage.jsx b/src/components/IOC/IOCManage/IOCManage.jsx index d49ffad3e90604b7e6acd8688228a0a9ae49526d..d4e64791df7de6f8ca5ae05cd742fc00dbd763c3 100644 --- a/src/components/IOC/IOCManage/IOCManage.jsx +++ b/src/components/IOC/IOCManage/IOCManage.jsx @@ -1,14 +1,14 @@ import { Button, Stack, Tooltip, Typography } from "@mui/material"; import { useState, useEffect, useContext, useCallback, useMemo } from "react"; -import { IOCDetails } from "../IOCDetails"; -import { DeployIOC } from "../DeployIOC"; -import { UndeployIOC } from "../UndeployIOC"; import { userContext, useAPIMethod, ExternalLink, InternalLink } from "@ess-ics/ce-ui-common"; +import { IOCDetails } from "../IOCDetails"; +import { DeployIOC } from "../DeployIOC"; +import { UndeployIOC } from "../UndeployIOC"; import { AccessControl } from "../../auth/AccessControl"; import { DeploymentStatus } from "../../../api/DataTypes"; import { IOCService } from "../IOCService"; diff --git a/src/components/IOC/IOCService/IOCService.jsx b/src/components/IOC/IOCService/IOCService.jsx index 72d5e106206cf48a4ebe5c910ddcb646a3ac0e01..c2d9d1b61a5b0dc0298d73dcf9f319e4dd0fb558 100644 --- a/src/components/IOC/IOCService/IOCService.jsx +++ b/src/components/IOC/IOCService/IOCService.jsx @@ -3,14 +3,14 @@ import { LinearProgress, Grid, Typography, - Tooltip + Tooltip, + Alert } from "@mui/material"; import { useState, useEffect, useCallback } from "react"; +import { useNavigate } from "react-router-dom"; import { ConfirmationDialog } from "@ess-ics/ce-ui-common"; -import Alert from "@mui/material/Alert"; import { initRequestParams } from "../../common/Helper"; import { AccessControl } from "../../auth/AccessControl"; -import { useNavigate } from "react-router-dom"; import { useStartJobMutation } from "../../../store/deployApi"; import { getErrorMessage } from "../../common/Alerts/AlertsData"; diff --git a/src/components/IOC/IOCStatus/IOCStatus.jsx b/src/components/IOC/IOCStatus/IOCStatus.jsx index 27512bd2df7706c18fc3d0044ed33d1b484b6d6d..b961ca4eccdcf7cd7458360c5400888f6c881637 100644 --- a/src/components/IOC/IOCStatus/IOCStatus.jsx +++ b/src/components/IOC/IOCStatus/IOCStatus.jsx @@ -1,9 +1,9 @@ import { useContext, useMemo, useEffect } from "react"; import { Grid } from "@mui/material"; -import { Status } from "../../common/Status"; -import { apiContext } from "../../../api/DeployApi"; import { useAPIMethod } from "@ess-ics/ce-ui-common"; import { getIOCStatus } from "./IOCStatusData"; +import { Status } from "../../common/Status"; +import { apiContext } from "../../../api/DeployApi"; function createRequest(id) { return { diff --git a/src/components/IOC/IOCTable/IOCDescription.jsx b/src/components/IOC/IOCTable/IOCDescription.jsx index 6f2e5d3951882e591e4532ec4437706ccdded1c7..b19e331b6f789e1db425f4bed4b264199f691e3a 100644 --- a/src/components/IOC/IOCTable/IOCDescription.jsx +++ b/src/components/IOC/IOCTable/IOCDescription.jsx @@ -1,7 +1,7 @@ import { useContext, useMemo } from "react"; -import { apiContext } from "../../../api/DeployApi"; import { Skeleton } from "@mui/material"; import { useAPIMethod, EllipsisText, EmptyValue } from "@ess-ics/ce-ui-common"; +import { apiContext } from "../../../api/DeployApi"; function createIocDescription(description) { return ( diff --git a/src/components/IOC/UndeployIOC/UndeployIOC.jsx b/src/components/IOC/UndeployIOC/UndeployIOC.jsx index 95054c958d0a3e49dc0909459259668daf579f8e..f4b8f35cc189b1d0a4a07553232b013bec00e234 100644 --- a/src/components/IOC/UndeployIOC/UndeployIOC.jsx +++ b/src/components/IOC/UndeployIOC/UndeployIOC.jsx @@ -1,8 +1,8 @@ import { useContext, useState, useEffect } from "react"; import { Navigate } from "react-router-dom"; +import { useAPIMethod } from "@ess-ics/ce-ui-common"; import { IOCUndeployDialog } from "../IOCUndeployDialog"; import { apiContext } from "../../../api/DeployApi"; -import { useAPIMethod } from "@ess-ics/ce-ui-common"; import { getErrorMessage } from "../../common/Helper"; // Process component diff --git a/src/components/Job/JobDetails.tsx b/src/components/Job/JobDetails.tsx index 545022064b96aae6ab306b45a1dfbb60d3463226..ace93beeea3c7418dc77bdb88ec5fa35429d5546 100644 --- a/src/components/Job/JobDetails.tsx +++ b/src/components/Job/JobDetails.tsx @@ -1,5 +1,4 @@ import { useEffect, useState, useMemo } from "react"; -import { JobDetails, AwxJobDetails } from "../../store/deployApi"; import { Typography, Stack, Box } from "@mui/material"; import { KeyValueTable, @@ -15,9 +14,10 @@ import { AccessControl } from "@ess-ics/ce-ui-common"; import { ActionTypeIconText } from "./JobIcons"; +import { JobDetailsTable } from "./JobDetailsTable"; import { DeploymentJobOutput } from "../deployments/DeploymentJobOutput"; import { AWXJobDetails, Status } from "../../api/DataTypes"; -import { JobDetailsTable } from "./JobDetailsTable"; +import { JobDetails, AwxJobDetails } from "../../store/deployApi"; interface JobDetailsProps { jobDetail: JobDetails; diff --git a/src/components/Job/JobDetailsTable.jsx b/src/components/Job/JobDetailsTable.jsx index b0fd255100f523d94d4f6b85c2f009e522cfbea0..bf59b5cf0b76e67369ded23ee1ff70e43760ad02 100644 --- a/src/components/Job/JobDetailsTable.jsx +++ b/src/components/Job/JobDetailsTable.jsx @@ -1,4 +1,3 @@ -import { getNoOfIOCs, isBatchJob } from "./JobUtils"; import { EllipsisText, InternalLink, @@ -6,6 +5,7 @@ import { SimpleAccordion } from "@ess-ics/ce-ui-common"; import { Typography, Stack } from "@mui/material"; +import { getNoOfIOCs, isBatchJob } from "./JobUtils"; import { JobRevisionChip } from "./JobRevisionChip"; const columns = [ diff --git a/src/components/Job/JobGitRefIcon.tsx b/src/components/Job/JobGitRefIcon.tsx index 2bba36049ef7f3b5ddbfa01ef193a84f6514f551..b68e5002975c1268d851ccf98a6818b20e4c915f 100644 --- a/src/components/Job/JobGitRefIcon.tsx +++ b/src/components/Job/JobGitRefIcon.tsx @@ -1,5 +1,5 @@ -import { useGitReferenceTypeQuery } from "../../store/deployApi"; import { Skeleton } from "@mui/material"; +import { useGitReferenceTypeQuery } from "../../store/deployApi"; import { GitRefTypeIcon } from "../common/Git/GitRefTypeIcon"; interface JobGitRefIconProps { diff --git a/src/components/Job/JobGitRefLink.tsx b/src/components/Job/JobGitRefLink.tsx index 3d24c93497c7e853972648ceda4ce6716aa89e25..d83e5146b0c0604d3ef5b3e7f3a94e030cbcc3b2 100644 --- a/src/components/Job/JobGitRefLink.tsx +++ b/src/components/Job/JobGitRefLink.tsx @@ -1,9 +1,9 @@ +import { Skeleton } from "@mui/material"; import { useGitProjectDetailsQuery, useListTagsAndCommitIdsQuery } from "../../store/deployApi"; import { GitRefLink } from "../common/Git/GitRefLink"; -import { Skeleton } from "@mui/material"; interface JobGitRefLinkProps { gitReference: string; diff --git a/src/components/Job/JobTable/JobDetailsColumn.jsx b/src/components/Job/JobTable/JobDetailsColumn.jsx index f20c624509425dc3088c5bd2bcbb26766c016928..9fa29fd749fbbc0fd089f265a02f6157536e97c1 100644 --- a/src/components/Job/JobTable/JobDetailsColumn.jsx +++ b/src/components/Job/JobTable/JobDetailsColumn.jsx @@ -1,6 +1,6 @@ -import { getNoOfIOCs, isBatchJob } from "../JobUtils"; import { Stack, Typography } from "@mui/material"; import { InternalLink } from "@ess-ics/ce-ui-common"; +import { getNoOfIOCs, isBatchJob } from "../JobUtils"; import { ActionTypeIconText } from "../JobIcons"; import { ACTION_TYPES } from "../JobData"; import { JobRevisionChip } from "../JobRevisionChip"; diff --git a/src/components/Job/JobTable/JobStatusColumn.tsx b/src/components/Job/JobTable/JobStatusColumn.tsx index cd1dbea6daa6cac1d02f312d40f6a168cbd0c731..836c96491a47233cc50c837002087694b0be0763 100644 --- a/src/components/Job/JobTable/JobStatusColumn.tsx +++ b/src/components/Job/JobTable/JobStatusColumn.tsx @@ -1,6 +1,6 @@ import { Stack } from "@mui/material"; -import { JobStatus } from "../JobStatus"; import { StartAndDuration } from "@ess-ics/ce-ui-common"; +import { JobStatus } from "../JobStatus"; import { JobDetails } from "../../../store/deployApi"; interface JobStatusColumnProps { diff --git a/src/components/auth/TokenRenew/TokenRenew.jsx b/src/components/auth/TokenRenew/TokenRenew.jsx index 833e451c3175fc9937b3b0925e80506c0678f62f..8b79b7880b13396540c1d87d2a9d5f84a4e7ff3e 100644 --- a/src/components/auth/TokenRenew/TokenRenew.jsx +++ b/src/components/auth/TokenRenew/TokenRenew.jsx @@ -1,6 +1,6 @@ import { useContext, useCallback } from "react"; -import { apiContext } from "../../../api/DeployApi"; import { userContext, useAPIMethod, usePolling } from "@ess-ics/ce-ui-common"; +import { apiContext } from "../../../api/DeployApi"; import env from "../../../config/env"; export const TokenRenew = () => { diff --git a/src/components/common/Alerts/ApiAlertError.tsx b/src/components/common/Alerts/ApiAlertError.tsx index d36854ba925c3d18027f138e0c0fb19ad8c9c1e9..a59fdc8e63cbe0df57d66d73a5277ac0d9bc5ab8 100644 --- a/src/components/common/Alerts/ApiAlertError.tsx +++ b/src/components/common/Alerts/ApiAlertError.tsx @@ -1,6 +1,6 @@ import { Alert } from "@mui/material"; -import { ApiError } from "../../../types/common"; import { getErrorMessage } from "./AlertsData"; +import { ApiError } from "../../../types/common"; interface ApiAlertErrorProps { error: ApiError; diff --git a/src/components/common/LogStream/LogStreamConsoleDialog.tsx b/src/components/common/LogStream/LogStreamConsoleDialog.tsx index 3140328d5d963920ed86c4612d9e8a3a2ab8149e..caac80851a6e773eaea3153d046e80eb0f58d674 100644 --- a/src/components/common/LogStream/LogStreamConsoleDialog.tsx +++ b/src/components/common/LogStream/LogStreamConsoleDialog.tsx @@ -1,6 +1,6 @@ import { Dialog } from "@ess-ics/ce-ui-common"; -import { LogStreamConsole } from "./LogStreamConsole"; import { Typography, LinearProgress, Container } from "@mui/material"; +import { LogStreamConsole } from "./LogStreamConsole"; interface LogStreamConsoleDialogProps { title: string; diff --git a/src/components/common/Loki/LokiPanel.jsx b/src/components/common/Loki/LokiPanel.jsx index 3600273987f3e637c752e83c5db11570475a00eb..8cb6b5167d27611c29613b9100a1ba9daca0a8d0 100644 --- a/src/components/common/Loki/LokiPanel.jsx +++ b/src/components/common/Loki/LokiPanel.jsx @@ -1,18 +1,18 @@ import { useState, useEffect, useCallback, useMemo } from "react"; +import { Stack, LinearProgress, Box } from "@mui/material"; +import { closeSnackbar } from "notistack"; +import { formatDateAndTime } from "@ess-ics/ce-ui-common"; +import Convert from "ansi-to-html"; import { useLazyFetchSyslogLinesQuery, useLazyFetchProcServLogLinesQuery } from "../../../store/deployApi"; import { ApiAlertError } from "../Alerts/ApiAlertError"; -import { Stack, LinearProgress, Box } from "@mui/material"; import { LogStreamConsole } from "../LogStream/LogStreamConsole"; import { LogStreamConsoleDialog } from "../LogStream/LogStreamConsoleDialog"; import { TimeRange } from "../Inputs/TimeRange"; import { PopoutButton } from "../Buttons/PopoutButton"; import { useCustomSnackbar } from "../snackbar/Snackbar"; -import { closeSnackbar } from "notistack"; -import { formatDateAndTime } from "@ess-ics/ce-ui-common"; -import Convert from "ansi-to-html"; import { isAbortError } from "../Helper"; const TIME_RANGE_VALUES = [ diff --git a/src/components/common/SearchBoxFilter/SearchBoxFilter.jsx b/src/components/common/SearchBoxFilter/SearchBoxFilter.jsx index 8c0618e7d01bc3e7e22575410fec822dfe2b112f..aac142ddd5e72b9a7b895f0bc3de075e94625cde 100644 --- a/src/components/common/SearchBoxFilter/SearchBoxFilter.jsx +++ b/src/components/common/SearchBoxFilter/SearchBoxFilter.jsx @@ -1,8 +1,8 @@ import { useState, useEffect } from "react"; import { styled } from "@mui/material/styles"; import { Container, List, ListItem, Paper, TextField } from "@mui/material"; -import { useTypingTimer } from "./TypingTimer"; import { useUniqueKeys } from "@ess-ics/ce-ui-common"; +import { useTypingTimer } from "./TypingTimer"; const PREFIX = "SearchBoxFilter"; diff --git a/src/components/common/Status/Status.jsx b/src/components/common/Status/Status.jsx index 8d26d90094b4f89092dfea0944ce606e6a74ec6c..0b1e669f1270c730fb0e79ff2147f6612f9ef498 100644 --- a/src/components/common/Status/Status.jsx +++ b/src/components/common/Status/Status.jsx @@ -1,6 +1,5 @@ import { useState, useEffect } from "react"; import { LabeledIcon } from "@ess-ics/ce-ui-common"; -import { Popover } from "../../common/Popover"; import { object, bool, array, func } from "prop-types"; import { useTheme, Skeleton } from "@mui/material"; import { PlayCircleFilled, PauseCircleFilled } from "@mui/icons-material"; @@ -8,6 +7,7 @@ import { StatusPopoverContent } from "./StatusPopoverContent"; import { StatusBadge } from "./StatusBadge"; import { StatusIcon } from "./StatusIcon"; import { statusesWithAlerts, statusConfig } from "./StatusData"; +import { Popover } from "../../common/Popover"; const propsTypes = { state: object, diff --git a/src/components/common/Status/StatusBadge.jsx b/src/components/common/Status/StatusBadge.jsx index cd203a349189b12a82e54c3073d01511571f078d..c3dfa9120d4e630572f87341f384cd3542818f09 100644 --- a/src/components/common/Status/StatusBadge.jsx +++ b/src/components/common/Status/StatusBadge.jsx @@ -1,8 +1,8 @@ import { string, object, arrayOf, oneOfType, node } from "prop-types"; -import { STATUS } from "./StatusData"; import { Stack } from "@mui/material"; import WarningAmberIcon from "@mui/icons-material/WarningAmber"; import ErrorOutlineIcon from "@mui/icons-material/ErrorOutline"; +import { STATUS } from "./StatusData"; const propTypes = { status: string, diff --git a/src/components/common/Status/StatusPopoverContent.jsx b/src/components/common/Status/StatusPopoverContent.jsx index fe0f8a970ede4e81f3b576b69fdf1af22e412a6a..5f139799697bb17ae4ee07143766610fafb81a81 100644 --- a/src/components/common/Status/StatusPopoverContent.jsx +++ b/src/components/common/Status/StatusPopoverContent.jsx @@ -1,7 +1,7 @@ import { string, arrayOf, object } from "prop-types"; -import { SEVERITY } from "./StatusData"; import { Typography, Stack } from "@mui/material"; import { AlertBanner, useUniqueKeys } from "@ess-ics/ce-ui-common"; +import { SEVERITY } from "./StatusData"; const propsTypes = { title: string, diff --git a/src/components/common/User/UserAvatar.jsx b/src/components/common/User/UserAvatar.jsx index 9363c44b1ce11ffe4a51fa4c205c15566e3e3b29..14d47ced787520dde6f1484222a45f13ba92cabe 100644 --- a/src/components/common/User/UserAvatar.jsx +++ b/src/components/common/User/UserAvatar.jsx @@ -1,8 +1,8 @@ import { useAPIMethod, userContext } from "@ess-ics/ce-ui-common"; import { Avatar, Tooltip, styled } from "@mui/material"; import { useContext, useEffect, useMemo } from "react"; -import { apiContext } from "../../../api/DeployApi"; import { Link } from "react-router-dom"; +import { apiContext } from "../../../api/DeployApi"; const unpacker = (data) => { if (data) { diff --git a/src/components/common/User/UserOperationList.jsx b/src/components/common/User/UserOperationList.jsx index 91f3fb0fa37fe275a905434111e543c8e0eb87f1..23991c7b021ac675accd0d04b514ade7fec92fde 100644 --- a/src/components/common/User/UserOperationList.jsx +++ b/src/components/common/User/UserOperationList.jsx @@ -1,9 +1,9 @@ import { useCallback, useContext, useEffect } from "react"; import { Card, CardHeader } from "@mui/material"; +import { useAPIMethod, usePagination, usePolling } from "@ess-ics/ce-ui-common"; import { initRequestParams } from "../Helper"; import { JobTable } from "../../Job"; import { apiContext } from "../../../api/DeployApi"; -import { useAPIMethod, usePagination, usePolling } from "@ess-ics/ce-ui-common"; import { ROWS_PER_PAGE } from "../../../constants"; export function UserOperationList({ userName }) { diff --git a/src/components/common/User/UserProfile.tsx b/src/components/common/User/UserProfile.tsx index 065e7e3baac374950559a4c79b5554ea88fd1221..a153ba1bba1c129074ecd197eabd25cffaed1128 100644 --- a/src/components/common/User/UserProfile.tsx +++ b/src/components/common/User/UserProfile.tsx @@ -1,5 +1,5 @@ -import { UserInfoResponse } from "../../../store/deployApi"; import { Avatar, Box, Typography, Stack } from "@mui/material"; +import { UserInfoResponse } from "../../../store/deployApi"; interface UserProfileProps { userInfo: UserInfoResponse; diff --git a/src/components/deployments/DeploymentIcons.jsx b/src/components/deployments/DeploymentIcons.jsx index 196c34106125c95df00f26869b957884a5c56e58..2b2184e5de5a6f6abf0fd35ae68ea16eaf22b476 100644 --- a/src/components/deployments/DeploymentIcons.jsx +++ b/src/components/deployments/DeploymentIcons.jsx @@ -6,8 +6,8 @@ import { AddCircleOutline, RemoveCircleOutline } from "@mui/icons-material"; -import { theme } from "../../style/Theme"; import { LabeledIcon } from "@ess-ics/ce-ui-common"; +import { theme } from "../../style/Theme"; export function DeploymentStatusIcon({ status }) { const deploymentStatusIcons = { diff --git a/src/components/deployments/DeploymentJobOutput.jsx b/src/components/deployments/DeploymentJobOutput.jsx index df80b2ed48f98630ac4ee7da36056e91fe254246..5d20b54a5c951cd1a502a06c947c606ba68d09f0 100644 --- a/src/components/deployments/DeploymentJobOutput.jsx +++ b/src/components/deployments/DeploymentJobOutput.jsx @@ -1,8 +1,8 @@ import { useState, useRef, useEffect, useMemo } from "react"; +import { Alert, LinearProgress, Stack } from "@mui/material"; import { LogStreamConsole } from "../common/LogStream/LogStreamConsole"; import { LogStreamConsoleDialog } from "../common/LogStream/LogStreamConsoleDialog"; import { PopoutButton } from "../common/Buttons/PopoutButton"; -import { Alert, LinearProgress, Stack } from "@mui/material"; import { getErrorMessage, isAbortError } from "../common/Helper"; import { useLazyFetchDeploymentJobLogQuery } from "../../store/deployApi"; diff --git a/src/components/host/HostStatus/HostStatus.jsx b/src/components/host/HostStatus/HostStatus.jsx index d46bba7c11d47ee6b67a5c8bfa08ce40daa1629e..d3e5d052f3024ca1249f77157ea23ebcf1181ed3 100644 --- a/src/components/host/HostStatus/HostStatus.jsx +++ b/src/components/host/HostStatus/HostStatus.jsx @@ -1,7 +1,7 @@ import { useContext, useMemo, useEffect } from "react"; -import { apiContext } from "../../../api/DeployApi"; import { useAPIMethod } from "@ess-ics/ce-ui-common"; import { getHostStatus } from "./HostStatusData"; +import { apiContext } from "../../../api/DeployApi"; import { Status } from "../../common/Status"; function createRequest(hostId) { diff --git a/src/components/navigation/LoginSuggester/LoginSuggester.jsx b/src/components/navigation/LoginSuggester/LoginSuggester.jsx index f8632a178faf9f22ecaf38d475e598e7c39e4d41..8b4a5ae7d5d421b5472dcc5e7a01ba9e32b7ffff 100644 --- a/src/components/navigation/LoginSuggester/LoginSuggester.jsx +++ b/src/components/navigation/LoginSuggester/LoginSuggester.jsx @@ -1,8 +1,8 @@ import { useContext, useEffect, useCallback, useState } from "react"; import { CookiesProvider, useCookies } from "react-cookie"; import { userContext } from "@ess-ics/ce-ui-common"; -import { useEffectOnMount } from "../../../hooks/MountEffects"; import { useNavigate } from "react-router-dom"; +import { useEffectOnMount } from "../../../hooks/MountEffects"; export function LoginSuggester({ children }) { const navigate = useNavigate(); diff --git a/src/components/navigation/NavigationMenu/NavigationMenu.jsx b/src/components/navigation/NavigationMenu/NavigationMenu.jsx index 2402dedd61e5b6a88788fe423b261d050fa1279f..49930428927520777660e4c5c95639c10401a33e 100644 --- a/src/components/navigation/NavigationMenu/NavigationMenu.jsx +++ b/src/components/navigation/NavigationMenu/NavigationMenu.jsx @@ -24,11 +24,11 @@ import { Tooltip } from "@mui/material"; import { useNavigate } from "react-router"; -import { applicationTitle } from "../../common/Helper"; -import { LoginControls } from "./LoginControls"; import { Link } from "react-router-dom"; -import { CCCEControlSymbol } from "../../../icons/CCCEControlSymbol"; +import { LoginControls } from "./LoginControls"; import { CreateIOCButton } from "./CreateIOCButton"; +import { applicationTitle } from "../../common/Helper"; +import { CCCEControlSymbol } from "../../../icons/CCCEControlSymbol"; import { theme } from "../../../style/Theme"; import { apiContext } from "../../../api/DeployApi"; diff --git a/src/components/records/RecordHostLink.jsx b/src/components/records/RecordHostLink.jsx index 135a2dde90fa04caf2c425c1494e5884b9f0fdfa..339544a3dd3640118af42ba1c3aff99259ccdb3e 100644 --- a/src/components/records/RecordHostLink.jsx +++ b/src/components/records/RecordHostLink.jsx @@ -1,12 +1,12 @@ import { useContext, useMemo } from "react"; import { Grid, Skeleton, Typography } from "@mui/material"; -import { apiContext } from "../../api/DeployApi"; import { useAPIMethod, InternalLink, EllipsisText, EmptyValue } from "@ess-ics/ce-ui-common"; +import { apiContext } from "../../api/DeployApi"; function createRequest(fqdn) { return { diff --git a/src/components/records/RecordSearch.jsx b/src/components/records/RecordSearch.jsx index 81be8c0bc5202cb2b0178e98e0905cb6c5a1ea54..45d8b4371fed41abbaa32b779be77e14774fafe2 100644 --- a/src/components/records/RecordSearch.jsx +++ b/src/components/records/RecordSearch.jsx @@ -1,9 +1,9 @@ import { useEffect, useCallback, useState } from "react"; -import { initRequestParams } from "../common/Helper"; -import { RecordTable } from "./RecordTable"; import { useSearchParams } from "react-router-dom"; import { Grid, Tabs, Tab } from "@mui/material"; import { usePagination, SearchBar } from "@ess-ics/ce-ui-common"; +import { RecordTable } from "./RecordTable"; +import { initRequestParams } from "../common/Helper"; import { ROWS_PER_PAGE } from "../../constants"; import { useLazyFindAllRecordsQuery } from "../../store/deployApi"; diff --git a/src/components/records/RecordTable.jsx b/src/components/records/RecordTable.jsx index a049149bb87f1011f2feb4667d1800e689f3ba23..58833e6833b4e28fd059086a66d9cb5055b39817 100644 --- a/src/components/records/RecordTable.jsx +++ b/src/components/records/RecordTable.jsx @@ -4,8 +4,8 @@ import { EllipsisText, EmptyValue } from "@ess-ics/ce-ui-common"; -import { RecordStatusIcon } from "./RecordIcons"; import { Grid } from "@mui/material"; +import { RecordStatusIcon } from "./RecordIcons"; import { RecordHostLink } from "./RecordHostLink"; const recordsColumns = [ diff --git a/src/icons/RocketLaunch.jsx b/src/icons/RocketLaunch.jsx index bbb86db8131ed0ad43d73251797d6e21a23bf68c..c960e88b04fd62640c0a8f7ef603756c8ce64fff 100644 --- a/src/icons/RocketLaunch.jsx +++ b/src/icons/RocketLaunch.jsx @@ -1,5 +1,5 @@ -import { ReactComponent as RocketLaunchBlack } from "./resources/rocket/rocket_launch_black_24dp.svg?react"; import { Tooltip } from "@mui/material"; +import { ReactComponent as RocketLaunchBlack } from "./resources/rocket/rocket_launch_black_24dp.svg?react"; export function RocketLaunch(props) { return ( diff --git a/src/index.jsx b/src/index.jsx index 5768ea6fbdb7ce948910f2037baf4d827326ea37..2e8d054f9078eb509530d2e918fa5231c1eaef16 100644 --- a/src/index.jsx +++ b/src/index.jsx @@ -1,7 +1,7 @@ import { StrictMode } from "react"; import { createRoot } from "react-dom/client"; -import App from "./App"; import { LicenseInfo } from "@mui/x-license-pro"; +import App from "./App"; // Set license key LicenseInfo.setLicenseKey(import.meta.env.VITE_APP_MUI_PRO_LICENSE_KEY); diff --git a/src/mocks/AppHarness.jsx b/src/mocks/AppHarness.jsx index e9ee04aa8be5b595e15749475542f0b8ef0dc33a..cc72b991ce8cac0b825120d8ae61f266f90f3d04 100644 --- a/src/mocks/AppHarness.jsx +++ b/src/mocks/AppHarness.jsx @@ -1,12 +1,12 @@ import { SnackbarProvider } from "notistack"; import { Container, CssBaseline, StyledEngineProvider } from "@mui/material"; import { ThemeProvider } from "@mui/material/styles"; +import { MemoryRouter } from "react-router-dom"; +import { TestUserProvider, UserImpersonator } from "./UserImpersonator"; import { theme } from "../style/Theme"; import { UserProvider } from "../api/UserProvider"; import { NavigationMenu } from "../components/navigation/NavigationMenu"; -import { MemoryRouter } from "react-router-dom"; import { DeployAPIProvider } from "../api/APIProvider"; -import { TestUserProvider, UserImpersonator } from "./UserImpersonator"; import { ReduxProvider } from "../store/ReduxProvider"; export function RouterHarness({ children, initialHistory = ["/"] }) { diff --git a/src/mocks/UserImpersonator.jsx b/src/mocks/UserImpersonator.jsx index 402e2d69c2a03b28ff1bfe982ce4636d8075d295..71f85e4194e54cdca3b616b465bf6a45f8ade5c6 100644 --- a/src/mocks/UserImpersonator.jsx +++ b/src/mocks/UserImpersonator.jsx @@ -1,6 +1,6 @@ import { useCallback, useContext, useEffect, useMemo, useState } from "react"; -import { defaultUser, defaultUserRoles } from "../stories/utils/common-args"; import { userContext } from "@ess-ics/ce-ui-common"; +import { defaultUser, defaultUserRoles } from "../stories/utils/common-args"; const testAuthContext = userContext; diff --git a/src/mocks/browser.js b/src/mocks/browser.js index 24f87fb5fa7a44344ed625faa92ec0c5d6542a52..bcd82e48b4c5279eeec71dec7f10446037543f53 100644 --- a/src/mocks/browser.js +++ b/src/mocks/browser.js @@ -1,4 +1,4 @@ -import { handlers } from "./handlers"; import { setupWorker } from "msw/browser"; +import { handlers } from "./handlers"; export const worker = setupWorker(...handlers); diff --git a/src/stories/components/common/IOC/IOCTable.stories.jsx b/src/stories/components/common/IOC/IOCTable.stories.jsx index 004c4e03178d25ffec7f9d40717ce92d1e85aaad..e64c16abd8677aff7484eef3f4de48f87738d197 100644 --- a/src/stories/components/common/IOC/IOCTable.stories.jsx +++ b/src/stories/components/common/IOC/IOCTable.stories.jsx @@ -1,7 +1,7 @@ -import { IOCTable } from "../../../../components/IOC/IOCTable"; import { Box } from "@mui/material"; -import iocs from "../../../../mocks/fixtures/PagedIOCResponse.json"; import { http } from "msw"; +import { IOCTable } from "../../../../components/IOC/IOCTable"; +import iocs from "../../../../mocks/fixtures/PagedIOCResponse.json"; import { RouterHarness } from "../../../../mocks/AppHarness"; import { hideStorybookControls, diff --git a/src/stories/components/common/host/HostTable.stories.jsx b/src/stories/components/common/host/HostTable.stories.jsx index bb7d0fc5fb1f4e89df1065e91cedc3715e244c3f..3d39d1ed39a589cf5a9166fc54e62be503c2a4a8 100644 --- a/src/stories/components/common/host/HostTable.stories.jsx +++ b/src/stories/components/common/host/HostTable.stories.jsx @@ -1,6 +1,6 @@ import { Container } from "@mui/material"; -import hosts from "../../../../mocks/fixtures/Hosts.json"; import { http } from "msw"; +import hosts from "../../../../mocks/fixtures/Hosts.json"; import { HostTable } from "../../../../components/host/HostTable"; import { RouterHarness } from "../../../../mocks/AppHarness"; import { diff --git a/src/stories/components/common/job/JobTable.stories.jsx b/src/stories/components/common/job/JobTable.stories.jsx index fbfd22615455e1a66bfbd4ca3ff25a751e059393..6b0dc2d83e66c8b844b577a2a058ecd573615c8c 100644 --- a/src/stories/components/common/job/JobTable.stories.jsx +++ b/src/stories/components/common/job/JobTable.stories.jsx @@ -1,10 +1,10 @@ +import { Box } from "@mui/material"; import { RouterHarness } from "../../../../mocks/AppHarness"; import { JobTable } from "../../../../components/Job/JobTable"; import { hideStorybookControls, paginationNoResults } from "../../../utils/common-args"; -import { Box } from "@mui/material"; import operationList from "../../../../mocks/fixtures/Jobs.json"; export default { diff --git a/src/stories/views/IOC/CreateIocView.stories.jsx b/src/stories/views/IOC/CreateIocView.stories.jsx index 412ef380e17235c261926ed4e886cf1f44265d74..3b4aa6707592a99a7adf26e069488d1160878cd2 100644 --- a/src/stories/views/IOC/CreateIocView.stories.jsx +++ b/src/stories/views/IOC/CreateIocView.stories.jsx @@ -1,6 +1,6 @@ +import { http } from "msw"; import { AppHarness } from "../../../mocks/AppHarness"; import { CreateIOCView } from "../../../views/IOC/CreateIOCView"; -import { http } from "msw"; import { handlers } from "../../../mocks/handlers"; import { userImpersonatorArgs } from "../../utils/common-args"; import general_exception from "../../../mocks/fixtures/GeneralException.json"; diff --git a/src/stories/views/IOC/IocListView.stories.jsx b/src/stories/views/IOC/IocListView.stories.jsx index 21e309fdc0c09c97795220b44f87566cb94902b5..63b5307f17ad724bed2f77150aa61d10fe31161c 100644 --- a/src/stories/views/IOC/IocListView.stories.jsx +++ b/src/stories/views/IOC/IocListView.stories.jsx @@ -1,5 +1,5 @@ -import { AppHarness } from "../../../mocks/AppHarness"; import { http } from "msw"; +import { AppHarness } from "../../../mocks/AppHarness"; import { handlers } from "../../../mocks/handlers"; import { IOCListView } from "../../../views/IOC/IOCListView"; diff --git a/src/views/IOC/CreateIOCAccessControl.jsx b/src/views/IOC/CreateIOCAccessControl.jsx index dccaa7467827e68c7228d096ab438bff60d1f408..1af87b467455115fa9f7d6749caa7c8969851cee 100644 --- a/src/views/IOC/CreateIOCAccessControl.jsx +++ b/src/views/IOC/CreateIOCAccessControl.jsx @@ -1,6 +1,6 @@ import { AccessControl } from "@ess-ics/ce-ui-common"; -import { CreateIOCView } from "./CreateIOCView"; import { Navigate } from "react-router-dom"; +import { CreateIOCView } from "./CreateIOCView"; export const CreateIOCAccessControl = () => { return ( diff --git a/src/views/IOC/CreateIOCView.jsx b/src/views/IOC/CreateIOCView.jsx index 0aa9eca657893b025423830d79d621834e0d7c52..667a9ab3f5d3caed01faedbf6ea52a34fe3d2744 100644 --- a/src/views/IOC/CreateIOCView.jsx +++ b/src/views/IOC/CreateIOCView.jsx @@ -1,7 +1,7 @@ import { GlobalAppBarContext } from "@ess-ics/ce-ui-common"; +import { useContext, useEffect } from "react"; import { applicationTitle } from "../../components/common/Helper"; import { CreateIOC } from "../../components/IOC/CreateIOC"; -import { useContext, useEffect } from "react"; export const CreateIOCView = () => { const { setTitle } = useContext(GlobalAppBarContext); diff --git a/src/views/IOC/IOCDetailsAccessControl.jsx b/src/views/IOC/IOCDetailsAccessControl.jsx index c2e57ad01fcb1cf218a55ca3e98b8390f4ff6332..cc22e3a04ebab75c8ee7ba7afbf87f80265d8fe1 100644 --- a/src/views/IOC/IOCDetailsAccessControl.jsx +++ b/src/views/IOC/IOCDetailsAccessControl.jsx @@ -1,7 +1,7 @@ import { RootPaper } from "@ess-ics/ce-ui-common"; -import { AccessControl } from "../../components/auth/AccessControl"; -import { IOCDetailsContainer } from "./IOCDetailsContainer"; import { useParams } from "react-router-dom"; +import { IOCDetailsContainer } from "./IOCDetailsContainer"; +import { AccessControl } from "../../components/auth/AccessControl"; export function IOCDetailsAccessControl() { const { id } = useParams(); diff --git a/src/views/IOC/IOCDetailsContainer.jsx b/src/views/IOC/IOCDetailsContainer.jsx index c1aff22189744d6c85795d6de138141b9bc0c86e..c3bcf7c23332f5b97a27d2768b0fbf86ab960add 100644 --- a/src/views/IOC/IOCDetailsContainer.jsx +++ b/src/views/IOC/IOCDetailsContainer.jsx @@ -1,9 +1,9 @@ import { useEffect, useContext, useState, useMemo } from "react"; -import { IOCDetailsView } from "./IOCDetailsView"; import { LinearProgress } from "@mui/material"; +import { useAPIMethod } from "@ess-ics/ce-ui-common"; +import { IOCDetailsView } from "./IOCDetailsView"; import { NotFoundView } from "../../components/navigation/NotFoundView/NotFoundView"; import { onFetchEntityError } from "../../components/common/Helper"; -import { useAPIMethod } from "@ess-ics/ce-ui-common"; import { apiContext } from "../../api/DeployApi"; export function IOCDetailsContainer({ id }) { diff --git a/src/views/IOC/IOCDetailsView.jsx b/src/views/IOC/IOCDetailsView.jsx index 98d8a0771ae1fc52e6bda2ab26c2c00d06dc0e99..04184d99de7ef47b163bda3216cd8db8e1f0f956 100644 --- a/src/views/IOC/IOCDetailsView.jsx +++ b/src/views/IOC/IOCDetailsView.jsx @@ -1,14 +1,7 @@ import { Grid, IconButton, Stack } from "@mui/material"; import ArrowBackIcon from "@mui/icons-material/ArrowBack"; import { useCallback, useContext, useEffect, useMemo, useState } from "react"; -import { IOCLiveStatus } from "../../components/IOC/IOCLiveStatus"; -import { IOCManage } from "../../components/IOC/IOCManage"; import { useNavigate } from "react-router-dom"; -import { IOCAdmin } from "../../components/IOC/IOCAdmin"; -import { - applicationTitle, - initRequestParams -} from "../../components/common/Helper"; import { GlobalAppBarContext, useAPIMethod, @@ -17,6 +10,13 @@ import { usePagination, usePolling } from "@ess-ics/ce-ui-common"; +import { IOCLiveStatus } from "../../components/IOC/IOCLiveStatus"; +import { IOCManage } from "../../components/IOC/IOCManage"; +import { IOCAdmin } from "../../components/IOC/IOCAdmin"; +import { + applicationTitle, + initRequestParams +} from "../../components/common/Helper"; import { apiContext } from "../../api/DeployApi"; import { ROWS_PER_PAGE } from "../../constants"; diff --git a/src/views/IOC/IOCListView.tsx b/src/views/IOC/IOCListView.tsx index b7acf9f18788fa9b3c9eb1f04ae008a510b3f83f..b28bb7724b77aaebd5d625fb826593268727c4e5 100644 --- a/src/views/IOC/IOCListView.tsx +++ b/src/views/IOC/IOCListView.tsx @@ -1,19 +1,19 @@ import { useState, useEffect, useCallback } from "react"; -import { useLazyListIocsQuery, ListIocsApiArg } from "../../store/deployApi"; import { useGlobalAppBarContext, RootPaper, usePagination, SearchBar } from "@ess-ics/ce-ui-common"; +import { useSearchParams } from "react-router-dom"; +import { Container, Grid, Tabs, Tab } from "@mui/material"; +import { useLazyListIocsQuery, ListIocsApiArg } from "../../store/deployApi"; import { applicationTitle, initRequestParams } from "../../components/common/Helper"; -import { useSearchParams } from "react-router-dom"; import { GlobalAppBarContext, OnPageParams } from "../../types/common"; import { ApiAlertError } from "../../components/common/Alerts/ApiAlertError"; -import { Container, Grid, Tabs, Tab } from "@mui/material"; import { IOCTable } from "../../components/IOC/IOCTable"; import { ROWS_PER_PAGE } from "../../constants"; diff --git a/src/views/UserPage/UserDetailsAccessControl.jsx b/src/views/UserPage/UserDetailsAccessControl.jsx index a919e3202e3436bbc0f5ddcda650c03e32fe8907..fa64a39fee66775e263d309b4497642beea7972a 100644 --- a/src/views/UserPage/UserDetailsAccessControl.jsx +++ b/src/views/UserPage/UserDetailsAccessControl.jsx @@ -1,6 +1,6 @@ import { RootPaper } from "@ess-ics/ce-ui-common"; -import { AccessControl } from "../../components/auth/AccessControl"; import { UserDetailsContainer } from "./UserDetailsContainer"; +import { AccessControl } from "../../components/auth/AccessControl"; export function UserDetailsAccessControl() { return ( diff --git a/src/views/UserPage/UserDetailsContainer.jsx b/src/views/UserPage/UserDetailsContainer.jsx index 7ef664c58466f0c40c90d7c256fd194f220f95b9..c913353c7b7bf636bd35a9d4ed444a3b1c63d0c2 100644 --- a/src/views/UserPage/UserDetailsContainer.jsx +++ b/src/views/UserPage/UserDetailsContainer.jsx @@ -1,9 +1,9 @@ import { useContext, useEffect, useMemo, useState } from "react"; -import { UserPageView } from "./UserPageView"; import { LinearProgress } from "@mui/material"; -import { NotFoundView } from "../../components/navigation/NotFoundView/NotFoundView"; import { useParams } from "react-router-dom"; import { userContext, useAPIMethod } from "@ess-ics/ce-ui-common"; +import { UserPageView } from "./UserPageView"; +import { NotFoundView } from "../../components/navigation/NotFoundView/NotFoundView"; import { apiContext } from "../../api/DeployApi"; function unpackUser(user) { diff --git a/src/views/host/HostListView.jsx b/src/views/host/HostListView.jsx index a55d8da9641bc7f9b81882d822ec076feb2e84db..7327096168919d7b27939859500afd02b5ae818b 100644 --- a/src/views/host/HostListView.jsx +++ b/src/views/host/HostListView.jsx @@ -1,6 +1,5 @@ import { useState, useEffect, useCallback, useContext } from "react"; import { Container, Grid, Tabs, Tab } from "@mui/material"; -import { HostTable } from "../../components/host/HostTable"; import { GlobalAppBarContext, RootPaper, @@ -8,11 +7,12 @@ import { usePagination, SearchBar } from "@ess-ics/ce-ui-common"; +import { useSearchParams } from "react-router-dom"; +import { HostTable } from "../../components/host/HostTable"; import { applicationTitle, initRequestParams } from "../../components/common/Helper"; -import { useSearchParams } from "react-router-dom"; import { apiContext } from "../../api/DeployApi"; import { ROWS_PER_PAGE } from "../../constants"; diff --git a/src/views/host/details/HostDetailsAccessControl.jsx b/src/views/host/details/HostDetailsAccessControl.jsx index 5f6ba4cb96f2921e7053bbb3558e4be54b3984d7..8750fda74748bc58e6d3021bf2f2e8415feee11e 100644 --- a/src/views/host/details/HostDetailsAccessControl.jsx +++ b/src/views/host/details/HostDetailsAccessControl.jsx @@ -1,7 +1,7 @@ import { RootPaper } from "@ess-ics/ce-ui-common"; -import { AccessControl } from "../../../components/auth/AccessControl"; -import { HostDetailsContainer } from "./HostDetailsContainer"; import { useParams } from "react-router-dom"; +import { HostDetailsContainer } from "./HostDetailsContainer"; +import { AccessControl } from "../../../components/auth/AccessControl"; export function HostDetailsAccessControl() { const { id } = useParams(); diff --git a/src/views/host/details/HostDetailsContainer.jsx b/src/views/host/details/HostDetailsContainer.jsx index 5a39b086de45b4598d4786b4d985516239fb6b68..2c9e0903c5d31edcf6ec1f7d66261c6c4b5db3d3 100644 --- a/src/views/host/details/HostDetailsContainer.jsx +++ b/src/views/host/details/HostDetailsContainer.jsx @@ -1,10 +1,10 @@ import { useState, useMemo, useContext, useEffect } from "react"; -import { HostDetailsView } from "./HostDetailsView"; import { LinearProgress } from "@mui/material"; +import { useAPIMethod } from "@ess-ics/ce-ui-common"; +import { HostDetailsView } from "./HostDetailsView"; import { onFetchEntityError } from "../../../components/common/Helper"; import { NotFoundView } from "../../../components/navigation/NotFoundView/NotFoundView"; import { apiContext } from "../../../api/DeployApi"; -import { useAPIMethod } from "@ess-ics/ce-ui-common"; export function HostDetailsContainer({ hostId }) { const [error, setError] = useState(null); diff --git a/src/views/host/details/HostDetailsView.jsx b/src/views/host/details/HostDetailsView.jsx index 3150e91ef4b6d6ad269c31f24f42f2838279d59b..619c4e642d99cd74e80b225ac96bf1917825dbe2 100644 --- a/src/views/host/details/HostDetailsView.jsx +++ b/src/views/host/details/HostDetailsView.jsx @@ -8,14 +8,14 @@ import { AlertBannerList, ExternalLink } from "@ess-ics/ce-ui-common"; -import { LokiPanel } from "../../../components/common/Loki/LokiPanel"; import { useNavigate } from "react-router-dom"; -import { applicationTitle } from "../../../components/common/Helper"; -import { AccessControl } from "../../../components/auth/AccessControl"; import { HostDetailsTable } from "./HostDetailsTable"; -import { HostStatus } from "../../../components/host/HostStatus"; import { HostJobsSection } from "./HostJobsSection"; import { HostIocSection } from "./HostIocSection"; +import { LokiPanel } from "../../../components/common/Loki/LokiPanel"; +import { applicationTitle } from "../../../components/common/Helper"; +import { AccessControl } from "../../../components/auth/AccessControl"; +import { HostStatus } from "../../../components/host/HostStatus"; import env from "../../../config/env"; export function HostDetailsView({ hostId, host, alert }) { diff --git a/src/views/host/details/HostIocSection.jsx b/src/views/host/details/HostIocSection.jsx index 3e6402cb198c3cfd9e7c7f2abebc46acfaf32c18..3566587bab2df49699de618aa5d07ac5fca9048d 100644 --- a/src/views/host/details/HostIocSection.jsx +++ b/src/views/host/details/HostIocSection.jsx @@ -1,9 +1,9 @@ import { useEffect, useContext, useCallback } from "react"; -import { IOCTable } from "../../../components/IOC/IOCTable"; import { string } from "prop-types"; -import { apiContext } from "../../../api/DeployApi"; import { Typography } from "@mui/material"; import { useAPIMethod, usePagination } from "@ess-ics/ce-ui-common"; +import { apiContext } from "../../../api/DeployApi"; +import { IOCTable } from "../../../components/IOC/IOCTable"; import { initRequestParams } from "../../../components/common/Helper"; import { ROWS_PER_PAGE } from "../../../constants"; diff --git a/src/views/host/details/HostJobsSection.jsx b/src/views/host/details/HostJobsSection.jsx index 8430a3eac11dc210b1dddf20b86eb29bdcd561dd..7f6dd88613c47862a5aae8b982a81e9e7810800e 100644 --- a/src/views/host/details/HostJobsSection.jsx +++ b/src/views/host/details/HostJobsSection.jsx @@ -1,14 +1,14 @@ import { useContext, useEffect, useMemo, useCallback, useState } from "react"; import { string } from "prop-types"; -import { getErrorMessage } from "../../../components/common/Helper"; -import { apiContext } from "../../../api/DeployApi"; import { SimpleAccordion, useAPIMethod, usePagination } from "@ess-ics/ce-ui-common"; -import { JobTable } from "../../../components/Job"; import { Alert, Typography } from "@mui/material"; +import { getErrorMessage } from "../../../components/common/Helper"; +import { apiContext } from "../../../api/DeployApi"; +import { JobTable } from "../../../components/Job"; import { ROWS_PER_PAGE } from "../../../constants"; const propTypes = { diff --git a/src/views/jobs/JobDetailsAccessControl.jsx b/src/views/jobs/JobDetailsAccessControl.jsx index 67810e66483bd24acbd2ac13aa4fcb55a1b6dfd0..71692ad10f0f7f9702d552ed7ebae6797850d7e9 100644 --- a/src/views/jobs/JobDetailsAccessControl.jsx +++ b/src/views/jobs/JobDetailsAccessControl.jsx @@ -1,7 +1,7 @@ import { RootPaper } from "@ess-ics/ce-ui-common"; -import { AccessControl } from "../../components/auth/AccessControl"; -import { JobDetailsContainer } from "./JobDetailsContainer"; import { useParams } from "react-router-dom"; +import { JobDetailsContainer } from "./JobDetailsContainer"; +import { AccessControl } from "../../components/auth/AccessControl"; export function JobDetailsAccessControl() { const { id } = useParams(); diff --git a/src/views/jobs/JobDetailsContainer.jsx b/src/views/jobs/JobDetailsContainer.jsx index 52a92bcff69cb50298a72d63067ddbc7917a8402..9f73f8897d2939f76a87fee8070f787d3d533407 100644 --- a/src/views/jobs/JobDetailsContainer.jsx +++ b/src/views/jobs/JobDetailsContainer.jsx @@ -1,9 +1,9 @@ import { useState, useContext, useMemo, useEffect } from "react"; -import { JobDetailsView } from "./JobDetailsView"; import { LinearProgress } from "@mui/material"; +import { useAPIMethod, usePolling } from "@ess-ics/ce-ui-common"; +import { JobDetailsView } from "./JobDetailsView"; import { NotFoundView } from "../../components/navigation/NotFoundView/NotFoundView"; import { onFetchEntityError } from "../../components/common/Helper"; -import { useAPIMethod, usePolling } from "@ess-ics/ce-ui-common"; import { apiContext } from "../../api/DeployApi"; const POLL_DEPLOYMENT_INTERVAL = 5000; diff --git a/src/views/jobs/JobDetailsView.jsx b/src/views/jobs/JobDetailsView.jsx index 523c33d576836392e01e38aa23c42b6db58e70ad..e3bb156286e28f5c80aa56e66c08c179834449bc 100644 --- a/src/views/jobs/JobDetailsView.jsx +++ b/src/views/jobs/JobDetailsView.jsx @@ -1,9 +1,9 @@ import { useContext, useEffect } from "react"; import { IconButton } from "@mui/material"; -import { JobsDetails } from "../../components/Job/JobDetails"; import ArrowBackIcon from "@mui/icons-material/ArrowBack"; import { useNavigate } from "react-router-dom"; import { GlobalAppBarContext } from "@ess-ics/ce-ui-common"; +import { JobsDetails } from "../../components/Job/JobDetails"; import { applicationTitle } from "../../components/common/Helper"; export function JobDetailsView({ job }) { diff --git a/src/views/jobs/JobLogAccessControl.jsx b/src/views/jobs/JobLogAccessControl.jsx index 76ee9850e96ceca4f35a12d7e0cfaf4569bacd3c..a65cbeecf97373070626672c6bc7367ffd0bccf7 100644 --- a/src/views/jobs/JobLogAccessControl.jsx +++ b/src/views/jobs/JobLogAccessControl.jsx @@ -1,7 +1,7 @@ import { useContext, useEffect } from "react"; -import { AccessControl } from "../../components/auth/AccessControl"; import { GlobalAppBarContext } from "@ess-ics/ce-ui-common"; import { JobListView } from "./JobListView"; +import { AccessControl } from "../../components/auth/AccessControl"; import { applicationTitle } from "../../components/common/Helper"; export function JobLogAccessControl() { diff --git a/src/views/records/RecordDetailsView.jsx b/src/views/records/RecordDetailsView.jsx index ea2895cee9e72b1db9d7fd72ff58faae4996dd55..9f25bd6f345baf942f17bdf791d5f5ecb5ba08b2 100644 --- a/src/views/records/RecordDetailsView.jsx +++ b/src/views/records/RecordDetailsView.jsx @@ -10,12 +10,12 @@ import { useAPIMethod, formatDateAndTime } from "@ess-ics/ce-ui-common"; +import { useParams, useNavigate } from "react-router-dom"; import { RecordBadge } from "../../components/records/RecordBadge"; import { applicationTitle, onFetchEntityError } from "../../components/common/Helper"; -import { useParams, useNavigate } from "react-router-dom"; import { NotFoundView } from "../../components/navigation/NotFoundView/NotFoundView"; import { apiContext } from "../../api/DeployApi"; diff --git a/src/views/records/RecordListView.jsx b/src/views/records/RecordListView.jsx index f05809b15bf773059aecfc113d7832fe204967bd..5c5f5767d62bf606136cd2391a2e32215bb36c54 100644 --- a/src/views/records/RecordListView.jsx +++ b/src/views/records/RecordListView.jsx @@ -1,4 +1,5 @@ import { useState, useCallback, useContext, useEffect } from "react"; +import { useSearchParams } from "react-router-dom"; import { Container, Grid, Tabs, Tab } from "@mui/material"; import { GlobalAppBarContext, @@ -11,7 +12,6 @@ import { applicationTitle, initRequestParams } from "../../components/common/Helper"; -import { useSearchParams } from "react-router-dom"; import { RecordTable } from "../../components/records/RecordTable"; import { apiContext } from "../../api/DeployApi"; import { ROWS_PER_PAGE } from "../../constants";