From e9a8f3ee84f7491aa60de1ab69c4f4e85688695c Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Thu, 23 Jun 2022 09:08:43 +0200
Subject: [PATCH 1/2] ability to reset view when grid load error occurs

---
 packages/datalib/src/GridDisplay.ts           | 7 ++++++-
 packages/web/src/datagrid/DataGridCore.svelte | 6 +++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/datalib/src/GridDisplay.ts b/packages/datalib/src/GridDisplay.ts
index 7f012324d..4a554813d 100644
--- a/packages/datalib/src/GridDisplay.ts
+++ b/packages/datalib/src/GridDisplay.ts
@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { GridConfig, GridCache, GridConfigColumns, createGridCache, GroupFunc } from './GridConfig';
+import { GridConfig, GridCache, GridConfigColumns, createGridCache, GroupFunc, createGridConfig } from './GridConfig';
 import {
   ForeignKeyInfo,
   TableInfo,
@@ -445,6 +445,11 @@ export abstract class GridDisplay {
     this.reload();
   }
 
+  resetConfig() {
+    this.setConfig(cfg => createGridConfig());
+    this.reload();
+  }
+
   getChangeSetCondition(row) {
     if (!this.changeSetKeyFields) return null;
     return _.pick(row, this.changeSetKeyFields);
diff --git a/packages/web/src/datagrid/DataGridCore.svelte b/packages/web/src/datagrid/DataGridCore.svelte
index 62f1c4dcb..3614b500b 100644
--- a/packages/web/src/datagrid/DataGridCore.svelte
+++ b/packages/web/src/datagrid/DataGridCore.svelte
@@ -1485,7 +1485,11 @@
 {#if !display || (!isDynamicStructure && (!columns || columns.length == 0))}
   <LoadingInfo wrapper message="Waiting for structure" />
 {:else if errorMessage}
-  <ErrorInfo message={errorMessage} alignTop />
+  <div>
+    <ErrorInfo message={errorMessage} alignTop />
+    <FormStyledButton value="Reset filter" on:click={() => display.clearFilters()} />
+      <FormStyledButton value="Reset view" on:click={() => display.resetConfig()} />
+      </div>
 {:else if isDynamicStructure && isLoadedAll && grider?.rowCount == 0}
   <div>
     <ErrorInfo

From 97ae7ae0d6ced86d594e4d73c3173852b94bfb4b Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Thu, 23 Jun 2022 09:52:41 +0200
Subject: [PATCH 2/2] filtering works for complex columns

---
 packages/datalib/src/GridDisplay.ts           | 14 ++++----
 packages/web/src/buttons/CommandButton.svelte | 33 +++++++++++++++++++
 packages/web/src/datagrid/DataGridCore.svelte | 10 ++++--
 .../web/src/datagrid/SqlDataGridCore.svelte   |  1 +
 4 files changed, 49 insertions(+), 9 deletions(-)
 create mode 100644 packages/web/src/buttons/CommandButton.svelte

diff --git a/packages/datalib/src/GridDisplay.ts b/packages/datalib/src/GridDisplay.ts
index 4a554813d..992b34a4f 100644
--- a/packages/datalib/src/GridDisplay.ts
+++ b/packages/datalib/src/GridDisplay.ts
@@ -194,12 +194,14 @@ export abstract class GridDisplay {
         if (condition) {
           conditions.push(
             _.cloneDeepWith(condition, (expr: Expression) => {
-              if (expr.exprType == 'placeholder')
-                return {
-                  exprType: 'column',
-                  columnName: column.columnName,
-                  source: { alias: column.sourceAlias },
-                };
+              if (expr.exprType == 'placeholder') {
+                return this.createColumnExpression(column, { alias: column.sourceAlias });
+              }
+              // return {
+              //   exprType: 'column',
+              //   columnName: column.columnName,
+              //   source: { alias: column.sourceAlias },
+              // };
             })
           );
         }
diff --git a/packages/web/src/buttons/CommandButton.svelte b/packages/web/src/buttons/CommandButton.svelte
new file mode 100644
index 000000000..880e42020
--- /dev/null
+++ b/packages/web/src/buttons/CommandButton.svelte
@@ -0,0 +1,33 @@
+<script context="module">
+  function getCommandTitle(command) {
+    let res = command.text;
+    if (command.keyText || command.keyTextFromGroup) {
+      res += ` (${formatKeyText(command.keyText || command.keyTextFromGroup)})`;
+    }
+    return res;
+  }
+</script>
+
+<script lang="ts">
+  import { commandsCustomized } from '../stores';
+  import { formatKeyText } from '../utility/common';
+  import FormStyledButton from './FormStyledButton.svelte';
+
+  export let command;
+  export let component = FormStyledButton;
+  export let hideDisabled = false;
+
+  $: cmd = Object.values($commandsCustomized).find((x: any) => x.id == command) as any;
+</script>
+
+{#if cmd && (!hideDisabled || cmd.enabled)}
+  <svelte:component
+    this={component}
+    title={getCommandTitle(cmd)}
+    icon={cmd.icon}
+    on:click={cmd.onClick}
+    disabled={!cmd.enabled}
+    value={cmd.toolbarName || cmd.name}
+    {...$$restProps}
+  />
+{/if}
diff --git a/packages/web/src/datagrid/DataGridCore.svelte b/packages/web/src/datagrid/DataGridCore.svelte
index 3614b500b..a607a8e8b 100644
--- a/packages/web/src/datagrid/DataGridCore.svelte
+++ b/packages/web/src/datagrid/DataGridCore.svelte
@@ -344,7 +344,8 @@
   export let collapsedLeftColumnStore;
   export let multipleGridsOnTab = false;
   export let tabControlHiddenTab = false;
-  export let onCustomGridRefresh;
+  export let onCustomGridRefresh = null;
+  export let onOpenQuery = null;
   export let useEvalFilters = false;
   export let jslid;
   // export let generalAllowSave = false;
@@ -1488,8 +1489,11 @@
   <div>
     <ErrorInfo message={errorMessage} alignTop />
     <FormStyledButton value="Reset filter" on:click={() => display.clearFilters()} />
-      <FormStyledButton value="Reset view" on:click={() => display.resetConfig()} />
-      </div>
+    <FormStyledButton value="Reset view" on:click={() => display.resetConfig()} />
+    {#if onOpenQuery}
+      <FormStyledButton value="Open Query" on:click={onOpenQuery} />
+    {/if}
+  </div>
 {:else if isDynamicStructure && isLoadedAll && grider?.rowCount == 0}
   <div>
     <ErrorInfo
diff --git a/packages/web/src/datagrid/SqlDataGridCore.svelte b/packages/web/src/datagrid/SqlDataGridCore.svelte
index 1c4db47a7..95ed86a3c 100644
--- a/packages/web/src/datagrid/SqlDataGridCore.svelte
+++ b/packages/web/src/datagrid/SqlDataGridCore.svelte
@@ -224,4 +224,5 @@
   frameSelection={!!macroPreview}
   {grider}
   {display}
+  onOpenQuery={openQuery}
 />