From 848e37a6e69978c8b32d1e3816aa9a63185dc0a9 Mon Sep 17 00:00:00 2001 From: nicholassully Date: Fri, 17 Jan 2025 07:22:09 +0000 Subject: [PATCH 1/4] pfs-211 added in ff for admin --- docker-compose.yml | 1 + docker/docker-compose.dev.yml | 1 + internal/server/env_vars.go | 38 ++++++++++++++++--------------- internal/server/env_vars_test.go | 19 ++++++++-------- package.json | 2 +- web/template/layout/header.gotmpl | 7 +++++- 6 files changed, 39 insertions(+), 29 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 678a2bd9..fa0e6be3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,6 +13,7 @@ services: SIRIUS_URL: http://json-server:3000 PREFIX: /supervision/deputies FEATURES: + FinanceAdminLink: "1" json-server: build: diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index b32b64be..078a4910 100644 --- a/docker/docker-compose.dev.yml +++ b/docker/docker-compose.dev.yml @@ -17,6 +17,7 @@ services: FIRM_HUB_HOST: http://localhost:8887 PREFIX: /supervision/deputies FEATURES: + FinanceAdminLink: "1" yarn: command: watch diff --git a/internal/server/env_vars.go b/internal/server/env_vars.go index e09d9ff3..8bd36dda 100644 --- a/internal/server/env_vars.go +++ b/internal/server/env_vars.go @@ -8,15 +8,16 @@ import ( ) type EnvironmentVars struct { - Port string - WebDir string - SiriusURL string - SiriusPublicURL string - FirmHubURL string - Prefix string - DefaultPaTeam int - DefaultProTeam int - Features []string + Port string + WebDir string + SiriusURL string + SiriusPublicURL string + FirmHubURL string + Prefix string + DefaultPaTeam int + DefaultProTeam int + Features []string + FinanceAdminLink string } func NewEnvironmentVars() (EnvironmentVars, error) { @@ -31,15 +32,16 @@ func NewEnvironmentVars() (EnvironmentVars, error) { } return EnvironmentVars{ - Port: getEnv("PORT", "1234"), - WebDir: getEnv("WEB_DIR", "web"), - SiriusURL: getEnv("SIRIUS_URL", "http://localhost:8080"), - SiriusPublicURL: getEnv("SIRIUS_PUBLIC_URL", "http://localhost:8080"), - FirmHubURL: getEnv("FIRM_HUB_HOST", "") + "/supervision/deputies/firm", - Prefix: getEnv("PREFIX", ""), - DefaultPaTeam: defaultPaTeamId, - DefaultProTeam: defaultProTeamId, - Features: strings.Split(getEnv("FEATURES", ""), ","), + Port: getEnv("PORT", "1234"), + WebDir: getEnv("WEB_DIR", "web"), + SiriusURL: getEnv("SIRIUS_URL", "http://localhost:8080"), + SiriusPublicURL: getEnv("SIRIUS_PUBLIC_URL", "http://localhost:8080"), + FirmHubURL: getEnv("FIRM_HUB_HOST", "") + "/supervision/deputies/firm", + Prefix: getEnv("PREFIX", ""), + DefaultPaTeam: defaultPaTeamId, + DefaultProTeam: defaultProTeamId, + Features: strings.Split(getEnv("FEATURES", ""), ","), + FinanceAdminLink: getEnv("FINANCE_ADMIN_LINK", "1"), }, nil } diff --git a/internal/server/env_vars_test.go b/internal/server/env_vars_test.go index 16871494..6732323f 100644 --- a/internal/server/env_vars_test.go +++ b/internal/server/env_vars_test.go @@ -10,14 +10,15 @@ func TestNewEnvironmentVars(t *testing.T) { assert.Nil(t, err) assert.Equal(t, EnvironmentVars{ - Port: "1234", - WebDir: "web", - SiriusURL: "http://localhost:8080", - SiriusPublicURL: "http://localhost:8080", - FirmHubURL: "/supervision/deputies/firm", - Prefix: "", - DefaultPaTeam: 28, - DefaultProTeam: 31, - Features: []string{""}, + Port: "1234", + WebDir: "web", + SiriusURL: "http://localhost:8080", + SiriusPublicURL: "http://localhost:8080", + FirmHubURL: "/supervision/deputies/firm", + Prefix: "", + DefaultPaTeam: 28, + DefaultProTeam: 31, + Features: []string{""}, + FinanceAdminLink: "1", }, vars) } diff --git a/package.json b/package.json index b78e25cd..ab3d080a 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@ministryofjustice/frontend": "^3.0.0", "accessible-autocomplete": "^3.0.0", "govuk-frontend": "^5.0.0", - "opg-sirius-header": "ministryofjustice/opg-sirius-header#semver:v0.26.0" + "opg-sirius-header": "ministryofjustice/opg-sirius-header#semver:v0.27.0-pfs-211-feature-flag-added-for-payments-admin.1" }, "devDependencies": { "axe-core": "^4.9.0", diff --git a/web/template/layout/header.gotmpl b/web/template/layout/header.gotmpl index 13b3ff2f..c5e80fad 100644 --- a/web/template/layout/header.gotmpl +++ b/web/template/layout/header.gotmpl @@ -1,3 +1,8 @@ {{ define "header" }} - + + {{ end }} From b2ab56e4c651e9eceae0c6b1ad6307299252ff64 Mon Sep 17 00:00:00 2001 From: nicholassully Date: Tue, 21 Jan 2025 07:29:51 +0000 Subject: [PATCH 2/4] pfs-211 changed header version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ab3d080a..78772c73 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@ministryofjustice/frontend": "^3.0.0", "accessible-autocomplete": "^3.0.0", "govuk-frontend": "^5.0.0", - "opg-sirius-header": "ministryofjustice/opg-sirius-header#semver:v0.27.0-pfs-211-feature-flag-added-for-payments-admin.1" + "opg-sirius-header": "ministryofjustice/opg-sirius-header#semver:v0.27.0-pfs-211-feature-flag-added-for-payments-admin.3" }, "devDependencies": { "axe-core": "^4.9.0", From 75c4a13c490063689919655e5adafb914b90a5c9 Mon Sep 17 00:00:00 2001 From: nicholassully Date: Thu, 23 Jan 2025 11:03:11 +0000 Subject: [PATCH 3/4] pfs-211 changing the header version back to main --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 323028cf..20f482ef 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@ministryofjustice/frontend": "^3.0.0", "accessible-autocomplete": "^3.0.0", "govuk-frontend": "^5.0.0", - "opg-sirius-header": "ministryofjustice/opg-sirius-header#semver:v0.27.0-pfs-211-feature-flag-added-for-payments-admin.5" + "opg-sirius-header": "ministryofjustice/opg-sirius-header#semver:v0.27.0" }, "devDependencies": { "axe-core": "^4.9.0", From 645a46599183d8ec0d03f4db7a02c5045750bc09 Mon Sep 17 00:00:00 2001 From: nicholassully Date: Fri, 24 Jan 2025 06:40:54 +0000 Subject: [PATCH 4/4] pfs-211 updating yarn lock to correct header and change defualt for finance admin link --- internal/server/env_vars.go | 2 +- internal/server/env_vars_test.go | 2 +- yarn.lock | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/server/env_vars.go b/internal/server/env_vars.go index 8bd36dda..08fcda9e 100644 --- a/internal/server/env_vars.go +++ b/internal/server/env_vars.go @@ -41,7 +41,7 @@ func NewEnvironmentVars() (EnvironmentVars, error) { DefaultPaTeam: defaultPaTeamId, DefaultProTeam: defaultProTeamId, Features: strings.Split(getEnv("FEATURES", ""), ","), - FinanceAdminLink: getEnv("FINANCE_ADMIN_LINK", "1"), + FinanceAdminLink: getEnv("FINANCE_ADMIN_LINK", "0"), }, nil } diff --git a/internal/server/env_vars_test.go b/internal/server/env_vars_test.go index 6732323f..3ff487ad 100644 --- a/internal/server/env_vars_test.go +++ b/internal/server/env_vars_test.go @@ -19,6 +19,6 @@ func TestNewEnvironmentVars(t *testing.T) { DefaultPaTeam: 28, DefaultProTeam: 31, Features: []string{""}, - FinanceAdminLink: "1", + FinanceAdminLink: "0", }, vars) } diff --git a/yarn.lock b/yarn.lock index 204f374a..0d4cf821 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1429,9 +1429,9 @@ onetime@^5.1.0: dependencies: mimic-fn "^2.1.0" -"opg-sirius-header@ministryofjustice/opg-sirius-header#semver:v0.27.0-pfs-211-feature-flag-added-for-payments-admin.4": +"opg-sirius-header@ministryofjustice/opg-sirius-header#semver:v0.27.0": version "1.0.0" - resolved "https://codeload.github.com/ministryofjustice/opg-sirius-header/tar.gz/88647a2b9a2c39192b1280fca39d8e6a5a305c61" + resolved "https://codeload.github.com/ministryofjustice/opg-sirius-header/tar.gz/eb9891f3ce8692d9a29b445ef0a909833bc5e231" dependencies: "@cypress/request" "3.0.0" scss "^0.2.4"