Merge pull request #21 from NorskHelsenett/feature/docs

Updating dependencies

charts/ror-webapp/templates/configmap.yaml

@@ -17,6 +17,8 @@ data:
       "regex": {
           "forms": "^[@()\\/:?\\r\\n.,a-zA-Z æøåÆØÅ0-9_-]+$"
       },
+      externalDocsUrl: "{{ .Values.docs.externalDocsUrl }}",
+      docsUrl: "{{ .Values.docs.docsUrl }}",
       "rowsPerPage": [10, 25, 50, 75, 100],
       "rows": 25,
       "rorApi": "{{ .Values.web.apiUrl }}",

charts/ror-webapp/values.yaml

@@ -73,3 +73,6 @@ autoscaling:
 nodeSelector: {}
 tolerations: []
 affinity: {}
+docs:
+  externalDocsUrl: https://norskhelsenett.github.io/ror/
+  docsUrl: https://norskhelsenett.github.io/ror/

package.json

@@ -31,7 +31,7 @@
     "@angular/service-worker": "^18.2.12",
     "@ngx-translate/core": "^16.0.4",
     "@ngx-translate/http-loader": "^16.0.1",
-    "@rork8s/ror-resources": "^1.1.0-rc11",
+    "@rork8s/ror-resources": "^1.1.0",
     "angular-oauth2-oidc": "^17.0.2",
     "chart.js": "^4.4.7",
     "dayjs": "^1.11.13",
@@ -61,22 +61,22 @@
     "@angular/cli": "^18.2.12",
     "@angular/compiler-cli": "^18.2.12",
     "@types/jasmine": "~5.1.5",
-    "@types/node": "^22.12.0",
+    "@types/node": "^22.13.1",
     "@types/uuid": "^10.0.0",
-    "@typescript-eslint/eslint-plugin": "^8.22.0",
-    "@typescript-eslint/parser": "^8.22.0",
+    "@typescript-eslint/eslint-plugin": "^8.24.0",
+    "@typescript-eslint/parser": "^8.24.0",
     "autoprefixer": "^10.4.20",
-    "eslint": "^9.19.0",
+    "eslint": "^9.20.1",
     "eslint-config-prettier": "^10.0.1",
     "eslint-plugin-prettier": "^5.2.3",
-    "jasmine-core": "~5.5.0",
+    "jasmine-core": "~5.6.0",
     "karma": "~6.4.4",
     "karma-chrome-launcher": "~3.2.0",
     "karma-coverage": "~2.2.1",
     "karma-jasmine": "~5.1.0",
     "karma-jasmine-html-reporter": "~2.1.0",
-    "postcss": "^8.5.1",
-    "prettier": "^3.4.2",
+    "postcss": "^8.5.2",
+    "prettier": "^3.5.0",
     "prettier-plugin-tailwindcss": "^0.6.11",
     "tailwindcss": "^3.4.17",
     "typescript": "~5.5.4"

src/app.config.ts

@@ -9,6 +9,8 @@ export interface AppConfig {
   rows: number;
   rorApi: string;
   sse: SSE;
+  docsUrl: string;
+  externalDocsUrl: string;
 }
 
 export interface Auth {

src/app/layout/layout.component.html

@@ -438,7 +438,7 @@
             <!-- active & hover classes 'text-gray-700 dark:text-light' -->
             <!-- inActive classes 'text-gray-400 dark:text-gray-400' -->
             <a
-              href="https://docs.sky.nhn.no"
+              href="{{ externalDocsUrl }}"
               target="_blank"
               role="menuitem"
               class="dark:hover:text-light block rounded-md p-2 text-sm text-gray-400 transition-colors duration-200 hover:text-gray-700"
@@ -604,7 +604,7 @@
 
           <!-- docs link -->
           <a
-            href="https://docs.sky.nhn.no"
+            href="{{ externalDocsUrl }}"
             target="_blank"
             class="text-primary-lighter bg-primary-50 hover:text-primary hover:bg-primary-100 dark:hover:text-light dark:hover:bg-primary-dark dark:bg-dark focus:bg-primary-100 dark:focus:bg-primary-dark focus:ring-primary-darker rounded-full p-2 transition-colors duration-200 focus:outline-none"
           >
@@ -748,7 +748,7 @@
 
           <!-- docs link -->
           <a
-            href="https://docs.sky.nhn.no"
+            href="{{ externalDocsUrl }}"
             target="_blank"
             class="text-primary-lighter bg-primary-50 hover:text-primary hover:bg-primary-100 dark:hover:text-light dark:hover:bg-primary-dark dark:bg-dark focus:bg-primary-100 dark:focus:bg-primary-dark focus:ring-primary-darker rounded-full p-2 transition-colors duration-200 focus:outline-none"
           >
@@ -963,7 +963,7 @@
               <!-- inActive classes 'text-gray-400 dark:text-gray-400' -->
               <a
                 (click)="toggleMobileMenu()"
-                href="https://docs.sky.nhn.no"
+                href="{{ externalDocsUrl }}"
                 target="_blank"
                 role="menuitem"
                 class="dark:text-light dark:hover:text-light block rounded-md p-2 text-sm text-gray-700 transition-colors duration-200 hover:text-gray-700"
@@ -1002,21 +1002,14 @@
 
     <!-- Main footer -->
     <footer class="dark:bg-darker dark:border-primary-darker mt-0 flex items-center justify-between border-t bg-white p-4">
-      <div>NHN &copy; {{ currentYear }}</div>
-      <div class="">
+      <div>ROR &copy; {{ currentYear }}</div>
+      <div class="flex">
         <a
-          href="https://helsegitlab.nhn.no/sdi/SDI-Infrastruktur/nhn-ror"
+          href="{{ rorDocsUrl }}"
           target="_blank"
           class="delay-50 focus:ring-primary dark:focus:ring-offset-dark flex flex-row rounded-md px-4 py-2 text-sm text-gray-700 duration-300 ease-in-out hover:-translate-y-1 hover:scale-110 focus:outline-none focus:ring focus:ring-offset-1 focus:ring-offset-white dark:text-white"
         >
-          <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 fill-current" viewBox="0 0 16 16">
-            <path
-              d="M15.6979 7.28711L8.71226 0.3018C8.31016 -0.100594 7.65768 -0.100594 7.25502 0.3018L5.80457 1.75251L7.64462 3.59255C8.07224 3.44815 8.56264 3.54507 8.90339 3.8859C9.2462 4.22884 9.3423 4.72345 9.19416 5.15263L10.9677 6.92595C11.3969 6.77801 11.8917 6.87364 12.2345 7.21692C12.7133 7.69562 12.7133 8.47162 12.2345 8.95072C11.7553 9.42983 10.9795 9.42983 10.5001 8.95072C10.1399 8.59023 10.0508 8.06101 10.2335 7.61726L8.5793 5.96325V10.3157C8.69594 10.3735 8.80613 10.4505 8.90339 10.5475C9.38223 11.0263 9.38223 11.8022 8.90339 12.2817C8.42456 12.7604 7.64815 12.7604 7.16967 12.2817C6.69083 11.8022 6.69083 11.0263 7.16967 10.5475C7.28802 10.4293 7.42507 10.3399 7.5713 10.28V5.88728C7.42507 5.82742 7.28835 5.73874 7.16967 5.61971C6.80701 5.25717 6.71974 4.72481 6.90575 4.27937L5.09177 2.46512L0.301736 7.25474C-0.100579 7.65747 -0.100579 8.30995 0.301736 8.71233L7.28767 15.6977C7.68985 16.1 8.34213 16.1 8.74491 15.6977L15.6979 8.7447C16.1004 8.34225 16.1004 7.68944 15.6979 7.28711"
-              clip-rule="evenodd"
-              fill-rule="evenodd"
-              fill="#E85800"
-            />
-          </svg>
+          <i class="pi pi-spin pi-github" style="font-size: 2rem"></i>
           <span class="ml-2"> {{ 'common.viewOnGit' | translate }}</span>
         </a>
       </div>

src/app/layout/layout.component.ts

@@ -1,5 +1,5 @@
 import { TranslateService } from '@ngx-translate/core';
-import { ChangeDetectionStrategy, Component, OnInit, ChangeDetectorRef, OnDestroy } from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnInit, ChangeDetectorRef, OnDestroy, effect } from '@angular/core';
 import { ThemeService } from '../core/services/theme.service';
 import { Observable, Subscription, catchError, share, tap } from 'rxjs';
 import { AuthService } from '../core/services/auth.service';
@@ -9,6 +9,7 @@ import { SseService } from '../create/create-cluster/services/sse.service';
 import { SignalService } from '../create/create-cluster/services/signal.service';
 import { BigEventsService } from '../core/services/big-events.service';
 import { environment } from '../../environments/environment';
+import { ConfigService } from '../core/services/config.service';
 
 @Component({
   selector: 'app-layout',
@@ -30,6 +31,8 @@ export class LayoutComponent implements OnInit, OnDestroy {
   birthday = false;
   desember = false;
   christmas = false;
+  rorDocsUrl: string | undefined;
+  externalDocsUrl: string | undefined;
 
   adminRead$: Observable<boolean> | undefined;
   adminOwner$: Observable<boolean> | undefined;
@@ -48,6 +51,7 @@ export class LayoutComponent implements OnInit, OnDestroy {
     private sseService: SseService,
     private signalService: SignalService,
     private bigEventsService: BigEventsService,
+    private configService: ConfigService,
   ) {}
 
   ngOnInit(): void {
@@ -60,6 +64,9 @@ export class LayoutComponent implements OnInit, OnDestroy {
 
     this.setupSSEClients();
 
+    this.rorDocsUrl = this.configService.config.docsUrl;
+    this.externalDocsUrl = this.configService.config.externalDocsUrl;
+
     this.changeDetector.detectChanges();
   }
 

src/assets/config/config.json

@@ -11,6 +11,8 @@
   "regex": {
     "forms": "^[@()\\/:?\\r\\n.,a-zA-Z æøåÆØÅ0-9_-]+$"
   },
+  "docsUrl": "https://norskhelsenett.github.io/ror/",
+  "externalDocsUrl": "https://norskhelsenett.github.io/ror/",
   "rowsPerPage": [10, 25, 50, 75, 100],
   "rows": 25,
   "rorApi": "http://localhost:10000",

src/assets/i18n/en.json

@@ -32,7 +32,7 @@
     "light": "Light",
     "dark": "Dark",
     "madeWith": "Made with",
-    "viewOnGit": "View on Helsegitlab",
+    "viewOnGit": "View on Github",
     "tryAgain": "Try again",
     "from": "From",
     "to": "To",

src/assets/i18n/no.json

@@ -32,7 +32,7 @@
     "light": "Lys",
     "dark": "Mørk",
     "madeWith": "Laget med",
-    "viewOnGit": "Link til Helsegitlab repo",
+    "viewOnGit": "Link til Github",
     "tryAgain": "Prøv på nytt",
     "from": "Fra",
     "to": "Til",

src/index.html

@@ -5,7 +5,7 @@
     <meta name="theme-color" content="#1976d2" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="keywords" content="ROR, Release, Operate, Report, Kubernetes, Multi cluster, cluster, multi cluster management" />
-    <meta name="description" content="ROR (Release Operate Report) by NHN" />
+    <meta name="description" content="ROR (Release Operate Report)" />
     <title>ROR</title>
     <base href="/" />
     <link rel="icon" type="image/x-icon" href="favicon.ico" />

src/manifest.webmanifest

@@ -1,7 +1,7 @@
 {
   "name": "Release Operate Report",
   "short_name": "ROR",
-  "description": "ROR (Release-Operate-Report) by NHN is a metadata aggregator and configuration management interface to manage multiple clusters over multiple datacenters and/or clouds.",
+  "description": "ROR (Release-Operate-Report) is a metadata aggregator and configuration management interface to manage multiple clusters over multiple datacenters and/or clouds.",
   "theme_color": "#015945",
   "background_color": "#fafafa",
   "display": "standalone",