Skip to content
Snippets Groups Projects
Commit c5e193f5 authored by Max Frederiksen's avatar Max Frederiksen Committed by Max Frederiksen
Browse files

MR comments 2

parent 7b70d7e6
No related branches found
No related tags found
2 merge requests!612Release 5.0.0,!590CE-3429: Convert to typescript
Showing
with 20 additions and 20 deletions
......@@ -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() {
......
......@@ -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);
......
import { useCustomSnackbar } from "./Snackbar";
export { useCustomSnackbar };
const MAX_SNACK = 5;
export { useCustomSnackbar, MAX_SNACK };
export default useCustomSnackbar;
......@@ -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";
......
export const ROWS_PER_PAGE = [20, 50];
export const DEFAULT_POLLING_INTERVAL_MILLIS = 3000;
export const MAX_SNACK = 5;
......@@ -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;
......
......@@ -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 {
......
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";
......
......@@ -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";
......
......@@ -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";
......
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";
......
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";
......
......@@ -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";
......
......@@ -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";
......
......@@ -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";
......
......@@ -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() {
......
......@@ -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
......
......@@ -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";
......
......@@ -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";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment