From 8381f23444e08682c0286187989ed3ab8f9ac5d0 Mon Sep 17 00:00:00 2001 From: Omkar Zade Date: Tue, 8 Jul 2025 14:50:19 +0200 Subject: [PATCH 1/3] (feat) add help cards in /help and /about, based on configurable supportEmail --- src/app/about/about.module.ts | 3 ++- src/app/about/about/about.component.html | 16 ++++++++++++++++ src/app/about/about/about.component.ts | 2 ++ src/app/app-config.service.ts | 1 + src/app/help/help/help.component.html | 12 ++++++++++++ src/app/help/help/help.component.ts | 2 ++ 6 files changed, 35 insertions(+), 1 deletion(-) diff --git a/src/app/about/about.module.ts b/src/app/about/about.module.ts index 34c2421d8c..1bb895992d 100644 --- a/src/app/about/about.module.ts +++ b/src/app/about/about.module.ts @@ -4,9 +4,10 @@ import { AboutComponent } from "./about/about.component"; import { MatCardModule } from "@angular/material/card"; import { FlexLayoutModule } from "@ngbracket/ngx-layout"; import { LinkyModule } from "ngx-linky"; +import { RouterModule } from "@angular/router"; @NgModule({ declarations: [AboutComponent], - imports: [CommonModule, FlexLayoutModule, LinkyModule, MatCardModule], + imports: [CommonModule, FlexLayoutModule, LinkyModule, MatCardModule, RouterModule], }) export class AboutModule {} diff --git a/src/app/about/about/about.component.html b/src/app/about/about/about.component.html index 5ae7081676..de86855831 100644 --- a/src/app/about/about/about.component.html +++ b/src/app/about/about/about.component.html @@ -43,5 +43,21 @@ > + + + + Getting help + + +

+ For a list of general topics, see our + Help page. +

+

In case of further questions or issues, please + contact + {{ supportEmail }}. +

+ + diff --git a/src/app/about/about/about.component.ts b/src/app/about/about/about.component.ts index 9deba19789..af43c5e84f 100644 --- a/src/app/about/about/about.component.ts +++ b/src/app/about/about/about.component.ts @@ -20,6 +20,7 @@ export class AboutComponent implements OnInit { SNFLink = ""; PSIDataPolicy = ""; facility = ""; + supportEmail = ""; constructor(public appConfigService: AppConfigService) {} @@ -36,6 +37,7 @@ export class AboutComponent implements OnInit { "Scicat allows users to access data and metadata from experiments"; this.accessText = "Users must comply with access policy of instruments"; this.termsText = "Data can be used freely under the CC-BY-4.0 licence"; + this.supportEmail = this.appConfig.supportEmail; if (this.facility === "ESS") { this.aboutText = "Scicat is a metadata catalogue allows users to access information about experimental results, " + diff --git a/src/app/app-config.service.ts b/src/app/app-config.service.ts index 4a70e92908..f363027f8d 100644 --- a/src/app/app-config.service.ts +++ b/src/app/app-config.service.ts @@ -120,6 +120,7 @@ export interface AppConfigInterface { labelsLocalization?: LabelsLocalization; dateFormat?: string; defaultMainPage?: MainPageConfiguration; + supportEmail?: string; } function isMainPageConfiguration(obj: any): obj is MainPageConfiguration { diff --git a/src/app/help/help/help.component.html b/src/app/help/help/help.component.html index 4474f53439..fda9d3f9c9 100644 --- a/src/app/help/help/help.component.html +++ b/src/app/help/help/help.component.html @@ -108,3 +108,15 @@

+ +

+ + + Questions or issues? + + + If you have any questions or need help, please contact + {{ supportEmail }}. + + +

diff --git a/src/app/help/help/help.component.ts b/src/app/help/help/help.component.ts index ef4c0ce2e9..de9e67c85a 100644 --- a/src/app/help/help/help.component.ts +++ b/src/app/help/help/help.component.ts @@ -14,6 +14,7 @@ export class HelpComponent implements OnInit { gettingStarted: string | null = null; shoppingCartEnabled = false; helpMessages: HelpMessages; + supportEmail: string | undefined; constructor(public appConfigService: AppConfigService) {} ngOnInit() { @@ -25,5 +26,6 @@ export class HelpComponent implements OnInit { ); this.gettingStarted = this.appConfig.gettingStarted; this.shoppingCartEnabled = this.appConfig.shoppingCartEnabled; + this.supportEmail = this.appConfig.supportEmail; } } From 9f07e64ccbc87e2eb97440adf890e1854748e979 Mon Sep 17 00:00:00 2001 From: Omkar Zade Date: Tue, 8 Jul 2025 15:09:54 +0200 Subject: [PATCH 2/3] fix linting error in about.module.ts --- src/app/about/about.module.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/app/about/about.module.ts b/src/app/about/about.module.ts index 1bb895992d..279570f38c 100644 --- a/src/app/about/about.module.ts +++ b/src/app/about/about.module.ts @@ -8,6 +8,12 @@ import { RouterModule } from "@angular/router"; @NgModule({ declarations: [AboutComponent], - imports: [CommonModule, FlexLayoutModule, LinkyModule, MatCardModule, RouterModule], + imports: [ + CommonModule, + FlexLayoutModule, + LinkyModule, + MatCardModule, + RouterModule, + ], }) export class AboutModule {} From a4387f80be4e329cd4297060d5ed64e56236062e Mon Sep 17 00:00:00 2001 From: Omkar Zade Date: Thu, 10 Jul 2025 10:45:00 +0200 Subject: [PATCH 3/3] Reset changes in about/ to original HEAD --- src/app/about/about.module.ts | 9 +-------- src/app/about/about/about.component.html | 16 ---------------- src/app/about/about/about.component.ts | 2 -- 3 files changed, 1 insertion(+), 26 deletions(-) diff --git a/src/app/about/about.module.ts b/src/app/about/about.module.ts index 279570f38c..34c2421d8c 100644 --- a/src/app/about/about.module.ts +++ b/src/app/about/about.module.ts @@ -4,16 +4,9 @@ import { AboutComponent } from "./about/about.component"; import { MatCardModule } from "@angular/material/card"; import { FlexLayoutModule } from "@ngbracket/ngx-layout"; import { LinkyModule } from "ngx-linky"; -import { RouterModule } from "@angular/router"; @NgModule({ declarations: [AboutComponent], - imports: [ - CommonModule, - FlexLayoutModule, - LinkyModule, - MatCardModule, - RouterModule, - ], + imports: [CommonModule, FlexLayoutModule, LinkyModule, MatCardModule], }) export class AboutModule {} diff --git a/src/app/about/about/about.component.html b/src/app/about/about/about.component.html index de86855831..5ae7081676 100644 --- a/src/app/about/about/about.component.html +++ b/src/app/about/about/about.component.html @@ -43,21 +43,5 @@ > - - - - Getting help - - -

- For a list of general topics, see our - Help page. -

-

In case of further questions or issues, please - contact - {{ supportEmail }}. -

- - diff --git a/src/app/about/about/about.component.ts b/src/app/about/about/about.component.ts index af43c5e84f..9deba19789 100644 --- a/src/app/about/about/about.component.ts +++ b/src/app/about/about/about.component.ts @@ -20,7 +20,6 @@ export class AboutComponent implements OnInit { SNFLink = ""; PSIDataPolicy = ""; facility = ""; - supportEmail = ""; constructor(public appConfigService: AppConfigService) {} @@ -37,7 +36,6 @@ export class AboutComponent implements OnInit { "Scicat allows users to access data and metadata from experiments"; this.accessText = "Users must comply with access policy of instruments"; this.termsText = "Data can be used freely under the CC-BY-4.0 licence"; - this.supportEmail = this.appConfig.supportEmail; if (this.facility === "ESS") { this.aboutText = "Scicat is a metadata catalogue allows users to access information about experimental results, " +