fix(@W-17943542): fix content path for inline media file inside nested folders (#1518)

* feat(@W-17728287): introducing lwc content type in site metadata

* fix(@W-17943542): fix content path for inline media file inside nested folders

* fix(@W-17943542): add digitalexperiences index check

* fix(@W-17943542): review comments

Author: skumar846676

src/resolve/adapters/digitalExperienceSourceAdapter.ts

@@ -75,13 +75,15 @@ export class DigitalExperienceSourceAdapter extends BundleSourceAdapter {
     const pathToContent = dirname(path);
     const parts = pathToContent.split(sep);
     /* Handle mobile or tablet variants.Eg- digitalExperiences/site/lwr11/sfdc_cms__view/home/mobile/mobile.json
-     Go back to one level in that case
-     Bundle hierarchy baseType/spaceApiName/contentType/contentApiName/variantFolders/file */
+      or inline media files where files can be in any subdiretory. Eg - digitalExperiences/site/lwr11/sfdc_cms__lwc/localComp/folder1/foler1_1/localCompHelper.html
+      from the digitalExperience folder go till we find the ContentApiName folder
+     */
     const digitalExperiencesIndex = parts.indexOf('digitalExperiences');
     if (digitalExperiencesIndex > -1) {
-      const depth = parts.length - digitalExperiencesIndex - 1;
-      if (depth === digitalExperienceBundleWithVariantsDepth) {
-        parts.pop();
+      const digitalExperiencesLength = digitalExperiencesIndex + 1;
+      const contentFolderLength = digitalExperiencesLength + contentParts.length;
+      if (parts.length > contentFolderLength) {
+        parts.length = contentFolderLength;
         return parts.join(sep);
       }
     }
@@ -164,6 +166,5 @@ export class DigitalExperienceSourceAdapter extends BundleSourceAdapter {
  * @returns name of type/apiName format
  */
 const calculateNameFromPath = (contentPath: string): string => `${parentName(contentPath)}/${baseName(contentPath)}`;
-
-// Bundle hierarchy baseType/spaceApiName/contentType/contentApiName/variantFolders/file
-const digitalExperienceBundleWithVariantsDepth = 5;
+const digitalExperienceStructure = join('BaseType', 'SpaceApiName', 'ContentType', 'ContentApiName');
+const contentParts = digitalExperienceStructure.split(sep);

test/resolve/adapters/digitalExperienceSourceAdapter.test.ts

@@ -35,6 +35,12 @@ describe('DigitalExperienceSourceAdapter', () => {
   const LWC_META_FILE = join(LWC_PATH, DE_METAFILE);
   const LWC_CONTENT_FILE = join(LWC_PATH, 'content.json');
   const LWC_JS_META_XML_FILE = join(LWC_PATH, 'localComp.js-meta.xml');
+  const LWC_JS_FILE = join(LWC_PATH, 'localComp.js');
+  const LWC_HTML_FILE = join(LWC_PATH, 'localComp.html');
+  const LWC_CSS_FILE = join(LWC_PATH, 'localComp.css');
+  const LWC_EDITOR_JSON_FILE = join(LWC_PATH, 'editor.json');
+  const LWC_SVG_FILE = join(LWC_PATH, 'localComp.svg');
+  const LWC_NESTED_FOLDERS_HTML_FILE = join(LWC_PATH, 'folder1', 'folder1_1', 'folder1_1_1', 'compHelper.html');
 
   const registryAccess = new RegistryAccess();
   const forceIgnore = new ForceIgnore();
@@ -48,6 +54,12 @@ describe('DigitalExperienceSourceAdapter', () => {
     LWC_META_FILE,
     LWC_CONTENT_FILE,
     LWC_JS_META_XML_FILE,
+    LWC_JS_FILE,
+    LWC_HTML_FILE,
+    LWC_CSS_FILE,
+    LWC_EDITOR_JSON_FILE,
+    LWC_SVG_FILE,
+    LWC_NESTED_FOLDERS_HTML_FILE,
   ]);
 
   const bundleAdapter = new DigitalExperienceSourceAdapter(
@@ -154,10 +166,21 @@ describe('DigitalExperienceSourceAdapter', () => {
       forceIgnore
     );
 
-    it('should return a SourceComponent for content json and .js-meta.xml', () => {
-      expect(digitalExperienceAdapter.getComponent(LWC_CONTENT_FILE)).to.deep.equal(component);
-      expect(digitalExperienceAdapter.getComponent(LWC_META_FILE)).to.deep.equal(component);
-      expect(digitalExperienceAdapter.getComponent(LWC_JS_META_XML_FILE)).to.deep.equal(component);
+    it('should return a SourceComponent for files in inline media content', () => {
+      const files: string[] = [
+        LWC_CONTENT_FILE,
+        LWC_META_FILE,
+        LWC_JS_META_XML_FILE,
+        LWC_JS_FILE,
+        LWC_HTML_FILE,
+        LWC_CSS_FILE,
+        LWC_EDITOR_JSON_FILE,
+        LWC_SVG_FILE,
+        LWC_NESTED_FOLDERS_HTML_FILE,
+      ];
+      files.forEach((file) => {
+        expect(digitalExperienceAdapter.getComponent(file)).to.deep.equal(component);
+      });
     });
   });
 });