Merge branch 'develop' into feature/139-add-user-deploy-support

Accenture · Feb 24, 2023 · a4589bc · a4589bc
2 parents 128f691 + f69f14a
commit a4589bc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -5,7 +5,6 @@
     // List of extensions which should be recommended for users of this workspace.
     "recommendations": [
         // collaboration
-        "gruntfuggly.todo-tree",
         "aaron-bond.better-comments",
         "github.vscode-pull-request-github",
 
@@ -15,11 +14,8 @@
         // Formatting & colors
         "editorconfig.editorconfig",
         "esbenp.prettier-vscode",
-        "sergey-agadzhanov.ampscript",
 
         // Markdown / Readme.md
-        "yzhang.markdown-all-in-one",
-        "davidanson.vscode-markdownlint",
         "joernberkefeld.markdown-preview-bitbucket-innersource"
     ]
 }
diff --git a/lib/metadataTypes/Role.js b/lib/metadataTypes/Role.js
@@ -246,8 +246,14 @@ class Role extends MetadataType {
         // Reached end: write permission into this.allPermissions
         if (element.Operation) {
             const permSplit = _permission.split(' > ');
-            const basePermission = permSplit.shift();
-            const permissionName = permSplit.join(' > ');
+            const permOperation = permSplit.pop();
+            let basePermission = permSplit.shift();
+            if (basePermission === 'Interactive Marketing Hub') {
+                basePermission = 'Salesforce Marketing Cloud';
+            }
+            const permissionName = `<nobr><b>${permSplit.join(
+                ' > '
+            )}</b> > ${permOperation}</nobr>`;
             if (!this.allPermissions[basePermission]) {
                 this.allPermissions[basePermission] = {};
             }