Skip to content

[Catalogv2] Add favorites support #29317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 16, 2025
+458 −210
Merged

[Catalogv2] Add favorites support #29317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
08aa439
add favorites support
salazarm Apr 16, 2025
ba5752f
Add favorites support + jest tests
salazarm Apr 16, 2025
560c243
Add favorites support + jest tests
salazarm Apr 16, 2025
6eeee37
Merge branch 'master' of https://github.com/dagster-io/dagster into s…
salazarm Apr 16, 2025
dd07961
fix
salazarm Apr 16, 2025
d6e8274
fix
salazarm Apr 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion js_modules/dagster-ui/packages/ui-core/src/asset-data/AssetLiveDataProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import uniq from 'lodash/uniq';
import React, {useCallback, useMemo, useRef} from 'react';

import {AssetBaseData, __resetForJest as __resetBaseData} from './AssetBaseDataProvider';
import {AssetHealthData} from './AssetHealthDataProvider';
import {AssetHealthData, __resetForJest as __resetHealthData} from './AssetHealthDataProvider';
import {
AssetStaleStatusData,
__resetForJest as __resetStaleData,
Expand Down Expand Up @@ -184,4 +184,5 @@ export function AssetLiveDataRefreshButton() {
export function __resetForJest() {
__resetBaseData();
__resetStaleData();
__resetHealthData();
}
227 changes: 21 additions & 206 deletions js_modules/dagster-ui/packages/ui-core/src/assets/AssetCatalogTableV2.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,63 +1,56 @@
import {
Box,
Colors,
Container,
Icon,
IconWrapper,
Inner,
Row,
Skeleton,
Subtitle1,
SubtitleSmall,
Tab,
Tabs,
ifPlural,
} from '@dagster-io/ui-components';
import {useVirtualizer} from '@tanstack/react-virtual';
import {Box, Skeleton, Subtitle1, Tab, Tabs, ifPlural} from '@dagster-io/ui-components';
import dayjs from 'dayjs';
import relativeTime from 'dayjs/plugin/relativeTime';
import updateLocale from 'dayjs/plugin/updateLocale';
import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
import {Link, useRouteMatch} from 'react-router-dom';
import React, {useCallback, useEffect, useMemo, useState} from 'react';
import {useRouteMatch} from 'react-router-dom';
import {useSetRecoilState} from 'recoil';
import {CreateCatalogViewButton} from 'shared/assets/CreateCatalogViewButton.oss';
import styled from 'styled-components';
import {useFavoriteAssets} from 'shared/assets/useFavoriteAssets.oss';

import {AssetCatalogAssetGraph} from './AssetCatalogAssetGraph';
import {AssetHealthStatusString, STATUS_INFO, statusToIconAndColor} from './AssetHealthSummary';
import {AssetRecentUpdatesTrend} from './AssetRecentUpdatesTrend';
import {AssetCatalogV2VirtualizedTable} from './AssetCatalogV2VirtualizedTable';
import {AssetHealthStatusString, statusToIconAndColor} from './AssetHealthSummary';
import {useAllAssets} from './AssetsCatalogTable';
import {AssetsEmptyState} from './AssetsEmptyState';
import {LaunchAssetExecutionButton} from './LaunchAssetExecutionButton';
import {asAssetKeyInput} from './asInput';
import {assetDetailsPathForKey} from './assetDetailsPathForKey';
import {PythonErrorInfo} from '../app/PythonErrorInfo';
import {AssetTableFragment} from './types/AssetTableFragment.types';
import {currentPageAtom} from '../app/analytics';
import {useAssetsHealthData} from '../asset-data/AssetHealthDataProvider';
import {AssetHealthFragment} from '../asset-data/types/AssetHealthDataProvider.types';
import {tokenForAssetKey} from '../asset-graph/Utils';
import {useAssetSelectionInput} from '../asset-selection/input/useAssetSelectionInput';
import {AssetHealthStatus} from '../graphql/types';
import {useQueryPersistedState} from '../hooks/useQueryPersistedState';
import {useBlockTraceUntilTrue} from '../performance/TraceContext';
import {SyntaxError} from '../selection/CustomErrorListener';
import {IndeterminateLoadingBar} from '../ui/IndeterminateLoadingBar';
import {numberFormatter} from '../ui/formatters';
const emptyArray: any[] = [];

dayjs.extend(relativeTime);
dayjs.extend(updateLocale);

export const AssetsCatalogTableV2Impl = React.memo(
export const AssetsCatalogTableV2 = React.memo(
({isFullScreen, toggleFullScreen}: {isFullScreen: boolean; toggleFullScreen: () => void}) => {
const {assets, loading: assetsLoading, error} = useAllAssets();
useBlockTraceUntilTrue('useAllAssets', !!assets?.length && !assetsLoading);

const {favorites, loading: favoritesLoading} = useFavoriteAssets();
const penultimateAssets = useMemo(() => {
if (!favorites) {
return assets ?? [];
}
return (assets ?? []).filter((asset: AssetTableFragment) =>
favorites.has(tokenForAssetKey(asset.key)),
);
}, [favorites, assets]);

const [errorState, setErrorState] = useState<SyntaxError[]>([]);
const {filterInput, filtered, loading, setAssetSelection, assetSelection} =
useAssetSelectionInput<AssetTableFragment>({
assets: assets ?? emptyArray,
assetsLoading: !assets && assetsLoading,
assets: penultimateAssets,
assetsLoading: !assets && (assetsLoading || favoritesLoading),
onErrorStateChange: useCallback(
(errors: SyntaxError[]) => {
if (errors !== errorState) {
Expand Down Expand Up @@ -232,7 +225,7 @@ const Table = React.memo(
<LaunchAssetExecutionButton primary={false} scope={scope} />
)}
</Box>
<VirtualizedTable groupedByStatus={groupedByStatus} loading={loading} />
<AssetCatalogV2VirtualizedTable groupedByStatus={groupedByStatus} loading={loading} />
</div>
{/* <Box border="left" padding={{vertical: 24, horizontal: 12}}>
Sidebar
Expand All @@ -243,184 +236,6 @@ const Table = React.memo(
},
);

const shimmer = {shimmer: true};
const shimmerRows = [shimmer, shimmer, shimmer, shimmer, shimmer];

const VirtualizedTable = React.memo(
({
groupedByStatus,
loading,
}: {
groupedByStatus: Record<AssetHealthStatusString, AssetHealthFragment[]>;
loading: boolean;
}) => {
const containerRef = useRef<HTMLDivElement>(null);

const [openStatuses, setOpenStatuses] = useState<Set<AssetHealthStatusString>>(
new Set(['Unknown', 'Healthy', 'Warning', 'Degraded']),
);

const unGroupedRowItems = useMemo(() => {
return Object.keys(groupedByStatus).flatMap((status_: string) => {
const status = status_ as AssetHealthStatusString;
if (!groupedByStatus[status].length) {
return [];
}
if (openStatuses.has(status)) {
return [{header: true, status}, ...groupedByStatus[status]];
}
return [{header: true, status}];
});
}, [groupedByStatus, openStatuses]);

const rowItems = loading ? shimmerRows : unGroupedRowItems;

const rowVirtualizer = useVirtualizer({
count: rowItems.length,
getScrollElement: () => containerRef.current,
estimateSize: () => 32,
overscan: 5,
});

const totalHeight = rowVirtualizer.getTotalSize();
const items = rowVirtualizer.getVirtualItems();

return (
<Container ref={containerRef} style={{overflow: 'scroll'}}>
<Inner $totalHeight={totalHeight}>
{items.map(({index, key, size, start}) => {
const item = rowItems[index]!;

const wrapper = (content: React.ReactNode) => (
<Row key={key} $height={size} $start={start}>
<div data-index={index} ref={rowVirtualizer.measureElement}>
<Box border="bottom" padding={{horizontal: 24, vertical: 12}}>
{content}
</Box>
</div>
</Row>
);

if ('shimmer' in item) {
return wrapper(<Skeleton key={key} $height={21} $width="45%" />);
}
if ('header' in item) {
return (
<Row key={key} $height={size} $start={start}>
<div data-index={index} ref={rowVirtualizer.measureElement}>
<StatusHeader
status={item.status}
open={openStatuses.has(item.status)}
count={groupedByStatus[item.status].length}
onToggle={() =>
setOpenStatuses((prev) => {
const newSet = new Set(prev);
if (newSet.has(item.status)) {
newSet.delete(item.status);
} else {
newSet.add(item.status);
}
return newSet;
})
}
/>
</div>
</Row>
);
}
return wrapper(<AssetRow asset={item} />);
})}
</Inner>
</Container>
);
},
);

const StatusHeader = React.memo(
({
status,
open,
count,
onToggle,
}: {
status: AssetHealthStatusString;
open: boolean;
count: number;
onToggle: () => void;
}) => {
const {iconName, iconColor, text} = STATUS_INFO[status];
return (
<StatusHeaderContainer
flex={{direction: 'row', alignItems: 'center', gap: 4}}
onClick={onToggle}
>
<Icon name={iconName} color={iconColor} />
<SubtitleSmall>
{text} ({numberFormatter.format(count)})
</SubtitleSmall>
<Icon
name="arrow_drop_down"
style={{transform: open ? 'rotate(0deg)' : 'rotate(-90deg)'}}
color={Colors.textLight()}
/>
</StatusHeaderContainer>
);
},
);

const StatusHeaderContainer = styled(Box)`
background-color: ${Colors.backgroundLight()};
&:hover {
background-color: ${Colors.backgroundLightHover()};
}
border-radius: 4px;
padding: 6px 24px;
`;

const AssetRow = React.memo(({asset}: {asset: AssetHealthFragment}) => {
const linkUrl = assetDetailsPathForKey({path: asset.assetKey.path});

return (
<RowWrapper to={linkUrl}>
<Box flex={{direction: 'row', alignItems: 'center', justifyContent: 'space-between'}}>
<Box flex={{direction: 'row', gap: 4, alignItems: 'center'}}>
<AssetIconWrapper>
<Icon name="asset" />
</AssetIconWrapper>
{asset.assetKey.path.join(' / ')}
</Box>
{/* Prevent clicks on the trend from propoagating to the row and triggering the link */}
<div
onClick={(e) => {
e.stopPropagation();
e.preventDefault();
}}
className="test"
>
<AssetRecentUpdatesTrend asset={asset} />
</div>
</Box>
</RowWrapper>
);
});

type AssetWithDefinition = AssetTableFragment & {
definition: NonNullable<AssetTableFragment['definition']>;
};
const AssetIconWrapper = styled.div``;

const RowWrapper = styled(Link)`
color: ${Colors.textLight()};
cursor: pointer;
:hover {
&,
${AssetIconWrapper} ${IconWrapper} {
color: ${Colors.textDefault()};
text-decoration: none;
}
${AssetIconWrapper} ${IconWrapper} {
background: ${Colors.textDefault()};
text-decoration: none;
}
}
`;
Comment on lines -246 to -426
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I move all of this to a new file for easier testing

Loading