Address review comments #1379

ral-facilities · Dec 2, 2024 · 26fab0f · 26fab0f
1 parent 09cb6b7
commit 26fab0f
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 11 deletions.
diff --git a/src/App.test.tsx b/src/App.test.tsx
@@ -35,6 +35,7 @@ vi.mock('axios', async () => {
         if (path === '/settings.json') {
           return Promise.resolve({
             data: {
+              // Set provider to icat as that supports maintenance states needed for App.test.tsx
               'auth-provider': 'icat',
               'ui-strings': '/res/default.json',
               plugins: [],

diff --git a/src/adminPage/adminPage.component.tsx b/src/adminPage/adminPage.component.tsx
@@ -59,10 +59,7 @@ const AdminPage = (props: AdminPageProps): ReactElement => {
       location.pathname.startsWith(adminRoutes[key])
     ) ??
       (props.adminPageDefaultTab &&
-      Object.prototype.hasOwnProperty.call(
-        adminRoutes,
-        props.adminPageDefaultTab
-      )
+      Object.hasOwn(adminRoutes, props.adminPageDefaultTab)
         ? props.adminPageDefaultTab
         : 'maintenance')
   );

diff --git a/src/mainAppBar/mobileOverflowMenu.component.tsx b/src/mainAppBar/mobileOverflowMenu.component.tsx
@@ -49,8 +49,7 @@ function MobileOverflowMenu({
 
   function navigateToAdminPage(): void {
     const targetRoute =
-      adminPageDefaultTab &&
-      Object.prototype.hasOwnProperty.call(adminRoutes, adminPageDefaultTab)
+      adminPageDefaultTab && Object.hasOwn(adminRoutes, adminPageDefaultTab)
         ? adminRoutes[adminPageDefaultTab]
         : adminRoutes['maintenance'];
 

diff --git a/src/mainAppBar/pageLinks.component.tsx b/src/mainAppBar/pageLinks.component.tsx
@@ -35,8 +35,7 @@ function PageLinks(): JSX.Element {
 
   function navigateToAdminPage(): void {
     const targetRoute =
-      adminPageDefaultTab &&
-      Object.prototype.hasOwnProperty.call(adminRoutes, adminPageDefaultTab)
+      adminPageDefaultTab && Object.hasOwn(adminRoutes, adminPageDefaultTab)
         ? adminRoutes[adminPageDefaultTab]
         : adminRoutes['maintenance'];
 

diff --git a/src/state/reducers/createReducer.tsx b/src/state/reducers/createReducer.tsx
@@ -7,7 +7,7 @@ interface Action {
 
 function createReducer(initialState: any, handlers: Record<string, any>): any {
   return function reducer(state: any = initialState, action: Action) {
-    if (action && Object.prototype.hasOwnProperty.call(handlers, action.type)) {
+    if (action && Object.hasOwn(handlers, action.type)) {
       return handlers[action.type](state, action.payload);
     }
     return state;

diff --git a/vite.config.ts b/vite.config.ts
@@ -44,8 +44,6 @@ export default defineConfig(({ mode }) => {
     plugins: plugins,
     server: {
       port: 3000,
-      // Don't open by default as Dockerfile wont run as it can't find a display
-      open: false,
     },
     preview: {
       port: 5001,