From c5e193f5b8b89485e271f85f0ee852a6f9e0eb6f Mon Sep 17 00:00:00 2001
From: Max Frederiksen <maxfrederiksen@Maxs-MacBook-Air.local>
Date: Thu, 16 Jan 2025 14:21:28 +0100
Subject: [PATCH] MR comments 2
---
src/App.tsx | 4 ++--
src/api/UserProvider.spec.tsx | 2 +-
src/components/common/snackbar/index.ts | 4 +++-
src/components/navigation/NavigationMenu/NavigationMenu.tsx | 2 +-
src/components/{common => navigation}/applicationTitle.ts | 0
src/constants/index.ts | 1 -
src/mocks/AppHarness.tsx | 2 +-
src/mocks/mockAPI.ts | 1 -
src/views/IOC/CreateIOCView.tsx | 2 +-
src/views/IOC/IOCDetailsView.tsx | 2 +-
src/views/IOC/IOCListView.tsx | 2 +-
src/views/UserPage/UserPageView.tsx | 2 +-
src/views/help/HelpView.tsx | 2 +-
src/views/host/HostListView.tsx | 2 +-
src/views/host/details/HostDetailsView.tsx | 2 +-
src/views/jobs/JobDetailsView.tsx | 2 +-
src/views/jobs/JobLogAccessControl.tsx | 2 +-
src/views/login/LoginView.tsx | 2 +-
src/views/records/RecordDetailsView.tsx | 2 +-
src/views/records/RecordListView.tsx | 2 +-
tsconfig.json | 2 --
21 files changed, 20 insertions(+), 22 deletions(-)
rename src/components/{common => navigation}/applicationTitle.ts (100%)
diff --git a/src/App.tsx b/src/App.tsx
index b6c7db91..05420ac5 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -20,13 +20,13 @@ import { JobLogAccessControl } from "./views/jobs/JobLogAccessControl";
import { RecordListView } from "./views/records/RecordListView";
import { RecordDetailsView } from "./views/records/RecordDetailsView";
import { TestErrorView } from "./views/TestErrorView";
-import { applicationTitle } from "./components/common/applicationTitle";
+import { applicationTitle } from "./components/navigation/applicationTitle";
import { CreateIOCAccessControl } from "./views/IOC/CreateIOCAccessControl";
import { UserDetailsAccessControl } from "./views/UserPage/UserDetailsAccessControl";
import { ReduxProvider } from "./store/ReduxProvider";
import { env } from "./config/env";
import { GlobalAppBarContext as GlobalAppBarContextType } from "./types/common";
-import { MAX_SNACK } from "./constants";
+import { MAX_SNACK } from "./components/common/snackbar";
// setting up the application (TAB)title
function App() {
diff --git a/src/api/UserProvider.spec.tsx b/src/api/UserProvider.spec.tsx
index b52cf898..c88defc2 100644
--- a/src/api/UserProvider.spec.tsx
+++ b/src/api/UserProvider.spec.tsx
@@ -4,7 +4,7 @@ import { SnackbarProvider } from "notistack";
import { UserProvider } from "./UserProvider";
import { ReduxProvider } from "../store/ReduxProvider";
import { UserContext } from "../types/common";
-import { MAX_SNACK } from "../constants";
+import { MAX_SNACK } from "../components/common/snackbar";
function DisplayUserContextValue() {
const contextValue = useContext(userContext);
diff --git a/src/components/common/snackbar/index.ts b/src/components/common/snackbar/index.ts
index 0f50baf8..86baeb2b 100644
--- a/src/components/common/snackbar/index.ts
+++ b/src/components/common/snackbar/index.ts
@@ -1,4 +1,6 @@
import { useCustomSnackbar } from "./Snackbar";
-export { useCustomSnackbar };
+const MAX_SNACK = 5;
+
+export { useCustomSnackbar, MAX_SNACK };
export default useCustomSnackbar;
diff --git a/src/components/navigation/NavigationMenu/NavigationMenu.tsx b/src/components/navigation/NavigationMenu/NavigationMenu.tsx
index 2cb093bc..c2bcc0b5 100644
--- a/src/components/navigation/NavigationMenu/NavigationMenu.tsx
+++ b/src/components/navigation/NavigationMenu/NavigationMenu.tsx
@@ -26,7 +26,7 @@ import { useNavigate } from "react-router";
import { Link } from "react-router-dom";
import { LoginControls } from "./LoginControls";
import { CreateIOCButton } from "./CreateIOCButton";
-import { applicationTitle } from "../../common/applicationTitle";
+import { applicationTitle } from "../applicationTitle";
import { CCCEControlSymbol } from "../../../icons/CCCEControlSymbol";
import { theme } from "../../../style/Theme";
import { useGetCurrentModeQuery } from "../../../store/deployApi";
diff --git a/src/components/common/applicationTitle.ts b/src/components/navigation/applicationTitle.ts
similarity index 100%
rename from src/components/common/applicationTitle.ts
rename to src/components/navigation/applicationTitle.ts
diff --git a/src/constants/index.ts b/src/constants/index.ts
index ea136b2d..26ae5f5a 100644
--- a/src/constants/index.ts
+++ b/src/constants/index.ts
@@ -1,3 +1,2 @@
export const ROWS_PER_PAGE = [20, 50];
export const DEFAULT_POLLING_INTERVAL_MILLIS = 3000;
-export const MAX_SNACK = 5;
diff --git a/src/mocks/AppHarness.tsx b/src/mocks/AppHarness.tsx
index 88d0beeb..e7719f77 100644
--- a/src/mocks/AppHarness.tsx
+++ b/src/mocks/AppHarness.tsx
@@ -9,7 +9,7 @@ import { UserProvider } from "../api/UserProvider";
import { NavigationMenu } from "../components/navigation/NavigationMenu";
import { ReduxProvider } from "../store/ReduxProvider";
import { User } from "../types/common";
-import { MAX_SNACK } from "../constants";
+import { MAX_SNACK } from "../components/common/snackbar";
interface RouterHarnessProps {
children: ReactNode;
diff --git a/src/mocks/mockAPI.ts b/src/mocks/mockAPI.ts
index 61425f71..9a003197 100644
--- a/src/mocks/mockAPI.ts
+++ b/src/mocks/mockAPI.ts
@@ -93,7 +93,6 @@ function logout() {
function isLoggedIn(req: any) {
const { cookies } = req;
- console.log({ cookies });
if (cookies) {
return Boolean(cookies["ce-deploy-auth"]);
} else {
diff --git a/src/views/IOC/CreateIOCView.tsx b/src/views/IOC/CreateIOCView.tsx
index b895b6e1..34be09f4 100644
--- a/src/views/IOC/CreateIOCView.tsx
+++ b/src/views/IOC/CreateIOCView.tsx
@@ -1,6 +1,6 @@
import { GlobalAppBarContext } from "@ess-ics/ce-ui-common";
import { useContext, useEffect } from "react";
-import { applicationTitle } from "../../components/common/applicationTitle";
+import { applicationTitle } from "../../components/navigation/applicationTitle";
import { CreateIOC } from "../../components/IOC/CreateIOC";
import { GlobalAppBarContext as GlobalAppBarContextType } from "../../types/common";
diff --git a/src/views/IOC/IOCDetailsView.tsx b/src/views/IOC/IOCDetailsView.tsx
index 79916a6d..56dff4a9 100644
--- a/src/views/IOC/IOCDetailsView.tsx
+++ b/src/views/IOC/IOCDetailsView.tsx
@@ -10,7 +10,7 @@ import {
import { IOCLiveStatus } from "../../components/IOC/IOCLiveStatus";
import { IOCManage } from "../../components/IOC/IOCManage";
import { IOCAdmin } from "../../components/IOC/IOCAdmin";
-import { applicationTitle } from "../../components/common/applicationTitle";
+import { applicationTitle } from "../../components/navigation/applicationTitle";
import { GlobalAppBarContext } from "../../types/common";
import { IocDetails } from "../../store/deployApi";
diff --git a/src/views/IOC/IOCListView.tsx b/src/views/IOC/IOCListView.tsx
index 9ba72287..e134cee4 100644
--- a/src/views/IOC/IOCListView.tsx
+++ b/src/views/IOC/IOCListView.tsx
@@ -8,7 +8,7 @@ import {
import { useSearchParams } from "react-router-dom";
import { Container, Grid, Tabs, Tab } from "@mui/material";
import { useLazyListIocsQuery, ListIocsApiArg } from "../../store/deployApi";
-import { applicationTitle } from "../../components/common/applicationTitle";
+import { applicationTitle } from "../../components/navigation/applicationTitle";
import { initRequestParams } from "../../api/initRequestParams";
import { GlobalAppBarContext, OnPageParams } from "../../types/common";
import { ApiAlertError } from "../../components/common/Alerts/ApiAlertError";
diff --git a/src/views/UserPage/UserPageView.tsx b/src/views/UserPage/UserPageView.tsx
index bd1a6eca..d3704d19 100644
--- a/src/views/UserPage/UserPageView.tsx
+++ b/src/views/UserPage/UserPageView.tsx
@@ -1,7 +1,7 @@
import { useContext, useEffect } from "react";
import { Grid } from "@mui/material";
import { GlobalAppBarContext } from "@ess-ics/ce-ui-common";
-import { applicationTitle } from "../../components/common/applicationTitle";
+import { applicationTitle } from "../../components/navigation/applicationTitle";
import { UserProfile } from "../../components/common/User/UserProfile";
import { UserOperationList } from "../../components/common/User/UserOperationList";
import { UserInfoResponse } from "../../store/deployApi";
diff --git a/src/views/help/HelpView.tsx b/src/views/help/HelpView.tsx
index 5327ec51..f1cf5911 100644
--- a/src/views/help/HelpView.tsx
+++ b/src/views/help/HelpView.tsx
@@ -1,7 +1,7 @@
import { useContext, useEffect } from "react";
import { RootPaper, Help, GlobalAppBarContext } from "@ess-ics/ce-ui-common";
import { Stack, Typography } from "@mui/material";
-import { applicationTitle } from "../../components/common/applicationTitle";
+import { applicationTitle } from "../../components/navigation/applicationTitle";
import { env } from "../../config/env";
import { GlobalAppBarContext as GlobalAppBarContextType } from "../../types/common";
diff --git a/src/views/host/HostListView.tsx b/src/views/host/HostListView.tsx
index 67bf367e..939c0a51 100644
--- a/src/views/host/HostListView.tsx
+++ b/src/views/host/HostListView.tsx
@@ -8,7 +8,7 @@ import {
} from "@ess-ics/ce-ui-common";
import { useSearchParams } from "react-router-dom";
import { HostTable } from "../../components/host/HostTable";
-import { applicationTitle } from "../../components/common/applicationTitle";
+import { applicationTitle } from "../../components/navigation/applicationTitle";
import { initRequestParams } from "../../api/initRequestParams";
import { ROWS_PER_PAGE } from "../../constants";
import { ListHostsApiArg, useLazyListHostsQuery } from "../../store/deployApi";
diff --git a/src/views/host/details/HostDetailsView.tsx b/src/views/host/details/HostDetailsView.tsx
index 1db71268..f4a7658f 100644
--- a/src/views/host/details/HostDetailsView.tsx
+++ b/src/views/host/details/HostDetailsView.tsx
@@ -13,7 +13,7 @@ import { HostDetailsTable } from "./HostDetailsTable";
import { HostJobsSection } from "./HostJobsSection";
import { HostIocSection } from "./HostIocSection";
import { LokiPanel } from "../../../components/common/Loki/LokiPanel";
-import { applicationTitle } from "../../../components/common/applicationTitle";
+import { applicationTitle } from "../../../components/navigation/applicationTitle";
import { AccessControl } from "../../../components/auth/AccessControl";
import { HostStatus } from "../../../components/host/HostStatus";
import { env } from "../../../config/env";
diff --git a/src/views/jobs/JobDetailsView.tsx b/src/views/jobs/JobDetailsView.tsx
index 0e581ef3..b5fd21c1 100644
--- a/src/views/jobs/JobDetailsView.tsx
+++ b/src/views/jobs/JobDetailsView.tsx
@@ -4,7 +4,7 @@ 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/applicationTitle";
+import { applicationTitle } from "../../components/navigation/applicationTitle";
import { GlobalAppBarContext as GlobalAppBarContextType } from "../../types/common";
import { JobDetails } from "../../store/deployApi";
diff --git a/src/views/jobs/JobLogAccessControl.tsx b/src/views/jobs/JobLogAccessControl.tsx
index 5c98f2d5..f4fbe1ba 100644
--- a/src/views/jobs/JobLogAccessControl.tsx
+++ b/src/views/jobs/JobLogAccessControl.tsx
@@ -2,7 +2,7 @@ import { useContext, useEffect } from "react";
import { GlobalAppBarContext } from "@ess-ics/ce-ui-common";
import { JobListView } from "./JobListView";
import { AccessControl } from "../../components/auth/AccessControl";
-import { applicationTitle } from "../../components/common/applicationTitle";
+import { applicationTitle } from "../../components/navigation/applicationTitle";
import { GlobalAppBarContext as GlobalAppBarContextType } from "../../types/common";
export function JobLogAccessControl() {
diff --git a/src/views/login/LoginView.tsx b/src/views/login/LoginView.tsx
index 8d23a30d..b312a05f 100644
--- a/src/views/login/LoginView.tsx
+++ b/src/views/login/LoginView.tsx
@@ -7,7 +7,7 @@ import {
LoginForm
} from "@ess-ics/ce-ui-common";
import { useRedirect } from "../../hooks/Redirect";
-import { applicationTitle } from "../../components/common/applicationTitle";
+import { applicationTitle } from "../../components/navigation/applicationTitle";
import {
GlobalAppBarContext as GlobalAppBarContextType,
UserContext
diff --git a/src/views/records/RecordDetailsView.tsx b/src/views/records/RecordDetailsView.tsx
index 2763ae1e..55a2f901 100644
--- a/src/views/records/RecordDetailsView.tsx
+++ b/src/views/records/RecordDetailsView.tsx
@@ -12,7 +12,7 @@ import {
import { useParams, useNavigate } from "react-router-dom";
import { Alias } from "./Alias";
import { RecordBadge } from "../../components/records/RecordBadge";
-import { applicationTitle } from "../../components/common/applicationTitle";
+import { applicationTitle } from "../../components/navigation/applicationTitle";
import { NotFoundView } from "../../components/navigation/NotFoundView/NotFoundView";
import { RecordDetails, useGetRecordQuery } from "../../store/deployApi";
diff --git a/src/views/records/RecordListView.tsx b/src/views/records/RecordListView.tsx
index 26f62f02..09b28c13 100644
--- a/src/views/records/RecordListView.tsx
+++ b/src/views/records/RecordListView.tsx
@@ -7,7 +7,7 @@ import {
usePagination,
SearchBar
} from "@ess-ics/ce-ui-common";
-import { applicationTitle } from "../../components/common/applicationTitle";
+import { applicationTitle } from "../../components/navigation/applicationTitle";
import { initRequestParams } from "../../api/initRequestParams";
import { RecordTable } from "../../components/records/RecordTable";
import { ROWS_PER_PAGE } from "../../constants";
diff --git a/tsconfig.json b/tsconfig.json
index 69644025..742fa721 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,8 +2,6 @@
"compilerOptions": {
"target": "ESNext",
"lib": ["dom", "dom.iterable", "esnext"],
- "allowJs": true,
- "checkJs": true,
"module": "ESNext",
"skipLibCheck": true,
"esModuleInterop": true,
--
GitLab