fix: always show lwc command, improve message output in push/pull (#7014)

Author: mshanemc

packages/salesforcedx-vscode-metadata/package.json

@@ -287,10 +287,6 @@
           "command": "sf.metadata.apex.generate.class",
           "when": "salesforcedx-vscode-metadata.showSharedCommands"
         },
-        {
-          "command": "sf.metadata.lightning.generate.lwc",
-          "when": "salesforcedx-vscode-metadata.showSharedCommands"
-        },
         {
           "command": "sf.metadata.delete.source",
           "when": "never"
@@ -393,7 +389,7 @@
         },
         {
           "command": "sf.metadata.lightning.generate.lwc",
-          "when": "explorerResourceIsFolder && resourceFilename == lwc && salesforcedx-vscode-metadata.showSharedCommands && sf:project_opened"
+          "when": "explorerResourceIsFolder && resourceFilename == lwc && sf:project_opened"
         }
       ]
     },

packages/salesforcedx-vscode-metadata/src/commands/projectDeployStart.ts

@@ -7,15 +7,23 @@
 
 import { ExtensionProviderService } from '@salesforce/effect-ext-utils';
 import * as Effect from 'effect/Effect';
+import * as vscode from 'vscode';
+import { nls } from '../messages';
 import { deployComponentSet } from '../shared/deploy/deployComponentSet';
 
 /** Deploy local changes to the default org */
 export const projectDeployStartCommand = (ignoreConflicts = false) =>
   Effect.gen(function* () {
     const api = yield* (yield* ExtensionProviderService).getServicesApi;
-    const componentSet = yield* (yield* api.services.ComponentSetService).ensureNonEmptyComponentSet(
-      yield* api.services.MetadataDeployService.getComponentSetForDeploy({ ignoreConflicts })
-    );
+    const [componentSetService] = yield* Effect.all([api.services.ComponentSetService], { concurrency: 'unbounded' });
+    const componentSet = yield* api.services.MetadataDeployService.getComponentSetForDeploy({ ignoreConflicts });
 
-    yield* deployComponentSet({ componentSet });
-  });
+    const nonEmpty = yield* componentSetService.ensureNonEmptyComponentSet(componentSet);
+    yield* deployComponentSet({ componentSet: nonEmpty });
+  }).pipe(
+    Effect.catchTag('EmptyComponentSetError', () =>
+      Effect.sync(() => {
+        void vscode.window.showInformationMessage(nls.localize('no_local_changes_to_deploy'));
+      })
+    )
+  );

packages/salesforcedx-vscode-metadata/src/commands/retrieveStart/projectRetrieveStart.ts

@@ -8,9 +8,19 @@
 import { ExtensionProviderService } from '@salesforce/effect-ext-utils';
 import type { ComponentSet } from '@salesforce/source-deploy-retrieve';
 import * as Effect from 'effect/Effect';
+import * as Schema from 'effect/Schema';
+import * as vscode from 'vscode';
 import { nls } from '../../messages';
 import { retrieveComponentSet } from '../../shared/retrieve/retrieveComponentSet';
 
+class SourceTrackingComponentsFailedError extends Schema.TaggedError<SourceTrackingComponentsFailedError>()(
+  'SourceTrackingComponentsFailedError',
+  {
+    message: Schema.String,
+    cause: Schema.optional(Schema.Unknown)
+  }
+) {}
+
 // Type guard function to ensure result has expected shape
 const isApplyResult = (
   value: unknown
@@ -26,8 +36,8 @@ export const projectRetrieveStartCommand = (ignoreConflicts: boolean) =>
     yield* Effect.annotateCurrentSpan({ ignoreConflicts });
 
     const api = yield* (yield* ExtensionProviderService).getServicesApi;
-    const [sourceTrackingService, channelService] = yield* Effect.all(
-      [api.services.SourceTrackingService, api.services.ChannelService],
+    const [sourceTrackingService, channelService, componentSetService] = yield* Effect.all(
+      [api.services.SourceTrackingService, api.services.ChannelService, api.services.ComponentSetService],
       { concurrency: 'unbounded' }
     );
 
@@ -48,26 +58,30 @@ export const projectRetrieveStartCommand = (ignoreConflicts: boolean) =>
     const result = yield* Effect.tryPromise({
       try: () => tracking.maybeApplyRemoteDeletesToLocal(true),
       catch: e =>
-        new Error(nls.localize('error_source_tracking_components_failed', e instanceof Error ? e.message : String(e)))
+        new SourceTrackingComponentsFailedError({
+          message: nls.localize('error_source_tracking_components_failed', e instanceof Error ? e.message : String(e)),
+          cause: e
+        })
     }).pipe(Effect.withSpan('maybeApplyRemoteDeletesToLocal'));
 
     if (!isApplyResult(result)) {
       return yield* Effect.fail(
-        new Error(nls.localize('error_source_tracking_components_failed', 'Invalid result from source tracking'))
+        new SourceTrackingComponentsFailedError({
+          message: nls.localize('error_source_tracking_components_failed', 'Invalid result from source tracking')
+        })
       );
     }
 
     const componentSet = result.componentSetFromNonDeletes;
-
-    const changeCount = componentSet.size;
+    const nonEmpty = yield* componentSetService.ensureNonEmptyComponentSet(componentSet);
     yield* channelService.appendToChannel(
-      `Found ${changeCount} remote change${changeCount === 1 ? '' : 's'} to retrieve`
+      `Found ${nonEmpty.size} remote change${nonEmpty.size === 1 ? '' : 's'} to retrieve`
     );
-
-    if (componentSet.size === 0) {
-      yield* channelService.appendToChannel('No remote changes to retrieve');
-      return;
-    }
-
-    yield* retrieveComponentSet({ componentSet, ignoreConflicts: true });
-  });
+    yield* retrieveComponentSet({ componentSet: nonEmpty, ignoreConflicts: true });
+  }).pipe(
+    Effect.catchTag('EmptyComponentSetError', () =>
+      Effect.sync(() => {
+        void vscode.window.showInformationMessage(nls.localize('no_remote_changes_to_retrieve'));
+      })
+    )
+  );

packages/salesforcedx-vscode-metadata/src/messages/i18n.ts

@@ -60,6 +60,8 @@ export const messages = {
     'You can run SFDX: Retrieve This Source from Org only on a source file or directory.',
   retrieve_select_manifest: 'You can run SFDX: Retrieve Source in Manifest from Org only on a manifest file.',
   retrieve_completed_with_errors_message: 'Retrieve completed with errors. Check output for details.',
+  no_remote_changes_to_retrieve: 'No remote changes to retrieve.',
+  no_local_changes_to_deploy: 'No local changes to deploy.',
   retrieve_source_conflicts_detected: 'Conflicts detected. Resolve conflicts before retrieving. \n Conflicts: %s',
   error_source_tracking_components_failed: 'Failed to retrieve components using source tracking: %s',
   delete_source_text: 'SFDX: Delete from Project and Org',