chore: remove references to deploy/retrieve beta commands (#5609)

* chore: remove references to deploy/retrieve beta commands * fix: update commands
forcedotcom · May 23, 2024 · 578cbcc · 578cbcc
1 parent 6586c4f
commit 578cbcc
Show file tree

Hide file tree

Showing 14 changed files with 38 additions and 39 deletions.
diff --git a/packages/salesforcedx-vscode-core/package.json b/packages/salesforcedx-vscode-core/package.json
@@ -807,7 +807,7 @@
       },
       {
         "command": "sf.retrieve.source.path",
-        "title": "%retrieve_text%"
+        "title": "%retrieve_this_source_text%"
       },
       {
         "command": "sf.retrieve.current.source.file",
@@ -819,7 +819,7 @@
       },
       {
         "command": "sf.deploy.source.path",
-        "title": "%deploy_text%"
+        "title": "%deploy_this_source_text%"
       },
       {
         "command": "sf.deploy.current.source.file",

diff --git a/packages/salesforcedx-vscode-core/package.nls.ja.json b/packages/salesforcedx-vscode-core/package.nls.ja.json
@@ -16,7 +16,6 @@
   "delete_source_text": "SFDX: プロジェクトおよび組織から削除",
   "delete_source_this_source_text": "SFDX: このソースをプロジェクトと組織から削除",
   "deploy_in_manifest_text": "SFDX: マニフェストファイルのソースを組織へデプロイ",
-  "deploy_text": "SFDX: 組織へソースをデプロイ",
   "deploy_this_source_text": "SFDX: このソースを組織へデプロイ",
   "diff_against_org": "SFDX: ファイルと組織の差分を表示",
   "diff_folder_against_org": "SFDX: フォルダと組織の差分を表示",
@@ -59,7 +58,6 @@
   "retrieve_display_text": "組織からソースを取得",
   "retrieve_in_manifest_text": "SFDX: マニフェストファイルのソースを組織から取得",
   "retrieve_test_code_coverage_text": "Apex テストの実行時にコードカバレッジの結果を計算して取得するかどうかを指定します。",
-  "retrieve_text": "SFDX: 組織からソースを取得",
   "retrieve_this_source_text": "SFDX: このソースを組織から取得",
   "running_tasks_title_text": "実行中のタスク",
   "sf_log_level_description": "SF_LOG_LEVEL CLI environment variable value",

diff --git a/packages/salesforcedx-vscode-core/package.nls.json b/packages/salesforcedx-vscode-core/package.nls.json
@@ -17,7 +17,6 @@
   "delete_source_text": "SFDX: Delete from Project and Org",
   "delete_source_this_source_text": "SFDX: Delete This from Project and Org",
   "deploy_in_manifest_text": "SFDX: Deploy Source in Manifest to Org",
-  "deploy_text": "SFDX: Deploy Source to Org",
   "deploy_this_source_text": "SFDX: Deploy This Source to Org",
   "diff_against_org": "SFDX: Diff File Against Org",
   "diff_folder_against_org": "SFDX: Diff Folder Against Org",
@@ -61,10 +60,9 @@
   "refresh_types_text": "SFDX: Refresh Types",
   "rename_lightning_component_text": "SFDX: Rename Component",
   "retrieve_and_open_display_text": "Retrieve and Open Source",
-  "retrieve_display_text": "Retrieve Source from Org",
+  "retrieve_display_text": "Retrieve This Source from Org",
   "retrieve_in_manifest_text": "SFDX: Retrieve Source in Manifest from Org",
   "retrieve_test_code_coverage_text": "Specifies whether code coverage results are calculated and retrieved when you run Apex tests.",
-  "retrieve_text": "SFDX: Retrieve Source from Org",
   "retrieve_this_source_text": "SFDX: Retrieve This Source from Org",
   "running_tasks_title_text": "Running Tasks",
   "setting_clear_output_tab_description": "When a new command is run, clear the output content from the previous command.",

diff --git a/packages/salesforcedx-vscode-core/src/commands/deployManifest.ts b/packages/salesforcedx-vscode-core/src/commands/deployManifest.ts
@@ -21,7 +21,7 @@ import { FilePathGatherer, SfCommandlet, SfWorkspaceChecker } from './util';
 
 export class LibraryDeployManifestExecutor extends DeployExecutor<string> {
   constructor() {
-    super(nls.localize('deploy_text'), 'deploy_with_manifest_beta');
+    super(nls.localize('deploy_this_source_text'), 'deploy_with_manifest');
   }
 
   protected async getComponents(
@@ -58,7 +58,7 @@ export const deployManifest = async (manifestUri: vscode.Uri) => {
     }
   }
 
-  const messages = getConflictMessagesFor('deploy_with_manifest_beta');
+  const messages = getConflictMessagesFor('deploy_with_manifest');
 
   if (messages) {
     const commandlet = new SfCommandlet(

diff --git a/packages/salesforcedx-vscode-core/src/commands/deploySourcePath.ts b/packages/salesforcedx-vscode-core/src/commands/deploySourcePath.ts
@@ -20,7 +20,7 @@ import { TimestampConflictChecker } from './util/timestampConflictChecker';
 
 export class LibraryDeploySourcePathExecutor extends DeployExecutor<string[]> {
   constructor() {
-    super(nls.localize('deploy_text'), 'deploy_with_sourcepath_beta');
+    super(nls.localize('deploy_this_source_text'), 'deploy_with_sourcepath');
   }
 
   public async getComponents(
@@ -67,7 +67,7 @@ export const deploySourcePaths = async (
     }
   }
 
-  const messages = getConflictMessagesFor('deploy_with_sourcepath_beta');
+  const messages = getConflictMessagesFor('deploy_with_sourcepath');
 
   if (messages) {
     const commandlet = new SfCommandlet<string[]>(

diff --git a/packages/salesforcedx-vscode-core/src/commands/retrieveManifest.ts b/packages/salesforcedx-vscode-core/src/commands/retrieveManifest.ts
@@ -19,7 +19,7 @@ import { FilePathGatherer, SfCommandlet, SfWorkspaceChecker } from './util';
 
 export class LibraryRetrieveManifestExecutor extends RetrieveExecutor<string> {
   constructor() {
-    super(nls.localize('retrieve_text'), 'retrieve_with_manifest_beta');
+    super(nls.localize('retrieve_this_source_text'), 'retrieve_with_manifest');
   }
 
   protected async getComponents(
@@ -42,7 +42,9 @@ export class LibraryRetrieveManifestExecutor extends RetrieveExecutor<string> {
   }
 }
 
-export const retrieveManifest = async (explorerPath: vscode.Uri): Promise<void> => {
+export const retrieveManifest = async (
+  explorerPath: vscode.Uri
+): Promise<void> => {
   if (!explorerPath) {
     const editor = vscode.window.activeTextEditor;
     if (editor && editor.document.languageId === 'forcesourcemanifest') {

diff --git a/...lesforcedx-vscode-core/src/commands/retrieveMetadata/libraryRetrieveSourcePathExecutor.ts b/...lesforcedx-vscode-core/src/commands/retrieveMetadata/libraryRetrieveSourcePathExecutor.ts
@@ -27,7 +27,10 @@ export class LibraryRetrieveSourcePathExecutor extends RetrieveExecutor<
   private openAfterRetrieve: boolean;
 
   constructor(openAfterRetrieve = false) {
-    super(nls.localize('retrieve_text'), 'retrieve_beta');
+    super(
+      nls.localize('retrieve_this_source_text'),
+      'retrieve_with_sourcepath'
+    );
     this.openAfterRetrieve = openAfterRetrieve;
   }
 

diff --git a/packages/salesforcedx-vscode-core/src/commands/retrieveSourcePath.ts b/packages/salesforcedx-vscode-core/src/commands/retrieveSourcePath.ts
@@ -23,7 +23,10 @@ export class LibraryRetrieveSourcePathExecutor extends RetrieveExecutor<
   string[]
 > {
   constructor() {
-    super(nls.localize('retrieve_text'), 'retrieve_with_sourcepath_beta');
+    super(
+      nls.localize('retrieve_this_source_text'),
+      'retrieve_with_sourcepath'
+    );
   }
 
   public async getComponents(

diff --git a/packages/salesforcedx-vscode-core/src/conflict/messages.ts b/packages/salesforcedx-vscode-core/src/conflict/messages.ts
@@ -13,7 +13,7 @@ export const getConflictMessagesFor = (
   const warningMessageKey = 'conflict_detect_conflicts_during_deploy';
   const messagesByLogName: Map<string, ConflictDetectionMessages> = new Map([
     [
-      'deploy_with_sourcepath_beta',
+      'deploy_with_sourcepath',
       {
         warningMessageKey,
         commandHint: inputs => {
@@ -34,7 +34,7 @@ export const getConflictMessagesFor = (
       }
     ],
     [
-      'deploy_with_manifest_beta',
+      'deploy_with_manifest',
       {
         warningMessageKey,
         commandHint: input => {

diff --git a/packages/salesforcedx-vscode-core/src/constants.ts b/packages/salesforcedx-vscode-core/src/constants.ts
@@ -33,7 +33,6 @@ export const TABLE_VAL_COL = 'table_header_value';
 export const TABLE_SUCCESS_COL = 'table_header_success';
 
 // sfdxCore setting config values
-export const BETA_DEPLOY_RETRIEVE = 'experimental.deployRetrieve';
 export const CONFLICT_DETECTION_ENABLED = 'detectConflictsAtSync';
 export const INTERNAL_DEVELOPMENT_FLAG = 'internal-development';
 export const PUSH_OR_DEPLOY_ON_SAVE_ENABLED = 'push-or-deploy-on-save.enabled';

diff --git a/packages/salesforcedx-vscode-core/src/messages/i18n.ja.ts b/packages/salesforcedx-vscode-core/src/messages/i18n.ja.ts
@@ -90,16 +90,16 @@ export const messages = {
   project_deploy_start_ignore_conflicts_default_org_text:
     'SFDX: Push Source to Default Org and Ignore Conflicts',
 
-  deploy_text: 'SFDX: 組織へソースをデプロイ',
+  deploy_this_source_text: 'SFDX: このソースを組織へデプロイ',
   deploy_select_file_or_directory:
-    'ソースファイルかディレクトリ上でのみ SFDX: 組織へソースをデプロイ を実行できます。',
+    'ソースファイルかディレクトリ上でのみ SFDX: このソースを組織へデプロイ を実行できます。',
   deploy_select_manifest:
     'マニフェストファイル上でのみ SFDX マニフェストのソースを組織へデプロイ を実行できます。',
-  retrieve_text: 'SFDX: 組織からソースを取得',
-  retrieve_display_text: 'SFDX: 組織からソースを取得',
+  retrieve_this_source_text: 'SFDX: このソースを組織から取得',
+  retrieve_display_text: 'SFDX: このソースを組織から取得',
   retrieve_and_open_display_text: 'Retrieve and Open Source',
   retrieve_select_file_or_directory:
-    'ソースファイルかディレクトリ上でのみ SFDX: 組織からソースを取得 を実行できます。',
+    'ソースファイルかディレクトリ上でのみ SFDX: このソースを組織から取得 を実行できます。',
   retrieve_select_manifest:
     'マニフェストファイル上でのみ SFDX: マニフェストのソースを組織から取得 を実行できます。',
   delete_source_text: 'SFDX: プロジェクトおよび組織から削除',

diff --git a/packages/salesforcedx-vscode-core/src/messages/i18n.ts b/packages/salesforcedx-vscode-core/src/messages/i18n.ts
@@ -106,16 +106,16 @@ export const messages = {
   project_deploy_start_ignore_conflicts_default_org_text:
     'SFDX: Push Source to Default Org and Ignore Conflicts',
   view_all_changes_text: 'View All Changes (Local and in Default Org)',
-  deploy_text: 'SFDX: Deploy Source to Org',
+  deploy_this_source_text: 'SFDX: Deploy This Source to Org',
   deploy_select_file_or_directory:
-    'You can run SFDX: Deploy Source to Org only on a source file or directory.',
+    'You can run SFDX: Deploy This Source to Org only on a source file or directory.',
   deploy_select_manifest:
     'You can run SFDX: Deploy Source in Manifest to Org only on a manifest file.',
-  retrieve_text: 'SFDX: Retrieve Source from Org',
-  retrieve_display_text: 'Retrieve Source from Org',
+  retrieve_this_source_text: 'SFDX: Retrieve This Source from Org',
+  retrieve_display_text: 'Retrieve This Source from Org',
   retrieve_and_open_display_text: 'Retrieve and Open Source',
   retrieve_select_file_or_directory:
-    'You can run SFDX: Retrieve Source from Org only on a source file or directory.',
+    '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.',
   delete_source_text: 'SFDX: Delete from Project and Org',

diff --git a/packages/salesforcedx-vscode-core/test/jest/commands/deployExecutor.test.ts b/packages/salesforcedx-vscode-core/test/jest/commands/deployExecutor.test.ts
@@ -119,7 +119,7 @@ describe('Deploy Executor', () => {
       .mockResolvedValue({ pollStatus: jest.fn() } as any);
     const executor = new TestDeployExecutor(
       'testDeploy',
-      'deploy_with_sourcepath_beta'
+      'deploy_with_sourcepath'
     );
     (executor as any).setupCancellation = jest.fn();
 
@@ -150,7 +150,7 @@ describe('Deploy Executor', () => {
       .mockResolvedValue({ pollStatus: jest.fn() } as any);
     const executor = new TestDeployExecutor(
       'testDeploy',
-      'deploy_with_sourcepath_beta'
+      'deploy_with_sourcepath'
     );
     (executor as any).setupCancellation = jest.fn();
 
@@ -176,7 +176,7 @@ describe('Deploy Executor', () => {
     DeployRetrieveExecutor.errorCollection = MockErrorCollection as any;
     const executor = new TestDeployExecutor(
       'testDeploy',
-      'deploy_with_sourcepath_beta'
+      'deploy_with_sourcepath'
     );
 
     // Act
@@ -241,7 +241,7 @@ describe('Deploy Executor', () => {
 
       const executor = new TestDeployExecutor(
         'testDeploy',
-        'deploy_with_sourcepath_beta'
+        'deploy_with_sourcepath'
       );
 
       // Act
@@ -276,7 +276,7 @@ describe('Deploy Executor', () => {
         .mockImplementation(jest.fn());
       const executor = new TestDeployExecutor(
         'testDeploy',
-        'deploy_with_sourcepath_beta'
+        'deploy_with_sourcepath'
       );
 
       // Act

diff --git a/packages/salesforcedx-vscode-core/test/jest/conflict/messages.test.ts b/packages/salesforcedx-vscode-core/test/jest/conflict/messages.test.ts
@@ -11,9 +11,7 @@ describe('messages', () => {
     const aPath = 'a/path';
     it('should return --sourcepath command hint when deploy with source path is being run', () => {
       const bPath = 'b/path';
-      const conflictMessages = getConflictMessagesFor(
-        'deploy_with_sourcepath_beta'
-      );
+      const conflictMessages = getConflictMessagesFor('deploy_with_sourcepath');
 
       const commandHint = conflictMessages?.commandHint([aPath, bPath]);
 
@@ -23,9 +21,7 @@ describe('messages', () => {
     });
 
     it('should return --manifest command hint when deploy with manifest is being run', () => {
-      const conflictMessages = getConflictMessagesFor(
-        'deploy_with_manifest_beta'
-      );
+      const conflictMessages = getConflictMessagesFor('deploy_with_manifest');
 
       const commandHint = conflictMessages?.commandHint(aPath);