feat: show release version and site on user settings page

SciCatProject · Jun 4, 2024 · e605097 · e605097
1 parent 923ef78
commit e605097
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "scicat-frontend",
-  "version": "4.3.1",
+  "version": "4.4.0",
   "license": "BSD-3-Clause",
   "scripts": {
     "ng": "ng",

diff --git a/src/app/users/user-settings/user-settings.component.html b/src/app/users/user-settings/user-settings.component.html
@@ -98,13 +98,13 @@
 
       <mat-card-content>
         <table>
-          <tr *ngIf="settings.datasetCount as value">
-            <th>Dataset Count</th>
-            <td>{{ value }}</td>
+          <tr *ngIf="appVersion">
+            <th>Release Version</th>
+            <td>{{ appVersion }}</td>
           </tr>
-          <tr *ngIf="settings.jobCount as value">
-            <th>Job Count</th>
-            <td>{{ value }}</td>
+          <tr *ngIf="appConfig.facility">
+            <th>Site</th>
+            <td>{{ appConfig.facility }}</td>
           </tr>
         </table>
       </mat-card-content>

diff --git a/src/app/users/user-settings/user-settings.component.ts b/src/app/users/user-settings/user-settings.component.ts
@@ -8,6 +8,8 @@ import {
 import { Message, MessageType } from "state-management/models";
 import { selectUserSettingsPageViewModel } from "state-management/selectors/user.selectors";
 import { DOCUMENT } from "@angular/common";
+import packageJson from "../../../../package.json";
+import { AppConfigService } from "app-config.service";
 
 @Component({
   selector: "app-user-settings",
@@ -16,10 +18,13 @@ import { DOCUMENT } from "@angular/common";
 })
 export class UserSettingsComponent implements OnInit {
   vm$ = this.store.select(selectUserSettingsPageViewModel);
+  appVersion: string | undefined = packageJson.version;
+  appConfig = this.appConfigService.getConfig();
   tokenValue: string;
   show = true;
 
   constructor(
+    public appConfigService: AppConfigService,
     @Inject(DOCUMENT) private document: Document,
     private store: Store,
   ) {

diff --git a/tsconfig.json b/tsconfig.json
@@ -4,6 +4,7 @@
   "compilerOptions": {
     "baseUrl": "./src/app",
     "outDir": "./dist/out-tsc",
+    "resolveJsonModule": true,
     "allowSyntheticDefaultImports": true,
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
@@ -19,10 +20,7 @@
     "useDefineForClassFields": false,
     "target": "es2022",
     "module": "es2022",
-    "lib": [
-      "es2022",
-      "dom"
-    ]
+    "lib": ["es2022", "dom"]
   },
   "angularCompilerOptions": {
     "enableI18nLegacyMessageIdFormat": false,