Skip to content

Commit 21461e6

Browse files
authored
Merge pull request #68 from reactome/better-config
Better config
2 parents e437e47 + 5f9bf84 commit 21461e6

5 files changed

Lines changed: 8 additions & 77 deletions

File tree

projects/website-angular/src/app/home-page/home-stats/home-stats.component.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { MatIcon } from "@angular/material/icon";
33
import { CarouselComponent } from "../../reactome-components/carousel/carousel.component";
44
import { StatsService } from '../../../services/stats.service';
55
import { APP_CONFIG } from '../../../config/config'; // NEW import
6+
import { GeneralService } from 'projects/pathway-browser/src/app/services/general.service';
67

78
interface Stats {
89
human_pathways: number;
@@ -23,6 +24,7 @@ interface Stats {
2324
})
2425
export class HomeStatsComponent {
2526
private statsService = inject(StatsService);
27+
private generalService = inject(GeneralService);
2628

2729
version: string = '';
2830
releaseDate: Date = new Date();
@@ -40,8 +42,7 @@ export class HomeStatsComponent {
4042
}
4143

4244
getVersionAndDate () {
43-
// Use APP_CONFIG instead of dynamic JSON import
44-
this.version = APP_CONFIG.version.releaseNumber;
45+
this.version = 'V' + (this.generalService.version.value() ?? APP_CONFIG.version.releaseNumber).toString();
4546
this.releaseDate = new Date(APP_CONFIG.version.releaseDate);
4647
this.fetchStats();
4748
}

projects/website-angular/src/config/config.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

projects/website-angular/src/config/config.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
export const APP_CONFIG = {
22
// app-level version info
33
version: {
4-
label: 'V95',
5-
releaseNumber: '95',
6-
releaseDate: '2025-12-09'
4+
releaseNumber: '96',
5+
releaseDate: '2026-04-01'
76
},
87

98
// canonical site base / download base (choose prod by default)

projects/website-angular/src/config/external-links.json

Lines changed: 0 additions & 62 deletions
This file was deleted.

projects/website-angular/src/services/stats.service.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { isPlatformBrowser } from '@angular/common';
33
import { HttpClient } from '@angular/common/http';
44
import { Observable, map, catchError, of, timeout } from 'rxjs';
55
import { APP_CONFIG } from '../config/config'; // NEW import
6+
import { GeneralService } from 'projects/pathway-browser/src/app/services/general.service';
67

78
export interface ReactomeStats {
89
pathways: number;
@@ -24,13 +25,14 @@ interface RawStatItem {
2425
export class StatsService {
2526
private http = inject(HttpClient);
2627
private platformId = inject(PLATFORM_ID);
28+
private generalService = inject(GeneralService);
2729
private isBrowser = isPlatformBrowser(this.platformId);
2830

2931
/**
3032
* Get the current Reactome version from APP_CONFIG
3133
*/
3234
async getVersion(): Promise<string> {
33-
return APP_CONFIG.version.releaseNumber;
35+
return (this.generalService.version.value() ?? APP_CONFIG.version.releaseNumber).toString();
3436
}
3537

3638
/**

0 commit comments

Comments
 (0)