From 351e7350039cce58b4f2ff904e0b260509561160 Mon Sep 17 00:00:00 2001 From: Lina Date: Mon, 5 Sep 2022 18:43:39 +0200 Subject: [PATCH 01/15] Update logic start --- .../sidebar-pm/sidebar-pm.component.html | 30 +++++++++++++++++-- .../sidebar-pm/sidebar-pm.component.ts | 7 +++++ .../services/config/config-apollo.service.ts | 9 ++++++ .../base/services/config/config-queries.ts | 13 +++++++- 4 files changed, 55 insertions(+), 4 deletions(-) diff --git a/src/app/base/components/sidebar-pm/sidebar-pm.component.html b/src/app/base/components/sidebar-pm/sidebar-pm.component.html index f5f52b23..e62f984b 100644 --- a/src/app/base/components/sidebar-pm/sidebar-pm.component.html +++ b/src/app/base/components/sidebar-pm/sidebar-pm.component.html @@ -192,9 +192,9 @@
- v1.1.1 + +
@@ -206,4 +206,28 @@ + + + + \ No newline at end of file diff --git a/src/app/base/components/sidebar-pm/sidebar-pm.component.ts b/src/app/base/components/sidebar-pm/sidebar-pm.component.ts index 0ffc4558..3c4c2327 100644 --- a/src/app/base/components/sidebar-pm/sidebar-pm.component.ts +++ b/src/app/base/components/sidebar-pm/sidebar-pm.component.ts @@ -14,6 +14,7 @@ import { OrganizationApolloService } from '../../services/organization/organizat import { RouteService } from '../../services/route.service'; import { DOCUMENT } from '@angular/common'; import { ProjectApolloService } from '../../services/project/project-apollo.service'; +import { ConfigApolloService } from '../../services/config/config-apollo.service'; @Component({ @@ -60,6 +61,7 @@ export class SidebarPmComponent implements OnInit { isFullscreen: boolean = false; @Output() firstName = new EventEmitter>(); toggleClass = 'ft-maximize'; + versionOverview: any[] = []; constructor( private organizationService: OrganizationApolloService, @@ -67,6 +69,7 @@ export class SidebarPmComponent implements OnInit { private activatedRoute: ActivatedRoute, private auth: AuthApiService, private projectApolloService: ProjectApolloService, + private configService: ConfigApolloService, @Inject(DOCUMENT) private document: any ) { } @@ -89,6 +92,10 @@ export class SidebarPmComponent implements OnInit { }) ) .subscribe()); + + this.subscriptions$.push(this.configService + .getVersionOverview() + .subscribe((versionOverview) => this.versionOverview = versionOverview)); } onDestroy() { diff --git a/src/app/base/services/config/config-apollo.service.ts b/src/app/base/services/config/config-apollo.service.ts index bc4b8f59..91ae45eb 100644 --- a/src/app/base/services/config/config-apollo.service.ts +++ b/src/app/base/services/config/config-apollo.service.ts @@ -60,4 +60,13 @@ export class ConfigApolloService { .pipe(map((result) => JSON.parse(result['data']['getBlackWhiteDemo']))); } + getVersionOverview() { + return this.apollo + .query({ + query: queries.GET_VERSION_OVERVIEW, + fetchPolicy: 'no-cache', + }) + .pipe(map((result) => result['data']['versionOverview'])); + } + } diff --git a/src/app/base/services/config/config-queries.ts b/src/app/base/services/config/config-queries.ts index 6cb9cda7..f5f442ce 100644 --- a/src/app/base/services/config/config-queries.ts +++ b/src/app/base/services/config/config-queries.ts @@ -62,5 +62,16 @@ export const queries = { { getBlackWhiteDemo } - ` + `, + GET_VERSION_OVERVIEW: gql` + query { + versionOverview { + service + installedVersion + checkedVersion + lastChecked + link + } + } + `, }; From 05d04aa11bcfb0e391f3957d6352fde7317c9024 Mon Sep 17 00:00:00 2001 From: Lina Date: Tue, 6 Sep 2022 11:48:51 +0200 Subject: [PATCH 02/15] Modal for version overview and added navigation to modal for steps update --- .../sidebar-pm/sidebar-pm.component.html | 113 +++++++++++++++--- .../sidebar-pm/sidebar-pm.component.ts | 29 ++++- 2 files changed, 124 insertions(+), 18 deletions(-) diff --git a/src/app/base/components/sidebar-pm/sidebar-pm.component.html b/src/app/base/components/sidebar-pm/sidebar-pm.component.html index e62f984b..03ad59e3 100644 --- a/src/app/base/components/sidebar-pm/sidebar-pm.component.html +++ b/src/app/base/components/sidebar-pm/sidebar-pm.component.html @@ -192,7 +192,7 @@
-
@@ -208,26 +208,107 @@ - -