Merge remote-tracking branch 'origin/develop' into feature/37-add-sup…

…port-for-automation-activity-wait-csclsroz-233 # Conflicts: # @types/lib/metadataTypes/Automation.d.ts.map # @types/lib/util/validations.d.ts.map
Accenture · Nov 7, 2024 · 3597bc0 · 3597bc0
2 parents dc9baf5 + feecb96
commit 3597bc0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/@types/lib/util/validations.d.ts.map b/@types/lib/util/validations.d.ts.map
diff --git a/lib/util/validations.js b/lib/util/validations.js
@@ -28,7 +28,13 @@ export default async function validation(definition, item, targetDir, codeExtrac
     try {
         if (customRuleImport) {
             customRules = customRuleImport
-                ? await customRuleImport.validation(definition, item, targetDir, Util)
+                ? await customRuleImport.validation(
+                      definition,
+                      item,
+                      targetDir,
+                      Util,
+                      codeExtractItemArr
+                  )
                 : {};
         }
     } catch (ex) {
@@ -67,6 +73,14 @@ export default async function validation(definition, item, targetDir, codeExtrac
                     // some types do not support folders
                     return true;
                 }
+                const doNotEvaluate = ['automation', 'attributeSet', 'list'];
+                if (
+                    doNotEvaluate.includes(definition.type) ||
+                    (definition.type === 'asset' && item?.assetType?.name === 'webpage')
+                ) {
+                    // this subtype is not visible in the interface and hence always technically sits in the root
+                    return true;
+                }
 
                 return folderPath.includes('/');
             },