From 3a002b3c3db078679a482305bae7a669e906c7bb Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 4 Mar 2024 09:46:10 +0000 Subject: [PATCH] Rename autorefresh setting and ensure functional in all blocks + DP --- packages/client/manifest.json | 66 +++++++++---------- .../src/components/app/DataProvider.svelte | 10 +-- .../components/app/blocks/CardsBlock.svelte | 4 +- .../components/app/blocks/ChartBlock.svelte | 4 +- .../app/blocks/RepeaterBlock.svelte | 4 +- .../components/app/blocks/RowExplorer.svelte | 4 +- .../components/app/blocks/TableBlock.svelte | 4 +- 7 files changed, 48 insertions(+), 48 deletions(-) diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 1b24136019..d8cfe1d489 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -4574,7 +4574,7 @@ { "type": "select", "label": "Auto-refresh", - "key": "refresh", + "key": "autoRefresh", "placeholder": "Never", "options": [ { @@ -4968,7 +4968,7 @@ { "type": "select", "label": "Auto-refresh", - "key": "refresh", + "key": "autoRefresh", "placeholder": "Never", "options": [ { @@ -5463,7 +5463,7 @@ { "type": "select", "label": "Auto-refresh", - "key": "refresh", + "key": "autoRefresh", "placeholder": "Never", "options": [ { @@ -5777,7 +5777,7 @@ { "type": "select", "label": "Auto-refresh", - "key": "refresh", + "key": "autoRefresh", "placeholder": "Never", "options": [ { @@ -5982,7 +5982,7 @@ { "type": "select", "label": "Auto-refresh", - "key": "refresh", + "key": "autoRefresh", "placeholder": "Never", "options": [ { @@ -6603,6 +6603,34 @@ "key": "dataSource", "required": true }, + { + "type": "select", + "label": "Auto-refresh", + "key": "autoRefresh", + "placeholder": "Never", + "options": [ + { + "label": "10 seconds", + "value": 10 + }, + { + "label": "30 seconds", + "value": 30 + }, + { + "label": "1 minute", + "value": 60 + }, + { + "label": "5 minutes", + "value": 300 + }, + { + "label": "10 minutes", + "value": 600 + } + ] + }, { "type": "text", "label": "Height", @@ -6711,34 +6739,6 @@ "key": "table", "required": true }, - { - "type": "select", - "label": "Auto-refresh", - "key": "refresh", - "placeholder": "Never", - "options": [ - { - "label": "10 seconds", - "value": 10 - }, - { - "label": "30 seconds", - "value": 30 - }, - { - "label": "1 minute", - "value": 60 - }, - { - "label": "5 minutes", - "value": 300 - }, - { - "label": "10 minutes", - "value": 600 - } - ] - }, { "type": "filter", "label": "Filtering", diff --git a/packages/client/src/components/app/DataProvider.svelte b/packages/client/src/components/app/DataProvider.svelte index c841c07ac4..8f3c31c130 100644 --- a/packages/client/src/components/app/DataProvider.svelte +++ b/packages/client/src/components/app/DataProvider.svelte @@ -9,7 +9,7 @@ export let sortOrder export let limit export let paginate - export let refresh + export let autoRefresh const { styleable, Provider, ActionTypes, API } = getContext("sdk") const component = getContext("component") @@ -30,7 +30,7 @@ paginate, }) $: schema = sanitizeSchema($fetch.schema) - $: setUpAutoRefresh(refresh) + $: setUpAutoRefresh(autoRefresh) $: actions = [ { type: ActionTypes.RefreshDatasource, @@ -137,10 +137,10 @@ return extendedQuery } - const setUpAutoRefresh = refresh => { + const setUpAutoRefresh = autoRefresh => { clearInterval(interval) - if (refresh) { - interval = setInterval(fetch.refresh, Math.max(10000, refresh * 1000)) + if (autoRefresh) { + interval = setInterval(fetch.refresh, Math.max(10000, autoRefresh * 1000)) } } diff --git a/packages/client/src/components/app/blocks/CardsBlock.svelte b/packages/client/src/components/app/blocks/CardsBlock.svelte index baa31901ea..2457896ca2 100644 --- a/packages/client/src/components/app/blocks/CardsBlock.svelte +++ b/packages/client/src/components/app/blocks/CardsBlock.svelte @@ -30,7 +30,7 @@ export let cardButtonOnClick export let linkColumn export let noRowsMessage - export let repeat + export let autoRefresh const { fetchDatasourceSchema } = getContext("sdk") @@ -172,7 +172,7 @@ sortOrder, paginate, limit, - repeat, + autoRefresh, }} order={1} > diff --git a/packages/client/src/components/app/blocks/ChartBlock.svelte b/packages/client/src/components/app/blocks/ChartBlock.svelte index 416c843e98..2767c44b8e 100644 --- a/packages/client/src/components/app/blocks/ChartBlock.svelte +++ b/packages/client/src/components/app/blocks/ChartBlock.svelte @@ -8,7 +8,7 @@ export let sortColumn export let sortOrder export let limit - export let repeat + export let autoRefresh // Block export let chartTitle @@ -66,7 +66,7 @@ sortColumn, sortOrder, limit, - repeat, + autoRefresh, }} > {#if dataProviderId && chartType} diff --git a/packages/client/src/components/app/blocks/RepeaterBlock.svelte b/packages/client/src/components/app/blocks/RepeaterBlock.svelte index ffd34596ed..d0bc04e2fd 100644 --- a/packages/client/src/components/app/blocks/RepeaterBlock.svelte +++ b/packages/client/src/components/app/blocks/RepeaterBlock.svelte @@ -16,7 +16,7 @@ export let hAlign export let vAlign export let gap - export let repeat + export let autoRefresh const component = getContext("component") @@ -35,7 +35,7 @@ sortOrder, limit, paginate, - repeat, + autoRefresh, }} > {#if $component.empty} diff --git a/packages/client/src/components/app/blocks/RowExplorer.svelte b/packages/client/src/components/app/blocks/RowExplorer.svelte index 72fdf810db..292f3c4a76 100644 --- a/packages/client/src/components/app/blocks/RowExplorer.svelte +++ b/packages/client/src/components/app/blocks/RowExplorer.svelte @@ -14,7 +14,7 @@ export let detailFields export let detailTitle export let noRowsMessage - export let repeat + export let autoRefresh const stateKey = generate() @@ -54,7 +54,7 @@ noValue: false, }, ], - repeat, + autoRefresh, }} styles={{ custom: ` diff --git a/packages/client/src/components/app/blocks/TableBlock.svelte b/packages/client/src/components/app/blocks/TableBlock.svelte index 2a149c2013..6b1f34920a 100644 --- a/packages/client/src/components/app/blocks/TableBlock.svelte +++ b/packages/client/src/components/app/blocks/TableBlock.svelte @@ -32,7 +32,7 @@ export let sidePanelSaveLabel export let sidePanelDeleteLabel export let notificationOverride - export let repeat + export let autoRefresh const { fetchDatasourceSchema, API } = getContext("sdk") const component = getContext("component") @@ -231,7 +231,7 @@ sortOrder, paginate, limit: rowCount, - repeat, + autoRefresh, }} context="provider" order={1}