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

Haar 2330 UI improvements #63

Closed
wants to merge 2 commits into from
Closed

Haar 2330 UI improvements #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3fe2af
fix width of table cells on base-client page
thomasridd Feb 6, 2024
6c8eb36
Update header link
thomasridd Feb 6, 2024
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 server/utils/nunjucksSetup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,5 @@ export default function nunjucksSetup(app: express.Express, applicationInfo: App
)

njkEnv.addFilter('initialiseName', initialiseName)
njkEnv.addGlobal('homeUrl', config.apis.hmppsAuth.externalUrl)
}
111 changes: 74 additions & 37 deletions server/views/pages/base-client.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,20 +78,23 @@
firstCellIsHeader: false,
head: [
{
text: "Base client"
text: "Base client",
classes: "govuk-!-width-one-half"
},{
text: baseClient.baseClientId
}],
rows: [
[
{
text: "Access token validity"
text: "Access token validity",
classes: "govuk-!-width-one-half"
},{
text: baseClient.accessTokenValidity
}
],[
{
text: "Approved scopes"
text: "Approved scopes",
classes: "govuk-!-width-one-half"
},{
html: toLinesHtml(baseClient.scopes)
}
Expand All @@ -106,13 +109,15 @@
firstCellIsHeader: false,
head: [
{
text: "Audit trail"
text: "Audit trail",
classes: "govuk-!-width-one-half"
},{
text: ""
}],
rows: [
[{
text: "Details"
text: "Details",
classes: "govuk-!-width-one-half"
},{
text: baseClient.audit
}]
Expand All @@ -129,26 +134,30 @@
firstCellIsHeader: false,
head: [
{
text: "Grant details"
text: "Grant details",
classes: "govuk-!-width-one-half"
},{
text: ""
}],
rows: [
[
{
text: "Grant type"
text: "Grant type",
classes: "govuk-!-width-one-half"
},{
text: "Client credentials"
}
],[
{
text: "Roles"
text: "Roles",
classes: "govuk-!-width-one-half"
},{
html: toLinesHtml(baseClient.clientCredentials.authorities)
}
],[
{
text: "Database username"
text: "Database username",
classes: "govuk-!-width-one-half"
},{
text: baseClient.clientCredentials.databaseUserName
}
Expand All @@ -165,32 +174,37 @@
firstCellIsHeader: false,
head: [
{
text: "Grant details"
text: "Grant details",
classes: "govuk-!-width-one-half"
},{
text: ""
}],
rows: [
[
{
text: "Grant type"
text: "Grant type",
classes: "govuk-!-width-one-half"
},{
text: "Authorization code"
}
],[
{
text: "Registered redirect URIs"
text: "Registered redirect URIs",
classes: "govuk-!-width-one-half"
},{
text: toLinesHtml(baseClient.authorisationCode.registeredRedirectURIs)
}
],[
{
text: "JWT Fields Configuration"
text: "JWT Fields Configuration",
classes: "govuk-!-width-one-half"
},{
text: baseClient.authorisationCode.jwtFields
}
],[
{
text: "Azure Ad login flow"
text: "Azure Ad login flow",
classes: "govuk-!-width-one-half"
},{
text: presenter.skipToAzureField
}
Expand All @@ -207,20 +221,23 @@
firstCellIsHeader: false,
head: [
{
text: "Config"
text: "Config",
classes: "govuk-!-width-one-half"
},{
text: ""
}],
rows: [
[
{
text: "Allow client to expire"
text: "Allow client to expire",
classes: "govuk-!-width-one-half"
},{
text: presenter.expiry
}
],[
{
text: "Allowed IPs"
text: "Allowed IPs",
classes: "govuk-!-width-one-half"
},{
html: toLinesHtml(baseClient.config.allowedIPs)
}
Expand All @@ -247,44 +264,51 @@
firstCellIsHeader: false,
head: [
{
text: "Service details"
text: "Service details",
classes: "govuk-!-width-one-half"
},{
text: ""
}],
rows: [
[
{
text: "Name"
text: "Name",
classes: "govuk-!-width-one-half"
},{
text: baseClient.serviceDetails.serviceName
}
],[
{
text: "Description"
text: "Description",
classes: "govuk-!-width-one-half"
},{
text: baseClient.serviceDetails.serviceDescription
}
],[
{
text: "Authorised roles"
text: "Authorised roles",
classes: "govuk-!-width-one-half"
},{
text: baseClient.serviceDetails.serviceAuthorisedRoles.join('</br>')
}
],[
{
text: "URL"
text: "URL",
classes: "govuk-!-width-one-half"
},{
text: baseClient.serviceDetails.serviceURL
}
],[
{
text: "Contact URL/email"
text: "Contact URL/email",
classes: "govuk-!-width-one-half"
},{
text: baseClient.serviceDetails.contactUsURL
}
],[
{
text: "Status"
text: "Status",
classes: "govuk-!-width-one-half"
},{
text: presenter.serviceEnabledLabel
}
Expand All @@ -310,35 +334,40 @@
firstCellIsHeader: false,
head: [
{
text: "Contact"
text: "Contact",
classes: "govuk-!-width-one-half"
},{
text: ""
}],
rows: [
[
{
text: "Client type"
text: "Client type",
classes: "govuk-!-width-one-half"
},{
text: capitalize(baseClient.deployment.clientType)
}
],
[
{
text: "Team"
text: "Team",
classes: "govuk-!-width-one-half"
},{
text: baseClient.deployment.team
}
],
[
{
text: "Team contact"
text: "Team contact",
classes: "govuk-!-width-one-half"
},{
text: baseClient.deployment.teamContact
}
],
[
{
text: "Team slack"
text: "Team slack",
classes: "govuk-!-width-one-half"
},{
text: baseClient.deployment.teamSlack
}
Expand All @@ -353,56 +382,64 @@
firstCellIsHeader: false,
head: [
{
text: "Platform"
text: "Platform",
classes: "govuk-!-width-one-half"
},{
text: ""
}],
rows: [
[
{
text: "Hosting"
text: "Hosting",
classes: "govuk-!-width-one-half"
},{
text: baseClient.deployment.hosting
}
],
[
{
text: "Namespace"
text: "Namespace",
classes: "govuk-!-width-one-half"
},{
text: baseClient.deployment.namespace
}
],
[
{
text: "Deployment"
text: "Deployment",
classes: "govuk-!-width-one-half"
},{
text: baseClient.deployment.deployment
}
],
[
{
text: "Secret name"
text: "Secret name",
classes: "govuk-!-width-one-half"
},{
text: baseClient.deployment.secretName
}
],
[
{
text: "Client id key"
text: "Client id key",
classes: "govuk-!-width-one-half"
},{
text: baseClient.deployment.clientIdKey
}
],
[
{
text: "Secret key"
text: "Secret key",
classes: "govuk-!-width-one-half"
},{
text: baseClient.deployment.secretKey
}
],
[
{
text: "Deployment info"
text: "Deployment info",
classes: "govuk-!-width-one-half"
},{
text: baseClient.deployment.deploymentInfo
}
Expand Down
Loading