fix some entities not visible in Following widget (#17665)

* fix some entities not visible in Following widget

* added some extra spacing in quick filter
This commit is contained in:
Ashish Gupta 2024-09-02 23:12:22 +05:30 committed by GitHub
parent 77d98c9675
commit 00fe8399ad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 105 additions and 50 deletions

View File

@ -12,19 +12,19 @@
*/ */
import { test } from '@playwright/test'; import { test } from '@playwright/test';
import { toLower } from 'lodash'; import { toLower } from 'lodash';
import { ContainerClass } from '../../support/entity/ContainerClass'; import { ContainerClass } from '../../../support/entity/ContainerClass';
import { DashboardClass } from '../../support/entity/DashboardClass'; import { DashboardClass } from '../../../support/entity/DashboardClass';
import { MlModelClass } from '../../support/entity/MlModelClass'; import { MlModelClass } from '../../../support/entity/MlModelClass';
import { PipelineClass } from '../../support/entity/PipelineClass'; import { PipelineClass } from '../../../support/entity/PipelineClass';
import { SearchIndexClass } from '../../support/entity/SearchIndexClass'; import { SearchIndexClass } from '../../../support/entity/SearchIndexClass';
import { TableClass } from '../../support/entity/TableClass'; import { TableClass } from '../../../support/entity/TableClass';
import { TopicClass } from '../../support/entity/TopicClass'; import { TopicClass } from '../../../support/entity/TopicClass';
import { import {
createNewPage, createNewPage,
getEntityTypeSearchIndexMapping, getEntityTypeSearchIndexMapping,
redirectToHomePage, redirectToHomePage,
} from '../../utils/common'; } from '../../../utils/common';
import { checkDataAssetWidget } from '../../utils/entity'; import { checkDataAssetWidget } from '../../../utils/entity';
const entities = [ const entities = [
TableClass, TableClass,

View File

@ -0,0 +1,88 @@
/*
* Copyright 2024 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 { Page, test as base } from '@playwright/test';
import { ApiEndpointClass } from '../../../support/entity/ApiEndpointClass';
import { ContainerClass } from '../../../support/entity/ContainerClass';
import { DashboardClass } from '../../../support/entity/DashboardClass';
import { DashboardDataModelClass } from '../../../support/entity/DashboardDataModelClass';
import { MlModelClass } from '../../../support/entity/MlModelClass';
import { PipelineClass } from '../../../support/entity/PipelineClass';
import { SearchIndexClass } from '../../../support/entity/SearchIndexClass';
import { StoredProcedureClass } from '../../../support/entity/StoredProcedureClass';
import { TableClass } from '../../../support/entity/TableClass';
import { TopicClass } from '../../../support/entity/TopicClass';
import { UserClass } from '../../../support/user/UserClass';
import { performAdminLogin } from '../../../utils/admin';
import { redirectToHomePage } from '../../../utils/common';
import {
followEntity,
validateFollowedEntityToWidget,
} from '../../../utils/entity';
const entities = [
TableClass,
DashboardClass,
PipelineClass,
TopicClass,
ContainerClass,
MlModelClass,
SearchIndexClass,
ApiEndpointClass,
DashboardDataModelClass,
StoredProcedureClass,
] as const;
const adminUser = new UserClass();
const test = base.extend<{ adminPage: Page }>({
adminPage: async ({ browser }, use) => {
const adminPage = await browser.newPage();
await adminUser.login(adminPage);
await use(adminPage);
await adminPage.close();
},
});
entities.forEach((EntityClass) => {
const entity = new EntityClass();
test.describe(entity.getType(), () => {
test.beforeAll('Setup pre-requests', async ({ browser }) => {
const { apiContext, afterAction } = await performAdminLogin(browser);
await adminUser.create(apiContext);
await adminUser.setAdminRole(apiContext);
await entity.create(apiContext);
await afterAction();
});
test.afterAll('Cleanup', async ({ browser }) => {
const { apiContext, afterAction } = await performAdminLogin(browser);
await entity.delete(apiContext);
await afterAction();
});
test('Check followed entity present in following widget', async ({
adminPage,
}) => {
await redirectToHomePage(adminPage);
await entity.visitEntityPage(adminPage);
const entityName = entity.entityResponseData?.['displayName'];
await followEntity(adminPage, entity.endpoint);
await validateFollowedEntityToWidget(adminPage, entityName, true);
});
});
});

View File

@ -181,7 +181,7 @@ const ExploreQuickFilters: FC<ExploreQuickFiltersProps> = ({
}, [fields]); }, [fields]);
return ( return (
<Space wrap className="explore-quick-filters-container" size={[4, 0]}> <Space wrap className="explore-quick-filters-container" size={[8, 0]}>
{fields.map((field) => { {fields.map((field) => {
const hasNullOption = fieldsWithNullValues.includes( const hasNullOption = fieldsWithNullValues.includes(
field.key as EntityFields field.key as EntityFields

View File

@ -24,7 +24,7 @@ import {
GlobalSettingsMenuCategory, GlobalSettingsMenuCategory,
} from '../../../../constants/GlobalSettings.constants'; } from '../../../../constants/GlobalSettings.constants';
import { LandingPageWidgetKeys } from '../../../../enums/CustomizablePage.enum'; import { LandingPageWidgetKeys } from '../../../../enums/CustomizablePage.enum';
import { AssetsType, TabSpecificField } from '../../../../enums/entity.enum'; import { TabSpecificField } from '../../../../enums/entity.enum';
import { Document } from '../../../../generated/entity/docStore/document'; import { Document } from '../../../../generated/entity/docStore/document';
import { EntityReference } from '../../../../generated/entity/type'; import { EntityReference } from '../../../../generated/entity/type';
import { useApplicationStore } from '../../../../hooks/useApplicationStore'; import { useApplicationStore } from '../../../../hooks/useApplicationStore';
@ -150,13 +150,9 @@ function CustomizeMyData({
}); });
if (userData) { if (userData) {
const includeData = Object.values(AssetsType);
const follows: EntityReference[] = userData.follows ?? []; const follows: EntityReference[] = userData.follows ?? [];
const includedFollowsData = follows.filter((data) => setFollowedDataCount(follows.length);
includeData.includes(data.type as AssetsType) setFollowedData(follows.slice(0, 8));
);
setFollowedDataCount(includedFollowsData.length);
setFollowedData(includedFollowsData.slice(0, 8));
} }
} catch (err) { } catch (err) {
setFollowedData([]); setFollowedData([]);

View File

@ -74,16 +74,6 @@ export enum EntityType {
API_ENDPOINT = 'apiEndpoint', API_ENDPOINT = 'apiEndpoint',
} }
export enum AssetsType {
TABLE = 'table',
TOPIC = 'topic',
DASHBOARD = 'dashboard',
PIPELINE = 'pipeline',
MLMODEL = 'mlmodel',
DASHBOARD_DATA_MODEL = 'dashboardDataModel',
STORED_PROCEDURE = 'storedProcedure',
}
export enum EntityLineageDirection { export enum EntityLineageDirection {
TOP_BOTTOM = 'TB', TOP_BOTTOM = 'TB',
LEFT_RIGHT = 'LR', LEFT_RIGHT = 'LR',

View File

@ -27,11 +27,7 @@ import Loader from '../../components/common/Loader/Loader';
import WelcomeScreen from '../../components/MyData/WelcomeScreen/WelcomeScreen.component'; import WelcomeScreen from '../../components/MyData/WelcomeScreen/WelcomeScreen.component';
import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1';
import { LOGGED_IN_USER_STORAGE_KEY } from '../../constants/constants'; import { LOGGED_IN_USER_STORAGE_KEY } from '../../constants/constants';
import { import { EntityType, TabSpecificField } from '../../enums/entity.enum';
AssetsType,
EntityType,
TabSpecificField,
} from '../../enums/entity.enum';
import { Thread } from '../../generated/entity/feed/thread'; import { Thread } from '../../generated/entity/feed/thread';
import { PageType } from '../../generated/system/ui/page'; import { PageType } from '../../generated/system/ui/page';
import { EntityReference } from '../../generated/type/entityReference'; import { EntityReference } from '../../generated/type/entityReference';
@ -124,13 +120,9 @@ const MyDataPage = () => {
}); });
if (userData) { if (userData) {
const includeData = Object.values(AssetsType);
const follows: EntityReference[] = userData.follows ?? []; const follows: EntityReference[] = userData.follows ?? [];
const includedFollowsData = follows.filter((data) => setFollowedDataCount(follows.length);
includeData.includes(data.type as AssetsType) setFollowedData(follows.slice(0, 8));
);
setFollowedDataCount(includedFollowsData.length);
setFollowedData(includedFollowsData.slice(0, 8));
} }
} catch (err) { } catch (err) {
setFollowedData([]); setFollowedData([]);

View File

@ -61,12 +61,7 @@ import {
} from '../constants/GlobalSettings.constants'; } from '../constants/GlobalSettings.constants';
import { TAG_START_WITH } from '../constants/Tag.constants'; import { TAG_START_WITH } from '../constants/Tag.constants';
import { ResourceEntity } from '../context/PermissionProvider/PermissionProvider.interface'; import { ResourceEntity } from '../context/PermissionProvider/PermissionProvider.interface';
import { import { EntityTabs, EntityType, FqnPart } from '../enums/entity.enum';
AssetsType,
EntityTabs,
EntityType,
FqnPart,
} from '../enums/entity.enum';
import { ExplorePageTabs } from '../enums/Explore.enum'; import { ExplorePageTabs } from '../enums/Explore.enum';
import { SearchIndex } from '../enums/search.enum'; import { SearchIndex } from '../enums/search.enum';
import { ServiceCategory, ServiceCategoryPlural } from '../enums/service.enum'; import { ServiceCategory, ServiceCategoryPlural } from '../enums/service.enum';
@ -1220,12 +1215,6 @@ export const getTitleCase = (text?: string) => {
return text ? startCase(text) : ''; return text ? startCase(text) : '';
}; };
export const filterEntityAssets = (data: EntityReference[]) => {
const includedEntity = Object.values(AssetsType);
return data.filter((d) => includedEntity.includes(d.type as AssetsType));
};
export const getResourceEntityFromEntityType = (entityType: string) => { export const getResourceEntityFromEntityType = (entityType: string) => {
switch (entityType) { switch (entityType) {
case EntityType.TABLE: case EntityType.TABLE: