Merge pull request #1773 from ral-facilities/unauthorised-route-config

Actually handle unauthorised route config

Author: louise-davies

packages/datagateway-common/src/state/actions/actions.types.tsx

@@ -1,10 +1,10 @@
 import {
-  MicroFrontendId,
   Datafile,
   Dataset,
+  DownloadSettingsAccessMethod,
   Instrument,
   Investigation,
-  DownloadSettingsAccessMethod,
+  MicroFrontendId,
 } from '../../app.types';
 import { DlsDatasetDetailsPanelTab } from '../../detailsPanels/dls/datasetDetailsPanel.component';
 import { DlsVisitDetailsPanelTab } from '../../detailsPanels/dls/visitDetailsPanel.component';
@@ -75,6 +75,7 @@ export interface PluginRoute {
   displayName: string;
   admin?: boolean;
   hideFromMenu?: boolean;
+  unauthorised?: boolean;
   order: number;
 }
 

packages/datagateway-dataview/src/main.test.tsx

@@ -63,6 +63,7 @@ describe('index - fetchSettings', () => {
           displayName: 'displayName',
           admin: false,
           hideFromMenu: false,
+          unauthorised: false,
           order: 0,
           helpSteps: [],
           logoLightMode: LogoLight,
@@ -101,6 +102,7 @@ describe('index - fetchSettings', () => {
           displayName: 'displayName1',
           order: 1,
           hideFromMenu: true,
+          unauthorised: true,
         },
       ],
       helpSteps: [{ target: '#id', content: 'content' }],
@@ -125,6 +127,7 @@ describe('index - fetchSettings', () => {
           displayName: 'displayName0',
           admin: true,
           hideFromMenu: false,
+          unauthorised: false,
           order: 0,
           helpSteps: [{ target: '#id', content: 'content' }],
           logoLightMode: LogoLight,
@@ -143,6 +146,7 @@ describe('index - fetchSettings', () => {
           displayName: 'displayName1',
           admin: false,
           hideFromMenu: true,
+          unauthorised: true,
           order: 1,
           helpSteps: [],
           logoLightMode: LogoLight,

packages/datagateway-dataview/src/main.tsx

@@ -124,6 +124,7 @@ export const fetchSettings = (): Promise<DataviewSettings | void> => {
                 order: route['order'] ?? 0,
                 hideFromMenu: route['hideFromMenu'] ?? false,
                 admin: route['admin'] ?? false,
+                unauthorised: route['unauthorised'] ?? false,
                 helpSteps:
                   index === 0 && 'helpSteps' in settings
                     ? settings['helpSteps']

packages/datagateway-download/src/main.test.tsx

@@ -63,6 +63,7 @@ describe('index - fetchSettings', () => {
           displayName: 'displayName',
           admin: false,
           hideFromMenu: false,
+          unauthorised: false,
           order: 0,
           helpSteps: [],
           logoLightMode: LogoLight,
@@ -100,6 +101,7 @@ describe('index - fetchSettings', () => {
           link: 'link1',
           displayName: 'displayName1',
           hideFromMenu: true,
+          unauthorised: true,
           order: 1,
         },
         {
@@ -132,6 +134,7 @@ describe('index - fetchSettings', () => {
           displayName: 'displayName0',
           admin: false,
           hideFromMenu: false,
+          unauthorised: false,
           order: 0,
           helpSteps: [{ target: '#id', content: 'content' }],
           logoLightMode: LogoLight,
@@ -150,6 +153,7 @@ describe('index - fetchSettings', () => {
           displayName: 'displayName1',
           admin: false,
           hideFromMenu: true,
+          unauthorised: true,
           order: 1,
           helpSteps: [],
           logoLightMode: LogoLight,
@@ -168,6 +172,7 @@ describe('index - fetchSettings', () => {
           displayName: 'displayNameAdmin0',
           admin: true,
           hideFromMenu: false,
+          unauthorised: false,
           order: 0,
           helpSteps: [],
           logoLightMode: LogoLight,

packages/datagateway-download/src/main.tsx

@@ -139,6 +139,7 @@ export const fetchSettings = (): Promise<DownloadSettings | void> => {
             displayName: route['displayName'],
             hideFromMenu: route['hideFromMenu'] ?? false,
             admin: route['admin'] ?? false,
+            unauthorised: route['unauthorised'] ?? false,
             order: route['order'] ?? 0,
             helpSteps:
               index === 0 && 'helpSteps' in settings

packages/datagateway-search/src/main.test.tsx

@@ -57,6 +57,7 @@ describe('index - fetchSettings', () => {
           displayName: 'displayName',
           admin: false,
           hideFromMenu: false,
+          unauthorised: false,
           order: 0,
           helpSteps: [],
           logoLightMode: LogoLight,
@@ -89,6 +90,7 @@ describe('index - fetchSettings', () => {
           displayName: 'displayName1',
           order: 1,
           hideFromMenu: true,
+          unauthorised: true,
         },
       ],
       helpSteps: [{ target: '#id', content: 'content' }],
@@ -113,6 +115,7 @@ describe('index - fetchSettings', () => {
           displayName: 'displayName0',
           admin: true,
           hideFromMenu: false,
+          unauthorised: false,
           order: 0,
           helpSteps: [{ target: '#id', content: 'content' }],
           logoLightMode: LogoLight,
@@ -131,6 +134,7 @@ describe('index - fetchSettings', () => {
           displayName: 'displayName1',
           admin: false,
           hideFromMenu: true,
+          unauthorised: true,
           order: 1,
           helpSteps: [],
           logoLightMode: LogoLight,

packages/datagateway-search/src/main.tsx

@@ -98,6 +98,7 @@ export const fetchSettings = (): Promise<SearchSettings | void> => {
                 order: route['order'] ?? 0,
                 hideFromMenu: route['hideFromMenu'] ?? false,
                 admin: route['admin'] ?? false,
+                unauthorised: route['unauthorised'] ?? false,
                 helpSteps:
                   index === 0 && 'helpSteps' in settings
                     ? settings['helpSteps']