+
{selectedItems && selectedItems.size > 1 && (
-
- {selectedItems.size} {t('label.selected-lowercase')}
+
+ {selectedItems.size} {t('label.items-selected-lowercase')}
)}
-
+
),
placement: 'bottom',
@@ -880,12 +814,12 @@ const AssetsTabs = forwardRef(
index: isEmpty(activeFilter) ? [SearchIndex.ALL] : activeFilter,
page: currentPage,
});
- }, [activeFilter, currentPage, pageSize, searchValue]);
+ }, [activeFilter, currentPage, pageSize, searchValue, quickFilterQuery]);
useEffect(() => {
- const dropdownItems = getAssetsPageQuickFilters();
+ const dropdownItems = getAssetsPageQuickFilters(type);
- setSelectedQuickFilters(
+ setFilters(
dropdownItems.map((item) => ({
...item,
value: getSelectedValuesFromQuickFilter(
@@ -897,6 +831,32 @@ const AssetsTabs = forwardRef(
);
}, [type]);
+ useEffect(() => {
+ const updatedQuickFilters = filters
+ .filter((filter) => selectedFilter.includes(filter.key))
+ .map((selectedFilterItem) => {
+ const originalFilterItem = selectedQuickFilters?.find(
+ (filter) => filter.key === selectedFilterItem.key
+ );
+
+ return originalFilterItem || selectedFilterItem;
+ });
+
+ const newItems = updatedQuickFilters.filter(
+ (item) =>
+ !selectedQuickFilters.some(
+ (existingItem) => item.key === existingItem.key
+ )
+ );
+
+ if (newItems.length > 0) {
+ setSelectedQuickFilters((prevSelected) => [
+ ...prevSelected,
+ ...newItems,
+ ]);
+ }
+ }, [selectedFilter, selectedQuickFilters, filters]);
+
useImperativeHandle(ref, () => ({
refreshAssets() {
fetchAssets({
@@ -926,28 +886,48 @@ const AssetsTabs = forwardRef(
-
-
-
-
-
-
-
-
+ {assetCount > 0 && (
+
+
+
+
+ } size="small" type="primary" />
+
+
+
+
+
+
+ {quickFilterQuery && (
+
+ {t('label.clear-entity', {
+ entity: '',
+ })}
+
+ )}
+
+
+
+ )}
{isLoading || isCountLoading ? (
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/GlossaryOverviewTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/GlossaryOverviewTab.component.tsx
index 30a0336e952..0c37cda95ec 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/GlossaryOverviewTab.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/GlossaryOverviewTab.component.tsx
@@ -28,6 +28,7 @@ import { OperationPermission } from '../../../PermissionProvider/PermissionProvi
import TagsContainerV2 from '../../../Tag/TagsContainerV2/TagsContainerV2';
import { DisplayType } from '../../../Tag/TagsViewer/TagsViewer.interface';
import GlossaryDetailsRightPanel from '../../GlossaryDetailsRightPanel/GlossaryDetailsRightPanel.component';
+import { GlossaryUpdateConfirmationModal } from '../../GlossaryUpdateConfirmationModal/GlossaryUpdateConfirmationModal';
import GlossaryTermReferences from './GlossaryTermReferences';
import GlossaryTermSynonyms from './GlossaryTermSynonyms';
import RelatedTerms from './RelatedTerms';
@@ -51,6 +52,7 @@ const GlossaryOverviewTab = ({
}: Props) => {
const [isDescriptionEditable, setIsDescriptionEditable] =
useState(false);
+ const [tagsUpdatating, setTagsUpdating] = useState();
const onDescriptionUpdate = async (updatedHTML: string) => {
if (selectedData.description !== updatedHTML) {
@@ -82,14 +84,7 @@ const GlossaryOverviewTab = ({
}, [selectedData, isVersionView]);
const handleTagsUpdate = async (updatedTags: TagLabel[]) => {
- if (updatedTags) {
- const updatedData = {
- ...selectedData,
- tags: updatedTags,
- };
-
- onUpdate(updatedData);
- }
+ setTagsUpdating(updatedTags);
};
const tags = useMemo(
@@ -103,6 +98,17 @@ const GlossaryOverviewTab = ({
[isVersionView, selectedData]
);
+ const handleGlossaryTagUpdateValidationConfirm = async () => {
+ if (selectedData) {
+ await onUpdate({
+ ...selectedData,
+ tags: tagsUpdatating,
+ });
+
+ setTagsUpdating(undefined);
+ }
+ };
+
return (
+ {tagsUpdatating && (
+ setTagsUpdating(undefined)}
+ onValidationSuccess={handleGlossaryTagUpdateValidationConfirm}
+ />
+ )}
);
};
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/assets-tabs.less b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/assets-tabs.less
index 489d473ffbf..e7655be5ed1 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/assets-tabs.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/assets-tabs.less
@@ -79,3 +79,22 @@
}
}
}
+
+.asset-tab-delete-notification {
+ background-color: @text-color !important;
+ box-shadow: none !important;
+ .ant-notification-notice-icon {
+ display: none;
+ }
+ .ant-notification-notice-close {
+ color: @white !important;
+ left: 24px;
+ top: 22px;
+ width: 20px;
+ }
+ .ant-notification-notice-message {
+ padding-right: 0 !important;
+ margin-left: 20px !important;
+ font-size: 14px !important;
+ }
+}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryUpdateConfirmationModal/GlossaryUpdateConfirmationModal.interface.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryUpdateConfirmationModal/GlossaryUpdateConfirmationModal.interface.tsx
new file mode 100644
index 00000000000..ef578c85b53
--- /dev/null
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryUpdateConfirmationModal/GlossaryUpdateConfirmationModal.interface.tsx
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2023 Collate.
+ * Licensed 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 { GlossaryTerm } from '../../../generated/entity/data/glossaryTerm';
+import { TagLabel } from '../../../generated/entity/data/table';
+
+export interface GlossaryUpdateConfirmationModalProps {
+ glossaryTerm: GlossaryTerm;
+ onValidationSuccess: (() => void) | (() => Promise);
+ onCancel: () => void;
+ updatedTags: TagLabel[];
+}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryUpdateConfirmationModal/GlossaryUpdateConfirmationModal.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryUpdateConfirmationModal/GlossaryUpdateConfirmationModal.test.tsx
new file mode 100644
index 00000000000..1cd935adfa3
--- /dev/null
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryUpdateConfirmationModal/GlossaryUpdateConfirmationModal.test.tsx
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2023 Collate.
+ * Licensed 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 { act, fireEvent, render } from '@testing-library/react';
+import React from 'react';
+import { GlossaryTerm } from '../../../generated/entity/data/glossaryTerm';
+import { GlossaryUpdateConfirmationModal } from './GlossaryUpdateConfirmationModal';
+
+const mockOnCancel = jest.fn();
+const mockOnValidationSuccess = jest.fn();
+const mockValidateTagAddtionToGlossary = jest.fn().mockResolvedValue({});
+
+jest.mock('../../../rest/glossaryAPI', () => ({
+ validateTagAddtionToGlossary: mockValidateTagAddtionToGlossary,
+}));
+
+jest.mock('../../../utils/EntityUtils', () => ({
+ getEntityLinkFromType: jest.fn(),
+ getEntityName: jest.fn(),
+}));
+
+jest.mock('../../common/Table/Table', () => {
+ return jest.fn();
+});
+
+describe('GlossaryUpdateConfirmationModal component', () => {
+ it('should render confirmation screen', async () => {
+ const { findByText } = render(
+
+ );
+
+ expect(await findByText('label.no-comma-cancel')).toBeInTheDocument();
+ expect(await findByText('label.yes-comma-confirm')).toBeInTheDocument();
+ expect(
+ await findByText('message.tag-update-confirmation')
+ ).toBeInTheDocument();
+ expect(
+ await findByText('message.glossary-tag-update-description')
+ ).toBeInTheDocument();
+ });
+
+ it('should call onCancel on clicking on no, cancel button', async () => {
+ const { findByText } = render(
+
+ );
+
+ fireEvent.click(await findByText('label.no-comma-cancel'));
+
+ expect(mockOnCancel).toHaveBeenCalled();
+ });
+
+ it.skip('should call validation api on clicking on yes, confirm button', async () => {
+ const { findByText } = render(
+
+ );
+
+ await act(async () => {
+ fireEvent.click(await findByText('label.yes-comma-confirm'));
+ });
+
+ expect(mockValidateTagAddtionToGlossary).toHaveBeenCalledWith(
+ { tags: [] },
+ true
+ );
+ });
+});
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryUpdateConfirmationModal/GlossaryUpdateConfirmationModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryUpdateConfirmationModal/GlossaryUpdateConfirmationModal.tsx
new file mode 100644
index 00000000000..e9e9c9e1cb9
--- /dev/null
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryUpdateConfirmationModal/GlossaryUpdateConfirmationModal.tsx
@@ -0,0 +1,176 @@
+/*
+ * Copyright 2023 Collate.
+ * Licensed 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 Icon from '@ant-design/icons';
+import { Button, Modal, Space, Typography } from 'antd';
+import { isEmpty } from 'lodash';
+import React, { useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Link } from 'react-router-dom';
+import { ReactComponent as ExclamationIcon } from '../../../assets/svg/ic-exclamation-circle.svg';
+import { ClientErrors } from '../../../enums/axios.enum';
+import { EntityType } from '../../../enums/entity.enum';
+import { GlossaryTerm } from '../../../generated/entity/data/glossaryTerm';
+import { EntityReference } from '../../../generated/entity/type';
+import {
+ BulkOperationResult,
+ Status,
+} from '../../../generated/type/bulkOperationResult';
+import { validateTagAddtionToGlossary } from '../../../rest/glossaryAPI';
+import {
+ getEntityLinkFromType,
+ getEntityName,
+} from '../../../utils/EntityUtils';
+import Table from '../../common/Table/Table';
+import { GlossaryUpdateConfirmationModalProps } from './GlossaryUpdateConfirmationModal.interface';
+
+export const GlossaryUpdateConfirmationModal = ({
+ glossaryTerm,
+ onValidationSuccess,
+ onCancel,
+ updatedTags,
+}: GlossaryUpdateConfirmationModalProps) => {
+ const [failedStatus, setFailedStatus] = useState();
+ const [tagError, setTagError] = useState<{ code: number; message: string }>();
+ const [tagAdditionConfirmation, setTagAdditionConfirmation] = useState(false);
+ const [validating, setValidating] = useState(false);
+ const { t } = useTranslation();
+
+ const handleUpdateConfirmation = async () => {
+ setTagAdditionConfirmation(true);
+ setValidating(true);
+ try {
+ // dryRun validations so that we can list failures if any
+ const res = await validateTagAddtionToGlossary(
+ { ...glossaryTerm, tags: updatedTags } as GlossaryTerm,
+ true
+ );
+
+ if (res.status && res.status === Status.Success) {
+ await onValidationSuccess();
+ } else {
+ setFailedStatus(res);
+ }
+ } catch (err) {
+ // error
+ setTagError(err.response?.data);
+ } finally {
+ setValidating(false);
+ }
+ };
+
+ const tagsColumn = useMemo(() => {
+ return [
+ {
+ title: t('label.asset-plural'),
+ dataIndex: 'request',
+ key: 'request',
+ render: (record: EntityReference) => (
+
+ {record.fullyQualifiedName}
+
+ ),
+ },
+ {
+ title: t('label.failure-reason'),
+ dataIndex: 'message',
+ key: 'message',
+ render: (error: string) => (
+ {error}
+ ),
+ },
+ ];
+ }, []);
+
+ return (
+
+
+ {failedStatus?.numberOfRowsFailed &&
+ `${failedStatus.numberOfRowsFailed} ${t('label.failed')}`}
+
+
+
+ )
+ }
+ title={
+ tagAdditionConfirmation
+ ? t('message.glossary-tag-update-modal-title')
+ : undefined
+ }
+ width={tagAdditionConfirmation ? 750 : undefined}
+ onCancel={onCancel}>
+ {tagAdditionConfirmation || validating ? (
+
+ {!isEmpty(failedStatus?.failedRequest) && !validating && (
+ <>
+
record.request.id}
+ />
+
+ {t('message.glossary-tag-assignement-help-message')}
+
+
+ )}
+ {tagError?.code === ClientErrors.BAD_REQUEST && (
+ {tagError.message}
+ )}
+
+ ) : (
+
+
+
+ {t('message.tag-update-confirmation')}
+
+
+ {t('message.glossary-tag-update-description')}{' '}
+ {getEntityName(glossaryTerm)}
+
+
+
+
+
+
+
+