@madgex/fert 5.0.13 → 5.0.15

package/README.md

@@ -79,11 +79,12 @@ e.g.
 
 `/services/<service-folder>/fert.service.config.js` [required] – a service configuration file in the service folder, specifying the following config to both the Fert dev server and the production asset build:
 
-| Option                    |                                                                                                                                            |
-| ------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------ |
-| `serviceName` <String>    | Which service to display and deploy, e.g. `jobseekers-frontend`, `recruiterservices-frontend`.                                             |
-| `entry` <String>          | The JavaScript entry file. Any assets (CSS/SCSS/SVGs) included will be processed and be part of the output. Defaults to `['src/index.js']` |
-| `externalAssets` <Object> |                                                                                                                                            |
+| Option                        |                                                                                                                                            |
+| ----------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------ |
+| `serviceName` <String>        | Which service to display and deploy, e.g. `jobseekers-frontend`, `recruiterservices-frontend`.                                             |
+| `entry` <String>              | The JavaScript entry file. Any assets (CSS/SCSS/SVGs) included will be processed and be part of the output. Defaults to `['src/index.js']` |
+| `externalAssets` <Object>     |                                                                                                                                            |
+
 
 The `entry` will be used by Vite to create production bundles.
 

package/bin/utils/index.js

@@ -34,16 +34,6 @@ exports.getConfig = async (cpid, configNames = []) => {
 };
 
 exports.resolveConfig = async (options = {}) => {
-  const defaults = {
-    clientPropertyId: null,
-    serviceName: null,
-    entry: 'src/index.js',
-    externalAssets: {
-      links: [],
-      scripts: [],
-    },
-  };
-
   Hoek.assert(options.serviceName, 'serviceName is required');
 
   const rootDir = await this.findFertConfigDir();
@@ -55,6 +45,17 @@ exports.resolveConfig = async (options = {}) => {
   const { dir: workingDir, serviceConfig } = serviceConfigs.find(
     (item) => item.serviceConfig.serviceName === options.serviceName,
   );
+
+  const defaults = {
+    clientPropertyId: null,
+    serviceName: null,
+    entry: 'src/index.js',
+    externalAssets: {
+      links: [],
+      scripts: [],
+    },
+  };
+
   const fertConfig = Hoek.applyToDefaults(
     defaults,
     // merge fert config  with service config

package/constants.js

@@ -13,6 +13,7 @@ module.exports = {
   VERSION,
   TMP_DIR: fs.realpathSync(os.tmpdir()),
   FERT_PACKAGE_DIR: path.resolve('./'),
+  CUSTOM_TEMPLATES_DIR: './pages',
   AWS_REGION: 'eu-west-1',
   PROPERTY_ID_API: 'https://property-identification-api.cs.madgexhosting.net/properties/',
   ASSETS_API_URL: 'https://asset-store.job.madgexhosting.net',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@madgex/fert",
-  "version": "5.0.13",
+  "version": "5.0.15",
   "description": "Tool to help build the V6 branding",
   "bin": {
     "fert": "./bin/cli.js"
@@ -31,7 +31,7 @@
     "@hapi/inert": "^7.1.0",
     "@hapi/vision": "^7.0.3",
     "@hapipal/toys": "^4.0.0",
-    "@madgex/config-api-sdk": "^1.7.7",
+    "@madgex/config-api-sdk": "^1.7.8",
     "@madgex/design-system": "^9.3.1",
     "@private/header-footer-podlet-server": "github:wiley/madgex-header-footer-podlet",
     "axios": "^1.8.4",

package/server/routes/views.js

@@ -1,3 +1,7 @@
+const fs = require('fs');
+const path = require('node:path');
+const { CUSTOM_TEMPLATES_DIR } = require('../../constants');
+
 // eslint-disable-next-line n/no-unpublished-require
 const Joi = require('joi');
 
@@ -27,7 +31,18 @@ module.exports = {
       },
     });
 
-    return h.view(page, {
+    /*
+      This to checks if there is a custom template in this service that matches the page given in the url.
+      If not displays the default template.
+
+      This is useful to check styling such as active state against different routes and can simulate 
+      navigation locally with relative paths without the need to create additional templates.
+    */
+    const customTemplateFound =
+      page && fs.existsSync(path.join(fertConfig.workingDir, `${CUSTOM_TEMPLATES_DIR}/${page}.njk`));
+    const template = customTemplateFound ? page : 'default';
+
+    return h.view(template, {
       auth: request.auth,
       podletResponse,
     });
@@ -35,7 +50,7 @@ module.exports = {
   options: {
     validate: {
       params: Joi.object({
-        page: Joi.string().empty(['', null]).default('page1'),
+        page: Joi.string().empty(['', null]),
       }),
     },
     auth: {

package/server/view-manager.js

@@ -1,5 +1,6 @@
 const Nunjucks = require('nunjucks');
 const path = require('node:path');
+const { CUSTOM_TEMPLATES_DIR } = require('../constants');
 
 module.exports = (server) => {
   const fertConfig = server.fertConfig();
@@ -29,7 +30,7 @@ module.exports = (server) => {
       },
     },
     path: [
-      path.join(fertConfig.workingDir, './pages'), // user-created 'pages'
+      path.join(fertConfig.workingDir, CUSTOM_TEMPLATES_DIR), // user-created 'pages'
       path.join(__dirname, './templates'), // fert-local base templates
     ],
     isCached: false,