fix: issue with inResource meta file not copied for corner cases

scolladon · Aug 4, 2021 · 2a13db4 · 2a13db4
1 parent ee56c9f
commit 2a13db4
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 7 deletions.
diff --git a/src/metadata/a48.json b/src/metadata/a48.json
@@ -810,7 +810,7 @@
     "directoryName": "experiences",
     "inFolder": false,
     "metaFile": true,
-    "suffix": "",
+    "suffix": "site",
     "xmlName": "ExperienceBundle"
   },
   {

diff --git a/src/metadata/v47.json b/src/metadata/v47.json
@@ -803,6 +803,7 @@
     "directoryName": "experiences",
     "inFolder": false,
     "metaFile": true,
+    "suffix": "site",
     "xmlName": "ExperienceBundle"
   },
   {

diff --git a/src/metadata/v49.json b/src/metadata/v49.json
@@ -817,6 +817,7 @@
     "directoryName": "experiences",
     "inFolder": false,
     "metaFile": true,
+    "suffix": "site",
     "xmlName": "ExperienceBundle"
   },
   {

diff --git a/src/metadata/v50.json b/src/metadata/v50.json
@@ -817,6 +817,7 @@
     "directoryName": "experiences",
     "inFolder": false,
     "metaFile": true,
+    "suffix": "site",
     "xmlName": "ExperienceBundle"
   },
   {

diff --git a/src/metadata/v51.json b/src/metadata/v51.json
@@ -816,6 +816,7 @@
     "directoryName": "experiences",
     "inFolder": false,
     "metaFile": true,
+    "suffix": "site",
     "xmlName": "ExperienceBundle"
   },
   {

diff --git a/src/metadata/v52.json b/src/metadata/v52.json
@@ -816,6 +816,7 @@
     "directoryName": "experiences",
     "inFolder": false,
     "metaFile": true,
+    "suffix": "site",
     "xmlName": "ExperienceBundle"
   },
   {

diff --git a/src/service/inResourceHandler.js b/src/service/inResourceHandler.js
@@ -4,6 +4,7 @@ const path = require('path')
 const fs = require('fs')
 const mc = require('../utils/metadataConstants')
 
+const STATICRESOURCE_TYPE = 'staticresources'
 const elementSrc = {}
 
 class ResourceHandler extends StandardHandler {
@@ -20,14 +21,16 @@ class ResourceHandler extends StandardHandler {
         'u'
       )
     )
+    this._buildElementMap(srcPath)
 
-    const parsedElementName = path.parse(elementName)
-    if (!Object.prototype.hasOwnProperty.call(elementSrc, srcPath)) {
-      elementSrc[srcPath] = fs.readdirSync(srcPath)
-    }
-
+    const matchingFiles = this._buildMatchingFiles(elementName)
     elementSrc[srcPath]
-      .filter(src => path.parse(src).name === parsedElementName.name)
+      .filter(
+        src =>
+          (this.type === STATICRESOURCE_TYPE &&
+            src.startsWith(path.parse(elementName).name)) ||
+          matchingFiles.includes(src)
+      )
       .forEach(src =>
         this._copyFiles(
           path.normalize(path.join(srcPath, src)),
@@ -70,6 +73,25 @@ class ResourceHandler extends StandardHandler {
         .replace(this.suffixRegex, '')
     )
   }
+
+  _buildMatchingFiles(elementName) {
+    const parsedElementName = path.parse(elementName).name
+    const matchingFiles = [parsedElementName]
+    if (StandardHandler.metadata[this.type].suffix) {
+      matchingFiles.push(
+        `${parsedElementName}.${StandardHandler.metadata[this.type].suffix}${
+          mc.METAFILE_SUFFIX
+        }`
+      )
+    }
+    return matchingFiles
+  }
+
+  _buildElementMap(srcPath) {
+    if (!Object.prototype.hasOwnProperty.call(elementSrc, srcPath)) {
+      elementSrc[srcPath] = fs.readdirSync(srcPath)
+    }
+  }
 }
 
 module.exports = ResourceHandler