From e0a370244d7fb52dd3b046c7dc687bae5e20a593 Mon Sep 17 00:00:00 2001
From: Johanna Szepanski <johanna.szepanski@softhouse.se>
Date: Fri, 22 Nov 2024 15:19:55 +0100
Subject: [PATCH] added rule for import order and changed order accordingly
---
src/App.jsx | 4 ++--
src/api/APIProvider.jsx | 2 +-
src/api/APIProvider.spec.jsx | 2 +-
src/api/UserProvider.spec.jsx | 4 ++--
.../IOC/ChangeHostAdmin/ChangeHostAdmin.jsx | 2 +-
src/components/IOC/CreateIOC/CreateIOC.jsx | 12 ++++++------
src/components/IOC/DeployIOC/DeployIOC.jsx | 2 +-
src/components/IOC/IOCDelete/IOCDelete.jsx | 2 +-
src/components/IOC/IOCDetails/IOCDetails.jsx | 2 +-
src/components/IOC/IOCLiveStatus/IOCLiveStatus.jsx | 2 +-
src/components/IOC/IOCManage/IOCManage.jsx | 6 +++---
src/components/IOC/IOCService/IOCService.jsx | 6 +++---
src/components/IOC/IOCStatus/IOCStatus.jsx | 4 ++--
src/components/IOC/IOCTable/IOCDescription.jsx | 2 +-
src/components/IOC/UndeployIOC/UndeployIOC.jsx | 2 +-
src/components/Job/JobDetails.tsx | 4 ++--
src/components/Job/JobDetailsTable.jsx | 2 +-
src/components/Job/JobGitRefIcon.tsx | 2 +-
src/components/Job/JobGitRefLink.tsx | 2 +-
src/components/Job/JobTable/JobDetailsColumn.jsx | 2 +-
src/components/Job/JobTable/JobStatusColumn.tsx | 2 +-
src/components/auth/TokenRenew/TokenRenew.jsx | 2 +-
src/components/common/Alerts/ApiAlertError.tsx | 2 +-
.../common/LogStream/LogStreamConsoleDialog.tsx | 2 +-
src/components/common/Loki/LokiPanel.jsx | 8 ++++----
.../common/SearchBoxFilter/SearchBoxFilter.jsx | 2 +-
src/components/common/Status/Status.jsx | 2 +-
src/components/common/Status/StatusBadge.jsx | 2 +-
.../common/Status/StatusPopoverContent.jsx | 2 +-
src/components/common/User/UserAvatar.jsx | 2 +-
src/components/common/User/UserOperationList.jsx | 2 +-
src/components/common/User/UserProfile.tsx | 2 +-
src/components/deployments/DeploymentIcons.jsx | 2 +-
src/components/deployments/DeploymentJobOutput.jsx | 2 +-
src/components/host/HostStatus/HostStatus.jsx | 2 +-
.../navigation/LoginSuggester/LoginSuggester.jsx | 2 +-
.../navigation/NavigationMenu/NavigationMenu.jsx | 6 +++---
src/components/records/RecordHostLink.jsx | 2 +-
src/components/records/RecordSearch.jsx | 4 ++--
src/components/records/RecordTable.jsx | 2 +-
src/icons/RocketLaunch.jsx | 2 +-
src/index.jsx | 2 +-
src/mocks/AppHarness.jsx | 4 ++--
src/mocks/UserImpersonator.jsx | 2 +-
src/mocks/browser.js | 2 +-
.../components/common/IOC/IOCTable.stories.jsx | 4 ++--
.../components/common/host/HostTable.stories.jsx | 2 +-
.../components/common/job/JobTable.stories.jsx | 2 +-
src/stories/views/IOC/CreateIocView.stories.jsx | 2 +-
src/stories/views/IOC/IocListView.stories.jsx | 2 +-
src/views/IOC/CreateIOCAccessControl.jsx | 2 +-
src/views/IOC/CreateIOCView.jsx | 2 +-
src/views/IOC/IOCDetailsAccessControl.jsx | 4 ++--
src/views/IOC/IOCDetailsContainer.jsx | 4 ++--
src/views/IOC/IOCDetailsView.jsx | 14 +++++++-------
src/views/IOC/IOCListView.tsx | 6 +++---
src/views/UserPage/UserDetailsAccessControl.jsx | 2 +-
src/views/UserPage/UserDetailsContainer.jsx | 4 ++--
src/views/host/HostListView.jsx | 4 ++--
.../host/details/HostDetailsAccessControl.jsx | 4 ++--
src/views/host/details/HostDetailsContainer.jsx | 4 ++--
src/views/host/details/HostDetailsView.jsx | 8 ++++----
src/views/host/details/HostIocSection.jsx | 4 ++--
src/views/host/details/HostJobsSection.jsx | 6 +++---
src/views/jobs/JobDetailsAccessControl.jsx | 4 ++--
src/views/jobs/JobDetailsContainer.jsx | 4 ++--
src/views/jobs/JobDetailsView.jsx | 2 +-
src/views/jobs/JobLogAccessControl.jsx | 2 +-
src/views/records/RecordDetailsView.jsx | 2 +-
src/views/records/RecordListView.jsx | 2 +-
70 files changed, 113 insertions(+), 113 deletions(-)
diff --git a/src/App.jsx b/src/App.jsx
index cf32f89b..c80fca55 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 dcea6b92..e4283752 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 c67d3f96..a67bd838 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 f35e60c1..694323e4 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 ed1335c9..cab11f68 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 27592d9c..7485950b 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 d355e498..0fdafd25 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 15fa9fef..951dee72 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 c9289725..788df40c 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 6201c5f6..438717f9 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 d49ffad3..d4e64791 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 72d5e106..c2d9d1b6 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 27512bd2..b961ca4e 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 6f2e5d39..b19e331b 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 95054c95..f4b8f35c 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 54502206..ace93bee 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 b0fd2551..bf59b5cf 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 2bba3604..b68e5002 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 3d24c934..d83e5146 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 f20c6245..9fa29fd7 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 cd1dbea6..836c9649 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 833e451c..8b79b788 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 d36854ba..a59fdc8e 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 3140328d..caac8085 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 36002739..8cb6b516 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 8c0618e7..aac142dd 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 8d26d900..0b1e669f 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 cd203a34..c3dfa912 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 fe0f8a97..5f139799 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 9363c44b..14d47ced 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 91f3fb0f..23991c7b 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 065e7e3b..a153ba1b 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 196c3410..2b2184e5 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 df80b2ed..5d20b54a 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 d46bba7c..d3e5d052 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 f8632a17..8b4a5ae7 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 2402dedd..49930428 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 135a2dde..339544a3 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 81be8c0b..45d8b437 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 a049149b..58833e68 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 bbb86db8..c960e88b 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 5768ea6f..2e8d054f 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 e9ee04aa..cc72b991 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 402e2d69..71f85e41 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 24f87fb5..bcd82e48 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 004c4e03..e64c16ab 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 bb7d0fc5..3d39d1ed 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 fbfd2261..6b0dc2d8 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 412ef380..3b4aa670 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 21e309fd..63b5307f 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 dccaa746..1af87b46 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 0aa9eca6..667a9ab3 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 c2e57ad0..cc22e3a0 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 c1aff221..c3bcf7c2 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 98d8a077..04184d99 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 b7acf9f1..b28bb772 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 a919e320..fa64a39f 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 7ef664c5..c913353c 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 a55d8da9..73270961 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 5f6ba4cb..8750fda7 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 5a39b086..2c9e0903 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 3150e91e..619c4e64 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 3e6402cb..3566587b 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 8430a3ea..7f6dd886 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 67810e66..71692ad1 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 52a92bcf..9f73f889 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 523c33d5..e3bb1562 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 76ee9850..a65cbeec 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 ea2895ce..9f25bd6f 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 f05809b1..5c5f5767 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";
--
GitLab