@gov-cy/govcy-express-services 1.3.0-alpha → 1.3.0-alpha.2

package/README.md

@@ -31,6 +31,11 @@ The APIs used for submission, temporary save and file uploads are not part of th
 - [📦 Full installation guide](#-full-installation-guide)
 - [🛠️ Usage](#%EF%B8%8F-usage)
   - [🧩 Dynamic services](#-dynamic-services)
+    - [Pages](#pages)
+    - [Form vs static pages](#form-vs-static-pages)
+    - [Multiple things pages (repeating group of inputs)](#multiple-things-pages-repeating-group-of-inputs)
+    - [Review page](#review-page)
+    - [Success page](#success-page)
   - [🛡️ Site eligibility checks](#%EF%B8%8F-site-eligibility-checks)
   - [📤 Site submissions](#-site-submissions)
   - [✅ Input validations](#-input-validations)
@@ -854,7 +859,7 @@ Here's an example of a page defined in the JSON file:
 
 The above `page` JSON generates a page that looks like the following screenshot:
 
-![Screenshot of sample page](express-page.png)
+![Screenshot of sample page](docs/img/express-page.png)
 
 The JSON structure is based on the [govcy-frontend-renderer's JSON template](https://github.com/gov-cy/govcy-frontend-renderer/blob/main/README.md#json-template-example).
 
@@ -871,7 +876,7 @@ Lets break down the JSON config for this page:
   - `sections` is an array of sections, which is an array of elements. Sections allowed: `beforeMain`, `main`, `afterMain`.
     - `elements` is an array of elements for the said section. Seem more details on the [govcy-frontend-renderer's design elements documentation](https://github.com/gov-cy/govcy-frontend-renderer/blob/main/DESIGN_ELEMENTS.md).
 
-**Forms vs static content**
+#### Form vs static pages
 
 - If the `pageTemplate` includes a `form` element in the `main` section and `button` element, the system will treat it as form and will:
   - Perform the eligibility checks
@@ -904,6 +909,226 @@ The [start page](https://gov-cy.github.io/govcy-design-system-docs/patterns/serv
 - Check out the [govcy-frontend-renderer's design elements](https://github.com/gov-cy/govcy-frontend-renderer/blob/main/DESIGN_ELEMENTS.md) for more details on the supported elements and their parameters.
 - Check out the [input validations section](#-input-validations) for more details on how to add validations to the JSON file.
 
+#### Multiple things pages (repeating group of inputs)
+![Multiple things pages](docs/img/express-mt.png)
+
+Some services need to collect **multiple entries of the same structure**, for example, academic qualifications, addresses, or dependents. The framework supports this through the `multipleThings` block in a page config. It uses the same input method of a normal form page, but the user can add more than one entries.
+
+When enabled, the framework automatically generates a **hub page** when the user visits the:
+
+```ruby
+/:siteId/:pageUrl
+```
+
+This hub page allows users to:
+- 📋 **View the list** of entries (hub page)
+- ➕ **Add** a new entry
+- ✏️ **Change** an existing entry
+- ❌ **Remove** an existing entry
+- ✅ **Continue** when they are finished
+
+**Multiple things - example JSON config**
+Here’s how to define a page that collects multiple academic qualifications:
+
+```json
+{
+  "pageData": {
+    "url": "qualifications",    // Page URL
+    "title": {                  // Page title of the input pages (add, edit)
+      "el": "Ακαδημαϊκά και επαγγελματικά προσόντα",
+      "en": "Academic and professional qualifications",
+      "tr": ""
+    },
+    "layout": "layouts/govcyBase.njk",  // Page layout for all pages (add, edit, hub page)
+    "mainLayout": "two-third",          // Page main layout for all pages (add, edit, hub page)
+    "nextPage": "memberships"           // The next page's URL
+  },
+  "pageTemplate" : {  // Page template for the input pages (add, edit)
+    ...
+  },
+  "multipleThings": { // Multiple things configuration
+    "min": 1,     // the minimum number of entries
+    "max": 5,     // the maximum number of entries
+    "dedupe": true, // whether to check for duplicates
+    "itemTitleTemplate": "{{title | trim}}  - {{year | trim}}", // the title template for each entry
+    "listPage": { // the hub page
+      "title": { // the hub page title
+        "el": "Ακαδημαϊκά προσόντα",
+        "en": "Academic details"
+      },
+      "topElements": [ // the hub page top elements
+        {
+          "element": "progressList",
+          "params": {
+            "id": "progress",
+            "current": "2",
+            "total": "6",
+            "showSteps": true
+          }
+        },
+        {
+          "element": "textElement",
+          "params": {
+            "id": "header",
+            "type": "h1",
+            "text": {
+              "el": "Ποια είναι τα προσόντα σας;",
+              "en": "What are your qualifications?",
+              "tr": ""
+            }
+          }
+        },
+        {
+          "element": "textElement",
+          "params": {
+            "id": "instructions",
+            "type": "p",
+            "text": {
+              "el": "Προσθέστε τουλάχιστον ένα τα ακαδημαϊκό ή επαγγελματικό προσόν για να συνεχίσετε. Μπορείτε να προσθέσετε μέχρι 5.",
+              "en": "Add at least one academic or professional qualifications to proceed. You can up to 5."
+            }
+          }
+        }
+      ],
+      "emptyState": { // the hub page empty state
+        "en": "No qualifications added yet.",
+        "el": "Δεν έχετε προσθέσει ακόμη προσόντα."
+      },
+      "addButtonText": { // the hub page add button text
+        "en": "➕ Add qualifications",
+        "el": "➕ Προσθήκη προσόντος"
+      },
+      "addButtonPlacement": "top", // the hub page add button placement
+      "continueButtonText": { // the hub page continue button text
+        "en": "Save and continue",
+        "el": "Αποθήκευση και συνέχεια"
+      },
+      "hasBackLink": true // whether the hub page has a back link
+    }
+  }
+}
+```
+
+Lets break down the JSON config for multiple things:
+- **multipleThings** are the page's definition for repeated group of inputs
+	- `multipleThings.min` : The minimum items rule
+	- `multipleThings.max` : The maximum items rule
+	- `multipleThings.dedupe`: When `true` prevents duplicates, using the `itemTitleTemplate` template. Optional with default value `false`
+	- `multipleThings.itemTitleTemplate`: The template (in Nunjucks form) used to display the items' on a list in the hub, review, success pages and email. Also used by the `dedupe` to compare for duplicates
+	- `multipleThings.listPage`: The definition the list (hub) page that shows the list of items, with the actions (add, edit, delete, continue)
+		- `multipleThings.listPage.title`: The title used in the hub page's meta data
+		- `multipleThings.listPage.topElements`: The elements to be displayed on the top of the page (more details on the [govcy-frontend-renderer's design elements documentation](https://github.com/gov-cy/govcy-frontend-renderer/blob/main/DESIGN_ELEMENTS.md)):
+		- `multipleThings.listPage.emptyState`: The message displayed when the count of items == 0. Optional, when not defined generic text is shown
+		- `multipleThings.listPage.addButtonText`: The text displayed on the add link. Optional, when not defined generic text is shown
+		- `multipleThings.listPage.addButtonPlacement`: Where to show the add link. Can be `top`,  `bottom` or `both`. Optional, default is `bottom`
+		- `multipleThings.listPage.continueButtonText`: The text displayed on the continue button text. Optional, default is `Continue`, `Συνέχεια`
+		- `multipleThings.listPage.hasBackLink`: When `true` shows the standard back button. Optional, default is `true
+
+
+**Multiple things - How it works**
+With multiple things pages, the system collects multiple set of the same type of data. The set of data are collected by a single page (similar to a normal page). The multiple things consist of 4 type of pages, the `hub`, `add`, `edit` and `delete` pages
+
+**Hub page**: When the user navigates through the service at `/:siteId/:pageUrl` (either coming from _review_ or _linear_ flow), the system shows the hub page. The hub page in general shows the list of entries, add links, continue button and validates the input (see below more details)
+
+`Hub page add links`: If the user has not reached the maximum number of allowed entries, the system shows add links on the hub page. There is an option for a custom add link text with `multipleThings.listPage.addButtonText`. There is an option for `top`, `bottom` or `both` placement with `multipleThings.listPage.addButtonPlacement`
+
+![Multiple things hub - add links](docs/img/express-mt-hub-add.png)
+
+`Hub empty state`: When no data are yet entered the hub shows an empty state message with an add link. There is an option for a custom empty state
+
+![Multiple things hub - empty state](docs/img/express-mt-hub-empty.png)
+
+`Hub list state`: When data exist, they are shown as a list with `change` and `delete` links. The list is created based on an the `multipleThings.itemTitleTemplate`, for example ` {{institution}} - {{title}} - {{year}}`
+
+![Multiple things hub - list](docs/img/express-mt-hub-list.png)
+
+`Hub max state`: If the data entries reached the maximum limit, the `add links` are removed and a `max limit reached` message is shown.
+
+![Multiple things hub - max](docs/img/express-mt-hub-max.png)
+
+`Hub page continue`: on Continue the system continues to the next page defined in the `pageData.nextPage`. If user came from the review page, it returns to the review.
+
+`Hub page validations`: The hub page validates the following when the continue button is pressed.
+  - `Minimum entries` have been entered. This is based on the `multipleThings.min`.
+  - `Maximum limit` has not been exceeded.. This is based on the `multipleThings.max`.
+  - `All entries validations pass`. This is based on the `pageTemplate` element validations.
+  
+  ![Multiple things hub - validations](docs/img/express-mt-hub-validagion.png)
+
+**Add pages**
+
+![Multiple things add](docs/img/express-mt-add.png)
+
+- Accessible through the add link or through the `/:siteId/:pageUrl/multiple/add` route
+- User is shown the item page (e.g. `academic-details`)
+- Files' data are stored in a **draft** until they click `Continue`
+- On `Continue`, the data and draft is pushed into the list
+- Behaves like a normal form page
+- On `Continue` if there are no validation errors, the user is navigated back to the hub and the added data is displayed on the list. If the user’s journey started from the review page, after clicking continue on the hub, it goes back to the review.
+- It performs all configured input validations defined PLUS
+  - `Maximum limit` has not been exceeded.
+  - `Dedupe validation`. If defined in the configuration the service checks if there is an identical entry. The check is made based on the item title template
+
+**Edit pages**
+
+![Multiple things edit](docs/img/express-mt-hub-edit.png)
+
+- Accessible through the change link or through the `/:siteId/:pageUrl/multiple/edit/:index` route
+- User selects an existing item from the hub page
+- The item page loads pre-filled data
+- Behaves like a normal form page
+- On `Continue` if there are no validation errors, the entry is updated and the user is navigated back to the hub and the updated data is displayed on the list. If the user’s journey started from the review page, after clicking continue on the hub, it goes back to the review.
+-  It performs all configured input validations defined PLUS
+  - `Dedupe validation`. If defined in the configuration the service checks if there is an identical entry. The check is made based on the item title template
+  
+**Delete pages**
+
+![Multiple things delete](docs/img/express-mt-delete.png)
+
+- Accessible through the remove link or through the `/:siteId/:pageUrl/multiple/delete/:index` route
+- A confirmation page is shown
+- On _Yes_, the item is removed from the list
+
+**Review & Success pages**
+
+![Multiple things review](docs/img/express-mt-review.png)
+
+  - Each item is displayed in the summary list, grouped under the hub’s title
+
+**Multiple things - data storage**
+
+Form data for a `multipleThings` page is stored as an **array** in the session data layer:
+```json
+{
+  "academic-details": {
+    "formData": [
+      {
+        "title": "BSc Computer Science",
+        "academicFile": {
+          "fileId": "12345",
+          "sha256": "abcdef..."
+        }
+      },
+      {
+        "title": "MSc Information Systems",
+        "academicFile": {
+          "fileId": "67890",
+          "sha256": "ghijkl..."
+        }
+      }
+    ]
+  }
+}
+```
+
+**Notes on multiple things**
+
+- Each `multipleThings` page must define its own item page (with fields and validations), used for the `add` add `edit` routes.
+- The hub page is generated automatically. It uses the `multipleThings.listPage` for the UI
+- Empty state is handled automatically.
+- `multipleDraft` is used internally to store file's data while the user is adding a new item.
+
+
 #### Review page
 
 The `review` page is automatically generated by the project and includes the following sections:
@@ -914,7 +1139,7 @@ The `review` page is automatically generated by the project and includes the fol
 
 Here's an example screenshot of review page
 
-![Screenshot of review page](express-review.png)
+![Screenshot of review page](docs/img/express-review.png)
 
 When the user clicks a change link, the user is redirected to the corresponding page in the service. After the user clicks on `continue` button the user is redirected back to the `review` page.
 
@@ -930,7 +1155,7 @@ The `success` page is automatically generated by the project, is accessible only
 
 Here's an example screenshot of success page
 
-![Screenshot of success page](express-success.png)
+![Screenshot of success page](docs/img/express-success.png)
 
 ### 🛡️ Site eligibility checks
 
@@ -1101,6 +1326,8 @@ HTTP/1.1 200 OK
 - If no `eligibilityAPIEndpoints` are configured, the system will not check for service eligibility for the specific site.
 - The response is normalized to always use PascalCase keys (`Succeeded`, `ErrorCode`, etc.), regardless of the backend’s casing.
 - If `Succeeded` is false, the system will look up the `ErrorCode` in your config to determine which error page to show.
+- For standard eligibility checks see:
+  - [Elegibility with Civil Registry](docs/Eligibility-civil-registry.md)
 
 **Caching**
 - The response from each eligibility endpoint is cached in the session for the number of minutes specified by `cashingTimeoutMinutes`.
@@ -1321,378 +1548,30 @@ The data is collected from the form elements and the data layer and are sent via
       "date_on_contract": "date_other",
       "date_contract": "16/04/2025",
       "reason": "24324dssf"
-    }
+    }, 
+    "academic-details": [                   // Multiple things page
+      {
+        "title": "BSc Computer Science",
+        "academicFile": {
+          "fileId": "12345",
+          "sha256": "abcdef..."
+        }
+      },
+      {
+        "title": "MSc Information Systems",
+        "academicFile": {
+          "fileId": "67890",
+          "sha256": "ghijkl..."
+        }
+      }
+    ]
   },
   "submissionDataVersion": "1",           // Submission data version
   "rendererData": {                        // Summary list renderer data ready for rendering . Object, will be stringified
-    "element": "summaryList",
-    "params": {
-      "items": [
-        {
-          "key": {
-            "el": "Στοιχεία του  εκπαιδευτικού",
-            "en": "Educator's details",
-            "tr": ""
-          },
-          "value": [
-            {
-              "element": "summaryList",
-              "params": {
-                "items": [
-                  {
-                    "key": {
-                      "el": "Ταυτοποίηση",
-                      "en": "Identification"
-                    },
-                    "value": [
-                      {
-                        "element": "textElement",
-                        "params": {
-                          "text": {
-                            "en": "Ταυτότητα, ARC",
-                            "el": "Ταυτότητα, ARC",
-                            "tr": "Ταυτότητα, ARC"
-                          },
-                          "type": "span"
-                        }
-                      }
-                    ]
-                  },
-                  {
-                    "key": {
-                      "el": "Εισαγάγετε αριθμό ταυτότητας",
-                      "en": "Enter ID number"
-                    },
-                    "value": [
-                      {
-                        "element": "textElement",
-                        "params": {
-                          "text": {
-                            "en": "121212",
-                            "el": "121212",
-                            "tr": "121212"
-                          },
-                          "type": "span"
-                        }
-                      }
-                    ]
-                  },
-                  {
-                    "key": {
-                      "el": "Αριθμός κοινωνικών ασφαλίσεων",
-                      "en": "Social Insurance Number"
-                    },
-                    "value": [
-                      {
-                        "element": "textElement",
-                        "params": {
-                          "text": {
-                            "en": "112121",
-                            "el": "112121",
-                            "tr": "112121"
-                          },
-                          "type": "span"
-                        }
-                      }
-                    ]
-                  }
-                ]
-              }
-            }
-          ]
-        },
-        {
-          "key": {
-            "el": "Διορισμός εκπαιδευτικού",
-            "en": "Teachers appointment",
-            "tr": ""
-          },
-          "value": [
-            {
-              "element": "summaryList",
-              "params": {
-                "items": [
-                  {
-                    "key": {
-                      "el": "Τι διορισμό έχει ο εκπαιδευτικός;",
-                      "en": "What type of appointment does the teacher have?"
-                    },
-                    "value": [
-                      {
-                        "element": "textElement",
-                        "params": {
-                          "text": {
-                            "en": "Συμβασιούχος",
-                            "el": "Συμβασιούχος",
-                            "tr": "Συμβασιούχος"
-                          },
-                          "type": "span"
-                        }
-                      }
-                    ]
-                  },
-                  {
-                    "key": {
-                      "el": "Αριθμός φακέλου (ΠΜΠ)",
-                      "en": "File Number"
-                    },
-                    "value": [
-                      {
-                        "element": "textElement",
-                        "params": {
-                          "text": {
-                            "en": "1212",
-                            "el": "1212",
-                            "tr": "1212"
-                          },
-                          "type": "span"
-                        }
-                      }
-                    ]
-                  },
-                  {
-                    "key": {
-                      "el": "Ειδικότητα",
-                      "en": "Specialty"
-                    },
-                    "value": [
-                      {
-                        "element": "textElement",
-                        "params": {
-                          "text": {
-                            "en": "Καθηγητής",
-                            "el": "Καθηγητής",
-                            "tr": "Καθηγητής"
-                          },
-                          "type": "span"
-                        }
-                      }
-                    ]
-                  }
-                ]
-              }
-            }
-          ]
-        },
-        {
-          "key": {
-            "el": "Ημερομηνία ανάληψης",
-            "en": "Takeover date",
-            "tr": ""
-          },
-          "value": [
-            {
-              "element": "summaryList",
-              "params": {
-                "items": [
-                  {
-                    "key": {
-                      "el": "Ημερομηνία ανάληψης",
-                      "en": "Start Date"
-                    },
-                    "value": [
-                      {
-                        "element": "textElement",
-                        "params": {
-                          "text": {
-                            "en": "16/04/2025",
-                            "el": "16/04/2025",
-                            "tr": "16/04/2025"
-                          },
-                          "type": "span"
-                        }
-                      }
-                    ]
-                  },
-                  {
-                    "key": {
-                      "el": "Η ημερομηνία αυτή είναι η ίδια με αυτή του συμβολαίου;",
-                      "en": "Is this date the same as the contract date?"
-                    },
-                    "value": [
-                      {
-                        "element": "textElement",
-                        "params": {
-                          "text": {
-                            "en": "Ναι, είναι η ίδια με αυτή του συμβολαίου",
-                            "el": "Ναι, είναι η ίδια με αυτή του συμβολαίου",
-                            "tr": "Ναι, είναι η ίδια με αυτή του συμβολαίου"
-                          },
-                          "type": "span"
-                        }
-                      }
-                    ]
-                  }
-                ]
-              }
-            }
-          ]
-        }
-      ]
-    }
+    ...
   },
   "printFriendlyData": [                  // Print friendly data. Object, will be stringified
-    {
-      "pageUrl": "index",                     // Page URL
-      "pageTitle": {                          // Page title
-        "el": "Στοιχεία του  εκπαιδευτικού",
-        "en": "Educator's details",
-        "tr": ""
-      },
-      "fields": [                             // Fields
-        {
-          "id": "id_select",                    // Field ID
-          "label": {                            // Field label
-            "el": "Ταυτοποίηση",
-            "en": "Identification"
-          },
-          "value": ["id", "arc"],          // Field value. // field level: checkboxes are ALWAYS arrays (may be []); radios/select/text are strings
-          "valueLabel": [                       // Field value label
-            {
-              "el": "Ταυτότητα",
-              "en": "ID",
-              "tr": ""
-            },
-            {
-              "el": "ARC",
-              "en": "ARC",
-              "tr": ""
-            }
-          ]
-        },
-        {
-          "id": "id_number",
-          "label": {
-            "el": "Εισαγάγετε αριθμό ταυτότητας",
-            "en": "Enter ID number"
-          },
-          "value": "654654",
-          "valueLabel": {
-            "el": "654654",
-            "en": "654654"
-          }
-        },
-        {
-          "id": "aka",
-          "label": {
-            "el": "Αριθμός κοινωνικών ασφαλίσεων",
-            "en": "Social Insurance Number"
-          },
-          "value": "232323",
-          "valueLabel": {
-            "el": "232323",
-            "en": "232323"
-          }
-        }
-      ]
-    },
-    {
-      "pageUrl": "appointment",
-      "pageTitle": {
-        "el": "Διορισμός εκπαιδευτικού",
-        "en": "Teachers appointment",
-        "tr": ""
-      },
-      "fields": [
-        {
-          "id": "diorismos",
-          "label": {
-            "el": "Τι διορισμό έχει ο εκπαιδευτικός;",
-            "en": "What type of appointment does the teacher have?"
-          },
-          "value": "monimos",
-          "valueLabel": {
-            "el": "Μόνιμος επί δοκιμασία",
-            "en": "Permanent on probation",
-            "tr": ""
-          }
-        },
-        {
-          "id": "fileno_monimos",
-          "label": {
-            "el": "Αριθμός φακέλου (ΠΜΠ)",
-            "en": "File Number"
-          },
-          "value": "3233",
-          "valueLabel": {
-            "el": "3233",
-            "en": "3233"
-          }
-        },
-        {
-          "id": "eidikotita_monimos",
-          "label": {
-            "el": "Ειδικότητα",
-            "en": "Specialty"
-          },
-          "value": "1",
-          "valueLabel": {
-            "el": "Δάσκαλος",
-            "en": "Elementary teacher",
-            "tr": ""
-          }
-        }
-      ]
-    },
-    {
-      "pageUrl": "takeover",
-      "pageTitle": {
-        "el": "Ημερομηνία ανάληψης",
-        "en": "Takeover date",
-        "tr": ""
-      },
-      "fields": [
-        {
-          "id": "date_start",
-          "label": {
-            "el": "Ημερομηνία ανάληψης",
-            "en": "Start Date"
-          },
-          "value": "2020-12-11",
-          "valueLabel": {
-            "el": "11/12/2020",
-            "en": "11/12/2020"
-          }
-        },
-        {
-          "id": "date_on_contract",
-          "label": {
-            "el": "Η ημερομηνία αυτή είναι η ίδια με αυτή του συμβολαίου;",
-            "en": "Is this date the same as the contract date?"
-          },
-          "value": "date_other",
-          "valueLabel": {
-            "el": "Όχι, αυτή είναι διαφορετική",
-            "en": "No, this is different",
-            "tr": ""
-          }
-        },
-        {
-          "id": "date_contract",
-          "label": {
-            "el": "Ημερομηνία συμβολαίου",
-            "en": "Contract Date"
-          },
-          "value": "16/04/2025",
-          "valueLabel": {
-            "el": "16/04/2025",
-            "en": "16/04/2025"
-          }
-        },
-        {
-          "id": "reason",
-          "label": {
-            "el": "Αιτιολόγηση καθυστέρησης στην ανάληψη καθηκόντων",
-            "en": "Reason for delay in assuming duties"
-          },
-          "value": "24324dssf",
-          "valueLabel": {
-            "el": "24324dssf",
-            "en": "24324dssf"
-          }
-        }
-      ]
-    }
+    ...
   ],
   "rendererVersion": "1.14.1",              // Renderer version
   "designSystemsVersion": "3.1.0",          // Design systems version

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gov-cy/govcy-express-services",
-  "version": "1.3.0-alpha",
+  "version": "1.3.0-alpha.2",
   "description": "An Express-based system that dynamically renders services using @gov-cy/govcy-frontend-renderer and posts data to a submission API.",
   "author": "DMRID - DSF Team",
   "license": "MIT",
@@ -51,8 +51,8 @@
     "coverage:badge": "coverage-badges --output ./coverage-badges.svg && npm run coverage:copy"
   },
   "dependencies": {
-    "@gov-cy/dsf-email-templates": "^2.1.0",
-    "@gov-cy/govcy-frontend-renderer": "^1.25.0",
+    "@gov-cy/dsf-email-templates": "^2.1.1",
+    "@gov-cy/govcy-frontend-renderer": "^1.26.0",
     "axios": "^1.9.0",
     "cookie-parser": "^1.4.7",
     "dotenv": "^16.3.1",
@@ -77,5 +77,8 @@
   },
   "engines": {
     "node": ">=18.0.0"
+  },
+  "overrides": {
+    "tar-fs": "^3.1.1"
   }
 }

package/src/middleware/govcyFileDeleteHandler.mjs

@@ -132,6 +132,10 @@ export function govcyFileDeletePageHandler() {
             } else {
                 // normal page
                 actionPath = `${pageUrl}/delete-file/${elementName}`;
+                // if normal page but has multipleThings, block it
+                if (page?.multipleThings) {
+                    return handleMiddlewareError(`Single mode delete file not allowed on multipleThings pages`, 404, next)
+                }
             }
             // Construct submit button
             const formElement = {
@@ -243,6 +247,10 @@ export function govcyFileDeletePostHandler() {
             } else {
                 // normal page
                 actionPath = `${pageUrl}`;
+                // if normal page but has multipleThings, block it
+                if (page?.multipleThings) {
+                    return handleMiddlewareError(`Single mode delete file not allowed on multipleThings pages`, 404, next)
+                }
             }
 
             // the page base return url

package/src/middleware/govcyFileViewHandler.mjs

@@ -62,6 +62,11 @@ export function govcyFileViewHandler() {
             //     return handleMiddlewareError(`Page condition evaluated to true on POST — skipping form save and redirecting`, 404, next);
             // }
 
+
+            // If mode is `single` make sure it has no multipleThings
+            if (mode === "single" && page?.multipleThings) {
+                return handleMiddlewareError(`Single mode file view not allowed on multipleThings pages`, 404, next)
+            }
             // Validate the field: Only allow delete if the page contains a fileInput with the given name
             const fileInputElement = pageContainsFileInput(pageTemplateCopy, elementName);
             if (!fileInputElement) {

package/src/middleware/govcyHttpErrorHandler.mjs

@@ -63,6 +63,8 @@ export function govcyHttpErrorHandler(err, req, res, next) {
     if (dataLayer.getUser(req.session)) {
         pageTemplate.sections.push(govcyResources.userNameSection(dataLayer.getUser(req.session).name)); // Add user name section
     }
+    // Add custom CSS path
+    pageData.site.customCSSFile = `/css/govcyExpress.css`;
     const html = renderer.renderFromJSON(pageTemplate, pageData);
     res.send(html);
 }

package/src/middleware/govcyMultipleThingsDeleteHandler.mjs

@@ -81,8 +81,8 @@ export function govcyMultipleThingsDeletePageHandler() {
                     isPageHeading: true,
                     classes: "govcy-mb-6",
                     items: [
-                        { value: "yes", text: govcyResources.staticResources.text.deleteYesOption },
-                        { value: "no", text: govcyResources.staticResources.text.deleteNoOption }
+                        { value: "yes", text: govcyResources.staticResources.text.multipleThingsDeleteYesOption },
+                        { value: "no", text: govcyResources.staticResources.text.multipleThingsDeleteNoOption }
                     ]
                 }
             };

package/src/middleware/govcyPageRender.mjs

@@ -24,6 +24,8 @@ export function renderGovcyPage() {
         if (dataLayer.getUser(req.session)) {
             processedPage.pageTemplate.sections.push(govcyResources.userNameSection(dataLayer.getUser(req.session).name)); // Add user name section
         }
+        // Add custom CSS path
+        processedPage.pageData.site.customCSSFile = `/css/govcyExpress.css`;
         const html = renderer.renderFromJSON(processedPage.pageTemplate, processedPage.pageData);
         res.send(html);
     };

package/src/middleware/govcyRoutePageHandler.mjs

@@ -47,6 +47,8 @@ export function govcyRoutePageHandler(req, res, next) {
     if (dataLayer.getUser(req.session)) {
         pageTemplate.sections.push(govcyResources.userNameSection(dataLayer.getUser(req.session).name)); // Add user name section
     }
+    // Add custom CSS path
+    pageData.site.customCSSFile = `/css/govcyExpress.css`;
     const renderer = new govcyFrontendRenderer();
     const html = renderer.renderFromJSON(pageTemplate, pageData);
     res.send(html);

package/src/public/css/govcyExpress.css

@@ -0,0 +1,33 @@
+
+dl.govcy-summary-list-row-internal:not(:first-of-type) {
+    margin-top: 0.5rem !important;
+}
+
+.list-inline-item:not(:last-child) {
+    margin-right: 0 !important;
+}
+.list-inline-item:not(:first-child) {
+    margin-left: .5rem;
+}
+
+.govcy-add-new-item {
+  display: inline-flex;
+  align-items: center;
+  text-decoration: underline;
+}
+
+.govcy-add-new-item::before {
+  content: "";
+  display: inline-block;
+  width: 24px;
+  height: 24px;
+  background: url("/img/Plus_24x24.svg") no-repeat center center;
+  background-size: contain;
+  margin-right: 0.25rem; /* Fallback for browsers without flex gap */
+}
+
+@media (max-width: 767.98px) {
+    #multipleThingsList>tbody>tr>td {
+        padding: .5rem .5rem;
+    }
+}

package/src/resources/govcyResources.mjs

@@ -172,9 +172,9 @@ export const staticResources = {
             tr: "You did not add any entries yet."
         },
         multipleThingsAddEntry: {
-            en: "➕ Add new entry",
-            el: "➕ Προσθήκη νέας καταχώρησης",
-            tr: "➕ Add new entry"
+            en: "Add new entry",
+            el: "Προσθήκη νέας καταχώρησης",
+            tr: "Add new entry"
         },
         multipleThingsDedupeMessage: {
             en: "This entry already exists",
@@ -220,6 +220,16 @@ export const staticResources = {
             en: "Entries",
             el: "Καταχωρήσεις",
             tr: "Entries"
+        },
+        multipleThingsDeleteYesOption: {
+            el:"Ναι, θέλω να διαγράψω την καταχώρηση",
+            en:"Yes, I want to delete this entry",
+            tr:"Yes, I want to delete this entry"
+        },
+        multipleThingsDeleteNoOption: {
+            el:"Όχι, δεν θέλω να διαγράψω την καταχώρηση",
+            en:"No, I don't want to delete this entry",
+            tr:"No, I don't want to delete this entry"
         }
     },
     //remderer sections
@@ -631,9 +641,9 @@ export function getMultipleThingsLink(linkType, siteId, pageUrl, lang , entryKey
         element: "htmlElement",
         params: {
             text: {
-                en: `<p><a${(count !== null && linkType === "add" ? ` id="addNewItem${count}"` : "")} href="${fullPath}">${linkTextString}</a></p>`,
-                el: `<p><a${(count !== null && linkType === "add" ? ` id="addNewItem${count}"` : "")} href="${fullPath}">${linkTextString}</a></p>`,
-                tr: `<p><a${(count !== null && linkType === "add" ? ` id="addNewItem${count}"` : "")} href="${fullPath}">${linkTextString}</a></p>`
+                en: `<p><a${(count !== null && linkType === "add" ? ` class="govcy-add-new-item" id="addNewItem${count}"` : "")} href="${fullPath}">${linkTextString}</a></p>`,
+                el: `<p><a${(count !== null && linkType === "add" ? ` class="govcy-add-new-item" id="addNewItem${count}"` : "")} href="${fullPath}">${linkTextString}</a></p>`,
+                tr: `<p><a${(count !== null && linkType === "add" ? ` class="govcy-add-new-item" id="addNewItem${count}"` : "")} href="${fullPath}">${linkTextString}</a></p>`
             }
         }
     };

package/src/utils/govcyFormHandling.mjs

@@ -104,7 +104,13 @@ export function populateFormData(
 
                 // 2) If not found, fall back to dataLayer (normal page behaviour)
                 if (!fileData) {
-                    fileData = dataLayer.getFormDataValue(store, siteId, pageUrl, fieldName);
+                    if (mode === "edit" && index !== null) {
+                        // In edit mode, try to get the file for the specific item index
+                        fileData = dataLayer.getFormDataValue(store, siteId, pageUrl, fieldName, index);
+                    } else {
+                        // In single or add mode, get the file normally
+                        fileData = dataLayer.getFormDataValue(store, siteId, pageUrl, fieldName);
+                    }
                 }
 
                 if (fileData) {

package/src/utils/govcyHandleFiles.mjs

@@ -100,6 +100,16 @@ export async function handleFileUpload({
 
     // deep copy the page template to avoid modifying the original
     const pageTemplateCopy = JSON.parse(JSON.stringify(page.pageTemplate));
+    
+    // If mode is `single` make sure it has no multipleThings
+    if (mode === "single" && page?.multipleThings) {
+      return {
+        status: 400,
+        dataStatus: 413,
+        errorMessage: 'Single mode upload not allowed on multipleThings pages'
+      };
+    }
+    
     // Validate the field: Only allow upload if the page contains a fileInput with the given name
     const isAllowed = pageContainsFileInput(pageTemplateCopy, elementName);
     if (!isAllowed) {

package/src/utils/govcyValidator.mjs

@@ -96,13 +96,39 @@ function validateValue(value, rules) {
       }
       return normalizedVal <= max;
     },
-    // ✅ New rule: maxCurrentYear
+    // ✅ Year based current rules
     maxCurrentYear: (val) => {
       const normalizedVal = normalizeNumber(val);
       if (isNaN(normalizedVal)) return false;
       const currentYear = new Date().getFullYear();
       return normalizedVal <= currentYear;
     },
+    minCurrentYear: (val) => {
+      const normalizedVal = normalizeNumber(val);
+      if (isNaN(normalizedVal)) return false;
+      const currentYear = new Date().getFullYear();
+      return normalizedVal >= currentYear;
+    },
+    // ✅ Date-based current rules
+    minCurrentDate: (val) => {
+      const valueDate = parseDate(val);
+      const today = new Date();
+      if (isNaN(valueDate)) return false;
+      // strip time components from both
+      const valueOnly = new Date(valueDate.getFullYear(), valueDate.getMonth(), valueDate.getDate());
+      const todayOnly = new Date(today.getFullYear(), today.getMonth(), today.getDate());
+      return valueOnly >= todayOnly;
+    },
+
+    maxCurrentDate: (val) => {
+      const valueDate = parseDate(val);
+      const today = new Date();
+      if (isNaN(valueDate)) return false;
+      const valueOnly = new Date(valueDate.getFullYear(), valueDate.getMonth(), valueDate.getDate());
+      const todayOnly = new Date(today.getFullYear(), today.getMonth(), today.getDate());
+      return valueOnly <= todayOnly;
+    },
+
     minValueDate: (val, minDate) => {
       const valueDate = parseDate(val); // Parse the input date
       const min = parseDate(minDate); // Parse the minimum date
@@ -139,7 +165,7 @@ function validateValue(value, rules) {
     // Skip validation if the value is empty
     if (value === null || value === undefined || (typeof value === 'string' && value.trim() === "")) {
       continue; // let "required" handle emptiness
-    } 
+    }
     // Check for "valid" rules (e.g., numeric, telCY, etc.)
     if (check === "valid" && validationRules[checkValue]) {
       const isValid = validationRules[checkValue](value);
@@ -168,12 +194,12 @@ function validateValue(value, rules) {
     if (check === 'minValue' && !validationRules.minValue(value, checkValue)) {
       return message;
     }
-    
+
     // Check for "maxValue"
     if (check === 'maxValue' && !validationRules.maxValue(value, checkValue)) {
       return message;
     }
-    
+
     // Check for "minValueDate"
     if (check === 'minValueDate' && !validationRules.minValueDate(value, checkValue)) {
       return message;