Merge pull request #711 from jembi/CU-86c0k74xv_Fix-issue-with-extern…

…al-apps-not-doing-a-full-redirect

fx: now redirecting to correct urls for external apps

packages/header-app/src/components/openhim.appbar.component.tsx

@@ -203,12 +203,10 @@ export default function OpenhimAppBar() {
         index === pages.length - 1
           ? {
               ...page,
-              children: apps
-                .sort((a, b) => a.name.localeCompare(b.name))
-                .map(app => ({
-                  name: app.name,
-                  link: `#!/` + app.url.split('/').pop().split('.')[0]
-                }))
+              children: apps.sort((a, b) => a.name.localeCompare(b.name)).map(app => ({
+                name: app.name,
+                link: app.type === 'esmodule' ? `#!/` + app.url.split('/').pop().split('.')[0] : app.url
+              }))
             }
           : page
       )

packages/header-app/src/types/index.ts

@@ -21,6 +21,7 @@ export interface UserProfile {
 export interface App {
   _id: string
   name: string
+  type: 'esmodule' | 'external'
   url: string
 }