Issue/tab retrieve (#498)

* fix: add metadata list to tab retrieve

* concatenate tab query and metadata list result

* version 2.8.6

Co-authored-by: mani <manivasaga.murugesan@accenture.com>

oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.8.5",
+  "version": "2.8.6",
   "commands": {
     "sfpowerkit:auth:login": {
       "id": "sfpowerkit:auth:login",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sfpowerkit",
-  "version": "2.8.5",
+  "version": "2.8.6",
   "author": {
     "name": "DXatScale",
     "email": "dxatscale@accenture.com"

src/impl/metadata/retriever/metadataRetriever.ts

@@ -39,8 +39,8 @@ export default class MetadataRetriever {
         items = await this.getObjectPermissions();
       } else if (this._componentType === METADATA_INFO.CustomField.xmlName) {
         items = await this.getFieldsByObjectName(parent);
-      } else if (this._componentType === METADATA_INFO.PermissionSet.xmlName) {
-        items = await this.getPermissionSets();
+      } else if (this._componentType === "UserPermissions") {
+        items = await this.getUserPermissions();
       } else if (this._componentType === METADATA_INFO.Layout.xmlName) {
         items = await this.getLayouts();
       } else if (this._componentType === METADATA_INFO.CustomTab.xmlName) {
@@ -72,10 +72,17 @@ export default class MetadataRetriever {
     let queryUtil = new QueryExecutor(this._conn);
     let items = await queryUtil.executeQuery(query, false);
 
-    return items.map((tab) => {
+    items.map((tab) => {
       tab.fullName = tab.Name;
       return tab;
     });
+
+    let listMetadataItems = await this.getComponentsFromOrgUsingListMetadata();
+    if (listMetadataItems.length > 0) {
+      items = items.concat(listMetadataItems);
+    }
+
+    return items;
   }
 
   private async getComponentsFromOrgUsingListMetadata() {
@@ -146,7 +153,7 @@ export default class MetadataRetriever {
     return entities;
   }
 
-  public async getPermissionSets(): Promise<any[]> {
+  public async getUserPermissions(): Promise<any[]> {
     let describeResult = await this._conn.sobject("PermissionSet").describe();
     let supportedPermissions = [];
     describeResult.fields.forEach((field) => {

src/impl/metadata/retriever/profileRetriever.ts

@@ -333,7 +333,7 @@ export default class ProfileRetriever {
   private async fetchPermissions() {
     let permissionRetriever = new MetadataRetriever(
       this.conn,
-      METADATA_INFO.PermissionSet.xmlName,
+      "UserPermissions",
       METADATA_INFO
     );
     let permissionSets = await permissionRetriever.getComponents();

src/impl/source/profiles/profileReconcile.ts

@@ -119,14 +119,14 @@ export default class ProfileReconcile extends ProfileActions {
     }
   }
 
-  private async removeUserPermissionNotAvailableInOrg(profileObj: Profile) {
+  private async removeUserPermissionNotAvailableInOrg(
+    profileObj: Profile,
+    supportedPermissions: string[]
+  ) {
     if (
       profileObj.userPermissions !== undefined &&
       profileObj.userPermissions.length > 0
     ) {
-      //Fetch all user permissions from the org.
-      let supportedPermissions = await this.fetchPermissions();
-
       //Remove permission that are not present in the target org
       profileObj.userPermissions = profileObj.userPermissions.filter(
         (permission) => {
@@ -644,7 +644,7 @@ export default class ProfileReconcile extends ProfileActions {
   private async fetchPermissions() {
     let permissionRetriever = new MetadataRetriever(
       this.conn,
-      METADATA_INFO.PermissionSet.xmlName,
+      "UserPermissions",
       METADATA_INFO
     );
     let permissionSets = await permissionRetriever.getComponents();
@@ -655,6 +655,13 @@ export default class ProfileReconcile extends ProfileActions {
   }
 
   private async reconcileUserPermissions(profileObj: Profile) {
+    if (
+      profileObj.userPermissions === undefined ||
+      profileObj.userPermissions.length === 0
+    ) {
+      return;
+    }
+
     //Delete all user Permissions if the profile is standard one
     let isCustom = profileObj.custom;
     if (!isCustom) {
@@ -669,14 +676,15 @@ export default class ProfileReconcile extends ProfileActions {
     //IS sourceonly, use ignorePermission set in sfdxProject.json file
     if (MetadataFiles.sourceOnly) {
       await this.removePermissionsBasedOnProjectConfig(profileObj);
-    } else {
-      await this.removeUserPermissionNotAvailableInOrg(profileObj);
-    }
 
-    if (MetadataFiles.sourceOnly) {
       await userPermissionBuilder.handlePermissionDependency(profileObj, []);
     } else {
       let supportedPermissions = await this.fetchPermissions();
+      await this.removeUserPermissionNotAvailableInOrg(
+        profileObj,
+        supportedPermissions
+      );
+
       await userPermissionBuilder.handlePermissionDependency(
         profileObj,
         supportedPermissions