Remove UI references to base-client (#76)

* Remove references to base client * handle baseClientId UI side * Tidy templates * fix lint errors
ministryofjustice · Mar 13, 2024 · 5539d6f · 5539d6f
1 parent 156be0d
commit 5539d6f
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 27 deletions.
diff --git a/server/mappers/baseClientApi/listBaseClients.ts b/server/mappers/baseClientApi/listBaseClients.ts
@@ -1,7 +1,7 @@
 import { Request } from 'express'
 import { ListBaseClientsResponse } from '../../interfaces/baseClientApi/baseClientResponse'
 import { BaseClient, BaseClientListFilter } from '../../interfaces/baseClientApi/baseClient'
-import { kebab, multiSeparatorSplit, snake } from '../../utils/utils'
+import { kebab, multiSeparatorSplit, snake, toBaseClientId } from '../../utils/utils'
 import { GrantTypes } from '../../data/enums/grantTypes'
 import { ClientType } from '../../data/enums/clientTypes'
 
@@ -69,7 +69,7 @@ export default (response: ListBaseClientsResponse): BaseClient[] => {
   return clients.map(
     client =>
       ({
-        baseClientId: client.baseClientId,
+        baseClientId: toBaseClientId(client.baseClientId),
         accessTokenValidity: 24000,
         scopes: [],
         grantType: snake(client.grantType),

diff --git a/server/utils/utils.test.ts b/server/utils/utils.test.ts
@@ -12,6 +12,7 @@ import {
   dateFormat,
   dateTimeFormatFromString,
   snakeUpper,
+  toBaseClientId,
 } from './utils'
 
 describe('convert to title case', () => {
@@ -171,3 +172,14 @@ describe('dateTimeStringFormat', () => {
     expect(dateTimeFormatFromString(input)).toEqual(expectedOutput)
   })
 })
+
+describe('toBaseId', () => {
+  it.each([
+    ['an id without a trailing -digit', 'base_id', 'base_id'],
+    ['an id with an internal -digit', 'base-1-id', 'base-1-id'],
+    ['an id with a trailing -digit', 'base_id-1', 'base_id'],
+    ['an id with trailing -multiple_digits', 'base_id-10', 'base_id'],
+  ])('handles %s: %s -> %s', (_inputType: string, input: string, expectedOutput: string) => {
+    expect(toBaseClientId(input)).toEqual(expectedOutput)
+  })
+})
diff --git a/server/utils/utils.ts b/server/utils/utils.ts
@@ -141,3 +141,9 @@ export const dateTimeFormatFromString = (date: string): string => {
 
   return format(new Date(date), 'dd-MM-yyyy HH:mm', { locale: enGB })
 }
+
+export const toBaseClientId = (id: string): string => {
+  // remove any trailing hyphen and number
+  if (!id) return id
+  return id.replace(/-\d+$/, '')
+}
diff --git a/server/views/pages/base-client.njk b/server/views/pages/base-client.njk
@@ -1,6 +1,6 @@
 {% extends "../partials/layout.njk" %}
 
-{% set pageTitle = applicationName + " - Home" %}
+{% set pageTitle = applicationName + " - Client" %}
 {% set mainClasses = "app-container govuk-body" %}
 
 {% set pageName="Home" %}
@@ -54,9 +54,9 @@
 
       <form class="govuk-grid-row" action="/base-clients/{{ baseClient.baseClientId }}/clients" method="POST">
         <input type="hidden" name="_csrf" value="{{ csrfToken }}">
-        <div class="govuk-grid-column-one-quarter">
+        <div class="govuk-grid-column-one-half">
           {{ govukButton({
-            text: "Add new client",
+            text: "Add client instance",
             attributes: {
               "data-qa": "add-new-client-button"
             }
@@ -66,9 +66,9 @@
 
       <div class="govuk-grid-row">
         <div class="govuk-grid-column-two-thirds">
-          <h2 class="govuk-heading-l">Base client details</h2>
+          <h2 class="govuk-heading-l">Client details</h2>
         </div>
-        <div class="govuk-grid-column-one-third">
+        <div class="govuk-grid-column-one-third govuk-!-text-align-right">
           <a class="govuk-link" href="/base-clients/{{ baseClient.baseClientId }}/edit" data-qa='change-client-details-link'>Change
             client details</a>
         </div>
@@ -78,7 +78,7 @@
         firstCellIsHeader: false,
         head: [
           {
-            text: "Base client",
+            text: "Client",
             classes: "govuk-!-width-one-half"
           },{
             text: baseClient.baseClientId
@@ -324,7 +324,7 @@
         <div class="govuk-grid-column-two-thirds">
           <h2 class="govuk-heading-l">Deployment details</h2>
         </div>
-        <div class="govuk-grid-column-one-third">
+        <div class="govuk-grid-column-one-third  govuk-!-text-align-right">
           <a class="govuk-link" href="/base-clients/{{ baseClient.baseClientId }}/deployment" data-qa='change-deployment-details-link'>Change
             deployment details</a>
         </div>

diff --git a/server/views/pages/delete-client-instance.njk b/server/views/pages/delete-client-instance.njk
@@ -1,6 +1,6 @@
 {% extends "../partials/layout.njk" %}
 
-{% set pageTitle = applicationName + " - Home" %}
+{% set pageTitle = applicationName + " - Delete client" %}
 {% set mainClasses = "app-container govuk-body" %}
 
 {% set pageName="Delete client?" %}

diff --git a/server/views/pages/edit-base-client-deployment.njk b/server/views/pages/edit-base-client-deployment.njk
@@ -1,6 +1,6 @@
 {% extends "../partials/layout.njk" %}
 
-{% set pageTitle = applicationName + " - Add base client" %}
+{% set pageTitle = applicationName + " - Add client" %}
 {% set mainClasses = "app-container govuk-body" %}
 
 {% set pageName="Home" %}
@@ -38,7 +38,7 @@
         rows: [
           {
             key: {
-            text: "Base client id"
+            text: "Client id"
           },
             value: {
             text: baseClient.baseClientId

diff --git a/server/views/pages/edit-base-client-details.njk b/server/views/pages/edit-base-client-details.njk
@@ -1,6 +1,6 @@
 {% extends "../partials/layout.njk" %}
 
-{% set pageTitle = applicationName + " - Add base client" %}
+{% set pageTitle = applicationName + " - Edit client" %}
 {% set mainClasses = "app-container govuk-body" %}
 
 {% set pageName="Home" %}

diff --git a/server/views/pages/index.njk b/server/views/pages/index.njk
diff --git a/server/views/pages/new-base-client-details.njk b/server/views/pages/new-base-client-details.njk
@@ -1,6 +1,6 @@
 {% extends "../partials/layout.njk" %}
 
-{% set pageTitle = applicationName + " - Add base client" %}
+{% set pageTitle = applicationName + " - Add client" %}
 {% set mainClasses = "app-container govuk-body" %}
 
 {% set pageName="Home" %}

diff --git a/server/views/pages/new-base-client-grant.njk b/server/views/pages/new-base-client-grant.njk
@@ -1,6 +1,6 @@
 {% extends "../partials/layout.njk" %}
 
-{% set pageTitle = applicationName + " - Add base client" %}
+{% set pageTitle = applicationName + " - Add client" %}
 {% set mainClasses = "app-container govuk-body" %}
 
 {% set pageName="Home" %}

diff --git a/server/views/pages/new-base-client-success.njk b/server/views/pages/new-base-client-success.njk
@@ -1,6 +1,6 @@
 {% extends "../partials/layout.njk" %}
 
-{% set pageTitle = applicationName + " - Add base client" %}
+{% set pageTitle = applicationName + " - Credentials" %}
 {% set mainClasses = "app-container govuk-body" %}
 
 {% set pageName="Home" %}