Merge branch 'services' into 'main'

fix url

See merge request !554

projects/nshmp-ws/src/app/services/components/content/content.component.html

@@ -115,23 +115,13 @@
                   </h4>
                   <mat-nav-list>
                     @for (app of serviceGroup.applicationsUsedIn; track app) {
-                      @if (serviceGroup.isHref) {
-                        <a
-                          mat-list-item
-                          [href]="app.routerLink"
-                          target="_blank"
-                        >
-                          {{ app.display }}
-                        </a>
-                      } @else {
-                        <a
-                          mat-list-item
-                          [routerLink]="app.routerLink"
-                          target="_blank"
-                        >
-                          {{ app.display }}
-                        </a>
-                      }
+                      <a
+                        mat-list-item
+                        [href]="baseUrl + app.routerLink"
+                        target="_blank"
+                      >
+                        {{ app.display }}
+                      </a>
                     }
                   </mat-nav-list>
                 </div>

projects/nshmp-ws/src/app/services/components/content/content.component.ts

@@ -16,7 +16,7 @@ import {
   MatSidenavContainer,
   MatSidenavContent,
 } from '@angular/material/sidenav';
-import {ActivatedRoute, Router, RouterLink} from '@angular/router';
+import {ActivatedRoute, Router} from '@angular/router';
 import {HazardService} from '@ghsc/nshmp-lib-ng/hazard';
 import {NshmpService} from '@ghsc/nshmp-lib-ng/nshmp';
 import {NshmpTemplateService} from '@ghsc/nshmp-template';
@@ -60,7 +60,6 @@ const APPS = apps();
     MatCardSubtitle,
     MatCardContent,
     MatDivider,
-    RouterLink,
     AsyncPipe,
   ],
   selector: 'app-content',
@@ -126,12 +125,7 @@ export class ContentComponent implements AfterViewInit {
         apps().hazard.dynamic,
         apps().hazard.disagg,
         apps().gmm.spectra,
-      ].map(nav => {
-        return {
-          ...nav,
-          routerLink: `${this.baseUrl}${nav.routerLink}`,
-        };
-      }),
+      ],
       applicationUsedInLabel: 'Main Applications',
       id: ServiceGroupId.TOOLBOX,
       images: [],

projects/nshmp-ws/src/app/swagger/app.component.ts

@@ -80,10 +80,12 @@ export class AppComponent implements OnInit {
                 if (spec && spec.paths) {
                   const newPaths: Record<string, string> = {};
                   // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-                  Object.entries(spec.paths).forEach(
-                    ([path, value]) =>
-                      (newPaths[contextPath + path] = value as string),
-                  );
+                  Object.entries(spec.paths).forEach(([path, value]) => {
+                    const servicePath = path.includes(contextPath)
+                      ? path
+                      : `${contextPath}${path}`;
+                    newPaths[servicePath] = value as string;
+                  });
                   spec.paths = newPaths;
                 }
                 oriAction(...args);