solutions-navbar: Rename to shell-ui

Author: JBWatenbergScality

solutions-ui-navbar/.dockerignore renamed to shell-ui/.dockerignore

@@ -19,7 +19,12 @@ FROM nginx:${NGINX_IMAGE_VERSION}
 
 WORKDIR /usr/share/nginx/html/
 RUN rm -rf ./*
-COPY --from=build-step /home/node/dist ./
+RUN mkdir shell
+COPY health ./shell
+COPY conf/config.json /config.json
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+COPY --from=build-step /home/node/dist ./shell
 COPY conf/nginx.conf /etc/nginx/conf.d/default.conf
-
+ENTRYPOINT [ "/entrypoint.sh" ]
 CMD ["nginx", "-g", "daemon off;"]

solutions-ui-navbar/.flowconfig renamed to shell-ui/.flowconfig

@@ -14,18 +14,36 @@ import { logOut } from './auth/logout';
 const EVENTS_PREFIX = 'solutions-navbar--';
 export const AUTHENTICATED_EVENT: string = EVENTS_PREFIX + 'authenticated';
 
+type Options = { [path: string]: { en: string, fr: string, roles?: string[] } }; // TODO should be able to accept configs for paths in dropdown menu under user name
+
 export type SolutionsNavbarProps = {
-  'oidc-provider-url': string,
-  scopes: string,
-  'client-id': string,
+  'oidc-provider-url'?: string,
+  scopes?: string,
+  'client-id'?: string,
   'response-type'?: string,
   'redirect-url'?: string,
-  options?: { [path: string]: { en: string, fr: string, roles?: string[] } },
+  options?: Options,
   onAuthenticated?: (evt: CustomEvent) => void,
   logOut?: () => void,
-  setUserManager?: (userManager: UserManager) =>void;
+  setUserManager?: (userManager: UserManager) => void,
+};
+
+type Config = {
+  docUrl?: string,
+  oidc?: {
+    providerUrl?: string,
+    redirectUrl?: string,
+    clientId?: string,
+    responseType?: string,
+    scopes?: string,
+  },
+  options?: Options,
 };
 
+// %CONFIG% is replaced at image boot by a provided configuration
+const jsonConfig = '%CONFIG%' || '{}';
+const config: Config = JSON.parse(jsonConfig);
+
 const SolutionsNavbar = ({
   'oidc-provider-url': oidcProviderUrl,
   scopes,
@@ -35,17 +53,19 @@ const SolutionsNavbar = ({
   options,
   onAuthenticated,
   logOut,
-  setUserManager
+  setUserManager,
 }: SolutionsNavbarProps) => {
-
   const userManager = new UserManager({
-    authority: oidcProviderUrl,
-    client_id: clientId,
-    redirect_uri: redirectUrl || window.location.href,
-    silent_redirect_uri: redirectUrl || window.location.href,
-    post_logout_redirect_uri: redirectUrl || window.location.href,
-    response_type: responseType || 'code',
-    scope: scopes,
+    authority: oidcProviderUrl || config.oidc?.providerUrl,
+    client_id: clientId || config.oidc?.clientId,
+    redirect_uri:
+      redirectUrl || config.oidc?.redirectUrl || window.location.href,
+    silent_redirect_uri:
+      redirectUrl || config.oidc?.redirectUrl || window.location.href,
+    post_logout_redirect_uri:
+      redirectUrl || config.oidc?.redirectUrl || window.location.href,
+    response_type: responseType || config.oidc?.responseType || 'code',
+    scope: scopes || config.oidc?.scopes,
     loadUserInfo: true,
     automaticSilentRenew: true,
     monitorSession: false,
@@ -57,7 +77,7 @@ const SolutionsNavbar = ({
       setUserManager(userManager);
     }
   }, [!setUserManager]);
-  
+
   const oidcConfig: AuthProviderProps = {
     onBeforeSignIn: () => {
       localStorage.setItem('redirectUrl', window.location.href);
@@ -146,13 +166,13 @@ class SolutionsNavbarWebComponent extends reactToWebComponent(
     super();
     this.setUserManager = (userManager: UserManager) => {
       this.userManager = userManager;
-    }
+    };
     this.onAuthenticated = (evt: CustomEvent) => {
       this.dispatchEvent(evt);
     };
     this.logOut = () => {
       logOut(this.userManager);
-    }
+    };
   }
 }
 

solutions-ui-navbar/.gitignore renamed to shell-ui/.gitignore

@@ -40,7 +40,7 @@
   },
   "scripts": {
     "analyze": "source-map-explorer 'build/static/js/*.js'",
-    "start:navbar": "docker stop solutions-navbar-dev-server; (docker run --rm -d --name solutions-navbar-dev-server -p 8084:80 $(docker build -q ../solutions-ui-navbar))",
+    "start:navbar": "docker stop shell-ui-dev-server; (docker run --rm -d --name shell-ui-dev-server -p 8084:80 $(docker build -q ../shell-ui))",
     "start:ui": "react-app-rewired start",
     "start": "npm run start:navbar && npm run start:ui",
     "build": "react-app-rewired --max_old_space_size=2048 build",