Skip to content

Commit

Permalink
Assets improvements part 2 (open-metadata#14255)
Browse files Browse the repository at this point in the history
* fix: make filters consistent

* disable if no selection

* fix: hide notification

* fix: failed status data

* localization

* fix notification loading

* remove close icon here

* fix: cypress

* update error alert design

* fix alert styling

* fix: minor issues

* fix: redirect link of data product

* fix: minor suggestion prompt

* complete user flow

* fix: glossary cypress

* update alert view

* fix tags manipulation

* fix: domain reload fixes

Co-Authored-By: Ashish Gupta <ashish@getcollate.io>

* fix: minor loading issue on delete

* fix: add admin check for activity feed

Co-Authored-By: Ashish Gupta <ashish@getcollate.io>

* fix: minor css fixes

* fix: localisation

* fix: minor issue

* miner cypress fix

* add mlmodelservice as mlmodel parent

* fix: added null checks

---------

Co-authored-by: Chirag Madlani <12962843+chirag-madlani@users.noreply.github.com>
Co-authored-by: Ashish Gupta <ashish@getcollate.io>
Co-authored-by: Shailesh Parmar <shailesh.parmar.webdev@gmail.com>
Co-authored-by: 07Himank <himank07mehta@gmail.com>
  • Loading branch information
5 people authored and Shiyang Xiao committed Dec 12, 2023
1 parent d8d98e1 commit 6d5cdd2
Show file tree
Hide file tree
Showing 33 changed files with 554 additions and 431 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,8 @@ public void propagateInheritedFieldsToChildren(
if (changeDescription != null) {
Pair<String, Map<String, Object>> updates = getInheritedFieldChanges(changeDescription);
Pair<String, String> parentMatch;
if (updates.getValue().get("type").toString().equalsIgnoreCase("domain")
if (!updates.getValue().isEmpty()
&& updates.getValue().get("type").toString().equalsIgnoreCase("domain")
&& (entityType.equalsIgnoreCase(Entity.DATABASE_SERVICE)
|| entityType.equalsIgnoreCase(Entity.DASHBOARD_SERVICE)
|| entityType.equalsIgnoreCase(Entity.MESSAGING_SERVICE)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@
"indexName": "mlmodel_service_search_index",
"indexMappingFile": "/elasticsearch/%s/mlmodel_service_index_mapping.json",
"alias": "mlModelService",
"parentAliases": ["all"]
"parentAliases": ["all","mlModelService"]
},
"testCaseResolutionStatus": {
"indexName": "test_case_resolution_status_search_index",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ export const NEW_GLOSSARY = {
reviewer: 'Aaron Johnson',
addReviewer: true,
tag: 'PersonalData.Personal',
isMutually: true,
};
export const NEW_GLOSSARY_1 = {
name: 'Cypress Product%Glossary',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,11 @@ const createGlossary = (glossaryData) => {
.should('be.visible')
.type(glossaryData.description);

cy.get('[data-testid="mutually-exclusive-button"]').scrollIntoView().click();
if (glossaryData.isMutually) {
cy.get('[data-testid="mutually-exclusive-button"]')
.scrollIntoView()
.click();
}

if (glossaryData.tag) {
// Add tag
Expand Down Expand Up @@ -311,10 +315,12 @@ const removeAssetsFromGlossaryTerm = (glossaryTerm, glossary) => {
cy.get('[data-testid="delete-button"]').click();
cy.get("[data-testid='save-button']").click();

interceptURL('GET', '/api/v1/search/query*', 'assetTab');
cy.get('[data-testid="overview"]').click();
cy.get('[data-testid="assets"]').click();

// go assets tab
goToAssetsTab(glossaryTerm.name, glossaryTerm.fullyQualifiedName, true);
verifyResponseStatusCode('@assetTab', 200);
verifyResponseStatusCode('@searchAssets', 200);

checkAssetsCount(glossaryTerm.assets.length - (index + 1));
});
};
Expand Down Expand Up @@ -719,7 +725,7 @@ describe('Glossary page should work properly', () => {

const ProductTerms = Object.values(NEW_GLOSSARY_1_TERMS);
ProductTerms.forEach((term) =>
createGlossaryTerm(term, NEW_GLOSSARY_1, 'Approved')
createGlossaryTerm(term, NEW_GLOSSARY_1, 'Approved', false)
);
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ describe('Postgres Ingestion', () => {

cy.get('#root\\/filterCondition')
.scrollIntoView()
.type(`s.query like '%${tableName}%'`);
.type(`s.query like '%%${tableName}%%'`);
cy.get('[data-testid="submit-btn"]')
.scrollIntoView()
.should('be.visible')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import {
ThreadTaskStatus,
ThreadType,
} from '../../../generated/entity/feed/thread';
import { useAuth } from '../../../hooks/authHooks';
import { useElementInView } from '../../../hooks/useElementInView';
import { getAllFeeds, getFeedCount } from '../../../rest/feedsAPI';
import { getCountBadge, getEntityDetailLink } from '../../../utils/CommonUtils';
Expand Down Expand Up @@ -81,6 +82,7 @@ export const ActivityFeedTab = ({
});
const { subTab: activeTab = ActivityFeedTabs.ALL } =
useParams<{ subTab: ActivityFeedTabs }>();
const { isAdminUser } = useAuth();
const [taskFilter, setTaskFilter] = useState<TaskFilter>('open');
const [allCount, setAllCount] = useState(0);
const [tasksCount, setTasksCount] = useState(0);
Expand Down Expand Up @@ -162,7 +164,7 @@ export const ActivityFeedTab = ({
undefined,
undefined,
ThreadType.Task,
FeedFilter.OWNER,
isAdminUser ? undefined : FeedFilter.OWNER,
undefined,
userId
).then((res) => {
Expand All @@ -178,7 +180,7 @@ export const ActivityFeedTab = ({
undefined,
undefined,
ThreadType.Conversation,
FeedFilter.OWNER,
isAdminUser ? undefined : FeedFilter.OWNER,
undefined,
userId
).then((res) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

import { Typography } from 'antd';
import { AxiosError } from 'axios';
import { isEmpty } from 'lodash';
import React, { useCallback, useEffect, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
import Loader from '../../components/Loader/Loader';
Expand Down Expand Up @@ -239,7 +240,7 @@ const Suggestions = ({
return <Loader />;
}

if (options.length === 0 && !isTourOpen) {
if (options.length === 0 && !isTourOpen && !isEmpty(searchText)) {
return (
<Typography.Text>
<Transi18next
Expand Down

This file was deleted.

This file was deleted.

Loading

0 comments on commit 6d5cdd2

Please sign in to comment.