From 1865ea6e6762cfec3a716d0e606076bec2ef241c Mon Sep 17 00:00:00 2001
From: Phil Moorhouse <phil@wheelsandcogs.co.uk>
Date: Thu, 28 Nov 2024 16:45:41 +0000
Subject: [PATCH 1/5] rename view dir to dataset

---
 src/routes/dataset.ts                | 4 ++--
 src/views/{view => dataset}/data.ejs | 0
 src/views/{view => dataset}/list.ejs | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename src/views/{view => dataset}/data.ejs (100%)
 rename src/views/{view => dataset}/list.ejs (100%)

diff --git a/src/routes/dataset.ts b/src/routes/dataset.ts
index 608a8ce..7b89a9c 100644
--- a/src/routes/dataset.ts
+++ b/src/routes/dataset.ts
@@ -17,7 +17,7 @@ export const dataset = Router();
 dataset.get('/', async (req: Request, res: Response, next: NextFunction) => {
     try {
         const datasets: DatasetListItemDTO[] = await req.swapi.getActiveDatasetList();
-        res.render('view/list', datasets);
+        res.render('dataset/list', datasets);
     } catch (err) {
         next(err);
     }
@@ -41,7 +41,7 @@ dataset.get('/:datasetId', fetchDataset, async (req: Request, res: Response, nex
 
     // eslint-disable-next-line require-atomic-updates
     res.locals.pagination = generateSequenceForNumber(datasetView?.current_page, datasetView?.total_pages);
-    res.render('view/data', datasetView);
+    res.render('dataset/data', datasetView);
 });
 
 dataset.get(
diff --git a/src/views/view/data.ejs b/src/views/dataset/data.ejs
similarity index 100%
rename from src/views/view/data.ejs
rename to src/views/dataset/data.ejs
diff --git a/src/views/view/list.ejs b/src/views/dataset/list.ejs
similarity index 100%
rename from src/views/view/list.ejs
rename to src/views/dataset/list.ejs

From ba57ec5d76fb4881b6d7a45e07c5844d04219d86 Mon Sep 17 00:00:00 2001
From: Phil Moorhouse <phil@wheelsandcogs.co.uk>
Date: Mon, 2 Dec 2024 17:45:14 +0000
Subject: [PATCH 2/5] add form for setting publish date

---
 package-lock.json                     |  11 +++
 package.json                          |   1 +
 src/@types/express-session/index.d.ts |  12 +--
 src/controllers/publish.ts            | 120 +++++++++++++++++++++-----
 src/dtos/processed-csv.ts             |  20 -----
 src/dtos/task-list-state.ts           |   9 +-
 src/dtos/view-dto.ts                  |   9 --
 src/dtos/view-error.ts                |   4 +-
 src/middleware/translations/en.json   |  51 ++++++++++-
 src/routes/publish.ts                 |   6 +-
 src/services/stats-wales-api.ts       |  16 +++-
 src/utils/generate-view-errors.ts     |  22 +++--
 src/validators/index.ts               |  36 +++++++-
 src/views/partials/error-handler.ejs  |   6 +-
 src/views/publish/schedule.ejs        |  83 ++++++++++++++++++
 src/views/publish/tasklist.ejs        |  38 ++++----
 16 files changed, 342 insertions(+), 102 deletions(-)
 delete mode 100644 src/dtos/processed-csv.ts
 create mode 100644 src/views/publish/schedule.ejs

diff --git a/package-lock.json b/package-lock.json
index ccbbb14..3650cb6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,6 +11,7 @@
       "dependencies": {
         "connect-redis": "^7.1.1",
         "cookie-parser": "^1.4.6",
+        "date-fns": "^4.1.0",
         "dotenv": "^16.4.5",
         "ejs": "^3.1.10",
         "express": "^4.21.0",
@@ -4079,6 +4080,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/date-fns": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz",
+      "integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/kossnocorp"
+      }
+    },
     "node_modules/debug": {
       "version": "4.3.7",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
diff --git a/package.json b/package.json
index 551e4fa..43d631a 100644
--- a/package.json
+++ b/package.json
@@ -60,6 +60,7 @@
   "dependencies": {
     "connect-redis": "^7.1.1",
     "cookie-parser": "^1.4.6",
+    "date-fns": "^4.1.0",
     "dotenv": "^16.4.5",
     "ejs": "^3.1.10",
     "express": "^4.21.0",
diff --git a/src/@types/express-session/index.d.ts b/src/@types/express-session/index.d.ts
index 1c11e26..50943ef 100644
--- a/src/@types/express-session/index.d.ts
+++ b/src/@types/express-session/index.d.ts
@@ -1,16 +1,8 @@
 import 'express-session';
-import { DatasetDTO, RevisionDTO } from '../../dtos/dataset';
-import { ViewErrDTO } from '../../dtos/view-dto';
-import { SourceAssignmentDTO } from '../../dtos/source-assignment-dto';
-import { FactTableDto } from '../../dtos/fact-table';
+import { ViewError } from '../../dtos/view-error';
 
 declare module 'express-session' {
     interface SessionData {
-        currentDataset: DatasetDTO | undefined;
-        currentRevision: RevisionDTO | undefined;
-        currentImport: FactTableDto | undefined;
-        errors: ViewErrDTO | undefined;
-        dimensionCreationRequest: SourceAssignmentDTO[];
-        currentTitle: string | undefined;
+        errors: ViewError[] | undefined;
     }
 }
diff --git a/src/controllers/publish.ts b/src/controllers/publish.ts
index 8e17ee6..5748673 100644
--- a/src/controllers/publish.ts
+++ b/src/controllers/publish.ts
@@ -1,29 +1,33 @@
-import path from 'node:path';
-
 import { Request, Response, NextFunction } from 'express';
 import { snakeCase, sortBy } from 'lodash';
 import { FieldValidationError, matchedData } from 'express-validator';
 import { nanoid } from 'nanoid';
 import { v4 as uuid } from 'uuid';
+import { isBefore, isValid, parseISO } from 'date-fns';
 
-import { generateViewErrors } from '../utils/generate-view-errors';
+import { generatePageErrors, generateViewErrors } from '../utils/generate-view-errors';
 import {
     collectionValidator,
+    dayValidator,
     descriptionValidator,
     designationValidator,
     frequencyUnitValidator,
     frequencyValueValidator,
+    getErrors,
     hasError,
+    hourValidator,
     isUpdatedValidator,
     linkIdValidator,
     linkLabelValidator,
     linkUrlValidator,
-    providerIdValidator,
+    minuteValidator,
+    monthValidator,
     qualityValidator,
     roundingAppliedValidator,
     roundingDescriptionValidator,
     titleValidator,
-    topicIdValidator
+    topicIdValidator,
+    yearValidator
 } from '../validators';
 import { ViewError } from '../dtos/view-error';
 import { logger } from '../utils/logger';
@@ -48,6 +52,7 @@ import { fileMimeTypeHandler } from '../utils/file-mimetype-handler';
 import { TopicDTO } from '../dtos/topic';
 import { DatasetTopicDTO } from '../dtos/dataset-topic';
 import { nestTopics } from '../utils/nested-topics';
+import { ApiException } from '../exceptions/api.exception';
 
 export const start = (req: Request, res: Response, next: NextFunction) => {
     res.render('publish/start');
@@ -78,7 +83,7 @@ export const provideTitle = async (req: Request, res: Response, next: NextFuncti
             }
             return;
         } catch (err) {
-            const error: ViewError = { field: 'title', tag: { name: 'errors.title.missing' } };
+            const error: ViewError = { field: 'title', message: { key: 'errors.title.missing' } };
             errors = generateViewErrors(undefined, 400, [error]);
         }
     }
@@ -104,7 +109,7 @@ export const uploadFile = async (req: Request, res: Response, next: NextFunction
             return;
         } catch (err) {
             res.status(400);
-            const error: ViewError = { field: 'csv', tag: { name: 'errors.upload.no_csv_data' } };
+            const error: ViewError = { field: 'csv', message: { key: 'errors.upload.no_csv_data' } };
             errors = generateViewErrors(undefined, 400, [error]);
         }
     }
@@ -145,7 +150,7 @@ export const factTablePreview = async (req: Request, res: Response, next: NextFu
             return;
         } catch (err: any) {
             res.status(500);
-            const error: ViewError = { field: 'confirm', tag: { name: 'errors.preview.confirm_error' } };
+            const error: ViewError = { field: 'confirm', message: { key: 'errors.preview.confirm_error' } };
             errors = generateViewErrors(dataset.id, 500, [error]);
         }
     }
@@ -161,7 +166,7 @@ export const factTablePreview = async (req: Request, res: Response, next: NextFu
         pagination = generateSequenceForNumber(previewData.current_page, previewData.total_pages);
     } catch (err: any) {
         res.status(400);
-        const error: ViewError = { field: 'preview', tag: { name: 'errors.preview.failed_to_get_preview' } };
+        const error: ViewError = { field: 'preview', message: { key: 'errors.preview.failed_to_get_preview' } };
         errors = generateViewErrors(undefined, 400, [error]);
     }
     res.render('publish/preview', { ...previewData, ignoredCount, pagination, revisit, errors });
@@ -203,22 +208,22 @@ export const sources = async (req: Request, res: Response, next: NextFunction) =
 
             if (counts.unknown > 0) {
                 logger.error('User failed to identify all sources');
-                error = { field: 'source', tag: { name: 'errors.sources.unknowns_found' } };
+                error = { field: 'source', message: { key: 'errors.sources.unknowns_found' } };
             }
 
             if (counts.dataValues > 1) {
                 logger.error('User tried to specify multiple data value sources');
-                error = { field: 'source', tag: { name: 'errors.sources.multiple_datavalues' } };
+                error = { field: 'source', message: { key: 'errors.sources.multiple_datavalues' } };
             }
 
             if (counts.footnotes > 1) {
                 logger.error('User tried to specify multiple footnote sources');
-                error = { field: 'source', tag: { name: 'errors.sources.multiple_footnotes' } };
+                error = { field: 'source', message: { key: 'errors.sources.multiple_footnotes' } };
             }
 
             if (counts.measure > 1) {
                 logger.error('User tried to specify multiple measure sources');
-                error = { field: 'source', tag: { name: 'errors.sources.multiple_measures' } };
+                error = { field: 'source', message: { key: 'errors.sources.multiple_measures' } };
             }
 
             if (error) {
@@ -292,7 +297,7 @@ export const provideSummary = async (req: Request, res: Response, next: NextFunc
             res.redirect(req.buildUrl(`/publish/${dataset.id}/tasklist`, req.language));
             return;
         } catch (err) {
-            const error: ViewError = { field: 'description', tag: { name: 'errors.description.missing' } };
+            const error: ViewError = { field: 'description', message: { key: 'errors.description.missing' } };
             errors = generateViewErrors(undefined, 400, [error]);
         }
     }
@@ -319,7 +324,7 @@ export const provideCollection = async (req: Request, res: Response, next: NextF
             res.redirect(req.buildUrl(`/publish/${dataset.id}/tasklist`, req.language));
             return;
         } catch (err) {
-            const error: ViewError = { field: 'collection', tag: { name: 'errors.collection.missing' } };
+            const error: ViewError = { field: 'collection', message: { key: 'errors.collection.missing' } };
             errors = generateViewErrors(undefined, 400, [error]);
         }
     }
@@ -354,7 +359,7 @@ export const provideQuality = async (req: Request, res: Response, next: NextFunc
             return;
         } catch (err: any) {
             if (err.path) {
-                const error: ViewError = { field: err.path, tag: { name: `errors.${snakeCase(err.path)}.missing` } };
+                const error: ViewError = { field: err.path, message: { key: `errors.${snakeCase(err.path)}.missing` } };
                 errors = generateViewErrors(dataset.id, 400, [error]);
             } else {
                 next(new UnknownException());
@@ -400,7 +405,7 @@ export const provideUpdateFrequency = async (req: Request, res: Response, next:
             res.redirect(req.buildUrl(`/publish/${dataset.id}/tasklist`, req.language));
             return;
         } catch (err) {
-            const error: ViewError = { field: 'update_frequency', tag: { name: 'errors.update_frequency.missing' } };
+            const error: ViewError = { field: 'update_frequency', message: { key: 'errors.update_frequency.missing' } };
             errors = generateViewErrors(undefined, 400, [error]);
         }
     }
@@ -501,7 +506,7 @@ export const provideDataProviders = async (req: Request, res: Response, next: Ne
             res.redirect(req.buildUrl(`/publish/${dataset.id}/providers?edit=${dataProvider.id}`, req.language));
             return;
         } catch (err: any) {
-            const error: ViewError = { tag: { name: err.message } };
+            const error: ViewError = { message: { key: err.message } };
             errors = generateViewErrors(undefined, 400, [error]);
         }
     }
@@ -512,7 +517,7 @@ export const provideDataProviders = async (req: Request, res: Response, next: Ne
         dataProviders, // list of assigned data providers
         availableProviders, // list of all available providers
         availableSources, // list of sources for the selected provider,
-        addSource: errors?.errors[0]?.tag.name === 'errors.provider_source.missing', // whether to show the source dropdown
+        addSource: errors?.errors[0]?.message?.key === 'errors.provider_source.missing', // whether to show the source dropdown
         errors
     });
 };
@@ -544,7 +549,7 @@ export const provideRelatedLinks = async (req: Request, res: Response, next: Nex
             link = existingLink;
         } else {
             // shouldn't happen unless someone changes the query param to an id that doesn't exist
-            const error: ViewError = { field: 'related_link', tag: { name: 'errors.related_link.missing' } };
+            const error: ViewError = { field: 'related_link', message: { key: 'errors.related_link.missing' } };
             errors = generateViewErrors(dataset.id, 400, [error]);
         }
     }
@@ -584,7 +589,7 @@ export const provideRelatedLinks = async (req: Request, res: Response, next: Nex
             res.redirect(req.buildUrl(`/publish/${dataset.id}/related`, req.language));
             return;
         } catch (err) {
-            const error: ViewError = { field: 'related_link', tag: { name: 'errors.related_link.required' } };
+            const error: ViewError = { field: 'related_link', message: { key: 'errors.related_link.required' } };
             errors = generateViewErrors(undefined, 400, [error]);
         }
     }
@@ -611,7 +616,7 @@ export const provideDesignation = async (req: Request, res: Response, next: Next
             res.redirect(req.buildUrl(`/publish/${dataset.id}/tasklist`, req.language));
             return;
         } catch (err) {
-            const error: ViewError = { field: 'designation', tag: { name: 'errors.designation.missing' } };
+            const error: ViewError = { field: 'designation', message: { key: 'errors.designation.missing' } };
             errors = generateViewErrors(undefined, 400, [error]);
         }
     }
@@ -640,10 +645,79 @@ export const provideTopics = async (req: Request, res: Response, next: NextFunct
             res.redirect(req.buildUrl(`/publish/${dataset.id}/tasklist`, req.language));
             return;
         } catch (err) {
-            const error: ViewError = { field: 'topics', tag: { name: 'errors.topics.missing' } };
+            const error: ViewError = { field: 'topics', message: { key: 'errors.topics.missing' } };
             errors = generateViewErrors(undefined, 400, [error]);
         }
     }
 
     res.render('publish/topics', { nestedTopics, selectedTopics, errors });
 };
+
+export const providePublishDate = async (req: Request, res: Response, next: NextFunction) => {
+    const { dataset, revision } = res.locals;
+    let errors: ViewError[] | undefined;
+    let dateError;
+    let timeError;
+    let values = { year: '', month: '', day: '', hour: '09', minute: '30' };
+
+    if (revision.publish_at) {
+        const publishAt = new Date(revision.publish_at);
+        values = {
+            year: publishAt.getFullYear().toString(),
+            month: (publishAt.getMonth() + 1).toString().padStart(2, '0'),
+            day: publishAt.getDate().toString().padStart(2, '0'),
+            hour: publishAt.getHours().toString().padStart(2, '0'),
+            minute: publishAt.getMinutes().toString().padStart(2, '0')
+        };
+    }
+
+    if (req.method === 'POST') {
+        try {
+            const validators = [dayValidator(), monthValidator(), yearValidator(), hourValidator(), minuteValidator()];
+
+            errors = (await getErrors(validators, req)).map((error: FieldValidationError) => {
+                return { field: error.path, message: { key: `publish.schedule.form.${error.path}.error` } };
+            });
+
+            values = {
+                year: req.body.year,
+                month: req.body.month.padStart(2, '0'),
+                day: req.body.day.padStart(2, '0'),
+                hour: req.body.hour.padStart(2, '0'),
+                minute: req.body.minute.padStart(2, '0')
+            };
+
+            const publishDate = parseISO(
+                `${values.year}-${values.month}-${values.day}T${values.hour}:${values.minute}:00`
+            );
+
+            if (!isValid(publishDate)) {
+                dateError = { field: 'date', message: { key: 'publish.schedule.form.date.error.invalid' } };
+                errors.unshift(dateError);
+            } else if (isBefore(publishDate, new Date())) {
+                dateError = { field: 'date', message: { key: 'publish.schedule.form.date.error.past' } };
+                errors.unshift(dateError);
+            }
+
+            if (errors.some((error) => error.field === 'hour' || error.field === 'minute')) {
+                timeError = { field: 'time', message: { key: 'publish.schedule.form.time.error.invalid' } };
+                errors.push(timeError);
+            }
+
+            if (errors.length > 0 || dateError) {
+                res.status(400);
+                throw new Error('form.validation');
+            }
+
+            await req.swapi.setPublishDate(dataset.id, revision.id, publishDate.toISOString());
+            res.redirect(req.buildUrl(`/publish/${dataset.id}/tasklist`, req.language));
+            return;
+        } catch (err) {
+            if (err instanceof ApiException) {
+                errors = [{ field: 'api', message: { key: 'publish.schedule.error.saving' } }];
+            }
+        }
+    }
+
+    res.render('publish/schedule', { values, errors, dateError, timeError });
+};
diff --git a/src/dtos/processed-csv.ts b/src/dtos/processed-csv.ts
deleted file mode 100644
index 361b092..0000000
--- a/src/dtos/processed-csv.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { DatasetDTO } from './dataset';
-import { ViewError } from './view-error';
-
-export interface PageInfo {
-    total_records: number;
-    start_record: number;
-    end_record: number;
-}
-
-export interface ProcessedCSV {
-    success: boolean;
-    dataset: DatasetDTO;
-    current_page: number;
-    page_info: PageInfo;
-    page_size: number;
-    total_pages: number;
-    headers: string[];
-    data: string[][];
-    errors: ViewError[];
-}
diff --git a/src/dtos/task-list-state.ts b/src/dtos/task-list-state.ts
index 503cef9..a7f1e17 100644
--- a/src/dtos/task-list-state.ts
+++ b/src/dtos/task-list-state.ts
@@ -19,10 +19,13 @@ export interface TaskListState {
         relevant_topics: TaskStatus;
     };
 
-    publishing: {
-        when: TaskStatus;
+    translation: {
         export: TaskStatus;
         import: TaskStatus;
-        submit: TaskStatus;
+    };
+
+    publishing: {
+        organisation: TaskStatus;
+        when: TaskStatus;
     };
 }
diff --git a/src/dtos/view-dto.ts b/src/dtos/view-dto.ts
index 35675c3..af7719c 100644
--- a/src/dtos/view-dto.ts
+++ b/src/dtos/view-dto.ts
@@ -1,5 +1,3 @@
-import { Readable } from 'stream';
-
 import { SourceType } from '../enums/source-type';
 
 import { ViewError } from './view-error';
@@ -19,14 +17,12 @@ export interface PageInfo {
 }
 
 export interface ViewErrDTO {
-    success: boolean;
     status: number;
     errors: ViewError[];
     dataset_id: string | undefined;
 }
 
 export interface ViewDTO {
-    success: boolean;
     dataset: DatasetDTO;
     fact_table: FactTableDto;
     current_page: number;
@@ -37,8 +33,3 @@ export interface ViewDTO {
     headers: CSVHeader[];
     data: string[][];
 }
-
-export interface ViewStream {
-    success: boolean;
-    stream: Readable;
-}
diff --git a/src/dtos/view-error.ts b/src/dtos/view-error.ts
index 2cd239e..0c98ab9 100644
--- a/src/dtos/view-error.ts
+++ b/src/dtos/view-error.ts
@@ -1,7 +1,7 @@
 export interface ViewError {
     field?: string;
-    tag: {
-        name: string;
+    message?: {
+        key: string;
         params?: object;
     };
 }
diff --git a/src/middleware/translations/en.json b/src/middleware/translations/en.json
index 44a195f..addf8b1 100644
--- a/src/middleware/translations/en.json
+++ b/src/middleware/translations/en.json
@@ -234,6 +234,49 @@
         "topics": {
             "heading": "Which topics are relevant to this dataset?"
         },
+        "schedule": {
+            "heading": "When should this dataset be published?",
+            "form": {
+                "date": {
+                    "label": "Date",
+                    "hint": "For example, 10 05 2024",
+                    "error": {
+                        "invalid": "The date this dataset should be published must be a real date",
+                        "past": "The date this dataset should be published must be in the future"
+                    }
+                },
+                "day": {
+                    "label": "Day",
+                    "error": "The date this dataset should be published must include a day"
+                },
+                "month": {
+                    "label": "Month",
+                    "error": "The date this dataset should be published must include a month"
+                },
+                "year": {
+                    "label": "Year",
+                    "error": "The date this dataset should be published must include a year"
+                },
+                "time": {
+                    "label": "Time",
+                    "hint": "This will be 09:30 by default. Only change this if a different publication time is needed. Use 24 hour clock format, for example 15:00.",
+                    "error": {
+                        "invalid": "The time this dataset should be published must be a real time"
+                    }
+                },
+                "hour": {
+                    "label": "Hour",
+                    "error": "The time this dataset should be published must include an hour"
+                },
+                "minute": {
+                    "label": "Minute",
+                    "error": "The time this dataset should be published must include a minute"
+                }
+            },
+            "error": {
+                "saving": "Could not save the publish date, please try later"
+            }
+        },
         "upload": {
             "title": "Upload the data table",
             "note": "The file should be in a CSV format"
@@ -305,11 +348,15 @@
                 "designation": "Designation",
                 "relevant_topics": "Relevant topics"
             },
+            "translation": {
+                "subheading": "Translation",
+                "export": "Export text fields for translation",
+                "import": "Import translations"
+            },
             "publishing": {
                 "subheading": "Publishing",
+                "organisation": "Publisher organisation and contact",
                 "when": "When this dataset should be published",
-                "export": "Export text fields for translation",
-                "import": "Import translations",
                 "submit": "Submit for approval"
             }
         },
diff --git a/src/routes/publish.ts b/src/routes/publish.ts
index 45cca6a..dad67af 100644
--- a/src/routes/publish.ts
+++ b/src/routes/publish.ts
@@ -18,7 +18,8 @@ import {
     provideRelatedLinks,
     provideUpdateFrequency,
     provideDesignation,
-    provideTopics
+    provideTopics,
+    providePublishDate
 } from '../controllers/publish';
 
 export const publish = Router();
@@ -72,3 +73,6 @@ publish.post('/:datasetId/designation', fetchDataset, upload.none(), provideDesi
 
 publish.get('/:datasetId/topics', fetchDataset, provideTopics);
 publish.post('/:datasetId/topics', fetchDataset, upload.none(), provideTopics);
+
+publish.get('/:datasetId/schedule', fetchDataset, providePublishDate);
+publish.post('/:datasetId/schedule', fetchDataset, upload.none(), providePublishDate);
diff --git a/src/services/stats-wales-api.ts b/src/services/stats-wales-api.ts
index 41f4f61..bde03e4 100644
--- a/src/services/stats-wales-api.ts
+++ b/src/services/stats-wales-api.ts
@@ -226,8 +226,8 @@ export class StatsWalesApi {
                 throw new ViewException(error.message, error.status, [
                     {
                         field: 'csv',
-                        tag: {
-                            name: 'errors.upload.no_csv_data',
+                        message: {
+                            key: 'errors.upload.no_csv_data',
                             params: {}
                         }
                     }
@@ -256,8 +256,8 @@ export class StatsWalesApi {
                 throw new ViewException(error.message, error.status, [
                     {
                         field: 'csv',
-                        tag: {
-                            name: 'errors.upload.no_csv_data',
+                        message: {
+                            key: 'errors.upload.no_csv_data',
                             params: {}
                         }
                     }
@@ -287,4 +287,12 @@ export class StatsWalesApi {
             (response) => response.json() as unknown as DatasetDTO
         );
     }
+
+    public async setPublishDate(datasetId: string, revisionId: string, publishDate: string): Promise<DatasetDTO> {
+        return this.fetch({
+            url: `dataset/${datasetId}/revision/by-id/${revisionId}/publish-at`,
+            method: HttpMethod.Patch,
+            json: { publish_at: publishDate }
+        }).then((response) => response.json() as unknown as DatasetDTO);
+    }
 }
diff --git a/src/utils/generate-view-errors.ts b/src/utils/generate-view-errors.ts
index d5cf2eb..662d966 100644
--- a/src/utils/generate-view-errors.ts
+++ b/src/utils/generate-view-errors.ts
@@ -1,11 +1,19 @@
+import { FieldValidationError } from 'express-validator';
+
 import { ViewErrDTO } from '../dtos/view-dto';
 import { ViewError } from '../dtos/view-error';
 
-export function generateViewErrors(datasetID: string | undefined, statusCode: number, errors: ViewError[]): ViewErrDTO {
-    return {
-        success: false,
-        status: statusCode,
-        errors,
-        dataset_id: datasetID
-    } as ViewErrDTO;
+export function generateViewErrors(dataset_id: string | undefined, status: number, errors: ViewError[]): ViewErrDTO {
+    return { dataset_id, status, errors };
+}
+
+export function generatePageErrors(errors: FieldValidationError[], i18nPrefix: string): ViewError[] {
+    return errors.map((error: FieldValidationError) => {
+        return {
+            field: error.path,
+            message: {
+                key: `${i18nPrefix}.form.${error.path}.error`
+            }
+        };
+    });
 }
diff --git a/src/validators/index.ts b/src/validators/index.ts
index b309bad..ed0b829 100644
--- a/src/validators/index.ts
+++ b/src/validators/index.ts
@@ -1,5 +1,6 @@
 import { Request } from 'express';
-import { body, param, ValidationChain } from 'express-validator';
+import { body, FieldValidationError, param, ValidationChain } from 'express-validator';
+import { ResultWithContext } from 'express-validator/lib/chain/context-runner';
 
 import { Designation } from '../enums/designation';
 import { DurationUnit } from '../enums/duration-unit';
@@ -8,6 +9,33 @@ export const hasError = async (validator: ValidationChain, req: Request) => {
     return !(await validator.run(req)).isEmpty();
 };
 
+export async function getErrors(
+    validators: ValidationChain | ValidationChain[],
+    req: Request
+): Promise<FieldValidationError[]> {
+    if (!Array.isArray(validators)) {
+        // eslint-disable-next-line no-param-reassign
+        validators = [validators];
+    }
+
+    let errors: FieldValidationError[] = [];
+
+    for (const validator of validators) {
+        const result: ResultWithContext = await validator.run(req);
+        if (!result.isEmpty()) {
+            const fieldErrors = result.array().filter((err) => err.type === 'field');
+            errors = errors.concat(fieldErrors);
+        }
+    }
+
+    return errors;
+}
+
+export async function getErrorFields(validators: ValidationChain | ValidationChain[], req: Request): Promise<string[]> {
+    const errors = await getErrors(validators, req);
+    return errors.map((error) => error.path);
+}
+
 export const datasetIdValidator = () => param('datasetId').trim().notEmpty().isUUID(4);
 export const revisionIdValidator = () => param('revisionId').trim().notEmpty().isUUID(4);
 export const factTableIdValidator = () => param('factTableId').trim().notEmpty().isUUID(4);
@@ -37,3 +65,9 @@ export const designationValidator = () => body('designation').trim().isIn(Object
 export const providerIdValidator = () => body('provider_id').trim().notEmpty().isUUID(4);
 
 export const topicIdValidator = () => body('topics').isArray({ min: 1 });
+
+export const dayValidator = () => body('day').isInt({ min: 1, max: 31, allow_leading_zeroes: true });
+export const monthValidator = () => body('month').isInt({ min: 1, max: 12, allow_leading_zeroes: true });
+export const yearValidator = () => body('year').isInt({ min: new Date().getFullYear(), allow_leading_zeroes: true });
+export const hourValidator = () => body('hour').isInt({ min: 0, max: 23, allow_leading_zeroes: true });
+export const minuteValidator = () => body('minute').isInt({ min: 0, max: 59, allow_leading_zeroes: true });
diff --git a/src/views/partials/error-handler.ejs b/src/views/partials/error-handler.ejs
index 50917d4..284d8f8 100644
--- a/src/views/partials/error-handler.ejs
+++ b/src/views/partials/error-handler.ejs
@@ -6,13 +6,13 @@
             </h2>
             <div class="govuk-error-summary__body">
                 <ul class="govuk-list govuk-error-summary__list">
-                    <% locals?.errors.errors.forEach(function(error) { %>
+                    <% locals?.errors?.forEach(function(error) { %>
                         <li>
-                            <a href="#<%= error.field %>"><%= t(error.tag.name, error.params) %></a>
+                            <a href="#<%= error.field %>"><%= t(error.message.key, error.message.params) %></a>
                         </li>
                     <% }); %>
                 </ul>
             </div>
         </div>
     </div>
-<% } %>
\ No newline at end of file
+<% } %>
diff --git a/src/views/publish/schedule.ejs b/src/views/publish/schedule.ejs
new file mode 100644
index 0000000..4d919a8
--- /dev/null
+++ b/src/views/publish/schedule.ejs
@@ -0,0 +1,83 @@
+<%- include("../partials/header"); %>
+<div class="govuk-width-container app-width-container">
+    <main class="govuk-main-wrapper" id="main-content" role="main">
+
+        <div class="top-links">
+            <div class="govuk-width-container">
+                <a href="javascript:history.back()" class="govuk-back-link"><%= t('buttons.back') %></a>
+                <a href="<%= buildUrl(`/publish/${locals.datasetId}/tasklist`, i18n.language) %>" class="govuk-link return-link"><%= t('publish.header.overview') %></a>
+            </div>
+        </div>
+
+        <div class="govuk-width-container">
+            <div class="govuk-grid-row">
+                <div class="govuk-grid-column-two-thirds">
+                    <h1 class="govuk-heading-xl"><%= t('publish.schedule.heading') %></h1>
+
+                    <%- include("../partials/error-handler", { errors: locals?.errors?.filter((error) => !['year', 'month', 'day'].includes(error.field)) }); %>
+
+                    <form enctype="multipart/form-data" method="post">
+                        <div class="govuk-form-group <%= locals.dateError ? 'govuk-form-group--error' : '' %>">
+                            <fieldset class="govuk-fieldset" aria-describedby="publication-date-hint">
+                              <legend class="govuk-fieldset__legend govuk-fieldset__legend--s"><%= t('publish.schedule.form.date.label') %></legend>
+                              <div id="publication-date-hint" class="govuk-hint"><%= t('publish.schedule.form.date.hint') %></div>
+                              <% if (locals.dateError) { %>
+                                <p id="publication-date-error" class="govuk-error-message">
+                                  <span class="govuk-visually-hidden">Error:</span> <%= t(locals.dateError.message.key) %>
+                                </p>
+                              <% } %>
+                              <div class="govuk-date-input" id="publication-date">
+                                <div class="govuk-date-input__item">
+                                  <div class="govuk-form-group">
+                                    <label class="govuk-label govuk-date-input__label" for="publication-day"><%= t('publish.schedule.form.day.label') %></label>
+                                    <input class="govuk-input govuk-date-input__input govuk-input--width-3 <%= locals.errors?.find(e => e.field === 'day') ? 'govuk-input--error' : '' %>" id="publication-day" name="day" type="text" inputmode="numeric" value="<%= locals.values?.day ? locals.values.day : '' %>">
+                                  </div>
+                                </div>
+                                <div class="govuk-date-input__item">
+                                  <div class="govuk-form-group">
+                                    <label class="govuk-label govuk-date-input__label" for="publication-month"><%= t('publish.schedule.form.month.label') %></label>
+                                    <input class="govuk-input govuk-date-input__input govuk-input--width-3 <%= locals.errors?.find(e => e.field === 'month') ? 'govuk-input--error' : '' %>" id="publication-month" name="month" type="text" inputmode="numeric" value="<%= locals.values?.month ? locals.values.month : '' %>">
+                                  </div>
+                                </div>
+                                <div class="govuk-date-input__item">
+                                  <div class="govuk-form-group">
+                                    <label class="govuk-label govuk-date-input__label" for="publication-year"><%= t('publish.schedule.form.year.label') %></label>
+                                    <input class="govuk-input govuk-date-input__input govuk-input--width-5 <%= locals.errors?.find(e => e.field === 'year') ? 'govuk-input--error' : '' %>" id="publication-year" name="year" type="text" inputmode="numeric" value="<%= locals.values?.year ? locals.values.year : '' %>">
+                                  </div>
+                                </div>
+                              </div>
+                            </fieldset>
+                        </div>
+                        <div class="govuk-form-group <%= locals.timeError ? 'govuk-form-group--error' : '' %>">
+                            <fieldset class="govuk-fieldset" aria-describedby="publication-time-hint">
+                                <legend class="govuk-fieldset__legend govuk-fieldset__legend--s"><%= t('publish.schedule.form.time.label') %></legend>
+                                <div id="publication-time-hint" class="govuk-hint"><%= t('publish.schedule.form.time.hint') %></div>
+                                <% if (locals.timeError) { %>
+                                  <p id="publication-time-error" class="govuk-error-message">
+                                    <span class="govuk-visually-hidden">Error:</span> <%= t(locals.timeError.message.key) %>
+                                  </p>
+                                <% } %>
+                                <div class="govuk-date-input__item">
+                                    <div class="govuk-form-group">
+                                        <label class="govuk-label govuk-date-input__label" for="publication-hour"><%= t('publish.schedule.form.hour.label') %></label>
+                                        <input class="govuk-input govuk-date-input__input govuk-input--width-3 <%= locals.errors?.find(e => e.field === 'hour') ? 'govuk-input--error' : '' %>" id="publication-hour" name="hour" type="text" inputmode="numeric" value="<%= locals.values?.hour ? locals.values.hour : '' %>">
+                                    </div>
+                                </div>
+                                <div class="govuk-date-input__item">
+                                    <div class="govuk-form-group">
+                                        <label class="govuk-label govuk-date-input__label" for="publication-minute"><%= t('publish.schedule.form.minute.label') %></label>
+                                        <input class="govuk-input govuk-date-input__input govuk-input--width-3 <%= locals.errors?.find(e => e.field === 'minute') ? 'govuk-input--error' : '' %>" id="publication-minute" name="minute" type="text" inputmode="numeric" value="<%= locals.values?.minute ? locals.values.minute : '' %>">
+                                    </div>
+                                </div>
+                            </fieldset>
+                          </div>
+                        <button type="submit" class="govuk-button" data-module="govuk-button"><%= t('buttons.continue') %></button>
+                        <a class="govuk-button govuk-button--secondary" href="javascript:history.back()"><%= t('buttons.cancel')%></a>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </main>
+</div>
+
+<%- include("../partials/footer"); %>
diff --git a/src/views/publish/tasklist.ejs b/src/views/publish/tasklist.ejs
index 038d20e..306e228 100644
--- a/src/views/publish/tasklist.ejs
+++ b/src/views/publish/tasklist.ejs
@@ -152,53 +152,57 @@
           </li>
         </ul>
 
-        <h2 class="govuk-heading-m govuk-!-margin-top-5"><%= t('publish.tasklist.publishing.subheading') %></h2>
+        <h2 class="govuk-heading-m govuk-!-margin-top-5"><%= t('publish.tasklist.translation.subheading') %></h2>
         <ul class="govuk-task-list">
           <li class="govuk-task-list__item govuk-task-list__item--with-link">
             <div class="govuk-task-list__name-and-hint">
-              <a class="govuk-link govuk-task-list__link" href="schedule" aria-describedby="prepare-application-5-status">
-                <%= t('publish.tasklist.publishing.when') %>
+              <a class="govuk-link govuk-task-list__link" href="<%= buildUrl(`/publish/${locals.datasetId}/translation-export`, i18n.language) %>" aria-describedby="prepare-application-5-status">
+                <%= t('publish.tasklist.translation.export') %>
               </a>
             </div>
             <div class="govuk-task-list__status">
-              <strong class="govuk-tag govuk-tag--<%= statusToColour(taskList.publishing.when) %>">
-                <%= t(`publish.tasklist.status.${taskList.publishing.when}`) %>
+              <strong class="govuk-tag govuk-tag--<%= statusToColour(taskList.translation.export) %>">
+                <%= t(`publish.tasklist.status.${taskList.translation.export}`) %>
               </strong>
             </div>
           </li>
           <li class="govuk-task-list__item govuk-task-list__item--with-link">
             <div class="govuk-task-list__name-and-hint">
-              <a class="govuk-link govuk-task-list__link" href="schedule" aria-describedby="prepare-application-5-status">
-                <%= t('publish.tasklist.publishing.export') %>
+              <a class="govuk-link govuk-task-list__link" href="<%= buildUrl(`/publish/${locals.datasetId}/translation-import`, i18n.language) %>" aria-describedby="prepare-application-5-status">
+                <%= t('publish.tasklist.translation.import') %>
               </a>
             </div>
             <div class="govuk-task-list__status">
-              <strong class="govuk-tag govuk-tag--<%= statusToColour(taskList.publishing.export) %>">
-                <%= t(`publish.tasklist.status.${taskList.publishing.export}`) %>
+              <strong class="govuk-tag govuk-tag--<%= statusToColour(taskList.translation.import) %>">
+                <%= t(`publish.tasklist.status.${taskList.translation.import}`) %>
               </strong>
             </div>
           </li>
+        </ul>
+
+        <h2 class="govuk-heading-m govuk-!-margin-top-5"><%= t('publish.tasklist.publishing.subheading') %></h2>
+        <ul class="govuk-task-list">
           <li class="govuk-task-list__item govuk-task-list__item--with-link">
             <div class="govuk-task-list__name-and-hint">
-              <a class="govuk-link govuk-task-list__link" href="schedule" aria-describedby="prepare-application-5-status">
-                <%= t('publish.tasklist.publishing.import') %>
+              <a class="govuk-link govuk-task-list__link" href="<%= buildUrl(`/publish/${locals.datasetId}/contacts`, i18n.language) %>" aria-describedby="prepare-application-5-status">
+                <%= t('publish.tasklist.publishing.organisation') %>
               </a>
             </div>
             <div class="govuk-task-list__status">
-              <strong class="govuk-tag govuk-tag--<%= statusToColour(taskList.publishing.import) %>">
-                <%= t(`publish.tasklist.status.${taskList.publishing.import}`) %>
+              <strong class="govuk-tag govuk-tag--<%= statusToColour(taskList.publishing.organisation) %>">
+                <%= t(`publish.tasklist.status.${taskList.publishing.organisation}`) %>
               </strong>
             </div>
           </li>
           <li class="govuk-task-list__item govuk-task-list__item--with-link">
             <div class="govuk-task-list__name-and-hint">
-              <a class="govuk-link govuk-task-list__link" href="schedule" aria-describedby="prepare-application-5-status">
-                <%= t('publish.tasklist.publishing.submit') %>
+              <a class="govuk-link govuk-task-list__link" href="<%= buildUrl(`/publish/${locals.datasetId}/schedule`, i18n.language) %>" aria-describedby="prepare-application-5-status">
+                <%= t('publish.tasklist.publishing.when') %>
               </a>
             </div>
             <div class="govuk-task-list__status">
-              <strong class="govuk-tag govuk-tag--<%= statusToColour(taskList.publishing.submit) %>">
-                <%= t(`publish.tasklist.status.${taskList.publishing.submit}`) %>
+              <strong class="govuk-tag govuk-tag--<%= statusToColour(taskList.publishing.when) %>">
+                <%= t(`publish.tasklist.status.${taskList.publishing.when}`) %>
               </strong>
             </div>
           </li>

From 02695dbdb51ebae91bf66ed8b7f6ed3d176db9e7 Mon Sep 17 00:00:00 2001
From: Phil Moorhouse <phil@wheelsandcogs.co.uk>
Date: Tue, 3 Dec 2024 13:28:33 +0000
Subject: [PATCH 3/5] fix tests

---
 src/controllers/publish.ts           | 63 +++++++++++++---------------
 src/services/stats-wales.api.test.ts |  8 ++--
 src/views/publish/preview.ejs        | 22 +---------
 test/mocks/fixtures.ts               |  9 ++--
 test/publish.test.ts                 | 11 +----
 5 files changed, 41 insertions(+), 72 deletions(-)

diff --git a/src/controllers/publish.ts b/src/controllers/publish.ts
index 5748673..036de32 100644
--- a/src/controllers/publish.ts
+++ b/src/controllers/publish.ts
@@ -5,7 +5,6 @@ import { nanoid } from 'nanoid';
 import { v4 as uuid } from 'uuid';
 import { isBefore, isValid, parseISO } from 'date-fns';
 
-import { generatePageErrors, generateViewErrors } from '../utils/generate-view-errors';
 import {
     collectionValidator,
     dayValidator,
@@ -31,7 +30,7 @@ import {
 } from '../validators';
 import { ViewError } from '../dtos/view-error';
 import { logger } from '../utils/logger';
-import { ViewDTO, ViewErrDTO } from '../dtos/view-dto';
+import { ViewDTO } from '../dtos/view-dto';
 import { SourceType } from '../enums/source-type';
 import { FactTableInfoDto } from '../dtos/fact-table-info';
 import { SourceAssignmentDTO } from '../dtos/source-assignment-dto';
@@ -59,7 +58,7 @@ export const start = (req: Request, res: Response, next: NextFunction) => {
 };
 
 export const provideTitle = async (req: Request, res: Response, next: NextFunction) => {
-    let errors: ViewErrDTO | undefined;
+    let errors: ViewError[] | undefined;
     const existingDataset = res.locals.dataset; // dataset does not exist the first time through
     let title = existingDataset ? singleLangDataset(existingDataset, req.language)?.datasetInfo?.title : undefined;
     const revisit = Boolean(existingDataset);
@@ -83,8 +82,7 @@ export const provideTitle = async (req: Request, res: Response, next: NextFuncti
             }
             return;
         } catch (err) {
-            const error: ViewError = { field: 'title', message: { key: 'errors.title.missing' } };
-            errors = generateViewErrors(undefined, 400, [error]);
+            errors = [{ field: 'title', message: { key: 'errors.title.missing' } }];
         }
     }
 
@@ -93,7 +91,7 @@ export const provideTitle = async (req: Request, res: Response, next: NextFuncti
 
 export const uploadFile = async (req: Request, res: Response, next: NextFunction) => {
     const dataset = res.locals.dataset;
-    let errors: ViewErrDTO | undefined;
+    let errors: ViewError[] | undefined;
     const revisit = dataset.dimensions?.length > 0;
 
     if (req.method === 'POST') {
@@ -109,8 +107,7 @@ export const uploadFile = async (req: Request, res: Response, next: NextFunction
             return;
         } catch (err) {
             res.status(400);
-            const error: ViewError = { field: 'csv', message: { key: 'errors.upload.no_csv_data' } };
-            errors = generateViewErrors(undefined, 400, [error]);
+            errors = [{ field: 'csv', message: { key: 'errors.upload.no_csv_data' } }];
         }
     }
 
@@ -119,7 +116,7 @@ export const uploadFile = async (req: Request, res: Response, next: NextFunction
 
 export const factTablePreview = async (req: Request, res: Response, next: NextFunction) => {
     const { dataset, revision, factTable } = res.locals;
-    let errors: ViewErrDTO | undefined;
+    let errors: ViewError[] | undefined;
     let previewData: ViewDTO | undefined;
     let ignoredCount = 0;
     let pagination: (string | number)[] = [];
@@ -150,8 +147,7 @@ export const factTablePreview = async (req: Request, res: Response, next: NextFu
             return;
         } catch (err: any) {
             res.status(500);
-            const error: ViewError = { field: 'confirm', message: { key: 'errors.preview.confirm_error' } };
-            errors = generateViewErrors(dataset.id, 500, [error]);
+            errors = [{ field: 'confirm', message: { key: 'errors.preview.confirm_error' } }];
         }
     }
 
@@ -166,8 +162,7 @@ export const factTablePreview = async (req: Request, res: Response, next: NextFu
         pagination = generateSequenceForNumber(previewData.current_page, previewData.total_pages);
     } catch (err: any) {
         res.status(400);
-        const error: ViewError = { field: 'preview', message: { key: 'errors.preview.failed_to_get_preview' } };
-        errors = generateViewErrors(undefined, 400, [error]);
+        errors = [{ field: 'preview', message: { key: 'errors.preview.failed_to_get_preview' } }];
     }
     res.render('publish/preview', { ...previewData, ignoredCount, pagination, revisit, errors });
 };
@@ -178,7 +173,7 @@ export const sources = async (req: Request, res: Response, next: NextFunction) =
         factTable.fact_table_info?.filter((factTableInfo: FactTableInfoDto) => Boolean(factTableInfo.column_type))
             .length > 0;
     let error: ViewError | undefined;
-    let errors: ViewErrDTO | undefined;
+    let errors: ViewError[] | undefined;
     let currentImport = factTable;
 
     try {
@@ -227,7 +222,7 @@ export const sources = async (req: Request, res: Response, next: NextFunction) =
             }
 
             if (error) {
-                errors = generateViewErrors(undefined, 400, [error]);
+                errors = [error];
                 res.status(400);
             } else {
                 await req.swapi.assignSources(dataset.id, revision.id, factTable.id, sourceAssignment);
@@ -279,7 +274,7 @@ export const changeData = async (req: Request, res: Response, next: NextFunction
 };
 
 export const provideSummary = async (req: Request, res: Response, next: NextFunction) => {
-    let errors: ViewErrDTO | undefined;
+    let errors: ViewError[] | undefined;
     const dataset = singleLangDataset(res.locals.dataset, req.language);
     let description = dataset?.datasetInfo?.description;
 
@@ -298,7 +293,7 @@ export const provideSummary = async (req: Request, res: Response, next: NextFunc
             return;
         } catch (err) {
             const error: ViewError = { field: 'description', message: { key: 'errors.description.missing' } };
-            errors = generateViewErrors(undefined, 400, [error]);
+            errors = [error];
         }
     }
 
@@ -306,7 +301,7 @@ export const provideSummary = async (req: Request, res: Response, next: NextFunc
 };
 
 export const provideCollection = async (req: Request, res: Response, next: NextFunction) => {
-    let errors: ViewErrDTO | undefined;
+    let errors: ViewError[] | undefined;
     const dataset = singleLangDataset(res.locals.dataset, req.language);
     let collection = dataset?.datasetInfo?.collection;
 
@@ -325,7 +320,7 @@ export const provideCollection = async (req: Request, res: Response, next: NextF
             return;
         } catch (err) {
             const error: ViewError = { field: 'collection', message: { key: 'errors.collection.missing' } };
-            errors = generateViewErrors(undefined, 400, [error]);
+            errors = [error];
         }
     }
 
@@ -333,7 +328,7 @@ export const provideCollection = async (req: Request, res: Response, next: NextF
 };
 
 export const provideQuality = async (req: Request, res: Response, next: NextFunction) => {
-    let errors: ViewErrDTO | undefined;
+    let errors: ViewError[] | undefined;
     const dataset = singleLangDataset(res.locals.dataset, req.language);
     let datasetInfo = dataset?.datasetInfo!;
 
@@ -360,7 +355,7 @@ export const provideQuality = async (req: Request, res: Response, next: NextFunc
         } catch (err: any) {
             if (err.path) {
                 const error: ViewError = { field: err.path, message: { key: `errors.${snakeCase(err.path)}.missing` } };
-                errors = generateViewErrors(dataset.id, 400, [error]);
+                errors = [error];
             } else {
                 next(new UnknownException());
                 return;
@@ -372,7 +367,7 @@ export const provideQuality = async (req: Request, res: Response, next: NextFunc
 };
 
 export const provideUpdateFrequency = async (req: Request, res: Response, next: NextFunction) => {
-    let errors: ViewErrDTO | undefined;
+    let errors: ViewError[] | undefined;
     const dataset = singleLangDataset(res.locals.dataset, req.language);
     let update_frequency = dataset?.datasetInfo!.update_frequency;
 
@@ -406,7 +401,7 @@ export const provideUpdateFrequency = async (req: Request, res: Response, next:
             return;
         } catch (err) {
             const error: ViewError = { field: 'update_frequency', message: { key: 'errors.update_frequency.missing' } };
-            errors = generateViewErrors(undefined, 400, [error]);
+            errors = [error];
         }
     }
 
@@ -414,7 +409,7 @@ export const provideUpdateFrequency = async (req: Request, res: Response, next:
 };
 
 export const provideDataProviders = async (req: Request, res: Response, next: NextFunction) => {
-    let errors: ViewErrDTO | undefined;
+    let errors: ViewError[] | undefined;
     const availableProviders: ProviderDTO[] = await req.swapi.getAllProviders();
     const dataset = singleLangDataset(res.locals.dataset, req.language);
     const deleteId = req.query.delete;
@@ -506,8 +501,7 @@ export const provideDataProviders = async (req: Request, res: Response, next: Ne
             res.redirect(req.buildUrl(`/publish/${dataset.id}/providers?edit=${dataProvider.id}`, req.language));
             return;
         } catch (err: any) {
-            const error: ViewError = { message: { key: err.message } };
-            errors = generateViewErrors(undefined, 400, [error]);
+            errors = [{ message: { key: err.message } }];
         }
     }
 
@@ -517,14 +511,14 @@ export const provideDataProviders = async (req: Request, res: Response, next: Ne
         dataProviders, // list of assigned data providers
         availableProviders, // list of all available providers
         availableSources, // list of sources for the selected provider,
-        addSource: errors?.errors[0]?.message?.key === 'errors.provider_source.missing', // whether to show the source dropdown
+        addSource: errors && errors[0]?.message?.key === 'errors.provider_source.missing', // whether to show the source dropdown
         errors
     });
 };
 
 export const provideRelatedLinks = async (req: Request, res: Response, next: NextFunction) => {
     const dataset = singleLangDataset(res.locals.dataset, req.language);
-    let errors: ViewErrDTO | undefined;
+    let errors: ViewError[] | undefined;
     let related_links = sortBy(dataset?.datasetInfo?.related_links || [], 'created_at');
     const deleteId = req.query.delete;
     const editId = req.query.edit;
@@ -549,8 +543,7 @@ export const provideRelatedLinks = async (req: Request, res: Response, next: Nex
             link = existingLink;
         } else {
             // shouldn't happen unless someone changes the query param to an id that doesn't exist
-            const error: ViewError = { field: 'related_link', message: { key: 'errors.related_link.missing' } };
-            errors = generateViewErrors(dataset.id, 400, [error]);
+            errors = [{ field: 'related_link', message: { key: 'errors.related_link.missing' } }];
         }
     }
 
@@ -590,7 +583,7 @@ export const provideRelatedLinks = async (req: Request, res: Response, next: Nex
             return;
         } catch (err) {
             const error: ViewError = { field: 'related_link', message: { key: 'errors.related_link.required' } };
-            errors = generateViewErrors(undefined, 400, [error]);
+            errors = [error];
         }
     }
 
@@ -598,7 +591,7 @@ export const provideRelatedLinks = async (req: Request, res: Response, next: Nex
 };
 
 export const provideDesignation = async (req: Request, res: Response, next: NextFunction) => {
-    let errors: ViewErrDTO | undefined;
+    let errors: ViewError[] | undefined;
     const dataset = singleLangDataset(res.locals.dataset, req.language);
     let designation = dataset?.datasetInfo?.designation;
 
@@ -617,7 +610,7 @@ export const provideDesignation = async (req: Request, res: Response, next: Next
             return;
         } catch (err) {
             const error: ViewError = { field: 'designation', message: { key: 'errors.designation.missing' } };
-            errors = generateViewErrors(undefined, 400, [error]);
+            errors = [error];
         }
     }
 
@@ -625,7 +618,7 @@ export const provideDesignation = async (req: Request, res: Response, next: Next
 };
 
 export const provideTopics = async (req: Request, res: Response, next: NextFunction) => {
-    let errors: ViewErrDTO | undefined;
+    let errors: ViewError[] | undefined;
     const dataset = singleLangDataset(res.locals.dataset, req.language);
     const availableTopics: TopicDTO[] = await req.swapi.getAllTopics();
     const nestedTopics = nestTopics(availableTopics);
@@ -646,7 +639,7 @@ export const provideTopics = async (req: Request, res: Response, next: NextFunct
             return;
         } catch (err) {
             const error: ViewError = { field: 'topics', message: { key: 'errors.topics.missing' } };
-            errors = generateViewErrors(undefined, 400, [error]);
+            errors = [error];
         }
     }
 
diff --git a/src/services/stats-wales.api.test.ts b/src/services/stats-wales.api.test.ts
index 2f41990..e618112 100644
--- a/src/services/stats-wales.api.test.ts
+++ b/src/services/stats-wales.api.test.ts
@@ -284,8 +284,8 @@ describe('StatsWalesApi', () => {
                 new ViewException('Bad Request', 400, [
                     {
                         field: 'csv',
-                        tag: {
-                            name: 'errors.upload.no_csv_data',
+                        message: {
+                            key: 'errors.upload.no_csv_data',
                             params: {}
                         }
                     }
@@ -365,8 +365,8 @@ describe('StatsWalesApi', () => {
                 new ViewException('Bad Request', 400, [
                     {
                         field: 'csv',
-                        tag: {
-                            name: 'errors.upload.no_csv_data',
+                        message: {
+                            key: 'errors.upload.no_csv_data',
                             params: {}
                         }
                     }
diff --git a/src/views/publish/preview.ejs b/src/views/publish/preview.ejs
index 356e5a3..236792c 100644
--- a/src/views/publish/preview.ejs
+++ b/src/views/publish/preview.ejs
@@ -16,26 +16,8 @@
 
         <h1 class="govuk-heading-xl"><%= locals.revisit ? t('publish.preview.heading_summary') : t('publish.preview.heading') %></h1>
 
-        <% if (locals?.errors) { %>
-            <div class="govuk-error-summary" data-module="govuk-error-summary">
-                <div role="alert">
-                    <h2 class="govuk-error-summary__title">
-                        <%= t('errors.problem') %>
-                    </h2>
-                    <div class="govuk-error-summary__body">
-                        <ul class="govuk-list govuk-error-summary__list">
-                            <% locals.errors.errors.forEach(function(error) { %>
-                                <li>
-                                    <a href="#<%= error.field %>">
-                                        <%= t(error.tag.name) %>
-                                    </a>
-                                </li>
-                                <% }); %>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-        <% } %>
+        <%- include("../partials/error-handler"); %>
+
         <div class="govuk-grid-row">
             <div class="govuk-grid-column-one-half">
                 <p class="govuk-body" style="padding-top: 10px;">
diff --git a/test/mocks/fixtures.ts b/test/mocks/fixtures.ts
index 563b164..5db9f14 100644
--- a/test/mocks/fixtures.ts
+++ b/test/mocks/fixtures.ts
@@ -156,7 +156,6 @@ export const completedDataset: DatasetDTO = {
 };
 
 export const datasetView: ViewDTO = {
-    success: true,
     dataset: {
         id: '7d3d49c0-9fc9-4ce2-ba48-5c466f30946c',
         created_at: '2024-09-05T10:05:03.871Z',
@@ -251,11 +250,13 @@ export const tasklistInProgress: TaskListState = {
         data_collection: TaskStatus.NotStarted,
         relevant_topics: TaskStatus.NotStarted
     },
+    translation: {
+        export: TaskStatus.NotStarted,
+        import: TaskStatus.NotStarted
+    },
     publishing: {
         when: TaskStatus.NotStarted,
-        export: TaskStatus.NotStarted,
-        import: TaskStatus.NotStarted,
-        submit: TaskStatus.NotStarted
+        organisation: TaskStatus.NotStarted
     }
 };
 
diff --git a/test/publish.test.ts b/test/publish.test.ts
index 4e2c0fe..e288c7c 100644
--- a/test/publish.test.ts
+++ b/test/publish.test.ts
@@ -7,10 +7,7 @@ import { http, HttpResponse } from 'msw';
 import { i18next } from '../src/middleware/translation';
 import app from '../src/app';
 import { appConfig } from '../src/config';
-import { DatasetDTO } from '../src/dtos/dataset';
-import { RevisionDTO } from '../src/dtos/revision';
-import { FactTableDto } from '../src/dtos/fact-table';
-import { ViewErrDTO } from '../src/dtos/view-dto';
+import { ViewError } from '../src/dtos/view-error';
 
 import { mockBackend } from './mocks/backend';
 import { datasetWithTitle, datasetWithImport, completedDataset } from './mocks/fixtures';
@@ -19,11 +16,7 @@ const t = i18next.t;
 
 declare module 'express-session' {
     interface SessionData {
-        currentDataset: DatasetDTO | undefined;
-        currentRevision: RevisionDTO | undefined;
-        currentImport: FactTableDto | undefined;
-        errors: ViewErrDTO | undefined;
-        currentTitle: string | undefined;
+        errors: ViewError[] | undefined;
     }
 }
 

From 398f6396e8566b06e9037537f3579d6fbb3f77a2 Mon Sep 17 00:00:00 2001
From: Phil Moorhouse <phil@wheelsandcogs.co.uk>
Date: Tue, 3 Dec 2024 14:58:56 +0000
Subject: [PATCH 4/5] show all errors

---
 src/controllers/publish.ts     | 16 ++++++++--------
 src/dtos/view-error.ts         |  2 +-
 src/views/publish/schedule.ejs |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/controllers/publish.ts b/src/controllers/publish.ts
index 036de32..f0d2748 100644
--- a/src/controllers/publish.ts
+++ b/src/controllers/publish.ts
@@ -501,7 +501,7 @@ export const provideDataProviders = async (req: Request, res: Response, next: Ne
             res.redirect(req.buildUrl(`/publish/${dataset.id}/providers?edit=${dataProvider.id}`, req.language));
             return;
         } catch (err: any) {
-            errors = [{ message: { key: err.message } }];
+            errors = [{ field: 'provider', message: { key: err.message } }];
         }
     }
 
@@ -648,7 +648,7 @@ export const provideTopics = async (req: Request, res: Response, next: NextFunct
 
 export const providePublishDate = async (req: Request, res: Response, next: NextFunction) => {
     const { dataset, revision } = res.locals;
-    let errors: ViewError[] | undefined;
+    let errors: ViewError[] = [];
     let dateError;
     let timeError;
     let values = { year: '', month: '', day: '', hour: '09', minute: '30' };
@@ -674,10 +674,10 @@ export const providePublishDate = async (req: Request, res: Response, next: Next
 
             values = {
                 year: req.body.year,
-                month: req.body.month.padStart(2, '0'),
-                day: req.body.day.padStart(2, '0'),
-                hour: req.body.hour.padStart(2, '0'),
-                minute: req.body.minute.padStart(2, '0')
+                month: req.body.month ? req.body.month.padStart(2, '0') : '',
+                day: req.body.day ? req.body.day.padStart(2, '0') : '',
+                hour: req.body.hour ? req.body.hour.padStart(2, '0') : '',
+                minute: req.body.minute ? req.body.minute.padStart(2, '0') : ''
             };
 
             const publishDate = parseISO(
@@ -686,10 +686,10 @@ export const providePublishDate = async (req: Request, res: Response, next: Next
 
             if (!isValid(publishDate)) {
                 dateError = { field: 'date', message: { key: 'publish.schedule.form.date.error.invalid' } };
-                errors.unshift(dateError);
+                errors.push(dateError);
             } else if (isBefore(publishDate, new Date())) {
                 dateError = { field: 'date', message: { key: 'publish.schedule.form.date.error.past' } };
-                errors.unshift(dateError);
+                errors.push(dateError);
             }
 
             if (errors.some((error) => error.field === 'hour' || error.field === 'minute')) {
diff --git a/src/dtos/view-error.ts b/src/dtos/view-error.ts
index 0c98ab9..2739ffd 100644
--- a/src/dtos/view-error.ts
+++ b/src/dtos/view-error.ts
@@ -1,5 +1,5 @@
 export interface ViewError {
-    field?: string;
+    field: string;
     message?: {
         key: string;
         params?: object;
diff --git a/src/views/publish/schedule.ejs b/src/views/publish/schedule.ejs
index 4d919a8..c9c02e3 100644
--- a/src/views/publish/schedule.ejs
+++ b/src/views/publish/schedule.ejs
@@ -14,7 +14,7 @@
                 <div class="govuk-grid-column-two-thirds">
                     <h1 class="govuk-heading-xl"><%= t('publish.schedule.heading') %></h1>
 
-                    <%- include("../partials/error-handler", { errors: locals?.errors?.filter((error) => !['year', 'month', 'day'].includes(error.field)) }); %>
+                    <%- include("../partials/error-handler"); %>
 
                     <form enctype="multipart/form-data" method="post">
                         <div class="govuk-form-group <%= locals.dateError ? 'govuk-form-group--error' : '' %>">

From 06d0ce3fa640a1c6d5daf263b02e150a7cb2cd8e Mon Sep 17 00:00:00 2001
From: Phil Moorhouse <phil@wheelsandcogs.co.uk>
Date: Tue, 3 Dec 2024 15:02:44 +0000
Subject: [PATCH 5/5] don't show errors if empty

---
 src/views/partials/error-handler.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/partials/error-handler.ejs b/src/views/partials/error-handler.ejs
index 284d8f8..7bb1ca8 100644
--- a/src/views/partials/error-handler.ejs
+++ b/src/views/partials/error-handler.ejs
@@ -1,4 +1,4 @@
-<% if (locals?.errors) { %>
+<% if (locals?.errors && locals.errors.length > 0) { %>
     <div class="govuk-error-summary" data-module="govuk-error-summary">
         <div role="alert">
             <h2 class="govuk-error-summary__title">