Skip to content
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

Jump to bottom

MetricsTreemap improvements #4466

Merged
merged 3 commits into from
May 18, 2024
Merged

MetricsTreemap improvements #4466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68aefe4
fix(ui): MetricsTreemap - ui fixes
vio May 18, 2024
da248ef
enhance(ui): MetricsTreemap - improve group title click
vio May 18, 2024
c7f0a8d
improve(ui): MetricsTreemap - adjust tile size
vio May 18, 2024
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
44 changes: 32 additions & 12 deletions packages/ui/src/components/bundle-assets/bundle-assets.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ const DISPLAY_TYPE_GROUPS = {

const getFileTypeFilters = (filters) =>
Object.entries(FILE_TYPE_LABELS).map(([key, label]) => ({
key,
label,
defaultValue: get(filters, `${ASSET_FILE_TYPE}.${key}`, true),
}));
key,
label,
defaultValue: get(filters, `${ASSET_FILE_TYPE}.${key}`, true),
}));

const getFilters = ({ compareMode, filters }) => ({
[ASSET_FILTERS.CHANGED]: {
Expand Down Expand Up @@ -163,9 +163,18 @@ RowHeader.defaultProps = {
};

const ViewMetricsTreemap = (props) => {
const { metricsTableTitle, jobs, items, displayType, emptyMessage, showEntryInfo, updateSearch } =
props;
const {
metricsTableTitle,
jobs,
items,
displayType,
emptyMessage,
showEntryInfo,
updateSearch,
search,
} = props;

// Get treenodes based on group
const treeNodes = useMemo(() => {
if (displayType.groupBy === 'folder') {
return getTreemapNodesGroupedByPath(items);
Expand All @@ -174,19 +183,28 @@ const ViewMetricsTreemap = (props) => {
return getTreemapNodes(items);
}, [items, displayType.groupBy]);

// Search based on the group path on group title click
const onGroupClick = useCallback(
(groupPath) => {
// Clear seach when groupPath is emty (root)
if (groupPath === '') {
updateSearch('');
return;
}
// Search by group path
// 1. use `^` to match only the string beggining
// 2. add `/` suffix to match only exact directories
// 3. if the group path is empty(root), clear search
if (groupPath) {
updateSearch(`^${groupPath}/`);
} else {
// 2. add `/` suffix to exactly match the directory
const newSearch = `^${groupPath}/`;

// Reset search when toggling the same groupPath
if (newSearch === search) {
updateSearch('');
return;
}

updateSearch(`^${groupPath}/`);
},
[updateSearch],
[updateSearch, search],
);

return (
Expand Down Expand Up @@ -215,6 +233,7 @@ ViewMetricsTreemap.propTypes = {
emptyMessage: PropTypes.node.isRequired,
showEntryInfo: PropTypes.func.isRequired,
updateSearch: PropTypes.func.isRequired,
search: PropTypes.string.isRequired,
};

export const BundleAssets = (props) => {
Expand Down Expand Up @@ -348,6 +367,7 @@ export const BundleAssets = (props) => {
emptyMessage={emptyMessage}
showEntryInfo={showEntryInfo}
updateSearch={updateSearch}
search={search}
/>
)}
</Box>
Expand Down
36 changes: 28 additions & 8 deletions packages/ui/src/components/bundle-modules/bundle-modules.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,22 @@ interface ViewMetricsTreemapProps {
emptyMessage: React.ReactNode;
showEntryInfo: React.ComponentProps<typeof MetricsTreemap>['onItemClick'];
updateSearch: (newSerarch: string) => void;
search: string;
}

const ViewMetricsTreemap = (props: ViewMetricsTreemapProps) => {
const { metricsTableTitle, jobs, items, displayType, emptyMessage, showEntryInfo, updateSearch } =
props;
const {
metricsTableTitle,
jobs,
items,
displayType,
emptyMessage,
showEntryInfo,
updateSearch,
search,
} = props;

// Get treenodes based on group
const treeNodes = useMemo(() => {
if (displayType.groupBy === 'folder') {
return getTreemapNodesGroupedByPath(items);
Expand All @@ -88,19 +98,28 @@ const ViewMetricsTreemap = (props: ViewMetricsTreemapProps) => {
return getTreemapNodes(items);
}, [items, displayType]);

// Search based on the group path on group title click
const onGroupClick = useCallback(
(groupPath: string) => {
// Clear seach when groupPath is emty (root)
if (groupPath === '') {
updateSearch('');
return;
}
// Search by group path
// 1. use `^` to match only the string beggining
// 2. add `/` suffix to match only exact directories
// 3. if the group path is empty(root), clear search
if (groupPath) {
updateSearch(`^${groupPath}/`);
} else {
// 2. add `/` suffix to exactly match the directory
const newSearch = `^${groupPath}/`;

// Reset search when toggling the same groupPath
if (newSearch === search) {
updateSearch('');
return;
}

updateSearch(newSearch);
},
[updateSearch],
[updateSearch, search],
);

return (
Expand Down Expand Up @@ -306,6 +325,7 @@ export const BundleModules = (props: BundleModulesProps) => {
emptyMessage={emptyMessage}
showEntryInfo={showEntryInfo}
updateSearch={updateSearch}
search={search}
/>
)}
</Box>
Expand Down
26 changes: 19 additions & 7 deletions packages/ui/src/components/bundle-packages/bundle-packages.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,9 @@ RowHeader.propTypes = {
};

const ViewMetricsTreemap = (props) => {
const { metricsTableTitle, jobs, items, displayType, emptyMessage, showEntryInfo, updateSearch } = props;
const { metricsTableTitle, jobs, items, displayType, emptyMessage, showEntryInfo, updateSearch, search } = props;

// Get treenodes based on group
const treeNodes = useMemo(() => {
if (displayType.groupBy === 'folder') {
return getTreemapNodesGroupedByPath(items);
Expand All @@ -130,19 +131,28 @@ const ViewMetricsTreemap = (props) => {
return getTreemapNodes(items);
}, [items, displayType.groupBy]);

// Search based on the group path on group title click
const onGroupClick = useCallback(
(groupPath) => {
// Clear seach when groupPath is emty (root)
if (groupPath === '') {
updateSearch('');
return;
}
// Search by group path
// 1. use `^` to match only the string beggining
// 2. add `/` suffix to match only exact directories
// 3. if the group path is empty(root), clear search
if (groupPath) {
updateSearch(`^${groupPath}/`);
} else {
// 2. add `/` suffix to exactly match the directory
const newSearch = `^${groupPath}/`;

// Reset search when toggling the same groupPath
if (newSearch === search) {
updateSearch('');
return;
}

updateSearch(newSearch);
},
[updateSearch],
[updateSearch, search],
);

return (
Expand Down Expand Up @@ -171,6 +181,7 @@ ViewMetricsTreemap.propTypes = {
emptyMessage: PropTypes.node.isRequired,
showEntryInfo: PropTypes.func.isRequired,
updateSearch: PropTypes.func.isRequired,
search: PropTypes.string.isRequired,
};

export const BundlePackages = (props) => {
Expand Down Expand Up @@ -300,6 +311,7 @@ export const BundlePackages = (props) => {
emptyMessage={emptyMessage}
showEntryInfo={showEntryInfo}
updateSearch={updateSearch}
search={search}
/>
)}
</Box>
Expand Down
32 changes: 24 additions & 8 deletions packages/ui/src/components/metrics-treemap/metrics-treemap.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@
}

.tileGroupTitle {
position: relative;
width: 100%;
padding: 4px 2px 4px var(--space-xxsmall);
padding: var(--space-xxxsmall) 1px var(--space-xxxsmall) var(--space-xxsmall);
color: var(--color-text);
font-family: var(--font-family-fixed);
font-size: 10px;
Expand All @@ -36,7 +37,17 @@
}

.tileGroupTitleTotal {
margin-left: var(--space-xxxsmall);
margin-left: var(--space-xxsmall);
color: var(--color-text-light);
}

.tileGroupTitle {
transition: var(--ui-transition-out);
}

.tileGroupTitle:hover .tileGroupTitleText {
text-decoration: underline;
transition: var(--ui-transition-in);
}

/** Tile group size variation */
Expand Down Expand Up @@ -141,7 +152,13 @@
flex: 0 1 auto;
width: 100%;
min-width: 0;
max-height: calc(2em * var(--line-height-heading));
max-height: calc(2em * var(--line-height-heading)); /* render max 2 rows */
overflow-wrap: break-word;
word-wrap: break-word;
word-break: break-all;
word-break: break-word;
hyphens: auto;
white-space: normal;
overflow: hidden;
}

Expand All @@ -162,9 +179,8 @@

/** Tile size variation */
.tileSizeSmall .tileContent {
padding: var(--space-xxxsmall) var(--space-xxsmall);
gap: 0;
font-size: var(--size-xsmall);
padding: var(--space-xxxsmall);
font-size: 10px;
}

.tileSizeSmall .tileContentLabel {
Expand All @@ -173,7 +189,7 @@

.tileSizeDefault {
transition: var(--ui-transition-in);
transition-property: left top width height;
transition-property: left, top, width, height;
}

/** Tile diff variation */
Expand All @@ -196,7 +212,7 @@
}

.tile-NO_CHANGE {
color: var(--color-text-ultra-light);
color: var(--color-text-light);
}

.tile-NO_CHANGE::before {
Expand Down
Loading
Loading