mod-build 3.6.41-beta.1 → 3.6.41-beta.3

package/gulp-tasks/templates.js

@@ -166,6 +166,23 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 		}
 	];
 
+	var mergeDefaultFormFieldConfig = function(steps, defaultConfig) {
+		if (!steps.items) {
+			console.error('No items[ ] found in steps{}!');
+			return steps;
+		}
+		steps.items.forEach(item => {
+			item.fields = item.fields.map(field => {
+				if (field.name && defaultConfig[field.name]) {
+					field = Object.assign(defaultConfig[field.name], field);
+				}
+				return field;
+			});
+		});
+
+		return steps;
+	};
+
 	var getDefaultFormFieldConfig = async function() {
 		const siteData = templatesData;
 		await new Promise((resolve) => {
@@ -173,18 +190,19 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 				if (xhr.statusCode !== 200) {
 					throw new Error(`${xhr.statusCode}: Error while fetching shared-components/defaultFormFieldConfig.json`);
 				}
-				if (!siteData.steps) {
-					throw new Error('steps not found!');
+
+				const defaultConfig = await JSON.parse(response);
+
+				if (siteData.steps) {
+					siteData.steps = await mergeDefaultFormFieldConfig(siteData.steps, defaultConfig)
 				}
-				response = await JSON.parse(response);
-				siteData.steps.items.forEach(item => {
-					item.fields = item.fields.map(field => {
-						if (field.name && response[field.name]) {
-							field = Object.assign(response[field.name], field);
-						}
-						return field;
-					});
-				});
+				if (siteData.qsSteps) {
+					siteData.qsSteps = await mergeDefaultFormFieldConfig(siteData.qsSteps, defaultConfig)
+				}
+				if (siteData.modSteps) {
+					siteData.modSteps = await mergeDefaultFormFieldConfig(siteData.modSteps, defaultConfig)
+				}
+
 				resolve();
 			})
 		});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mod-build",
-  "version": "3.6.41-beta.1",
+  "version": "3.6.41-beta.3",
   "description": "Share components for S3 sites.",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",