Merge branch 'main' into tech-debt/3448

zowe · Feb 26, 2025 · 0b499d2 · 0b499d2
2 parents d3eab0c + cf9146e
commit 0b499d2
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/packages/zowe-explorer/CHANGELOG.md b/packages/zowe-explorer/CHANGELOG.md
@@ -23,6 +23,7 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen
 - Fixed an issue seen with outdated profile information in the z/OS tree view data during upload and download of data set and USS files
   [#3457](https://github.com/zowe/zowe-explorer-vscode/issues/3457)
 - 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)
+- Fixed an issue where selecting items in table views would reset the column sort order. [#3473](https://github.com/zowe/zowe-explorer-vscode/issues/3473)
 
 ## `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
@@ -3868,7 +3868,7 @@ describe("Dataset Actions Unit Tests - function search", () => {
                         field: "name",
                         headerName: vscode.l10n.t("Data Set Name"),
                         filter: true,
-                        sort: "asc",
+                        initialSort: "asc",
                     } as Table.ColumnOpts,
                     {
                         field: "position",
@@ -4006,7 +4006,7 @@ describe("Dataset Actions Unit Tests - function search", () => {
                         field: "name",
                         headerName: vscode.l10n.t("Data Set Name"),
                         filter: true,
-                        sort: "asc",
+                        initialSort: "asc",
                     } as Table.ColumnOpts,
                     {
                         field: "position",
@@ -4120,7 +4120,7 @@ describe("Dataset Actions Unit Tests - function search", () => {
                         field: "name",
                         headerName: vscode.l10n.t("Data Set Name"),
                         filter: true,
-                        sort: "asc",
+                        initialSort: "asc",
                     } as Table.ColumnOpts,
                     {
                         field: "position",
@@ -4260,7 +4260,7 @@ describe("Dataset Actions Unit Tests - function search", () => {
                         field: "name",
                         headerName: vscode.l10n.t("Data Set Name"),
                         filter: true,
-                        sort: "asc",
+                        initialSort: "asc",
                     } as Table.ColumnOpts,
                     {
                         field: "position",

diff --git a/packages/zowe-explorer/src/trees/dataset/DatasetActions.ts b/packages/zowe-explorer/src/trees/dataset/DatasetActions.ts
@@ -1932,7 +1932,7 @@ export class DatasetActions {
                         field: "name",
                         headerName: vscode.l10n.t("Data Set Name"),
                         filter: true,
-                        sort: "asc",
+                        initialSort: "asc",
                     } as Table.ColumnOpts,
                     {
                         field: "position",

diff --git a/packages/zowe-explorer/src/trees/job/JobTableView.ts b/packages/zowe-explorer/src/trees/job/JobTableView.ts
@@ -73,7 +73,7 @@ export class JobTableView {
         {
             field: "jobname",
             headerName: l10n.t("Name"),
-            sort: "asc",
+            initialSort: "asc",
         } as Table.ColumnOpts,
         {
             field: "class",

diff --git a/packages/zowe-explorer/src/webviews/src/table-view/types.ts b/packages/zowe-explorer/src/webviews/src/table-view/types.ts
@@ -39,6 +39,8 @@ export const tableProps = (
     ensureDomOrder: true,
     rowData: tableData.rows,
     columnDefs: tableData.columns?.map((col) => ({
+        sortable: true,
+        sortingOrder: ["asc", "desc", null],
         ...col,
         comparator: col.comparator ? new Function(wrapFn(col.comparator))() : undefined,
         colSpan: col.colSpan ? new Function(wrapFn(col.colSpan))() : undefined,