fix: Issue #694 (#711) Add tabs reconsile when merging profile.

* fix: Issue #694 Add tabs reconsile when merging profile.
dxatscale · Aug 23, 2022 · d8b7507 · d8b7507
1 parent 308f702
commit d8b7507
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 23 deletions.
diff --git a/src/impl/source/profiles/profileActions.ts b/src/impl/source/profiles/profileActions.ts
@@ -7,6 +7,8 @@ import { Connection, Org, SfdxProject } from '@salesforce/core';
 import ProfileRetriever from '../../metadata/retriever/profileRetriever';
 import { ComponentSet, MetadataResolver, registry, SourceComponent } from '@salesforce/source-deploy-retrieve';
 import { META_XML_SUFFIX } from '@salesforce/source-deploy-retrieve/lib/src/common';
+import Profile from '../../metadata/schema';
+import MetadataRetriever from '../../metadata/retriever/metadataRetriever';
 
 export default abstract class ProfileActions {
     protected conn: Connection;
@@ -137,6 +139,29 @@ export default abstract class ProfileActions {
         });
         return profileSourceFile;
     }
+
+    protected async reconcileTabs(profileObj: Profile): Promise<void> {
+        let tabRetriever = new MetadataRetriever(this.org.getConnection(), registry.types.customtab.name);
+
+        if (profileObj.tabVisibilities !== undefined) {
+            if (!Array.isArray(profileObj.tabVisibilities)) {
+                profileObj.tabVisibilities = [profileObj.tabVisibilities];
+            }
+            let validArray = [];
+            for (let i = 0; i < profileObj.tabVisibilities.length; i++) {
+                let cmpObj = profileObj.tabVisibilities[i];
+                let exist = await tabRetriever.isComponentExistsInProjectDirectoryOrInOrg(cmpObj.tab);
+                if (exist) {
+                    validArray.push(cmpObj);
+                }
+            }
+            Sfpowerkit.log(
+                `Tab Visibilities reduced from ${profileObj.tabVisibilities.length}  to  ${validArray.length}`,
+                LoggerLevel.DEBUG
+            );
+            profileObj.tabVisibilities = validArray;
+        }
+    }
 }
 
 export interface ProfileSourceFile {

diff --git a/src/impl/source/profiles/profileMerge.ts b/src/impl/source/profiles/profileMerge.ts
@@ -729,6 +729,8 @@ export default class ProfileMerge extends ProfileActions {
                 let profileObj: Profile;
                 let indices = _.keys(_.pickBy(localProfiles, { name: profileObjFromServer.fullName }));
                 for (const index of indices) {
+                    Sfpowerkit.log('Reconciling  Tabs on retrieved profiles.', LoggerLevel.DEBUG);
+                    await this.reconcileTabs(profileObjFromServer);
                     let filePath = localProfiles[index].path;
                     if (filePath && fs.existsSync(filePath)) {
                         SFPLogger.log('Merging profile ' + profileObjFromServer.fullName, LoggerLevel.DEBUG);

diff --git a/src/impl/source/profiles/profileSync.ts b/src/impl/source/profiles/profileSync.ts
@@ -109,27 +109,4 @@ export default class ProfileSync extends ProfileActions {
         //Retun final status
         return profileStatus;
     }
-
-    private async reconcileTabs(profileObj: Profile): Promise<void> {
-        let tabRetriever = new MetadataRetriever(this.org.getConnection(), registry.types.customtab.name);
-
-        if (profileObj.tabVisibilities !== undefined) {
-            if (!Array.isArray(profileObj.tabVisibilities)) {
-                profileObj.tabVisibilities = [profileObj.tabVisibilities];
-            }
-            let validArray = [];
-            for (let i = 0; i < profileObj.tabVisibilities.length; i++) {
-                let cmpObj = profileObj.tabVisibilities[i];
-                let exist = await tabRetriever.isComponentExistsInProjectDirectoryOrInOrg(cmpObj.tab);
-                if (exist) {
-                    validArray.push(cmpObj);
-                }
-            }
-            SFPLogger.log(
-                `Tab Visibilities reduced from ${profileObj.tabVisibilities.length}  to  ${validArray.length}`,
-                LoggerLevel.DEBUG
-            );
-            profileObj.tabVisibilities = validArray;
-        }
-    }
 }