diff --git a/projects/nshmp-apps/src/app/app.routes.ts b/projects/nshmp-apps/src/app/app.routes.ts index 47e8da2ddda9e3cf2d80a32da531fafa1bd2a405..005133679daa55f8ee40b5e01be28b90e80090c8 100644 --- a/projects/nshmp-apps/src/app/app.routes.ts +++ b/projects/nshmp-apps/src/app/app.routes.ts @@ -5,6 +5,7 @@ import {devRoutes} from './dev/dev.routes'; import {errorRoutes} from './error-pages/error-pages.routes'; import {gmmRoutes} from './gmm/gmm.routes'; import {hazardRoutes} from './hazard/hazard.routes'; +import {internalRoutes} from './internal/internal.routes'; import {ncmRoutes} from './ncm/ncm.routes'; import {sourceRoutes} from './source/source.routes'; @@ -43,6 +44,11 @@ const routes: Routes = [ children: hazardRoutes(), path: 'hazard', }, + // Internal applications + { + children: internalRoutes(), + path: 'internal', + }, // Source model applications { children: sourceRoutes(), diff --git a/projects/nshmp-apps/src/app/dev/dev.routes.ts b/projects/nshmp-apps/src/app/dev/dev.routes.ts index 809e547e7c151dc5b97886d968897e0c44d8756e..64f3fdc463a8381f38e58a7bc5cbe5ad0f060168 100644 --- a/projects/nshmp-apps/src/app/dev/dev.routes.ts +++ b/projects/nshmp-apps/src/app/dev/dev.routes.ts @@ -1,6 +1,6 @@ +import {HttpParams} from '@angular/common/http'; import {Routes} from '@angular/router'; -import {devAwsRoutes} from './aws/aws.routes'; import {devGmmRoutes} from './gmm/gmm.routes'; import {devHazardRoutes} from './hazard/hazard.routes'; import {devMathRoutes} from './math/math.routes'; @@ -15,13 +15,6 @@ const routes: Routes = [ import('./dashboard/app.component').then(com => com.AppComponent), path: '', }, - // AWS applications - { - // canActivate: [NetworkGuard], - // TODO add back auth when ipv6 issue is solved - children: devAwsRoutes(), - path: 'aws', - }, // Math applications { children: devMathRoutes(), @@ -37,6 +30,20 @@ const routes: Routes = [ children: devGmmRoutes(), path: 'gmm', }, + // Redirect AWS applications + { + children: [ + { + path: '**', + redirectTo: params => { + const url = params.url.pop(); + const queryParams = new HttpParams().appendAll(params.queryParams); + return `/internal/aws/${url.path}?${queryParams.toString()}`; + }, + }, + ], + path: 'aws', + }, ]; /** diff --git a/projects/nshmp-apps/src/app/dev/aws/.compodoc.yml b/projects/nshmp-apps/src/app/internal/aws/.compodoc.yml similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/.compodoc.yml rename to projects/nshmp-apps/src/app/internal/aws/.compodoc.yml diff --git a/projects/nshmp-apps/src/app/dev/aws/README.md b/projects/nshmp-apps/src/app/internal/aws/README.md similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/README.md rename to projects/nshmp-apps/src/app/internal/aws/README.md diff --git a/projects/nshmp-apps/src/app/dev/aws/aws.routes.ts b/projects/nshmp-apps/src/app/internal/aws/aws.routes.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/aws.routes.ts rename to projects/nshmp-apps/src/app/internal/aws/aws.routes.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/.compodoc.yml b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/.compodoc.yml similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/.compodoc.yml rename to projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/.compodoc.yml diff --git a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/README.md b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/README.md similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/README.md rename to projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/README.md diff --git a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/app.component.html b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/app.component.html similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/app.component.html rename to projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/app.component.html diff --git a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/app.component.scss b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/app.component.scss similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/app.component.scss rename to projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/app.component.scss diff --git a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/app.component.spec.ts b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/app.component.spec.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/app.component.spec.ts rename to projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/app.component.spec.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/app.component.ts b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/app.component.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/app.component.ts rename to projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/app.component.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/about/about.component.html b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/about/about.component.html similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/about/about.component.html rename to projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/about/about.component.html diff --git a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/about/about.component.scss b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/about/about.component.scss similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/about/about.component.scss rename to projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/about/about.component.scss diff --git a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/about/about.component.spec.ts b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/about/about.component.spec.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/about/about.component.spec.ts rename to projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/about/about.component.spec.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/about/about.component.ts b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/about/about.component.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/about/about.component.ts rename to projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/about/about.component.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/content/content.component.html b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.html similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/content/content.component.html rename to projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.html diff --git a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/content/content.component.scss b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.scss similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/content/content.component.scss rename to projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.scss diff --git a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/content/content.component.spec.ts b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.spec.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/content/content.component.spec.ts rename to projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.spec.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/content/content.component.ts b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/content/content.component.ts rename to projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/control-panel/control-panel.component.html b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/control-panel/control-panel.component.html similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/control-panel/control-panel.component.html rename to projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/control-panel/control-panel.component.html diff --git a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/control-panel/control-panel.component.scss b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/control-panel/control-panel.component.scss similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/control-panel/control-panel.component.scss rename to projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/control-panel/control-panel.component.scss diff --git a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/control-panel/control-panel.component.spec.ts b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/control-panel/control-panel.component.spec.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/control-panel/control-panel.component.spec.ts rename to projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/control-panel/control-panel.component.spec.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/control-panel/control-panel.component.ts b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/control-panel/control-panel.component.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/control-panel/control-panel.component.ts rename to projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/control-panel/control-panel.component.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/snack-bar/snack-bar.component.html b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/snack-bar/snack-bar.component.html similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/snack-bar/snack-bar.component.html rename to projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/snack-bar/snack-bar.component.html diff --git a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/snack-bar/snack-bar.component.scss b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/snack-bar/snack-bar.component.scss similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/snack-bar/snack-bar.component.scss rename to projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/snack-bar/snack-bar.component.scss diff --git a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/snack-bar/snack-bar.component.spec.ts b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/snack-bar/snack-bar.component.spec.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/snack-bar/snack-bar.component.spec.ts rename to projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/snack-bar/snack-bar.component.spec.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/snack-bar/snack-bar.component.ts b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/snack-bar/snack-bar.component.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/components/snack-bar/snack-bar.component.ts rename to projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/snack-bar/snack-bar.component.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/models/control-form.model.ts b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/models/control-form.model.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/models/control-form.model.ts rename to projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/models/control-form.model.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/models/get-logs.model.ts b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/models/get-logs.model.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/models/get-logs.model.ts rename to projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/models/get-logs.model.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/models/state.model.ts b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/models/state.model.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/models/state.model.ts rename to projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/models/state.model.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/pipes/log.pipe.spec.ts b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/pipes/log.pipe.spec.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/pipes/log.pipe.spec.ts rename to projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/pipes/log.pipe.spec.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/pipes/log.pipe.ts b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/pipes/log.pipe.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/pipes/log.pipe.ts rename to projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/pipes/log.pipe.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/services/app.service.ts b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/services/app.service.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/services/app.service.ts rename to projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/services/app.service.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/tsconfig.doc.json b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/tsconfig.doc.json similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/tsconfig.doc.json rename to projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/tsconfig.doc.json diff --git a/projects/nshmp-apps/src/app/dev/aws/haz-job-history/.compodoc.yml b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/.compodoc.yml similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/haz-job-history/.compodoc.yml rename to projects/nshmp-apps/src/app/internal/aws/haz-job-history/.compodoc.yml diff --git a/projects/nshmp-apps/src/app/dev/aws/haz-job-history/README.md b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/README.md similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/haz-job-history/README.md rename to projects/nshmp-apps/src/app/internal/aws/haz-job-history/README.md diff --git a/projects/nshmp-apps/src/app/dev/aws/haz-job-history/app.component.html b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/app.component.html similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/haz-job-history/app.component.html rename to projects/nshmp-apps/src/app/internal/aws/haz-job-history/app.component.html diff --git a/projects/nshmp-apps/src/app/dev/aws/haz-job-history/app.component.scss b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/app.component.scss similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/haz-job-history/app.component.scss rename to projects/nshmp-apps/src/app/internal/aws/haz-job-history/app.component.scss diff --git a/projects/nshmp-apps/src/app/dev/aws/haz-job-history/app.component.spec.ts b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/app.component.spec.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/haz-job-history/app.component.spec.ts rename to projects/nshmp-apps/src/app/internal/aws/haz-job-history/app.component.spec.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/haz-job-history/app.component.ts b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/app.component.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/haz-job-history/app.component.ts rename to projects/nshmp-apps/src/app/internal/aws/haz-job-history/app.component.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/haz-job-history/components/about/about.component.html b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/about/about.component.html similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/haz-job-history/components/about/about.component.html rename to projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/about/about.component.html diff --git a/projects/nshmp-apps/src/app/dev/aws/haz-job-history/components/about/about.component.scss b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/about/about.component.scss similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/haz-job-history/components/about/about.component.scss rename to projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/about/about.component.scss diff --git a/projects/nshmp-apps/src/app/dev/aws/haz-job-history/components/about/about.component.spec.ts b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/about/about.component.spec.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/haz-job-history/components/about/about.component.spec.ts rename to projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/about/about.component.spec.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/haz-job-history/components/about/about.component.ts b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/about/about.component.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/haz-job-history/components/about/about.component.ts rename to projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/about/about.component.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/haz-job-history/components/content/content.component.html b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/content/content.component.html similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/haz-job-history/components/content/content.component.html rename to projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/content/content.component.html diff --git a/projects/nshmp-apps/src/app/dev/aws/haz-job-history/components/content/content.component.scss b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/content/content.component.scss similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/haz-job-history/components/content/content.component.scss rename to projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/content/content.component.scss diff --git a/projects/nshmp-apps/src/app/dev/aws/haz-job-history/components/content/content.component.spec.ts b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/content/content.component.spec.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/haz-job-history/components/content/content.component.spec.ts rename to projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/content/content.component.spec.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/haz-job-history/components/content/content.component.ts b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/content/content.component.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/haz-job-history/components/content/content.component.ts rename to projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/content/content.component.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/haz-job-history/components/control-panel/control-panel.component.html b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/control-panel/control-panel.component.html similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/haz-job-history/components/control-panel/control-panel.component.html rename to projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/control-panel/control-panel.component.html diff --git a/projects/nshmp-apps/src/app/dev/aws/haz-job-history/components/control-panel/control-panel.component.scss b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/control-panel/control-panel.component.scss similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/haz-job-history/components/control-panel/control-panel.component.scss rename to projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/control-panel/control-panel.component.scss diff --git a/projects/nshmp-apps/src/app/dev/aws/haz-job-history/components/control-panel/control-panel.component.spec.ts b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/control-panel/control-panel.component.spec.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/haz-job-history/components/control-panel/control-panel.component.spec.ts rename to projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/control-panel/control-panel.component.spec.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/haz-job-history/components/control-panel/control-panel.component.ts b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/control-panel/control-panel.component.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/haz-job-history/components/control-panel/control-panel.component.ts rename to projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/control-panel/control-panel.component.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/haz-job-history/models/control-form.model.ts b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/models/control-form.model.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/haz-job-history/models/control-form.model.ts rename to projects/nshmp-apps/src/app/internal/aws/haz-job-history/models/control-form.model.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/haz-job-history/models/state.model.ts b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/models/state.model.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/haz-job-history/models/state.model.ts rename to projects/nshmp-apps/src/app/internal/aws/haz-job-history/models/state.model.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/haz-job-history/services/app.service.ts b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/services/app.service.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/haz-job-history/services/app.service.ts rename to projects/nshmp-apps/src/app/internal/aws/haz-job-history/services/app.service.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/haz-job-history/tsconfig.doc.json b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/tsconfig.doc.json similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/haz-job-history/tsconfig.doc.json rename to projects/nshmp-apps/src/app/internal/aws/haz-job-history/tsconfig.doc.json diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/.compodoc.yml b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/.compodoc.yml similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/.compodoc.yml rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/.compodoc.yml diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/README.md b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/README.md similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/README.md rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/README.md diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/app.component.html b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/app.component.html similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/app.component.html rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/app.component.html diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/app.component.scss b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/app.component.scss similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/app.component.scss rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/app.component.scss diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/app.component.spec.ts b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/app.component.spec.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/app.component.spec.ts rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/app.component.spec.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/app.component.ts b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/app.component.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/app.component.ts rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/app.component.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/about/about.component.html b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/about/about.component.html similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/about/about.component.html rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/about/about.component.html diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/about/about.component.scss b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/about/about.component.scss similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/about/about.component.scss rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/about/about.component.scss diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/about/about.component.spec.ts b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/about/about.component.spec.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/about/about.component.spec.ts rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/about/about.component.spec.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/about/about.component.ts b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/about/about.component.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/about/about.component.ts rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/about/about.component.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/config-example/config-example.component.html b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/config-example/config-example.component.html similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/config-example/config-example.component.html rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/config-example/config-example.component.html diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/config-example/config-example.component.scss b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/config-example/config-example.component.scss similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/config-example/config-example.component.scss rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/config-example/config-example.component.scss diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/config-example/config-example.component.spec.ts b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/config-example/config-example.component.spec.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/config-example/config-example.component.spec.ts rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/config-example/config-example.component.spec.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/config-example/config-example.component.ts b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/config-example/config-example.component.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/config-example/config-example.component.ts rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/config-example/config-example.component.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/config/config.component.html b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/config/config.component.html similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/config/config.component.html rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/config/config.component.html diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/config/config.component.scss b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/config/config.component.scss similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/config/config.component.scss rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/config/config.component.scss diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/config/config.component.spec.ts b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/config/config.component.spec.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/config/config.component.spec.ts rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/config/config.component.spec.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/config/config.component.ts b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/config/config.component.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/config/config.component.ts rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/config/config.component.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/content/content.component.html b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/content/content.component.html similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/content/content.component.html rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/content/content.component.html diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/content/content.component.scss b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/content/content.component.scss similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/content/content.component.scss rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/content/content.component.scss diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/content/content.component.spec.ts b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/content/content.component.spec.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/content/content.component.spec.ts rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/content/content.component.spec.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/content/content.component.ts b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/content/content.component.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/content/content.component.ts rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/content/content.component.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/form/form.component.html b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.html similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/form/form.component.html rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.html diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/form/form.component.scss b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.scss similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/form/form.component.scss rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.scss diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/form/form.component.spec.ts b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.spec.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/form/form.component.spec.ts rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.spec.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/form/form.component.ts b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/form/form.component.ts rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/history/history.component.html b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.html similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/history/history.component.html rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.html diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/history/history.component.scss b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.scss similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/history/history.component.scss rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.scss diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/history/history.component.spec.ts b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.spec.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/history/history.component.spec.ts rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.spec.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/history/history.component.ts b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/history/history.component.ts rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/job-submitted/job-submitted.component.html b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/job-submitted/job-submitted.component.html similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/job-submitted/job-submitted.component.html rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/job-submitted/job-submitted.component.html diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/job-submitted/job-submitted.component.scss b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/job-submitted/job-submitted.component.scss similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/job-submitted/job-submitted.component.scss rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/job-submitted/job-submitted.component.scss diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/job-submitted/job-submitted.component.spec.ts b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/job-submitted/job-submitted.component.spec.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/job-submitted/job-submitted.component.spec.ts rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/job-submitted/job-submitted.component.spec.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/job-submitted/job-submitted.component.ts b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/job-submitted/job-submitted.component.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/components/job-submitted/job-submitted.component.ts rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/job-submitted/job-submitted.component.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/models/file-info.model.ts b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/models/file-info.model.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/models/file-info.model.ts rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/models/file-info.model.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/models/file-type.model.ts b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/models/file-type.model.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/models/file-type.model.ts rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/models/file-type.model.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/models/file-upload.model.ts b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/models/file-upload.model.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/models/file-upload.model.ts rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/models/file-upload.model.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/models/form-group.model.ts b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/models/form-group.model.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/models/form-group.model.ts rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/models/form-group.model.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/models/gitlab-tag-item.model.ts b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/models/gitlab-tag-item.model.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/models/gitlab-tag-item.model.ts rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/models/gitlab-tag-item.model.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/models/instance-type.model.ts b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/models/instance-type.model.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/models/instance-type.model.ts rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/models/instance-type.model.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/models/map-regions.model.ts b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/models/map-regions.model.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/models/map-regions.model.ts rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/models/map-regions.model.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/models/nshmp-haz-class.model.ts b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/models/nshmp-haz-class.model.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/models/nshmp-haz-class.model.ts rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/models/nshmp-haz-class.model.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/models/state.model.ts b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/models/state.model.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/models/state.model.ts rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/models/state.model.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/services/app.service.ts b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/services/app.service.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/services/app.service.ts rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/services/app.service.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/tsconfig.doc.json b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/tsconfig.doc.json similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/tsconfig.doc.json rename to projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/tsconfig.doc.json diff --git a/projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/.compodoc.yml b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/.compodoc.yml similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/.compodoc.yml rename to projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/.compodoc.yml diff --git a/projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/README.md b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/README.md similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/README.md rename to projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/README.md diff --git a/projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/app.component.html b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/app.component.html similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/app.component.html rename to projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/app.component.html diff --git a/projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/app.component.scss b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/app.component.scss similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/app.component.scss rename to projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/app.component.scss diff --git a/projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/app.component.spec.ts b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/app.component.spec.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/app.component.spec.ts rename to projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/app.component.spec.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/app.component.ts b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/app.component.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/app.component.ts rename to projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/app.component.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/components/about/about.component.html b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/about/about.component.html similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/components/about/about.component.html rename to projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/about/about.component.html diff --git a/projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/components/about/about.component.scss b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/about/about.component.scss similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/components/about/about.component.scss rename to projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/about/about.component.scss diff --git a/projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/components/about/about.component.spec.ts b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/about/about.component.spec.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/components/about/about.component.spec.ts rename to projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/about/about.component.spec.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/components/about/about.component.ts b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/about/about.component.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/components/about/about.component.ts rename to projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/about/about.component.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/components/content/content.component.html b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/content/content.component.html similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/components/content/content.component.html rename to projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/content/content.component.html diff --git a/projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/components/content/content.component.scss b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/content/content.component.scss similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/components/content/content.component.scss rename to projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/content/content.component.scss diff --git a/projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/components/content/content.component.spec.ts b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/content/content.component.spec.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/components/content/content.component.spec.ts rename to projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/content/content.component.spec.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/components/content/content.component.ts b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/content/content.component.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/components/content/content.component.ts rename to projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/content/content.component.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/models/state.model.ts b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/models/state.model.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/models/state.model.ts rename to projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/models/state.model.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/services/app.service.ts b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/services/app.service.ts similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/services/app.service.ts rename to projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/services/app.service.ts diff --git a/projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/tsconfig.doc.json b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/tsconfig.doc.json similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/tsconfig.doc.json rename to projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/tsconfig.doc.json diff --git a/projects/nshmp-apps/src/app/dev/aws/tsconfig.doc.json b/projects/nshmp-apps/src/app/internal/aws/tsconfig.doc.json similarity index 100% rename from projects/nshmp-apps/src/app/dev/aws/tsconfig.doc.json rename to projects/nshmp-apps/src/app/internal/aws/tsconfig.doc.json diff --git a/projects/nshmp-apps/src/app/internal/dashboard/.compodoc.yml b/projects/nshmp-apps/src/app/internal/dashboard/.compodoc.yml new file mode 100644 index 0000000000000000000000000000000000000000..3951b7ab87116e22b4cc4e99f75ed653d90cfdf1 --- /dev/null +++ b/projects/nshmp-apps/src/app/internal/dashboard/.compodoc.yml @@ -0,0 +1 @@ +name: Internal Dashboard diff --git a/projects/nshmp-apps/src/app/internal/dashboard/README.md b/projects/nshmp-apps/src/app/internal/dashboard/README.md new file mode 100644 index 0000000000000000000000000000000000000000..1d9f073e8cf822f6cfeef1b565e952c64dbb18f6 --- /dev/null +++ b/projects/nshmp-apps/src/app/internal/dashboard/README.md @@ -0,0 +1,30 @@ +# USGS Earthquake Hazard Toolbox Development Dashboard + +> - [User Guide](https://ghsc.code-pages.usgs.gov/nshmp/nshmp-apps/) +> - [Applications](https://ghsc.code-pages.usgs.gov/nshmp/nshmp-apps/apps/) +> - [Development Applications](https://ghsc.code-pages.usgs.gov/nshmp/nshmp-apps/apps/dev) +> - [Internal Applications](https://ghsc.code-pages.usgs.gov/nshmp/nshmp-apps/apps/internal) +> - [Libraries](https://ghsc.code-pages.usgs.gov/nshmp/nshmp-apps/libs/) + +## Dashboard + +Internal dashboard for all USGS internal applications. + +Contains links to internal applications: + +- AWS applications: + - [Check hazard jobs application](https://ghsc.code-pages.usgs.gov/nshmp/nshmp-apps/apps/dev/aws/check-haz-jobs) + - [Hazard job history application](https://ghsc.code-pages.usgs.gov/nshmp/nshmp-apps/apps/dev/aws/aws/haz-job-history) + - [Submit hazard jobs application](https://ghsc.code-pages.usgs.gov/nshmp/nshmp-apps/apps/dev/aws/aws/submit-haz-jobs) + - [Terminate hazard jobs application](https://ghsc.code-pages.usgs.gov/nshmp/nshmp-apps/apps/dev/aws/aws/terminate-haz-jobs) + +## Components + +### App + +Main app component for dashboard application. + +## Routing + +See [InternalModule](https://ghsc.code-pages.usgs.gov/nshmp/nshmp-apps/apps/dev/modules/InternalModule.html) +for routing configuration for internal applications. diff --git a/projects/nshmp-apps/src/app/internal/dashboard/app.component.html b/projects/nshmp-apps/src/app/internal/dashboard/app.component.html new file mode 100644 index 0000000000000000000000000000000000000000..ba0728ed002fc40d1b8bdf8eef71bb819b3f973f --- /dev/null +++ b/projects/nshmp-apps/src/app/internal/dashboard/app.component.html @@ -0,0 +1,21 @@ +<nshmp-lib-ng-template #template [navigationList]="navigationList"> + <!-- Dashboard --> + <nshmp-lib-ng-dashboard [sections]="sections"> + <nshmp-lib-ng-dashboard-title> + USGS Earthquake + <br /> + Hazard Toolbox: + <br /> + Internal Applications + </nshmp-lib-ng-dashboard-title> + <nshmp-lib-ng-dashboard-description /> + </nshmp-lib-ng-dashboard> + + <!-- About page --> + <nshmp-lib-ng-about-page> + <nshmp-lib-ng-about-content + [showSavingSettingPanel]="false" + [showUsingApplicationPanel]="false" + /> + </nshmp-lib-ng-about-page> +</nshmp-lib-ng-template> diff --git a/projects/nshmp-apps/src/app/internal/dashboard/app.component.scss b/projects/nshmp-apps/src/app/internal/dashboard/app.component.scss new file mode 100644 index 0000000000000000000000000000000000000000..9725bdd50fd511d82056ee0edd62b199fb4fdeaa --- /dev/null +++ b/projects/nshmp-apps/src/app/internal/dashboard/app.component.scss @@ -0,0 +1 @@ +@import '../../../styles/dashboards'; diff --git a/projects/nshmp-apps/src/app/internal/dashboard/app.component.spec.ts b/projects/nshmp-apps/src/app/internal/dashboard/app.component.spec.ts new file mode 100644 index 0000000000000000000000000000000000000000..892acc0c639cb4d4ba6d7c40f483790efb8c7c13 --- /dev/null +++ b/projects/nshmp-apps/src/app/internal/dashboard/app.component.spec.ts @@ -0,0 +1,33 @@ +import {provideHttpClient} from '@angular/common/http'; +import {ComponentFixture, TestBed} from '@angular/core/testing'; +import {provideNoopAnimations} from '@angular/platform-browser/animations'; +import {provideRouter} from '@angular/router'; + +import {AppComponent} from './app.component'; + +describe('DashboardComponent', () => { + let component: AppComponent; + let fixture: ComponentFixture<AppComponent>; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [AppComponent], + providers: [ + provideHttpClient(), + provideNoopAnimations(), + provideRouter([]), + ], + teardown: {destroyAfterEach: false}, + }).compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(AppComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/projects/nshmp-apps/src/app/internal/dashboard/app.component.ts b/projects/nshmp-apps/src/app/internal/dashboard/app.component.ts new file mode 100644 index 0000000000000000000000000000000000000000..51c6803040c302d59ff4bd9265d03c334e21a947 --- /dev/null +++ b/projects/nshmp-apps/src/app/internal/dashboard/app.component.ts @@ -0,0 +1,65 @@ +import {Component, OnDestroy, OnInit} from '@angular/core'; +import { + NshmpLibNgAboutContentComponent, + NshmpLibNgAboutPageComponent, +} from '@ghsc/nshmp-lib-ng/about'; +import { + ApplicationSections, + NshmpLibNgDashboardComponent, + NshmpLibNgDashboardDescriptionComponent, + NshmpLibNgDashboardTitleComponent, + NshmpLibNgTemplateComponent, +} from '@ghsc/nshmp-lib-ng/nshmp'; +import {Subscription} from 'rxjs'; + +import * as nav from '../../../shared/utils/navigation.utils'; +import {AuthService} from '../shared/services/auth.service'; + +/** + * Development dashboard showing links to development applications. + */ +@Component({ + imports: [ + NshmpLibNgTemplateComponent, + NshmpLibNgAboutPageComponent, + NshmpLibNgAboutContentComponent, + NshmpLibNgDashboardComponent, + NshmpLibNgDashboardTitleComponent, + NshmpLibNgDashboardDescriptionComponent, + ], + selector: 'app-app', + standalone: true, + styleUrl: './app.component.scss', + templateUrl: './app.component.html', +}) +export class AppComponent implements OnInit, OnDestroy { + /** Navigation list for menu */ + navigationList = nav.devNavigation(); + + /** AWS applications */ + private awsApps = nav.devAwsApps(); + + sections: ApplicationSections[] = []; + + private sub: Subscription; + + constructor(private authService: AuthService) {} + ngOnInit(): void { + this.sub = this.authService.isAuthorized().subscribe(() => { + this.sections = [ + { + sections: [ + { + applications: this.awsApps.map(navigation => ({navigation})), + }, + ], + }, + ]; + }); + } + + ngOnDestroy(): void { + this.sections = []; + this.sub.unsubscribe(); + } +} diff --git a/projects/nshmp-apps/src/app/internal/dashboard/tsconfig.doc.json b/projects/nshmp-apps/src/app/internal/dashboard/tsconfig.doc.json new file mode 100644 index 0000000000000000000000000000000000000000..80b484b95807b67f9a690fc905b41a1037a575b8 --- /dev/null +++ b/projects/nshmp-apps/src/app/internal/dashboard/tsconfig.doc.json @@ -0,0 +1,4 @@ +{ + "include": ["**/*.ts"], + "exclude": ["**/*.spec.ts"] +} diff --git a/projects/nshmp-apps/src/app/internal/internal.routes.ts b/projects/nshmp-apps/src/app/internal/internal.routes.ts new file mode 100644 index 0000000000000000000000000000000000000000..8fd1ea96284c0658330293e30230f829858c9636 --- /dev/null +++ b/projects/nshmp-apps/src/app/internal/internal.routes.ts @@ -0,0 +1,29 @@ +import {Routes} from '@angular/router'; + +import {devAwsRoutes} from './aws/aws.routes'; +import {networkGuard} from './shared/guards/network.guard'; + +/** + * Internal application routes. + */ +const routes: Routes = [ + // Development dahsboard + { + loadComponent: () => + import('./dashboard/app.component').then(com => com.AppComponent), + path: '', + }, + // AWS applications + { + canActivate: [networkGuard], + children: devAwsRoutes(), + path: 'aws', + }, +]; + +/** + * Returns the internal applications routes. + */ +export function internalRoutes(): Routes { + return routes; +} diff --git a/projects/nshmp-apps/src/app/internal/shared/guards/network.guard.ts b/projects/nshmp-apps/src/app/internal/shared/guards/network.guard.ts new file mode 100644 index 0000000000000000000000000000000000000000..0fdabaaead2eff579ff83f5cd22015a12247a387 --- /dev/null +++ b/projects/nshmp-apps/src/app/internal/shared/guards/network.guard.ts @@ -0,0 +1,12 @@ +import {inject} from '@angular/core'; +import {CanActivateFn} from '@angular/router'; + +import {AuthService} from '../services/auth.service'; + +/** + * Network auth route guard. + */ +export const networkGuard: CanActivateFn = () => { + const authService = inject(AuthService); + return authService.isAuthorized(); +}; diff --git a/projects/nshmp-apps/src/app/internal/shared/services/auth.service.ts b/projects/nshmp-apps/src/app/internal/shared/services/auth.service.ts new file mode 100644 index 0000000000000000000000000000000000000000..b18c00d3e321ace8a40f57b3306d123ba28a4a7e --- /dev/null +++ b/projects/nshmp-apps/src/app/internal/shared/services/auth.service.ts @@ -0,0 +1,49 @@ +import {HttpClient} from '@angular/common/http'; +import {Injectable} from '@angular/core'; +import {NshmpService, SpinnerService} from '@ghsc/nshmp-lib-ng/nshmp'; +import {environment} from 'projects/nshmp-apps/src/environments/environment'; +import {catchError, map} from 'rxjs'; + +interface AuthResponse { + isAuthorized: boolean; +} + +/** + * Authorizer for USGS network. + */ +@Injectable({ + providedIn: 'root', +}) +export class AuthService { + private service = environment.webServices.aws; + private url = `${this.service.url}${this.service.services.auth}`; + + constructor( + private http: HttpClient, + private spinnerService: SpinnerService, + private nshmpService: NshmpService + ) {} + + isAuthorized() { + const ref = this.spinnerService.show('Checking USGS network ...'); + + return this.http.get<AuthResponse>(this.url).pipe( + map(response => { + console.log(response); + ref.close(); + + if (!response.isAuthorized) { + this.nshmpService.throwError$( + new Error('Must be on USGS network to access internal applications') + ); + } + + return response.isAuthorized; + }), + catchError((error: Error) => { + ref.close(); + return this.nshmpService.throwError$(error); + }) + ); + } +}