From d9d22499c41218dc388f44b3bdb1e11a07f5857a Mon Sep 17 00:00:00 2001 From: Philippe Bourgau Date: Tue, 13 Aug 2024 12:05:01 +0200 Subject: [PATCH] [#674] Displaying the flavor in Web info - pass the Flavor through HTTP - update the html to display the flavor - adapt structs and tests --- src/http/api/session_info.go | 2 ++ src/http/api/session_info_test.go | 1 + .../components/tcr-session-info/tcr-session-info.component.html | 2 ++ .../tcr-session-info/tcr-session-info.component.spec.ts | 1 + webapp/src/app/interfaces/tcr-session-info.ts | 1 + webapp/src/app/services/tcr-session-info.service.spec.ts | 1 + 6 files changed, 8 insertions(+) diff --git a/src/http/api/session_info.go b/src/http/api/session_info.go index 452b52e8..1a2a2cbd 100644 --- a/src/http/api/session_info.go +++ b/src/http/api/session_info.go @@ -35,6 +35,7 @@ type sessionInfo struct { VCSName string `json:"vcsName"` VCSSessionSummary string `json:"vcsSession"` CommitOnFail bool `json:"commitOnFail"` + Flavor string `json:"flavor"` GitAutoPush bool `json:"gitAutoPush"` MessageSuffix string `json:"messageSuffix"` } @@ -51,6 +52,7 @@ func SessionInfoGetHandler(c *gin.Context) { VCSName: info.VCSName, VCSSessionSummary: info.VCSSessionSummary, CommitOnFail: info.CommitOnFail, + Flavor: info.Flavor, GitAutoPush: info.GitAutoPush, MessageSuffix: info.MessageSuffix, } diff --git a/src/http/api/session_info_test.go b/src/http/api/session_info_test.go index 00d49641..229baf1b 100644 --- a/src/http/api/session_info_test.go +++ b/src/http/api/session_info_test.go @@ -57,6 +57,7 @@ func Test_session_info_get_handler(t *testing.T) { VCSName: info.VCSName, VCSSessionSummary: info.VCSSessionSummary, CommitOnFail: info.CommitOnFail, + Flavor: info.Flavor, GitAutoPush: info.GitAutoPush, MessageSuffix: info.MessageSuffix, } diff --git a/webapp/src/app/components/tcr-session-info/tcr-session-info.component.html b/webapp/src/app/components/tcr-session-info/tcr-session-info.component.html index 70f1e153..6035cf00 100644 --- a/webapp/src/app/components/tcr-session-info/tcr-session-info.component.html +++ b/webapp/src/app/components/tcr-session-info/tcr-session-info.component.html @@ -76,6 +76,8 @@

VCS Commit Mes

VCS Commit-On-Fail {{ sessionInfo.commitOnFail | onOff }}

+

+ Flavor {{ sessionInfo.flavor | showEmpty }}

Git Auto-Push {{ sessionInfo.gitAutoPush | onOff }}

diff --git a/webapp/src/app/components/tcr-session-info/tcr-session-info.component.spec.ts b/webapp/src/app/components/tcr-session-info/tcr-session-info.component.spec.ts index 887ad5ad..1ca059c3 100644 --- a/webapp/src/app/components/tcr-session-info/tcr-session-info.component.spec.ts +++ b/webapp/src/app/components/tcr-session-info/tcr-session-info.component.spec.ts @@ -29,6 +29,7 @@ import {TcrSessionInfoComponent} from "./tcr-session-info.component"; const sample: TcrSessionInfo = { baseDir: "/my/base/dir", commitOnFail: false, + flavor: "nice", gitAutoPush: false, language: "java", messageSuffix: "my-suffix", diff --git a/webapp/src/app/interfaces/tcr-session-info.ts b/webapp/src/app/interfaces/tcr-session-info.ts index 0366831f..306a174f 100644 --- a/webapp/src/app/interfaces/tcr-session-info.ts +++ b/webapp/src/app/interfaces/tcr-session-info.ts @@ -28,6 +28,7 @@ export interface TcrSessionInfo { vcsName: string; vcsSession: string; commitOnFail: boolean; + flavor: string; gitAutoPush: boolean; messageSuffix: string; } diff --git a/webapp/src/app/services/tcr-session-info.service.spec.ts b/webapp/src/app/services/tcr-session-info.service.spec.ts index bd9a674a..a511f26d 100644 --- a/webapp/src/app/services/tcr-session-info.service.spec.ts +++ b/webapp/src/app/services/tcr-session-info.service.spec.ts @@ -58,6 +58,7 @@ describe('TcrSessionInfoService', () => { const sample: TcrSessionInfo = { baseDir: "/my/base/dir", commitOnFail: false, + flavor: "nice", gitAutoPush: false, language: "java", messageSuffix: "my-suffix",