You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by mi...@apache.org on 2023/03/23 11:25:20 UTC
[superset] branch master updated: feat: Allows reload on default filter value error (#23459)
This is an automated email from the ASF dual-hosted git repository.
michaelsmolina pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git
The following commit(s) were added to refs/heads/master by this push:
new b0773145d6 feat: Allows reload on default filter value error (#23459)
b0773145d6 is described below
commit b0773145d649167b9ecee9c128086097d2a45d25
Author: Michael S. Molina <70...@users.noreply.github.com>
AuthorDate: Thu Mar 23 08:24:54 2023 -0300
feat: Allows reload on default filter value error (#23459)
---
.../FiltersConfigForm/FiltersConfigForm.tsx | 66 +++++++++++-----------
1 file changed, 34 insertions(+), 32 deletions(-)
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx
index 4f1fef8716..eb182d93e4 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx
@@ -1214,39 +1214,41 @@ const FiltersConfigForm = (
},
]}
>
- {error ? (
- <BasicErrorAlert
- title={t('Cannot load filter')}
- body={error}
- level="error"
- />
- ) : showDefaultValue ? (
+ {error || showDefaultValue ? (
<DefaultValueContainer>
- <DefaultValue
- setDataMask={dataMask => {
- if (
- !isEqual(
- initialDefaultValue?.filterState?.value,
- dataMask?.filterState?.value,
- )
- ) {
- formChanged();
- }
- setNativeFilterFieldValues(form, filterId, {
- defaultDataMask: dataMask,
- });
- form.validateFields([
- ['filters', filterId, 'defaultDataMask'],
- ]);
- forceUpdate();
- }}
- hasDefaultValue={hasDefaultValue}
- filterId={filterId}
- hasDataset={hasDataset}
- form={form}
- formData={newFormData}
- enableNoResults={enableNoResults}
- />
+ {error ? (
+ <BasicErrorAlert
+ title={t('Cannot load filter')}
+ body={error}
+ level="error"
+ />
+ ) : (
+ <DefaultValue
+ setDataMask={dataMask => {
+ if (
+ !isEqual(
+ initialDefaultValue?.filterState?.value,
+ dataMask?.filterState?.value,
+ )
+ ) {
+ formChanged();
+ }
+ setNativeFilterFieldValues(form, filterId, {
+ defaultDataMask: dataMask,
+ });
+ form.validateFields([
+ ['filters', filterId, 'defaultDataMask'],
+ ]);
+ forceUpdate();
+ }}
+ hasDefaultValue={hasDefaultValue}
+ filterId={filterId}
+ hasDataset={hasDataset}
+ form={form}
+ formData={newFormData}
+ enableNoResults={enableNoResults}
+ />
+ )}
{hasDataset && datasetId && (
<Tooltip title={t('Refresh the default values')}>
<RefreshIcon onClick={() => refreshHandler(true)} />