This is an automated email from the ASF dual-hosted git repository. jli pushed a commit to branch 4.1 in repository https://gitbox.apache.org/repos/asf/superset.git
commit bfa868ac089775a98f4c1139dfff16f6845c0450 Author: alexandrusoare <[email protected]> AuthorDate: Mon Dec 9 18:06:32 2024 +0200 fix(AllEntitiesTable): show Tags (#31301) (cherry picked from commit 0133bab0387e13f36b8c3e3beba6ea7481a101c7) --- .../features/allEntities/AllEntitiesTable.test.tsx | 131 +++++++++++++++++++++ .../src/features/allEntities/AllEntitiesTable.tsx | 6 +- 2 files changed, 136 insertions(+), 1 deletion(-) diff --git a/superset-frontend/src/features/allEntities/AllEntitiesTable.test.tsx b/superset-frontend/src/features/allEntities/AllEntitiesTable.test.tsx new file mode 100644 index 0000000000..9ddd30a745 --- /dev/null +++ b/superset-frontend/src/features/allEntities/AllEntitiesTable.test.tsx @@ -0,0 +1,131 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { render } from 'spec/helpers/testing-library'; +import { screen } from '@testing-library/react'; +import * as useQueryParamsModule from 'use-query-params'; +import AllEntitiesTable from './AllEntitiesTable'; + +describe('AllEntitiesTable', () => { + const mockSetShowTagModal = jest.fn(); + + const mockObjects = { + dashboard: [], + chart: [], + query: [], + }; + + const mockObjectsWithTags = { + dashboard: [ + { + id: 1, + type: 'dashboard', + name: 'Sales Dashboard', + url: '/dashboard/1', + changed_on: '2023-11-20T12:34:56Z', + created_by: 1, + creator: 'John Doe', + owners: [{ id: 1, first_name: 'John', last_name: 'Doe' }], + tags: [ + { id: 101, name: 'Sales', type: 'TagType.custom' }, + { id: 42, name: 'Current Tag', type: 'TagType.custom' }, + ], + }, + ], + chart: [ + { + id: 2, + type: 'chart', + name: 'Monthly Revenue', + url: '/chart/2', + changed_on: '2023-11-19T12:00:00Z', + created_by: 2, + creator: 'Jane Smith', + owners: [{ id: 2, first_name: 'Jane', last_name: 'Smith' }], + tags: [ + { id: 102, name: 'Revenue', type: 'TagType.custom' }, + { id: 42, name: 'Current Tag', type: 'TagType.custom' }, + ], + }, + ], + query: [ + { + id: 3, + type: 'query', + name: 'User Engagement', + url: '/query/3', + changed_on: '2023-11-18T09:30:00Z', + created_by: 3, + creator: 'Alice Brown', + owners: [{ id: 3, first_name: 'Alice', last_name: 'Brown' }], + tags: [ + { id: 103, name: 'Engagement', type: 'TagType.custom' }, + { id: 42, name: 'Current Tag', type: 'TagType.custom' }, + ], + }, + ], + }; + + beforeEach(() => { + jest + .spyOn(useQueryParamsModule, 'useQueryParam') + .mockReturnValue([42, jest.fn()]); + }); + + afterEach(() => { + jest.restoreAllMocks(); + }); + + it('renders when empty', () => { + render( + <AllEntitiesTable + search="" + setShowTagModal={mockSetShowTagModal} + objects={mockObjects} + />, + ); + + expect( + screen.getByText('No entities have this tag currently assigned'), + ).toBeInTheDocument(); + + expect(screen.getByText('Add tag to entities')).toBeInTheDocument(); + }); + + it('renders the correct tags for each object type, excluding the current tag', () => { + render( + <AllEntitiesTable + search="" + setShowTagModal={mockSetShowTagModal} + objects={mockObjectsWithTags} + />, + ); + + expect(screen.getByText('Sales Dashboard')).toBeInTheDocument(); + expect(screen.getByText('Sales')).toBeInTheDocument(); + + expect(screen.getByText('Monthly Revenue')).toBeInTheDocument(); + expect(screen.getByText('Revenue')).toBeInTheDocument(); + + expect(screen.getByText('User Engagement')).toBeInTheDocument(); + expect(screen.getByText('Engagement')).toBeInTheDocument(); + + expect(screen.queryByText('Current Tag')).not.toBeInTheDocument(); + }); +}); diff --git a/superset-frontend/src/features/allEntities/AllEntitiesTable.tsx b/superset-frontend/src/features/allEntities/AllEntitiesTable.tsx index ad5e307bf2..be68047def 100644 --- a/superset-frontend/src/features/allEntities/AllEntitiesTable.tsx +++ b/superset-frontend/src/features/allEntities/AllEntitiesTable.tsx @@ -24,6 +24,7 @@ import FacePile from 'src/components/FacePile'; import Tag from 'src/types/TagType'; import Owner from 'src/types/Owner'; import { EmptyStateBig } from 'src/components/EmptyState'; +import { NumberParam, useQueryParam } from 'use-query-params'; const MAX_TAGS_TO_SHOW = 3; const PAGE_SIZE = 10; @@ -79,6 +80,7 @@ export default function AllEntitiesTable({ }: AllEntitiesTableProps) { type objectType = 'dashboard' | 'chart' | 'query'; + const [tagId] = useQueryParam('id', NumberParam); const showListViewObjs = objects.dashboard.length > 0 || objects.chart.length > 0 || @@ -119,7 +121,9 @@ export default function AllEntitiesTable({ <TagsList tags={tags.filter( (tag: Tag) => - tag.type === 'TagTypes.custom' || tag.type === 1, + tag.type !== undefined && + ['TagType.custom', 1].includes(tag.type) && + tag.id !== tagId, )} maxTags={MAX_TAGS_TO_SHOW} />
