fix: resolve fullname correctly for EmailTemplateFolder

Author: shetzel

src/shared/remoteSourceTrackingService.ts

@@ -509,7 +509,9 @@ export const remoteChangeElementToChangeResult = (rce: RemoteChangeElement): Cha
   ...rce,
   ...(mappingsForSourceMemberTypesToMetadataType.has(rce.type)
     ? {
-        name: rce.name.split('/')[0],
+        // SNOWFLAKE: EmailTemplateFolder is treated as an alias for EmailFolder so it has a mapping.
+        // The name must be handled differently than with bundle types.
+        name: rce.type === 'EmailTemplateFolder' ? rce.name : rce.name.split('/')[0],
         type: mappingsForSourceMemberTypesToMetadataType.get(rce.type),
       }
     : {}),

test/unit/remoteSourceTracking.test.ts

@@ -14,8 +14,13 @@ import { MockTestOrgData, instantiateContext, stubContext, restoreContext } from
 import { EnvVars, envVars, Logger, Messages, Org } from '@salesforce/core';
 import { expect } from 'chai';
 import { ComponentStatus } from '@salesforce/source-deploy-retrieve';
-import { RemoteSourceTrackingService, calculateTimeout, Contents } from '../../src/shared/remoteSourceTrackingService';
-import { RemoteSyncInput, SourceMember, MemberRevision } from '../../src/shared/types';
+import {
+  RemoteSourceTrackingService,
+  calculateTimeout,
+  Contents,
+  remoteChangeElementToChangeResult,
+} from '../../src/shared/remoteSourceTrackingService';
+import { RemoteSyncInput, SourceMember, MemberRevision, RemoteChangeElement } from '../../src/shared/types';
 import * as mocks from '../../src/shared/remoteSourceTrackingService';
 
 Messages.importMessagesDirectory(__dirname);
@@ -93,6 +98,42 @@ describe('remoteSourceTrackingService', () => {
       org,
       projectPath: await $$.localPathRetriever($$.id),
     });
+
+    describe('remoteChangeElementToChangeResult()', () => {
+      it('should return correct ChangeResult for EmailTemplateFolder', () => {
+        const rce: RemoteChangeElement = {
+          name: 'level1/level2/level3',
+          type: 'EmailTemplateFolder',
+          deleted: false,
+          modified: true,
+        };
+        const changeResult = remoteChangeElementToChangeResult(rce);
+        expect(changeResult).to.deep.equal({
+          origin: 'remote',
+          name: 'level1/level2/level3',
+          type: 'EmailFolder',
+          deleted: false,
+          modified: true,
+        });
+      });
+
+      it('should return correct ChangeResult for LightningComponentResource', () => {
+        const rce: RemoteChangeElement = {
+          name: 'fooLWC/bar',
+          type: 'LightningComponentResource',
+          deleted: false,
+          modified: true,
+        };
+        const changeResult = remoteChangeElementToChangeResult(rce);
+        expect(changeResult).to.deep.equal({
+          origin: 'remote',
+          name: 'fooLWC',
+          type: 'LightningComponentBundle',
+          deleted: false,
+          modified: true,
+        });
+      });
+    });
   });
 
   describe('getServerMaxRevision', () => {