Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pfs-211 added in ff for admin #475

Merged
merged 5 commits into from
Jan 24, 2025
+41 −32
Merged

pfs-211 added in ff for admin #475

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
848e37a
pfs-211 added in ff for admin
Nicholassully Jan 17, 2025
b2ab56e
pfs-211 changed header version
Nicholassully Jan 21, 2025
ba93bc6
Merge branch 'main' into pfs-211-added-in-feature-flag-for-admin
Nicholassully Jan 21, 2025
75c4a13
pfs-211 changing the header version back to main
Nicholassully Jan 23, 2025
645a465
pfs-211 updating yarn lock to correct header and change defualt for f…
Nicholassully Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docker-compose.yml
View file
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@ services:
SIRIUS_URL: http://json-server:3000
PREFIX: /supervision/deputies
FEATURES:
FinanceAdminLink: "1"

json-server:
build:
1 change: 1 addition & 0 deletions docker/docker-compose.dev.yml
View file
Original file line number Diff line number Diff line change
@@ -17,6 +17,7 @@ services:
FIRM_HUB_HOST: http://localhost:8887
PREFIX: /supervision/deputies
FEATURES:
FinanceAdminLink: "1"

yarn:
command: watch
38 changes: 20 additions & 18 deletions internal/server/env_vars.go
View file
Original file line number Diff line number Diff line change
@@ -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", "0"),
}, nil
}

19 changes: 10 additions & 9 deletions internal/server/env_vars_test.go
View file
Original file line number Diff line number Diff line change
@@ -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: "0",
}, vars)
}
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -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"
},
"devDependencies": {
"axe-core": "^4.9.0",
7 changes: 6 additions & 1 deletion web/template/layout/header.gotmpl
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
{{ define "header" }}
<sirius-header {{ if eq .Error "" }} user-roles="{{ .UserDetails.GetRoles }}" {{ end }}></sirius-header>
<sirius-header
{{ if eq .Error "" }}
user-roles="{{ .UserDetails.GetRoles }}"
finance-flag="{{ .EnvironmentVars.FinanceAdminLink }}"
{{ end }}>
</sirius-header>
{{ end }}
5 changes: 2 additions & 3 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
@@ -1429,10 +1429,9 @@ onetime@^5.1.0:
dependencies:
mimic-fn "^2.1.0"

"opg-sirius-header@ministryofjustice/opg-sirius-header#semver:v0.26.0":
"opg-sirius-header@ministryofjustice/opg-sirius-header#semver:v0.27.0":
version "1.0.0"
uid "4a5fac267c80abe1808f451f54347d3512f5d4c1"
resolved "https://codeload.github.com/ministryofjustice/opg-sirius-header/tar.gz/4a5fac267c80abe1808f451f54347d3512f5d4c1"
resolved "https://codeload.github.com/ministryofjustice/opg-sirius-header/tar.gz/eb9891f3ce8692d9a29b445ef0a909833bc5e231"
dependencies:
"@cypress/request" "3.0.0"
scss "^0.2.4"