fix: Org Browser refresh works for custom objects with a namespace

packages/salesforcedx-utils-vscode/src/helpers/utils.ts

@@ -14,9 +14,12 @@ export const isNullOrUndefined = (object: any): object is null | undefined => {
 };
 
 export const extractJsonObject = (str: string): any => {
-  const jsonString = str.substring(str.indexOf('{'), str.lastIndexOf('}') + 1);
+  const isPlainText = str.includes('{') ? false : true;
+  const jsonString = isPlainText
+    ? str
+    : str.substring(str.indexOf('{'), str.lastIndexOf('}') + 1);
 
-  return JSON.parse(jsonString);
+  return isPlainText ? jsonString : JSON.parse(jsonString);
 };
 
 // There's a bug in VS Code where, after a file has been renamed,

packages/salesforcedx-vscode-core/src/orgBrowser/metadataCmp.ts

@@ -67,12 +67,14 @@ export class ComponentUtils {
       if (!isNullOrUndefined(cmpArray)) {
         cmpArray = cmpArray instanceof Array ? cmpArray : [cmpArray];
         for (const cmp of cmpArray) {
-          const { fullName, manageableState } = cmp;
+          const { fullName, manageableState, namespacePrefix } = cmp;
           if (
             !isNullOrUndefined(fullName) &&
             validManageableStates.has(manageableState)
           ) {
-            components.push(fullName);
+            components.push(
+              namespacePrefix ? `${namespacePrefix}__${fullName}` : fullName
+            );
           }
         }
       }
@@ -128,9 +130,8 @@ export class ComponentUtils {
     if (folderName) {
       metadataQuery.folder = folderName;
     }
-    const metadataFileProperties = await connection.metadata.list(
-      metadataQuery
-    );
+    const metadataFileProperties =
+      await connection.metadata.list(metadataQuery);
     const result = { status: 0, result: metadataFileProperties };
     const jsonResult = JSON.stringify(result, null, 2);
     fs.writeFileSync(componentsPath, jsonResult);

packages/salesforcedx-vscode-core/src/orgBrowser/metadataOutlineProvider.ts

@@ -21,16 +21,16 @@ import {
 } from './index';
 
 export class MetadataOutlineProvider
-  implements vscode.TreeDataProvider<BrowserNode> {
+  implements vscode.TreeDataProvider<BrowserNode>
+{
   private defaultOrg: string | undefined;
   private toRefresh: boolean = false;
 
   private internalOnDidChangeTreeData: vscode.EventEmitter<
     BrowserNode | undefined
   > = new vscode.EventEmitter<BrowserNode | undefined>();
-  public readonly onDidChangeTreeData: vscode.Event<
-    BrowserNode | undefined
-  > = this.internalOnDidChangeTreeData.event;
+  public readonly onDidChangeTreeData: vscode.Event<BrowserNode | undefined> =
+    this.internalOnDidChangeTreeData.event;
 
   constructor(defaultOrg: string | undefined) {
     this.defaultOrg = defaultOrg;
@@ -154,7 +154,7 @@ export class MetadataOutlineProvider
   }
 }
 
-export function parseErrors(error: any): Error {
+export const parseErrors = (error: any): Error => {
   try {
     const errMsg = typeof error === 'string' ? error : error.message;
     const e = extractJsonObject(errMsg);
@@ -177,4 +177,4 @@ export function parseErrors(error: any): Error {
   } catch (e) {
     return new Error(e);
   }
-}
+};

packages/salesforcedx-vscode-core/src/orgBrowser/nodeTypes.ts

@@ -22,8 +22,10 @@ export enum NodeType {
   Folder = 'folder'
 }
 
-export class BrowserNode extends vscode.TreeItem
-  implements RetrieveMetadataTrigger {
+export class BrowserNode
+  extends vscode.TreeItem
+  implements RetrieveMetadataTrigger
+{
   public toRefresh: boolean = false;
   public readonly fullName: string;
   public suffix?: string;
@@ -76,9 +78,12 @@ export class BrowserNode extends vscode.TreeItem
     }
 
     fullNames.forEach(fullName => {
+      const hasNamespacePrefix = fullName.includes('__');
       const label =
         this.type === NodeType.Folder
-          ? fullName.substr(fullName.indexOf('/') + 1)
+          ? fullName.substring(fullName.indexOf('/') + 1)
+          : hasNamespacePrefix
+          ? fullName.substring(fullName.indexOf('_') + 2)
           : fullName;
       const child = new BrowserNode(label, type, fullName);
       child._parent = this;

packages/salesforcedx-vscode-core/test/vscode-integration/orgBrowser/metadataCmp.test.ts

@@ -149,6 +149,12 @@ describe('build metadata components list', () => {
           fullName: 'fakeName1',
           type: 'ApexClass',
           manageableState: 'unmanaged'
+        },
+        {
+          fullName: 'fakeName3',
+          type: 'ApexClass',
+          manageableState: 'unmanaged',
+          namespacePrefix: 'sf_namespace'
         }
       ]
     });
@@ -160,6 +166,7 @@ describe('build metadata components list', () => {
     if (!isNullOrUndefined(fullNames)) {
       expect(fullNames[0]).to.equal('fakeName1');
       expect(fullNames[1]).to.equal('fakeName2');
+      expect(fullNames[2]).to.equal('sf_namespace__fakeName3');
       expect(readFileStub.called).to.equal(false);
     }
   });
@@ -179,6 +186,12 @@ describe('build metadata components list', () => {
           fullName: 'fakeName1',
           type: 'ApexClass',
           manageableState: 'unmanaged'
+        },
+        {
+          fullName: 'fakeName3',
+          type: 'ApexClass',
+          manageableState: 'unmanaged',
+          namespacePrefix: 'sf_namespace'
         }
       ]
     });
@@ -192,6 +205,7 @@ describe('build metadata components list', () => {
     if (!isNullOrUndefined(fullNames)) {
       expect(fullNames[0]).to.equal('fakeName1');
       expect(fullNames[1]).to.equal('fakeName2');
+      expect(fullNames[2]).to.equal('sf_namespace__fakeName3');
       expect(readFileStub.called).to.equal(true);
     }
   });