From 2f0a40e9bb8c8e8893517d6dfcca1433ff088173 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Tue, 24 Oct 2023 15:18:46 +0100 Subject: [PATCH] Introduce modal to show warning to users, and toast to show success. --- .../backend/DataTable/TableDataTable.svelte | 6 +++ .../components/grid/cells/HeaderCell.svelte | 42 +++++++++---------- .../grid/controls/MigrationModal.svelte | 42 +++++++++++++++++++ 3 files changed, 69 insertions(+), 21 deletions(-) create mode 100644 packages/frontend-core/src/components/grid/controls/MigrationModal.svelte diff --git a/packages/builder/src/components/backend/DataTable/TableDataTable.svelte b/packages/builder/src/components/backend/DataTable/TableDataTable.svelte index 5fee849afb..22deacbe03 100644 --- a/packages/builder/src/components/backend/DataTable/TableDataTable.svelte +++ b/packages/builder/src/components/backend/DataTable/TableDataTable.svelte @@ -53,6 +53,11 @@ await datasources.fetch() } } + + const refreshDefinitions = async () => { + await tables.fetch() + await datasources.fetch() + }
@@ -66,6 +71,7 @@ schemaOverrides={isUsersTable ? userSchemaOverrides : null} showAvatars={false} on:updatedatasource={handleGridTableUpdate} + on:refreshdefinitions={refreshDefinitions} > {#if isUsersTable && $store.features.disableUserMetadata} diff --git a/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte b/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte index 01c759a15c..9b05f9ef79 100644 --- a/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte @@ -1,9 +1,17 @@ + + + +
Hide column - {#if column.schema.type === "link" && column.schema.tableId === "ta_users"} - + {#if $config.canEditColumns && column.schema.type === "link" && column.schema.tableId === "ta_users"} + Migrate to user column {/if} diff --git a/packages/frontend-core/src/components/grid/controls/MigrationModal.svelte b/packages/frontend-core/src/components/grid/controls/MigrationModal.svelte new file mode 100644 index 0000000000..b262f93797 --- /dev/null +++ b/packages/frontend-core/src/components/grid/controls/MigrationModal.svelte @@ -0,0 +1,42 @@ + + + + TODO: copy here +