[Discover] Fix for other setting

elastic · Oct 16, 2023 · fd2c19d · fd2c19d
1 parent 05536b6
commit fd2c19d
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/plugins/discover/public/application/main/utils/get_switch_data_view_app_state.ts b/src/plugins/discover/public/application/main/utils/get_switch_data_view_app_state.ts
@@ -25,13 +25,13 @@ export function getDataViewAppState(
   sortDirection: string = 'desc',
   query?: Query | AggregateQuery
 ) {
-  const currentColumnsRefreshed = uniq([...currentColumns, ...defaultColumns]);
+  let columns = currentColumns || [];
 
-  const nextColumns = modifyColumns
-    ? currentColumnsRefreshed.filter((column) => nextDataView.fields.getByName(column))
-    : currentColumnsRefreshed;
+  if (modifyColumns) {
+    const currentColumnsRefreshed = uniq([...columns, ...defaultColumns]);
+    columns = currentColumnsRefreshed.filter((column) => nextDataView.fields.getByName(column));
+  }
 
-  let columns = nextColumns.length ? nextColumns : [];
   if (query && isOfAggregateQueryType(query)) {
     columns = [];
   }