UIPQB-164: Columns are reset when user modifies query

folio-org · Dec 24, 2024 · 755fd0d · 755fd0d
1 parent f97fb60
commit 755fd0d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 * [UIPQB-141](https://folio-org.atlassian.net/browse/UIPQB-141) Modal dialog focus inconsistencies across screenreaders.
 * [UIPQB-162](https://folio-org.atlassian.net/browse/UIPQB-162) Errors when query includes a modified custom field.
 * [UIPQB-175](https://folio-org.atlassian.net/browse/UIPQB-175) Displays the "Smth went wrong" page, when the user clicks on "Select operator" dropdown and selects any of them, if there are deleted custom fields.
+* [UIPQB-164](https://folio-org.atlassian.net/browse/UIPQB-164) Columns are reset when user modifies query.
 
 
 ## [1.2.6](https://github.com/folio-org/ui-plugin-query-builder/tree/v1.2.6) (2024-12-11)

diff --git a/src/QueryBuilder/ResultViewer/ResultViewer.js b/src/QueryBuilder/ResultViewer/ResultViewer.js
@@ -82,6 +82,7 @@ export const ResultViewer = ({
     onPreviewShown,
     defaultLimit,
     forcedVisibleValues,
+    visibleColumns
   });
 
   // refresh functionality

diff --git a/src/hooks/useViewerCallbacks.js b/src/hooks/useViewerCallbacks.js
@@ -8,12 +8,17 @@ export const useViewerCallbacks = ({
   currentRecordsCount,
   onPreviewShown,
   defaultLimit,
+                                     visibleColumns
 }) => {
   useEffect(() => {
     if (defaultColumns.length !== 0) {
       onSetDefaultColumns?.(defaultColumns);
 
-      onSetDefaultVisibleColumns?.(defaultVisibleColumns);
+      const uniqueVisibleColumns = Array.from(
+          new Set([...defaultVisibleColumns, ...visibleColumns])
+      );
+
+      onSetDefaultVisibleColumns?.(uniqueVisibleColumns);
     }
   }, [currentRecordsCount]);