This is an automated email from the ASF dual-hosted git repository. suddjian pushed a commit to branch filter-dataset-terminology in repository https://gitbox.apache.org/repos/asf/superset.git
commit 70106b7d642cdee85614dce0be27136e8fb1173e Author: David Aaron Suddjian <[email protected]> AuthorDate: Fri Apr 2 11:24:24 2021 -0700 chore(dashboard): Datasource -> Dataset ### SUMMARY <!--- Describe the change below, including rationale and design decisions --> Just transitioning from deprecated terminology ### BEFORE/AFTER SCREENSHOTS OR ANIMATED GIF <!--- Skip this if not applicable --> ### TEST PLAN <!--- What steps should be taken to verify the changes --> ### ADDITIONAL INFORMATION <!--- Check any relevant boxes with "x" --> <!--- HINT: Include "Fixes #nnn" if you are fixing an existing issue --> - [ ] Has associated issue: - [ ] Changes UI - [ ] Includes DB Migration (follow approval process in [SIP-59](https://github.com/apache/superset/issues/13351)) - [ ] Migration is atomic, supports rollback & is backwards-compatible - [ ] Confirm DB migration upgrade and downgrade tested - [ ] Runtime estimates and downtime expectations provided - [ ] Introduces new feature or API - [ ] Removes existing feature or API --- .../FiltersConfigForm/FiltersConfigForm.tsx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 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 97c99f9..cf49a3a 100644 --- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx +++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx @@ -104,17 +104,17 @@ export const FiltersConfigForm: React.FC<FiltersConfigFormProps> = ({ .map(([key]) => key); // @ts-ignore - const hasDatasource = !!nativeFilterItems[formFilter?.filterType]?.value + const hasDataset = !!nativeFilterItems[formFilter?.filterType]?.value ?.datasourceCount; const hasColumn = - hasDatasource && + hasDataset && !FILTERS_WITH_ONLY_DATASOURCE.includes(formFilter?.filterType); const hasFilledDatasource = - !hasDatasource || + !hasDataset || (formFilter?.dataset?.value && (formFilter?.column || !hasColumn)); - useBackendFormUpdate(form, filterId, filterToEdit, hasDatasource, hasColumn); + useBackendFormUpdate(form, filterId, filterToEdit, hasDataset, hasColumn); const initDatasetId = filterToEdit?.targets[0]?.datasetId; const initColumn = filterToEdit?.targets[0]?.column?.name; @@ -180,14 +180,14 @@ export const FiltersConfigForm: React.FC<FiltersConfigFormProps> = ({ /> </StyledFormItem> </StyledContainer> - {hasDatasource && ( + {hasDataset && ( <> <StyledFormItem name={['filters', filterId, 'dataset']} initialValue={{ value: initDatasetId }} - label={<StyledLabel>{t('Datasource')}</StyledLabel>} + label={<StyledLabel>{t('Dataset')}</StyledLabel>} rules={[ - { required: !removed, message: t('Datasource is required') }, + { required: !removed, message: t('Dataset is required') }, ]} data-test="datasource-input" > @@ -262,7 +262,7 @@ export const FiltersConfigForm: React.FC<FiltersConfigFormProps> = ({ data-test="default-input" label={<StyledLabel>{t('Default Value')}</StyledLabel>} > - {(hasFilledDatasource || !hasDatasource) && ( + {(hasFilledDatasource || !hasDataset) && ( <DefaultValue setDataMask={({ nativeFilters }) => { setNativeFilterFieldValues(form, filterId, { @@ -271,7 +271,7 @@ export const FiltersConfigForm: React.FC<FiltersConfigFormProps> = ({ forceUpdate(); }} filterId={filterId} - hasDatasource={hasDatasource} + hasDatasource={hasDataset} form={form} formData={newFormData} />
