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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gov-cy/govcy-express-services",
-  "version": "1.3.0-alpha",
+  "version": "1.3.0-alpha.1",
   "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",
@@ -52,7 +52,7 @@
   },
   "dependencies": {
     "@gov-cy/dsf-email-templates": "^2.1.0",
-    "@gov-cy/govcy-frontend-renderer": "^1.25.0",
+    "@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/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/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",
@@ -631,9 +631,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) {