Fixed deleting too many jobs/uss files/datasets at once causes confir…

…mation prompt to be oversized (#3448) * Fix #3254 Signed-off-by: JWaters02 <[email protected]> * Fix oversized prompt for deleting USS files Signed-off-by: JWaters02 <[email protected]> * Fix oversized prompt for deleting datasets Signed-off-by: JWaters02 <[email protected]> Update changelog entry to be more generic Signed-off-by: JWaters02 <[email protected]> * Fix duplicate changelog entries Signed-off-by: Timothy Johnson <[email protected]> --------- Signed-off-by: JWaters02 <[email protected]> Signed-off-by: Joshua Waters <[email protected]> Signed-off-by: Billie Simmons <[email protected]> Signed-off-by: Timothy Johnson <[email protected]> Co-authored-by: Billie Simmons <[email protected]> Co-authored-by: Timothy Johnson <[email protected]>
zowe · Feb 18, 2025 · ed05975 · ed05975
1 parent 8d1339d
commit ed05975
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 29 deletions.
diff --git a/packages/zowe-explorer/CHANGELOG.md b/packages/zowe-explorer/CHANGELOG.md
@@ -16,6 +16,7 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen
 - Fixed an issue where the 'Delete' key binding for the USS tree returns a 'contextValue' error. [#2796](https://github.com/zowe/zowe-explorer-vscode/issues/2796)
 - Fixed an issue where cancelling Unix, MVS or TSO command still submits the command. [#3422](https://github.com/zowe/zowe-explorer-vscode/issues/3422)
 - Fixed an issue where user is unable to open a renamed sequential data set from the Data Sets tree view.. [#3345](https://github.com/zowe/zowe-explorer-vscode/issues/3345)
+- Fixed issue where deleting too many nodes at once would cause the confirmation prompt to be oversized. [#3254](https://github.com/zowe/zowe-explorer-vscode/issues/3254)
 
 ## `3.1.1`
 

diff --git a/packages/zowe-explorer/__tests__/__unit__/trees/dataset/DatasetActions.unit.test.ts b/packages/zowe-explorer/__tests__/__unit__/trees/dataset/DatasetActions.unit.test.ts
@@ -510,7 +510,7 @@ describe("Dataset Actions Unit Tests - Function deleteDatasetPrompt", () => {
         await DatasetActions.deleteDatasetPrompt(blockMocks.testDatasetTree);
 
         expect(mocked(Gui.showMessage)).toHaveBeenCalledWith(
-            `The following 1 item(s) were deleted: ${blockMocks.testDatasetNode.getLabel().toString()}`
+            `The following 1 item(s) were deleted:\n ${blockMocks.testDatasetNode.getLabel().toString()}`
         );
     });
 
@@ -527,7 +527,7 @@ describe("Dataset Actions Unit Tests - Function deleteDatasetPrompt", () => {
         await DatasetActions.deleteDatasetPrompt(blockMocks.testDatasetTree);
 
         expect(mocked(Gui.showMessage)).toHaveBeenCalledWith(
-            `The following 1 item(s) were deleted: ` +
+            `The following 1 item(s) were deleted:\n ` +
                 `${blockMocks.testMemberNode.getParent().getLabel().toString()}(${blockMocks.testMemberNode.getLabel().toString()})`
         );
     });
@@ -544,7 +544,7 @@ describe("Dataset Actions Unit Tests - Function deleteDatasetPrompt", () => {
         await DatasetActions.deleteDatasetPrompt(blockMocks.testDatasetTree);
 
         expect(mocked(Gui.showMessage)).toHaveBeenCalledWith(
-            `The following 1 item(s) were deleted: ${blockMocks.testVsamNode.getLabel().toString()}`
+            `The following 1 item(s) were deleted:\n ${blockMocks.testVsamNode.getLabel().toString()}`
         );
     });
 
@@ -560,7 +560,7 @@ describe("Dataset Actions Unit Tests - Function deleteDatasetPrompt", () => {
         await DatasetActions.deleteDatasetPrompt(blockMocks.testDatasetTree);
 
         expect(mocked(Gui.showMessage)).toHaveBeenCalledWith(
-            `The following 1 item(s) were deleted: ${blockMocks.testMigrNode.getLabel().toString()}`
+            `The following 1 item(s) were deleted:\n ${blockMocks.testMigrNode.getLabel().toString()}`
         );
     });
 
@@ -576,8 +576,8 @@ describe("Dataset Actions Unit Tests - Function deleteDatasetPrompt", () => {
         await DatasetActions.deleteDatasetPrompt(blockMocks.testDatasetTree);
 
         expect(mocked(Gui.showMessage)).toHaveBeenCalledWith(
-            `The following 2 item(s) were deleted: ` +
-                `${blockMocks.testDatasetNode.getLabel().toString()}, ${blockMocks.testVsamNode.getLabel().toString()}`
+            `The following 2 item(s) were deleted:\n ` +
+                `${blockMocks.testDatasetNode.getLabel().toString()}\n ${blockMocks.testVsamNode.getLabel().toString()}`
         );
     });
 
@@ -593,7 +593,7 @@ describe("Dataset Actions Unit Tests - Function deleteDatasetPrompt", () => {
         await DatasetActions.deleteDatasetPrompt(blockMocks.testDatasetTree);
 
         expect(mocked(Gui.showMessage)).toHaveBeenCalledWith(
-            `The following 1 item(s) were deleted: ${blockMocks.testDatasetNode.getLabel().toString()}`
+            `The following 1 item(s) were deleted:\n ${blockMocks.testDatasetNode.getLabel().toString()}`
         );
     });
 
@@ -659,8 +659,8 @@ describe("Dataset Actions Unit Tests - Function deleteDatasetPrompt", () => {
         await DatasetActions.deleteDatasetPrompt(blockMocks.testDatasetTree);
 
         expect(mocked(Gui.showMessage)).toHaveBeenCalledWith(
-            `The following 2 item(s) were deleted: ` +
-                `${blockMocks.testDatasetNode.getLabel().toString()}, ${blockMocks.testFavoritedNode.getLabel().toString()}`
+            `The following 2 item(s) were deleted:\n ` +
+                `${blockMocks.testDatasetNode.getLabel().toString()}\n ${blockMocks.testFavoritedNode.getLabel().toString()}`
         );
     });
 
@@ -686,7 +686,7 @@ describe("Dataset Actions Unit Tests - Function deleteDatasetPrompt", () => {
 
         await DatasetActions.deleteDatasetPrompt(blockMocks.testDatasetTree, blockMocks.testMemberNode);
         expect(mocked(Gui.showMessage)).toHaveBeenCalledWith(
-            `The following 1 item(s) were deleted: ` +
+            `The following 1 item(s) were deleted:\n ` +
                 `${blockMocks.testMemberNode.getParent().getLabel().toString()}(${blockMocks.testMemberNode.getLabel().toString()})`
         );
     });

diff --git a/packages/zowe-explorer/src/trees/dataset/DatasetActions.ts b/packages/zowe-explorer/src/trees/dataset/DatasetActions.ts
@@ -587,6 +587,10 @@ export class DatasetActions {
             return SharedContext.isDsMember(deletedNode) ? deletedNode.getParent() : ` ${deletedNode.getLabel().toString()}`;
         });
 
+        const MAX_DISPLAYED_DATASET_NAMES = 10;
+        const displayedDatasetNames = nodesToDelete.slice(0, MAX_DISPLAYED_DATASET_NAMES).join("\n");
+        const additionalDatasetsCount = nodesToDelete.length - MAX_DISPLAYED_DATASET_NAMES;
+
         // Confirm that the user really wants to delete
         ZoweLogger.debug(
             vscode.l10n.t({
@@ -597,9 +601,11 @@ export class DatasetActions {
         );
         const deleteButton = vscode.l10n.t("Delete");
         const message = vscode.l10n.t({
-            message: `Are you sure you want to delete the following {0} item(s)?\nThis will permanently remove these data sets and/or members from your system.\n\n{1}`,
-            args: [nodesToDelete.length, nodesToDelete.toString().replace(/(,)/g, "\n")],
-            comment: ["Data Sets to delete length", "Data Sets to delete"],
+            message:
+                `Are you sure you want to delete the following {0} item(s)?\n` +
+                `This will permanently remove these data sets and/or members from your system.\n\n{1}{2}`,
+            args: [nodesToDelete.length, displayedDatasetNames, additionalDatasetsCount > 0 ? `\n...and ${additionalDatasetsCount} more` : ""],
+            comment: ["Data Sets to delete length", "Data Sets to delete", "Additional datasets count"],
         });
         await Gui.warningMessage(message, {
             items: [deleteButton],
@@ -651,11 +657,13 @@ export class DatasetActions {
         }
         if (nodesDeleted.length > 0) {
             nodesDeleted.sort((a, b) => a.localeCompare(b));
+            const displayedDeletedNames = nodesDeleted.slice(0, MAX_DISPLAYED_DATASET_NAMES).join("\n");
+            const additionalDeletedCount = nodesDeleted.length - MAX_DISPLAYED_DATASET_NAMES;
             Gui.showMessage(
                 vscode.l10n.t({
-                    message: "The following {0} item(s) were deleted: {1}",
-                    args: [nodesDeleted.length, nodesDeleted.toString().trim()],
-                    comment: ["Data Sets deleted length", "Data Sets deleted"],
+                    message: "The following {0} item(s) were deleted:\n{1}{2}",
+                    args: [nodesDeleted.length, displayedDeletedNames, additionalDeletedCount > 0 ? `\n...and ${additionalDeletedCount} more` : ""],
+                    comment: ["Data Sets deleted length", "Data Sets deleted", "Additional datasets count"],
                 })
             );
         }

diff --git a/packages/zowe-explorer/src/trees/job/JobActions.ts b/packages/zowe-explorer/src/trees/job/JobActions.ts
@@ -62,11 +62,16 @@ export class JobActions {
         ZoweLogger.trace("job.actions.deleteMultipleJobs called.");
         const deleteButton = vscode.l10n.t("Delete");
         const toJobname = (jobNode: IZoweJobTreeNode): string => `${jobNode.job.jobname}(${jobNode.job.jobid})`;
+        const jobNames = jobs.map(toJobname);
+        const MAX_DISPLAYED_JOB_NAMES = 10;
+        let displayedJobNames = jobNames.slice(0, MAX_DISPLAYED_JOB_NAMES).join("\n");
+        let additionalJobsCount = jobNames.length - MAX_DISPLAYED_JOB_NAMES;
         const message = vscode.l10n.t({
             message:
-                "Are you sure you want to delete the following {0} items?\nThis will permanently remove the following jobs from your system.\n\n{1}",
-            args: [jobs.length, jobs.map(toJobname).toString().replace(/(,)/g, "\n")],
-            comment: ["Jobs length", "Job names"],
+                "Are you sure you want to delete the following {0} items?\n" +
+                "This will permanently remove the following jobs from your system.\n\n{1}{2}",
+            args: [jobs.length, displayedJobNames, additionalJobsCount > 0 ? `\n...and ${additionalJobsCount} more` : ""],
+            comment: ["Jobs length", "Job names", "Additional jobs count"],
         });
         const deleteChoice = await Gui.warningMessage(message, {
             items: [deleteButton],
@@ -101,10 +106,12 @@ export class JobActions {
             })
             .filter((result) => result !== undefined);
         if (deletedJobs.length) {
+            displayedJobNames = deletedJobs.slice(0, MAX_DISPLAYED_JOB_NAMES).map(toJobname).join(", ");
+            additionalJobsCount = deletedJobs.length - MAX_DISPLAYED_JOB_NAMES;
             Gui.showMessage(
                 vscode.l10n.t({
-                    message: "The following jobs were deleted: {0}",
-                    args: [deletedJobs.map(toJobname).toString().replace(/(,)/g, ", ")],
+                    message: "The following jobs were deleted: {0}{1}",
+                    args: [displayedJobNames, additionalJobsCount > 0 ? `, ...and ${additionalJobsCount} more` : ""],
                     comment: ["Deleted jobs"],
                 })
             );

diff --git a/packages/zowe-explorer/src/trees/uss/USSActions.ts b/packages/zowe-explorer/src/trees/uss/USSActions.ts
@@ -248,17 +248,18 @@ export class USSActions {
             selectedNodes = ussFileProvider.getTreeView().selection;
         }
         selectedNodes = selectedNodes.filter((x) => SharedContext.isDocument(x) || SharedContext.isUssDirectory(x) || SharedContext.isBinary(x));
-        const fileNames = selectedNodes.reduce((label, currentVal) => {
-            return `${label}${currentVal.label.toString()}\n`;
-        }, "");
-
-        const deleteButton = vscode.l10n.t("Delete");
+        const fileNames = selectedNodes.map(({ label }) => label.toString());
+        const MAX_DISPLAYED_FILE_NAMES = 10;
+        const displayedFileNames = fileNames.slice(0, MAX_DISPLAYED_FILE_NAMES).join("\n");
+        const additionalFilesCount = fileNames.length - MAX_DISPLAYED_FILE_NAMES;
         const message = vscode.l10n.t({
             message:
-                "Are you sure you want to delete the following item?\nThis will permanently remove the following file or folder from your system.\n\n{0}",
-            args: [fileNames.toString()],
-            comment: ["File names"],
+                "Are you sure you want to delete the following item?\n" +
+                "This will permanently remove the following file or folder from your system.\n\n{0}{1}",
+            args: [displayedFileNames, additionalFilesCount > 0 ? `\n...and ${additionalFilesCount} more` : ""],
+            comment: ["File names", "Additional files count"],
         });
+        const deleteButton = vscode.l10n.t("Delete");
         let cancelled = false;
         await Gui.warningMessage(message, {
             items: [deleteButton],