diff --git a/src/server/common/components/entity-list/_entity-list.scss b/src/server/common/components/entity-list/_entity-list.scss
index fc42b5879..49a1921a4 100644
--- a/src/server/common/components/entity-list/_entity-list.scss
+++ b/src/server/common/components/entity-list/_entity-list.scss
@@ -30,13 +30,17 @@
display: flex;
flex-wrap: wrap;
align-items: flex-start;
- padding: govuk-spacing(2) + 2 govuk-spacing(2) govuk-spacing(2) govuk-spacing(2);
+ padding: govuk-spacing(2) govuk-spacing(2) govuk-spacing(2) govuk-spacing(2);
border-bottom: 1px solid $app-grey;
line-height: 1.4;
&:nth-child(odd) {
background-color: $app-light-grey;
}
+
+ &:last-child {
+ border: none;
+ }
}
.app-entity-list__item {
@@ -50,7 +54,6 @@
}
}
-// TODO can this be improved? Can CSS grid be used?
.app-entity-list__item--tiny {
flex: .2;
max-width: 80px;
diff --git a/src/server/common/components/entity-list/template.test.js b/src/server/common/components/entity-list/template.test.js
index 70636abfd..5538659f6 100644
--- a/src/server/common/components/entity-list/template.test.js
+++ b/src/server/common/components/entity-list/template.test.js
@@ -81,7 +81,7 @@ describe('Entity List Component', () => {
expect(getEntity(4).html()).toContain('B. A. Baracus')
expect(getEntity(5).length).toEqual(1)
- expect(getEntity(5).html()).toContain('14:10:49 Thu 14th Dec 202')
+ expect(getEntity(5).html()).toContain('14:04:49 Thu 14th Dec 2023')
})
})
diff --git a/src/server/common/components/footer/_footer.scss b/src/server/common/components/footer/_footer.scss
index 1f0db16cb..d9689314d 100644
--- a/src/server/common/components/footer/_footer.scss
+++ b/src/server/common/components/footer/_footer.scss
@@ -1,6 +1,6 @@
.app-footer {
padding: govuk-spacing(2) govuk-spacing(2) govuk-spacing(6);
min-height: govuk-spacing(9);
- border-top: 1px solid govuk-colour("mid-grey");
- background: $govuk-canvas-background-colour;
+ border-bottom: 1px solid $app-grey;
+ background-color: $app-light-grey;
}
diff --git a/src/server/common/components/tabs/_tabs.scss b/src/server/common/components/tabs/_tabs.scss
index badfd40a7..9cf841685 100644
--- a/src/server/common/components/tabs/_tabs.scss
+++ b/src/server/common/components/tabs/_tabs.scss
@@ -32,7 +32,7 @@
.app-tabs__list-item {
border-radius: $app-border-radius $app-border-radius 0 0;
margin: govuk-spacing(2) govuk-spacing(1) 0 0;
- background-color: govuk-colour("light-grey");
+ background-color: $app-light-grey;
}
.app-tabs__tab {
diff --git a/src/server/common/templates/partials/navigation/_navigation.scss b/src/server/common/templates/partials/navigation/_navigation.scss
index bb37d7544..b3ca9530f 100644
--- a/src/server/common/templates/partials/navigation/_navigation.scss
+++ b/src/server/common/templates/partials/navigation/_navigation.scss
@@ -2,7 +2,7 @@ $navigation-height: 60px;
$border-width: 4px;
.app-navigation {
- border-bottom: 1px solid govuk-colour("mid-grey");
+ border-bottom: 1px solid $app-grey;
background-color: $app-light-grey;
}
diff --git a/src/server/deployments/helpers/fetch/fetch-deployment.js b/src/server/deployments/helpers/fetch/fetch-deployment.js
index 0ab8f6bce..019de6449 100644
--- a/src/server/deployments/helpers/fetch/fetch-deployment.js
+++ b/src/server/deployments/helpers/fetch/fetch-deployment.js
@@ -13,6 +13,7 @@ async function fetchDeployment(deploymentId) {
})
const json = await response.json()
+ // Portal Backend returns empty array for not found deployments
if (response.status === 404 || json?.length === 0) {
throw Boom.boomify(Boom.notFound())
}
diff --git a/src/server/deployments/helpers/pre/provide-deployment.js b/src/server/deployments/helpers/pre/provide-deployment.js
index 84500df8b..0f5310ada 100644
--- a/src/server/deployments/helpers/pre/provide-deployment.js
+++ b/src/server/deployments/helpers/pre/provide-deployment.js
@@ -1,16 +1,11 @@
-import Boom from '@hapi/boom'
-
import { transformDeployment } from '~/src/server/deployments/transformers/transform-deployment'
import { fetchDeployment } from '~/src/server/deployments/helpers/fetch/fetch-deployment'
const provideDeployment = {
method: async function (request) {
const deploymentId = request.params?.deploymentId
- const deployment = transformDeployment(await fetchDeployment(deploymentId))
-
- if (!deployment) {
- throw Boom.boomify(Boom.notFound())
- }
+ const deploymentResponse = await fetchDeployment(deploymentId)
+ const deployment = transformDeployment(deploymentResponse)
// If is an XHR call and when the deployment has finished and is running return null to make the poller refresh
// the page.
diff --git a/src/server/deployments/transformers/transform-deployment.js b/src/server/deployments/transformers/transform-deployment.js
index 950e994a2..93e3229bf 100644
--- a/src/server/deployments/transformers/transform-deployment.js
+++ b/src/server/deployments/transformers/transform-deployment.js
@@ -74,7 +74,7 @@ function transformDeployment(deploymentEvents) {
}
}
- if (requestedDeployment && deploymentTasks.length) {
+ if (requestedDeployment && deploymentTasks.length > 0) {
const deploymentTaskIds = [
...new Set(
deploymentTasks
diff --git a/src/server/deployments/transformers/transform-deployments-to-entity-row.js b/src/server/deployments/transformers/transform-deployments-to-entity-row.js
index 217e50b1c..1fec70f8a 100644
--- a/src/server/deployments/transformers/transform-deployments-to-entity-row.js
+++ b/src/server/deployments/transformers/transform-deployments-to-entity-row.js
@@ -26,7 +26,7 @@ function transformDeploymentsToEntityRow(deployedService) {
},
{
kind: 'date',
- value: deployedService.updatedAt,
+ value: deployedService.createdAt,
formatString: 'k:mm:ss EE do MMM yyyy'
}
]
diff --git a/src/server/deployments/transformers/transform-deployments-to-entity-row.test.js b/src/server/deployments/transformers/transform-deployments-to-entity-row.test.js
index 15f85bd26..2b530add0 100644
--- a/src/server/deployments/transformers/transform-deployments-to-entity-row.test.js
+++ b/src/server/deployments/transformers/transform-deployments-to-entity-row.test.js
@@ -27,7 +27,7 @@ describe('#transformDeploymentsToEntityRow', () => {
{
formatString: 'k:mm:ss EE do MMM yyyy',
kind: 'date',
- value: '2023-12-14T14:10:49Z'
+ value: '2023-12-14T14:04:49Z'
}
])
})
diff --git a/src/server/deployments/views/deployment.njk b/src/server/deployments/views/deployment.njk
index 007fe413e..540f321f5 100644
--- a/src/server/deployments/views/deployment.njk
+++ b/src/server/deployments/views/deployment.njk
@@ -14,7 +14,6 @@
{% endblock %}
{% block tabContent %}
-
{% if not deployment.status.hasFinished %}
Deployed by
{{ deployment.user | sanitizeUser }}
-
Last updated
+
Updated
{{ appTime({ datetime: deployment.deployedAt, formatString: "k:mm:ss EE do MMM yyyy" }) }}
Instances
+ Instance status
{% for key, task in deployment.tasks %}
@@ -139,4 +138,5 @@
{% if not deployment.status.hasFinished %}
{% endif %}
+
{% endblock %}
diff --git a/src/server/deployments/views/list.njk b/src/server/deployments/views/list.njk
index d16ff57bc..6304f0c3d 100644
--- a/src/server/deployments/views/list.njk
+++ b/src/server/deployments/views/list.njk
@@ -18,7 +18,7 @@
{ text: "Version", size: "tiny" },
{ text: "Status", size: "small" },
{ text: "User", size: "large" },
- { text: "Last updated", size: "large" }
+ { text: "Created", size: "large" }
],
entityRows: entityRows,
noResult: noResult,
diff --git a/src/server/services/transformers/transform-unfinished-to-service.js b/src/server/services/transformers/transform-unfinished-to-service.js
deleted file mode 100644
index 980c83100..000000000
--- a/src/server/services/transformers/transform-unfinished-to-service.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// TODO remove
-function transformUnfinishedToService(unfinished) {
- const serviceName = unfinished?.repositoryName
- const team = {
- teamId: unfinished.team.teamId,
- name: unfinished.team.name
- }
-
- return {
- isUnfinished: true,
- serviceName,
- githubUrl: unfinished?.createRepository?.url,
- id: serviceName,
- teams: [team],
- serviceStatus: unfinished
- }
-}
-
-export { transformUnfinishedToService }