The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Remove selected tags (#63714)
Alexander Polyankin61a8141a44ce
diff --git a/e2e/test/scenarios/admin/transforms.cy.spec.ts b/e2e/test/scenarios/admin/transforms.cy.spec.tsindex 0294b11a454..88404f1ce67 100644--- a/e2e/test/scenarios/admin/transforms.cy.spec.ts+++ b/e2e/test/scenarios/admin/transforms.cy.spec.ts@@ -522,10 +522,9 @@ H.describeWithSnowplowEE("scenarios > admin > transforms", () => {assertOptionSelected("hourly");assertOptionSelected("daily");- H.popover().findByText("hourly").click();- cy.wait("@updateTransform");- assertOptionNotSelected("hourly");- assertOptionSelected("daily");+ getTagsInput().type("{backspace}");+ assertOptionSelected("hourly");+ assertOptionNotSelected("daily");});it("should be able to create tags inline", () => {@@ -1553,10 +1552,9 @@ describe("scenarios > admin > transforms > jobs", () => {assertOptionSelected("hourly");assertOptionSelected("daily");- H.popover().findByText("hourly").click();- cy.wait("@updateJob");- assertOptionNotSelected("hourly");- assertOptionSelected("daily");+ getTagsInput().type("{backspace}");+ assertOptionSelected("hourly");+ assertOptionNotSelected("daily");});});diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/TagMultiSelect.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/TagMultiSelect.tsxindex 48a2dac3327..c3778ec78ab 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/TagMultiSelect.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/TagMultiSelect.tsx@@ -37,6 +37,7 @@ export function TagMultiSelect({ tagIds, onChange }: TagMultiSelectProps) {useCreateTransformTagMutation();const tagById = getTagById(tags);const [searchValue, setSearchValue] = useState("");+ const trimmedSearchValue = searchValue.trim();const [modalType, setModalType] = useState<TagModalType>();const [selectedTagId, setSelectedTagId] = useState<TransformTagId>();const { sendErrorToast } = useMetadataToasts();@@ -45,11 +46,12 @@ export function TagMultiSelect({ tagIds, onChange }: TagMultiSelectProps) {if (isCreating) {return;}- const { data: tag } = await createTag({ name: searchValue });+ const { data: tag } = await createTag({ name: trimmedSearchValue });if (!tag) {sendErrorToast(t`Failed to create a tag`);} else {onChange([...tagIds, tag.id], true);+ setSearchValue("");}};@@ -92,19 +94,22 @@ export function TagMultiSelect({ tagIds, onChange }: TagMultiSelectProps) {<><MultiSelectvalue={tagIds.map(getValue)}- data={getOptions(tags, searchValue)}+ data={getOptions(tags, trimmedSearchValue)}placeholder={t`Add tags`}searchValue={searchValue}- hidePickedOptions={false}searchablerightSection={isLoading || isCreating ? <Loader size="sm" /> : undefined}- nothingFoundMessage={t`No tags found.`}+ nothingFoundMessage={getNotFoundMessage(+ tags,+ tagIds,+ trimmedSearchValue,+ )}renderOption={(item) =>item.option.value === NEW_VALUE ? (<NewTagSelectItem- searchValue={searchValue}+ trimmedSearchValue={trimmedSearchValue}selected={item.checked}onCreate={handleCreate}/>@@ -140,12 +145,12 @@ export function TagMultiSelect({ tagIds, onChange }: TagMultiSelectProps) {}type NewTagSelectItemProps = SelectItemProps & {- searchValue: string;+ trimmedSearchValue: string;onCreate: () => void;};function NewTagSelectItem({- searchValue,+ trimmedSearchValue,selected,onCreate,}: NewTagSelectItemProps) {@@ -158,7 +163,7 @@ function NewTagSelectItem({return (<SelectItem selected={selected} mih="2.25rem" onClick={handleClick}><Text c="inherit" lh="inherit">- {jt`Create ${(<strong key="value">{searchValue}</strong>)}`}+ {jt`Create ${(<strong key="value">{trimmedSearchValue}</strong>)}`}</Text></SelectItem>);@@ -227,15 +232,18 @@ function getTagId(value: string): TransformTagId {return parseInt(value, 10);}-function getOptions(tags: TransformTag[], searchValue: string) {+function getOptions(tags: TransformTag[], trimmedSearchValue: string) {const options = tags.map((tag) => ({tag,value: getValue(tag.id),label: tag.name,}));- if (searchValue.length > 0 && tags.every((tag) => tag.name !== searchValue)) {- return [...options, { value: NEW_VALUE, label: searchValue }];+ if (+ trimmedSearchValue.length > 0 &&+ tags.every((tag) => tag.name !== trimmedSearchValue)+ ) {+ return [...options, { value: NEW_VALUE, label: trimmedSearchValue }];}return options;@@ -246,3 +254,20 @@ function getTagById(): Record<TransformTagId, TransformTag> {return Object.fromEntries(tags.map((tag) => [tag.id, tag]));}++function getNotFoundMessage(+ tags: TransformTag[],+ tagIds: TransformTagId[],+ trimmedSearchValue: string,+) {+ if (tags.length === 0) {+ return t`Start typing to create a tag`;+ }+ if (tags.some((tag) => tag.name === trimmedSearchValue)) {+ return t`A tag with that name already exists`;+ }+ if (tags.length === tagIds.length) {+ return t`All tags selected`;+ }+ return t`No tags found`;+}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/TagMultiSelect.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/TagMultiSelect.unit.spec.tsxnew file mode 100644index 00000000000..5d36bc41a28--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/TagMultiSelect.unit.spec.tsx@@ -0,0 +1,76 @@+import userEvent from "@testing-library/user-event";++import {+ setupCreateTransformTagEndpoint,+ setupListTransformTagsEndpoint,+} from "__support__/server-mocks";+import { renderWithProviders, screen, waitFor } from "__support__/ui";+import type { TransformTag, TransformTagId } from "metabase-types/api";+import { createMockTransformTag } from "metabase-types/api/mocks";++import { TagMultiSelect } from "./TagMultiSelect";++type SetupOpts = {+ tags?: TransformTag[];+ tagIds?: TransformTagId[];+ newTag?: TransformTag;+};++function setup({ tags = [], tagIds = [], newTag }: SetupOpts) {+ setupListTransformTagsEndpoint(tags);+ if (newTag != null) {+ setupCreateTransformTagEndpoint(newTag);+ }++ const onChange = jest.fn();+ renderWithProviders(<TagMultiSelect tagIds={tagIds} onChange={onChange} />);++ const input = screen.getByPlaceholderText("Add tags");+ return { input, onChange };+}++describe("TagMultiSelect", () => {+ it("should clear the input after creating a tag", async () => {+ const { input } = setup({+ tags: [],+ newTag: createMockTransformTag({ name: "foo" }),+ });+ await userEvent.type(input, "foo");+ await userEvent.click(screen.getByText(/Create/));+ await waitFor(() => expect(input).toHaveValue(""));+ });++ it("should show a message when there are no tags", async () => {+ const { input } = setup({ tags: [] });+ await userEvent.click(input);+ expect(+ await screen.findByText("Start typing to create a tag"),+ ).toBeInTheDocument();+ });++ it("should show a message when there all tags are selected", async () => {+ const tag = createMockTransformTag();+ const { input } = setup({ tags: [tag], tagIds: [tag.id] });+ await userEvent.click(input);+ expect(await screen.findByText("All tags selected")).toBeInTheDocument();+ });++ it("should show a message when there all tags are selected but the search text matches with the same of one of the tags", async () => {+ const tag = createMockTransformTag({ name: "foo" });+ const { input } = setup({ tags: [tag], tagIds: [tag.id] });+ await userEvent.type(input, tag.name);+ expect(+ await screen.findByText("A tag with that name already exists"),+ ).toBeInTheDocument();+ });++ it("should show a message when there not all tags are selected but the search text matches with the same of one of the tags", async () => {+ const tag1 = createMockTransformTag({ id: 1, name: "foo" });+ const tag2 = createMockTransformTag({ id: 2, name: "bar" });+ const { input } = setup({ tags: [tag1, tag2], tagIds: [tag1.id] });+ await userEvent.type(input, tag1.name);+ expect(+ await screen.findByText("A tag with that name already exists"),+ ).toBeInTheDocument();+ });+});diff --git a/frontend/test/__support__/server-mocks/transform.ts b/frontend/test/__support__/server-mocks/transform.tsindex 19365edf159..896878395d6 100644--- a/frontend/test/__support__/server-mocks/transform.ts+++ b/frontend/test/__support__/server-mocks/transform.ts@@ -11,6 +11,10 @@ export function setupListTransformTagsEndpoint(tags: TransformTag[]) {fetchMock.get(`path:/api/ee/transform-tag`, tags);}+export function setupCreateTransformTagEndpoint(tag: TransformTag) {+ fetchMock.post(`path:/api/ee/transform-tag`, tag);+}+export function setupListTransformJobsEndpoint(jobs: TransformJob[]) {fetchMock.get(`path:/api/ee/transform-job`, jobs);}