From 681cd2a96794e9140a11bcd447fad6ff73f532fb Mon Sep 17 00:00:00 2001 From: "Michael S. Molina" Date: Thu, 25 Feb 2021 10:44:22 -0300 Subject: [PATCH] chore: Moves OnPasteSelect tests to component's folder --- .../components/Select/OnPasteSelect.test.jsx} | 0 .../src/components/Select/Select.stories.tsx | 18 +++++++++++++++++- .../{SupersetStyledSelect.tsx => Select.tsx} | 0 .../src/components/Select/index.ts | 4 ++-- .../src/components/Select/styles.tsx | 2 +- .../FiltersConfigForm/FiltersConfigForm.tsx | 2 +- .../src/explore/components/SaveModal.tsx | 2 +- 7 files changed, 22 insertions(+), 6 deletions(-) rename superset-frontend/{spec/javascripts/components/OnPasteSelect_spec.jsx => src/components/Select/OnPasteSelect.test.jsx} (100%) rename superset-frontend/src/components/Select/{SupersetStyledSelect.tsx => Select.tsx} (100%) diff --git a/superset-frontend/spec/javascripts/components/OnPasteSelect_spec.jsx b/superset-frontend/src/components/Select/OnPasteSelect.test.jsx similarity index 100% rename from superset-frontend/spec/javascripts/components/OnPasteSelect_spec.jsx rename to superset-frontend/src/components/Select/OnPasteSelect.test.jsx diff --git a/superset-frontend/src/components/Select/Select.stories.tsx b/superset-frontend/src/components/Select/Select.stories.tsx index 72cffddd75f18..125f667786493 100644 --- a/superset-frontend/src/components/Select/Select.stories.tsx +++ b/superset-frontend/src/components/Select/Select.stories.tsx @@ -28,7 +28,7 @@ const OPTIONS = [ ]; export default { - title: 'Select component', + title: 'Select', argTypes: { options: { type: 'select', @@ -92,6 +92,14 @@ SelectGallery.args = { options: OPTIONS, }; +SelectGallery.story = { + parameters: { + knobs: { + disabled: true, + }, + }, +}; + // eslint-disable-next-line @typescript-eslint/no-unused-vars export const InteractiveSelect = (args: any) => { const [{ value, multi, clearable, placeholder }, updateArgs] = useArgs(); @@ -125,3 +133,11 @@ InteractiveSelect.args = { clearable: false, placeholder: "I'm interactive", }; + +InteractiveSelect.story = { + parameters: { + knobs: { + disabled: true, + }, + }, +}; diff --git a/superset-frontend/src/components/Select/SupersetStyledSelect.tsx b/superset-frontend/src/components/Select/Select.tsx similarity index 100% rename from superset-frontend/src/components/Select/SupersetStyledSelect.tsx rename to superset-frontend/src/components/Select/Select.tsx diff --git a/superset-frontend/src/components/Select/index.ts b/superset-frontend/src/components/Select/index.ts index 18e74ef2ea717..14f41fd7419e8 100644 --- a/superset-frontend/src/components/Select/index.ts +++ b/superset-frontend/src/components/Select/index.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -export * from './SupersetStyledSelect'; +export * from './Select'; export * from './styles'; -export { default } from './SupersetStyledSelect'; +export { default } from './Select'; export { default as OnPasteSelect } from './OnPasteSelect'; diff --git a/superset-frontend/src/components/Select/styles.tsx b/superset-frontend/src/components/Select/styles.tsx index ffbb102c58d9c..b0f22b9841a7b 100644 --- a/superset-frontend/src/components/Select/styles.tsx +++ b/superset-frontend/src/components/Select/styles.tsx @@ -30,7 +30,7 @@ import { Props as SelectProps } from 'react-select/src/Select'; import { colors as reactSelectColors } from 'react-select/src/theme'; import { DeepNonNullable } from 'react-select/src/components'; import { OptionType } from 'antd/lib/select'; -import { SupersetStyledSelectProps } from './SupersetStyledSelect'; +import { SupersetStyledSelectProps } from './Select'; export const DEFAULT_CLASS_NAME = 'Select'; export const DEFAULT_CLASS_NAME_PREFIX = 'Select'; 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 b97785a5950ee..c663c4d9448ce 100644 --- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx +++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx @@ -25,7 +25,7 @@ import { import { FormInstance } from 'antd/lib/form'; import React, { useCallback } from 'react'; import { Checkbox, Form, Input, Typography } from 'src/common/components'; -import { Select } from 'src/components/Select/SupersetStyledSelect'; +import { Select } from 'src/components/Select'; import SupersetResourceSelect from 'src/components/SupersetResourceSelect'; import { addDangerToast } from 'src/messageToasts/actions'; import { ClientErrorObject } from 'src/utils/getClientErrorObject'; diff --git a/superset-frontend/src/explore/components/SaveModal.tsx b/superset-frontend/src/explore/components/SaveModal.tsx index bc19942409c7a..fc848530f78ee 100644 --- a/superset-frontend/src/explore/components/SaveModal.tsx +++ b/superset-frontend/src/explore/components/SaveModal.tsx @@ -26,7 +26,7 @@ import { Radio } from 'src/common/components/Radio'; import Modal from 'src/common/components/Modal'; import Button from 'src/components/Button'; import FormLabel from 'src/components/FormLabel'; -import { CreatableSelect } from 'src/components/Select/SupersetStyledSelect'; +import { CreatableSelect } from 'src/components/Select'; import { connect } from 'react-redux'; // Session storage key for recent dashboard