diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/utils.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/utils.tsx index 41179c44df..d34a1f7c6e 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/utils.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/utils.tsx @@ -85,19 +85,6 @@ export const getChartPopularityTier = (viewCountPercentileLast30Days, uniqueUser return PopularityTier.TIER_4; }; -export const getQueryPopularityTier = (runsPercentileLast30days: number) => { - if (runsPercentileLast30days > 80) { - return PopularityTier.TIER_1; - } - if (runsPercentileLast30days > 30) { - return PopularityTier.TIER_2; - } - if (runsPercentileLast30days > 0) { - return PopularityTier.TIER_3; - } - return PopularityTier.TIER_4; -}; - /** * Returns true if the user "exists", e.g. there exists some information about * the user in DataHub already. diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueriesListSection.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueriesListSection.tsx index b4f88273ed..4623c00cfb 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueriesListSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueriesListSection.tsx @@ -141,9 +141,7 @@ export default function QueriesListSection({ createdDateColumn, powersColumn, usedByColumn, - popularityColumn, columnsColumn, - lastRunColumn, editColumn, } = useQueryTableColumns({ queries, @@ -166,11 +164,11 @@ export default function QueriesListSection({ editColumn, ]; - const popularQueriesColumns = [queryTextColumn(), usedByColumn, lastRunColumn, columnsColumn, popularityColumn]; + const popularQueriesColumns = [queryTextColumn(), usedByColumn, columnsColumn]; - const downstreamQueriesColumns = [queryTextColumn(550), powersColumn, lastRunColumn]; + const downstreamQueriesColumns = [queryTextColumn(550), powersColumn]; - const recentQueriesColumns = [queryTextColumn(550), lastRunColumn]; + const recentQueriesColumns = [queryTextColumn(550)]; const pagionationOptions: false | TablePaginationConfig = showPagination ? ({ diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueriesTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueriesTab.tsx index f5de13329a..ace18d0673 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueriesTab.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueriesTab.tsx @@ -54,17 +54,8 @@ export default function QueriesTab() { /** * Fetch the List of Popular Queries */ - const { - popularQueries, - loading: popularQueriesLoading, - pagination: popularQueriesPagination, - total, - sorting: popularSorting, - selectedUsersFilter, - setSelectedUsersFilter, - selectedColumnsFilter, - setSelectedColumnsFilter, - } = usePopularQueries({ entityUrn, siblingUrn, filterText }); + const { selectedUsersFilter, setSelectedUsersFilter, selectedColumnsFilter, setSelectedColumnsFilter } = + usePopularQueries({ entityUrn, siblingUrn, filterText }); /** * Fetch the List of Downstream Queries @@ -90,18 +81,9 @@ export default function QueriesTab() { }; // can add something about initalLoading if there was never data, or have state that is like finishedInitialLoad = false, with useEffect - const isLoading = - !entityUrn || - highlightedQueriesLoading || - popularQueriesLoading || - downstreamQueriesLoading || - recentQueriesLoading; + const isLoading = !entityUrn || highlightedQueriesLoading || downstreamQueriesLoading || recentQueriesLoading; const showEmptyView = - !isLoading && - !recentQueries.length && - !highlightedQueries.length && - !downstreamQueries.length && - !popularQueries.length; + !isLoading && !recentQueries.length && !highlightedQueries.length && !downstreamQueries.length; // shared props with all of the QueriesListSection components below const props = { @@ -159,19 +141,6 @@ export default function QueriesTab() { onButtonClick={() => setShowQueryBuilder(true)} /> )} - {(popularQueries.length > 0 || popularQueriesLoading) && ( - - )} {downstreamQueries.length > 0 && ( { - const usedByFilter = newFilters.find((f) => f.field === 'topUsersLast30DaysFeature'); - if (usedByFilter) { - setSelectedUsersFilter(usedByFilter); - } else { - setSelectedUsersFilter({ field: 'topUsersLast30DaysFeature', values: [] }); - } - const columnsFilter = newFilters.find((f) => f.field === 'entities'); if (columnsFilter) { setSelectedColumnsFilter(columnsFilter); @@ -55,15 +47,13 @@ export default function QueryFilters({ setPage(1); }; - const usersFilter = useUsersFilter({ selectedColumnsFilter, selectedUsersFilter }); const columnsFilter = useColumnsFilter({ selectedColumnsFilter, selectedUsersFilter, setSelectedColumnsFilter }); const filterPredicates: FilterPredicate[] = convertToAvailableFilterPredictes( [selectedUsersFilter, selectedColumnsFilter], - [usersFilter, columnsFilter], + [columnsFilter], ); - let selectedFilters: FacetFilterInput[] = selectedColumnsFilter.values?.length ? [selectedColumnsFilter] : []; - selectedFilters = selectedUsersFilter.values?.length ? [...selectedFilters, selectedUsersFilter] : selectedFilters; + const selectedFilters: FacetFilterInput[] = selectedColumnsFilter.values?.length ? [selectedColumnsFilter] : []; const labelStyle = { backgroundColor: ANTD_GRAY_V2[15], @@ -77,21 +67,13 @@ export default function QueryFilters({ filter={columnsFilter} filterPredicates={filterPredicates} onChangeFilters={onChangeFilters} - activeFilters={[selectedColumnsFilter, selectedUsersFilter]} + activeFilters={[selectedColumnsFilter]} labelStyle={selectedColumnsFilter.values?.length ? undefined : labelStyle} shouldUseAggregationsFromFilter /> - facet.field === 'topUsersLast30DaysFeature', - )?.aggregations; - - const userAggregations = - aggregations - ?.map((agg) => ({ - value: agg.entity?.urn || agg.value, - displayName: agg.entity?.urn ? entityRegistry.getDisplayName(agg.entity.type, agg.entity) : agg.value, - count: agg.count, - })) - ?.sort((aggA, aggB) => aggB.count - aggA.count) || []; - - const usersFilter = { aggregations: userAggregations, displayName: 'Users', field: 'topUsersLast30DaysFeature' }; - - return usersFilter; -} diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/queryColumns.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/queryColumns.tsx index d769586b18..e527c08c71 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/queryColumns.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/queryColumns.tsx @@ -1,7 +1,6 @@ import DeleteOutlinedIcon from '@mui/icons-material/DeleteOutlined'; import EditOutlinedIcon from '@mui/icons-material/EditOutlined'; import { Modal, Typography, message } from 'antd'; -import { Popover } from '@components'; import React, { useState } from 'react'; import styled from 'styled-components'; import MarkdownViewer from '@src/app/entity/shared/components/legacy/MarkdownViewer'; @@ -10,11 +9,6 @@ import { CorpUser, EntityType } from '../../../../../../types.generated'; import { useEntityRegistryV2 } from '../../../../../useEntityRegistry'; import ActorAvatar from '../../../ActorAvatar'; import { ActionButton } from '../../../containers/profile/sidebar/SectionActionButton'; -import { - getBarsStatusFromPopularityTier, - getQueryPopularityTier, -} from '../../../containers/profile/sidebar/shared/utils'; -import { PopularityBars } from '../Schema/components/SchemaFieldDrawer/PopularityBars'; import QueryBuilderModal from './QueryBuilderModal'; import { Query } from './types'; @@ -182,37 +176,10 @@ export const EditDeleteColumn = ({ query, hoveredQueryUrn, onEdited, onDeleted } ); }; -/* - * Popularity Column - */ - -const PopularityWrapper = styled.div` - display: flex; - justify-content: center; -`; - -interface PopularityColumnProps { +interface ColumnProps { query: Query; } -export const PopularityColumn = ({ query }: PopularityColumnProps) => { - const { runsPercentileLast30days } = query; - if (!runsPercentileLast30days) return null; - const tier = getQueryPopularityTier(runsPercentileLast30days); - const status = getBarsStatusFromPopularityTier(tier); - return ( - This query has been run more than {runsPercentileLast30days}% of other queries in the last 30 days. - } - > - - - - - ); -}; - const ColumnsWrapper = styled.div` text-align: right; `; @@ -220,6 +187,6 @@ const ColumnsWrapper = styled.div` /* * Columns Column */ -export const ColumnsColumn = ({ query }: PopularityColumnProps) => { +export const ColumnsColumn = ({ query }: ColumnProps) => { return {query.columns?.length ?? 0}; }; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/types.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/types.ts index 6647dcf3d1..35d826e0f2 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/types.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/types.ts @@ -17,7 +17,6 @@ export type Query = { createdBy?: CorpUser | null; poweredEntity?: Entity; usedBy?: CorpUser[]; - runsPercentileLast30days?: number | null; columns?: SchemaFieldEntity[]; }; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/usePopularQueries.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/usePopularQueries.ts index 35e667dff2..a13ad4495d 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/usePopularQueries.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/usePopularQueries.ts @@ -1,6 +1,6 @@ import { useState } from 'react'; import { useListQueriesQuery } from '../../../../../../graphql/query.generated'; -import { FacetFilterInput, QueryEntity, QuerySource, SortOrder } from '../../../../../../types.generated'; +import { FacetFilterInput, QueryEntity, QuerySource } from '../../../../../../types.generated'; import { filterQueries, getAndFilters, getQueryEntitiesFilter } from './utils/filterQueries'; import usePagination from '../../../../../sharedV2/pagination/usePagination'; import { DEFAULT_PAGE_SIZE } from './utils/constants'; @@ -13,16 +13,9 @@ interface Props { siblingUrn?: string; filterText: string; defaultSelectedColumns?: string[]; - defaultSelectedUsers?: string[]; } -export const usePopularQueries = ({ - entityUrn, - siblingUrn, - filterText, - defaultSelectedColumns, - defaultSelectedUsers, -}: Props) => { +export const usePopularQueries = ({ entityUrn, siblingUrn, filterText, defaultSelectedColumns }: Props) => { const columnFromQueryParam = useQueryParamValue('column') as string | null; const siblingColumnFromQueryParam = useQueryParamValue('siblingColumn') as string | null; let columnsFromQueryParams = columnFromQueryParam ? [decodeURI(columnFromQueryParam)] : []; @@ -34,7 +27,7 @@ export const usePopularQueries = ({ values: [...(columnsFromQueryParams.length ? columnsFromQueryParams : defaultSelectedColumns || [])], }; const [selectedColumnsFilter, setSelectedColumnsFilter] = useState(defaultColumnsFilter); - const defaultUsersFilter = { field: 'topUsersLast30DaysFeature', values: [...(defaultSelectedUsers || [])] }; + const defaultUsersFilter = { field: '', values: [] }; // Not supported const [selectedUsersFilter, setSelectedUsersFilter] = useState(defaultUsersFilter); const pagination = usePagination(DEFAULT_PAGE_SIZE); @@ -50,11 +43,7 @@ export const usePopularQueries = ({ start, count, source: QuerySource.System, - sortInput: - sortField && sortOrder - ? { sortCriterion: { field: sortField, sortOrder } } - : { sortCriterion: { field: 'runsPercentileLast30days', sortOrder: SortOrder.Descending } }, - + sortInput: sortField && sortOrder ? { sortCriterion: { field: sortField, sortOrder } } : null, orFilters: [{ and: andFilters }], }, }, diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useQueryTableColumns.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useQueryTableColumns.tsx index 03ab88486b..3ec1170267 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useQueryTableColumns.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useQueryTableColumns.tsx @@ -1,16 +1,14 @@ import moment from 'moment'; import React from 'react'; import styled from 'styled-components'; -import { Tooltip } from '@components'; import { Query } from './types'; import QueryComponent from './Query'; -import { EditDeleteColumn, QueryCreatedBy, QueryDescription, PopularityColumn, ColumnsColumn } from './queryColumns'; +import { EditDeleteColumn, QueryCreatedBy, QueryDescription, ColumnsColumn } from './queryColumns'; import { CorpUser, Entity } from '../../../../../../types.generated'; import { EntityLink } from '../../../../../homeV2/reference/sections/EntityLink'; import { useEntityRegistryV2 } from '../../../../../useEntityRegistry'; import { Sorting } from '../../../../../sharedV2/sorting/useSorting'; import TopUsersFacepile from '../../../containers/profile/sidebar/shared/TopUsersFacepile'; -import { toRelativeTimeString } from '../../../../../shared/time/timeUtils'; const UsersWrapper = styled.div` display: flex; @@ -145,7 +143,7 @@ export default function useQueryTableColumns({ key: 'usedBy', className: 'usedBy', sorter: shouldRelyOnBackendSorting - ? false // we don't support sorting by topUsersLast30DaysFeature on backend since it is a text field + ? false : (queryA, queryB) => { if (!queryA.usedBy || !queryA.usedBy[0] || !queryB.usedBy || !queryB.usedBy[0]) return 0; const usedByA = entityRegistry.getDisplayName(queryA.usedBy[0].type, queryA.usedBy[0]); @@ -161,17 +159,6 @@ export default function useQueryTableColumns({ }, }; - const popularityColumn = { - title: 'Popularity', - key: 'popularity', - field: 'runsPercentileLast30days', - width: 110, - sorter: shouldRelyOnBackendSorting - ? true - : (queryA, queryB) => queryA.runsPercentileLast30days - queryB.runsPercentileLast30days, - render: (query: Query) => , - }; - const columnsColumn = { title: 'Columns', key: 'columns', @@ -179,25 +166,6 @@ export default function useQueryTableColumns({ render: (query: Query) => , }; - const lastRunColumn = { - title: 'Last Run', - dataIndex: 'lastRun', - key: 'lastRun', - field: 'lastExecutedAtFeature', - className: 'lastRun', - sorter: shouldRelyOnBackendSorting ? true : (queryA, queryB) => queryA.lastRun - queryB.lastRun, - render: (lastRun: string) => { - if (!lastRun) return null; - return ( -
- - {toRelativeTimeString(new Date(lastRun).getTime())} - -
- ); - }, - }; - const editColumn = { title: '', key: 'edit', @@ -220,9 +188,7 @@ export default function useQueryTableColumns({ createdDateColumn, powersColumn, usedByColumn, - popularityColumn, columnsColumn, - lastRunColumn, editColumn, }; } diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldQueriesSidebarTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldQueriesSidebarTab.tsx index 3963b3f384..ba860a616f 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldQueriesSidebarTab.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldQueriesSidebarTab.tsx @@ -8,7 +8,7 @@ import NoStatsAvailble from '../../../../../../../../images/no-stats-available.s import { useBaseEntity, useRouteToTab } from '../../../../../../../entity/shared/EntityContext'; import { ANTD_GRAY } from '../../../../../constants'; import Query from '../../../Queries/Query'; -import { PopularityColumn, QueryCreatedBy } from '../../../Queries/queryColumns'; +import { QueryCreatedBy } from '../../../Queries/queryColumns'; import { usePopularQueries } from '../../../Queries/usePopularQueries'; import { GetDatasetQuery } from '../../../../../../../../graphql/dataset.generated'; import Loading from '../../../../../../../shared/Loading'; @@ -57,15 +57,6 @@ const SubtitleSection = styled.div` flex-direction: row; `; -const PopularityLabel = styled.span` - line-height: 26px; - margin-right: 8px; -`; - -const PopularityColumnContainer = styled.div` - margin-bottom: 5px; -`; - const QUERIES_TO_SHOW = 6; const SeeAllButton = styled(Button)` @@ -173,12 +164,6 @@ export default function SchemaFieldQueriesSidebarTab({ properties: { fieldPath } )} on {moment(query.lastRun).format('MM/DD/YYYY')} - - Popularity - - - - diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/Insights.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/Insights.tsx index f912330a5e..df65f23b1b 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/Insights.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/Insights.tsx @@ -11,11 +11,7 @@ import { HorizontalListSkeletons } from '../../../../HorizontalListSkeletons'; import { Section } from '../Section'; import { INSIGHT_CARD_MIN_WIDTH } from './cards/SearchListInsightCard'; import { InsightStatusProvider } from './InsightStatusProvider'; -import { MOST_FREQUENTLY_UPDATED_ID, MostFrequentlyUpdated } from './cards/MostFrequentlyUpdated'; -import { MOST_QUERIED_ID, MostQueriedCard } from './cards/MostQueriedCard'; import { MOST_ROWS_ID, MostRowsCard } from './cards/MostRowsCard'; -import { MOST_USERS_ID, MostUsersCard } from './cards/MostUsersCard'; -import { MOST_VIEWED_DASHBOARDS_ID, MostViewedDashboardsCard } from './cards/MostViewedDashboards'; import { POPULAR_GLOSSARY_TERMS_ID, PopularGlossaryTerms } from './cards/PopularGlossaryTerms'; import { RECENTLY_CREATED_DATASETS_ID, RecentlyCreatedDatasetsCard } from './cards/RecentlyCreatedDatasetsCard'; import { RECENTLY_UPDATED_ID, RecentlyUpdatedDatasetsCard } from './cards/RecentlyUpdatedDatasetsCard'; @@ -30,27 +26,6 @@ type InsightSection = { }; const ALL_INSIGHTS: InsightSection[] = [ - { - id: MOST_USERS_ID, - component: MostUsersCard, - personas: [ - PersonaType.TECHNICAL_USER, - PersonaType.DATA_ENGINEER, - PersonaType.DATA_STEWARD, - PersonaType.DATA_LEADER, - ], - }, - { - id: MOST_VIEWED_DASHBOARDS_ID, - component: MostViewedDashboardsCard, - personas: [ - PersonaType.BUSINESS_USER, - PersonaType.DATA_STEWARD, - PersonaType.DATA_LEADER, - PersonaType.TECHNICAL_USER, - PersonaType.DATA_ENGINEER, - ], - }, { id: POPULAR_GLOSSARY_TERMS_ID, component: PopularGlossaryTerms, @@ -62,27 +37,6 @@ const ALL_INSIGHTS: InsightSection[] = [ PersonaType.BUSINESS_USER, ], }, - { - id: MOST_QUERIED_ID, - component: MostQueriedCard, - personas: [ - PersonaType.BUSINESS_USER, - PersonaType.TECHNICAL_USER, - PersonaType.DATA_ENGINEER, - PersonaType.DATA_STEWARD, - PersonaType.DATA_LEADER, - ], - }, - { - id: MOST_FREQUENTLY_UPDATED_ID, - component: MostFrequentlyUpdated, - personas: [ - PersonaType.TECHNICAL_USER, - PersonaType.DATA_ENGINEER, - PersonaType.DATA_STEWARD, - PersonaType.DATA_LEADER, - ], - }, { id: RECENTLY_UPDATED_ID, component: RecentlyUpdatedDatasetsCard, diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostFrequentlyUpdated.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostFrequentlyUpdated.tsx deleted file mode 100644 index 46dbb1323a..0000000000 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostFrequentlyUpdated.tsx +++ /dev/null @@ -1,19 +0,0 @@ -import React from 'react'; -import { buildMostUpdatedFilters, buildMostUpdatedSort } from './useGetMostUpdated'; -import { SearchListInsightCard } from './SearchListInsightCard'; -import { EntityType } from '../../../../../../../../types.generated'; - -export const MOST_FREQUENTLY_UPDATED_ID = 'MostFrequentlyUpdated'; - -export const MostFrequentlyUpdated = () => { - return ( - - ); -}; diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostQueriedCard.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostQueriedCard.tsx deleted file mode 100644 index 621671e181..0000000000 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostQueriedCard.tsx +++ /dev/null @@ -1,19 +0,0 @@ -import React from 'react'; -import { buildMostQueriedFilters, buildMostQueriedSort } from './useGetMostQueried'; -import { SearchListInsightCard } from './SearchListInsightCard'; -import { EntityType } from '../../../../../../../../types.generated'; - -export const MOST_QUERIED_ID = 'MostQueried'; - -export const MostQueriedCard = () => { - return ( - - ); -}; diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostUsersCard.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostUsersCard.tsx deleted file mode 100644 index 5f498ac0a3..0000000000 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostUsersCard.tsx +++ /dev/null @@ -1,19 +0,0 @@ -import React from 'react'; -import { EntityType } from '../../../../../../../../types.generated'; -import { SearchListInsightCard } from './SearchListInsightCard'; -import { buildMostUsersFilters, buildMostUsersSort } from './useGetMostUsers'; - -export const MOST_USERS_ID = 'MostUsers'; - -export const MostUsersCard = () => { - return ( - - ); -}; diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostViewedDashboards.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostViewedDashboards.tsx deleted file mode 100644 index 2f1d1040ac..0000000000 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostViewedDashboards.tsx +++ /dev/null @@ -1,19 +0,0 @@ -import React from 'react'; -import { EntityType } from '../../../../../../../../types.generated'; -import { SearchListInsightCard } from './SearchListInsightCard'; -import { buildMostViewedDashboardsFilter, buildMostViewedDashboardsSort } from './useGetMostViewedDashboards'; - -export const MOST_VIEWED_DASHBOARDS_ID = 'MostViewedDashboards'; - -export const MostViewedDashboardsCard = () => { - return ( - - ); -}; diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostQueried.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostQueried.tsx deleted file mode 100644 index 5e0a1b01f7..0000000000 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostQueried.tsx +++ /dev/null @@ -1,26 +0,0 @@ -import { FilterOperator, SortCriterion, SortOrder } from '../../../../../../../../types.generated'; -import { FilterSet } from '../../../../../../../entityV2/shared/components/styled/search/types'; -import { UnionType } from '../../../../../../../searchV2/utils/constants'; - -const MIN_QUERIES = '10'; - -export const buildMostQueriedFilters = (): FilterSet => { - return { - unionType: UnionType.AND, - filters: [ - { - field: 'usageCountLast30DaysFeature', - values: [MIN_QUERIES], - condition: FilterOperator.GreaterThanOrEqualTo, - negated: false, - }, - ], - }; -}; - -export const buildMostQueriedSort = (): SortCriterion => { - return { - field: 'usageCountLast30DaysFeature', - sortOrder: SortOrder.Descending, - }; -}; diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostUpdated.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostUpdated.tsx deleted file mode 100644 index 597c3611ac..0000000000 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostUpdated.tsx +++ /dev/null @@ -1,26 +0,0 @@ -import { FilterOperator, SortCriterion, SortOrder } from '../../../../../../../../types.generated'; -import { FilterSet } from '../../../../../../../entityV2/shared/components/styled/search/types'; -import { UnionType } from '../../../../../../../searchV2/utils/constants'; - -const MIN_UPDATES = '10'; - -export const buildMostUpdatedFilters = (): FilterSet => { - return { - unionType: UnionType.AND, - filters: [ - { - field: 'writeCountLast30DaysFeature', - values: [MIN_UPDATES], - condition: FilterOperator.GreaterThanOrEqualTo, - negated: false, - }, - ], - }; -}; - -export const buildMostUpdatedSort = (): SortCriterion => { - return { - field: 'writeCountLast30DaysFeature', - sortOrder: SortOrder.Descending, - }; -}; diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostUsers.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostUsers.tsx deleted file mode 100644 index 358f07644e..0000000000 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostUsers.tsx +++ /dev/null @@ -1,26 +0,0 @@ -import { FilterOperator, SortCriterion, SortOrder } from '../../../../../../../../types.generated'; -import { FilterSet } from '../../../../../../../entityV2/shared/components/styled/search/types'; -import { UnionType } from '../../../../../../../searchV2/utils/constants'; - -const MIN_USERS = '2'; - -export const buildMostUsersFilters = (): FilterSet => { - return { - unionType: UnionType.AND, - filters: [ - { - field: 'uniqueUserCountLast30DaysFeature', - values: [MIN_USERS], - condition: FilterOperator.GreaterThanOrEqualTo, - negated: false, - }, - ], - }; -}; - -export const buildMostUsersSort = (): SortCriterion => { - return { - field: 'uniqueUserCountLast30DaysFeature', - sortOrder: SortOrder.Descending, - }; -}; diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostViewedDashboards.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostViewedDashboards.tsx deleted file mode 100644 index 624624ba1d..0000000000 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostViewedDashboards.tsx +++ /dev/null @@ -1,26 +0,0 @@ -import { FilterOperator, SortCriterion, SortOrder } from '../../../../../../../../types.generated'; -import { FilterSet } from '../../../../../../../entityV2/shared/components/styled/search/types'; -import { UnionType } from '../../../../../../../searchV2/utils/constants'; - -const MIN_QUERIES = '1'; - -export const buildMostViewedDashboardsFilter = (): FilterSet => { - return { - unionType: UnionType.AND, - filters: [ - { - field: 'viewCountLast30DaysFeature', - values: [MIN_QUERIES], - condition: FilterOperator.GreaterThanOrEqualTo, - negated: false, - }, - ], - }; -}; - -export const buildMostViewedDashboardsSort = (): SortCriterion => { - return { - field: 'viewCountLast30DaysFeature', - sortOrder: SortOrder.Descending, - }; -}; diff --git a/datahub-web-react/src/app/searchV2/context/constants.ts b/datahub-web-react/src/app/searchV2/context/constants.ts index fd873040b7..0f06129b58 100644 --- a/datahub-web-react/src/app/searchV2/context/constants.ts +++ b/datahub-web-react/src/app/searchV2/context/constants.ts @@ -24,32 +24,3 @@ export const SORT_OPTIONS = { sortOrder: SortOrder.Descending, }, }; - -// Extensions -export const ROW_COUNT_FIELD = 'rowCountFeature'; -export const SIZE_IN_BYTES_FIELD = 'sizeInBytesFeature'; -export const QUERY_COUNT = 'queryCountLast30DaysFeature'; -export const UPDATE_COUNT = 'writeCountLast30DaysFeature'; - -export const DATASET_FEATURES_SORT_OPTIONS = { - [`${ROW_COUNT_FIELD}_${SortOrder.Descending}`]: { - label: 'Table Row Count', - field: ROW_COUNT_FIELD, - sortOrder: SortOrder.Descending, - }, - [`${SIZE_IN_BYTES_FIELD}_${SortOrder.Descending}`]: { - label: 'Table Size (Bytes)', - field: SIZE_IN_BYTES_FIELD, - sortOrder: SortOrder.Descending, - }, - [`${QUERY_COUNT}_${SortOrder.Descending}`]: { - label: 'Table Query Count (Last 30 Days)', - field: QUERY_COUNT, - sortOrder: SortOrder.Descending, - }, - [`${UPDATE_COUNT}_${SortOrder.Descending}`]: { - label: 'Table Update Count (Last 30 Days)', - field: UPDATE_COUNT, - sortOrder: SortOrder.Descending, - }, -};