#748: standardize asset-template's main extract's file name

content.asset-template-meta.html
Accenture · Feb 17, 2023 · ba8b301 · ba8b301
1 parent f7776e3
commit ba8b301
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/boilerplate/files/.vscode/settings.json b/boilerplate/files/.vscode/settings.json
@@ -18,6 +18,7 @@
         "*-meta.ssjs": "${capture}-meta.json",
         "*.asset-asset-meta.html": "${dirname}.asset-asset-meta.json",
         "*.asset-message-meta.html": "${dirname}.asset-message-meta.json",
+        "*.asset-template-meta.html": "${dirname}.asset-template-meta.json",
         "*.css": "${capture}.asset-code-meta.json",
         "*.docx": "${capture}.asset-document-meta.json",
         "*.eps": "${capture}.asset-image-meta.json",

diff --git a/boilerplate/forcedUpdates.json b/boilerplate/forcedUpdates.json
@@ -1,4 +1,8 @@
 [
+    {
+        "version": "4.3.4",
+        "files": [".vscode/settings.json"]
+    },
     {
         "version": "4.1.12",
         "files": [".vscode/settings.json"]

diff --git a/lib/metadataTypes/Asset.js b/lib/metadataTypes/Asset.js
@@ -865,30 +865,28 @@ class Asset extends MetadataType {
                 // this complex type always creates its own subdir per asset
                 subDirArr = [this.definition.type, subType];
                 readDirArr = [deployDir, ...subDirArr, templateName || customerKey];
+                const fileName = 'content' + subtypeExtension;
 
                 const fileExtArr = ['html']; // eslint-disable-line no-case-declarations
                 for (const ext of fileExtArr) {
                     if (
                         await File.pathExists(
-                            File.normalizePath([
-                                ...readDirArr,
-                                `${templateName || customerKey}${subtypeExtension}.${ext}`,
-                            ])
+                            File.normalizePath([...readDirArr, `${fileName}.${ext}`])
                         )
                     ) {
                         // the main content can be empty (=not set up yet) hence check if we did extract sth or else readFile() will print error msgs
                         if (!fileListOnly) {
                             metadata.content = await File.readFilteredFilename(
                                 readDirArr,
-                                (templateName || customerKey) + subtypeExtension,
+                                fileName,
                                 ext
                             );
                         }
                         if (templateName) {
                             // to use this method in templating, store a copy of the info in fileList
                             fileList.push({
                                 subFolder: subDirArr,
-                                fileName: (templateName || customerKey) + subtypeExtension,
+                                fileName: fileName,
                                 fileExt: ext,
                                 content: metadata.content,
                             });
@@ -1204,7 +1202,7 @@ class Asset extends MetadataType {
                 if (metadata?.content?.length) {
                     codeArr.push({
                         subFolder: null,
-                        fileName: customerKey,
+                        fileName: 'content',
                         fileExt: fileExt,
                         content: metadata.content,
                     });