Skip to content

Commit 1aa1662

Browse files
committed
fix(ui): Summary - pass budget data to SummaryItem
1 parent e47ab21 commit 1aa1662

File tree

2 files changed

+1
-142
lines changed

2 files changed

+1
-142
lines changed

packages/ui/src/app/app.jsx

-141
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ const AppComponent = ({ version, jobs }) => {
176176
);
177177
}
178178

179-
<<<<<<< HEAD
180179
return (
181180
<JobsProvider jobs={jobs}>
182181
<Layout jobs={jobs} version={version}>
@@ -187,146 +186,6 @@ const AppComponent = ({ version, jobs }) => {
187186
data={jobs[0].summary}
188187
budgets={jobs[0].insights?.webpack?.budgets}
189188
showSummaryItemDelta={jobs.length !== 1}
190-
=======
191-
const { summary, insights } = useMemo(() => jobs[0], jobs);
192-
193-
const { duplicatePackagesCount } = summary.webpack;
194-
const duplicatePackagesInsights = Boolean(
195-
duplicatePackagesCount.current || duplicatePackagesCount.baseline,
196-
);
197-
198-
return (
199-
<Layout jobs={jobs} version={version}>
200-
<Container className={css.summaryContainer}>
201-
<Summary
202-
size="large"
203-
keys={METRICS_WEBPACK_GENERAL}
204-
data={summary}
205-
budgets={insights?.webpack?.budgets}
206-
showSummaryItemDelta={jobs.length !== 1}
207-
/>
208-
</Container>
209-
210-
<Container className={css.tabsContainer}>
211-
<Tabs className={css.tabs}>
212-
<NavLink exact to={URLS.OVERVIEW} activeClassName={css.tabActive}>
213-
{I18N.OVERVIEW}
214-
</NavLink>
215-
<NavLink exact to={URLS.ASSETS} activeClassName={css.tabActive}>
216-
{I18N.ASSETS}
217-
</NavLink>
218-
<NavLink exact to={URLS.MODULES} activeClassName={css.tabActive}>
219-
{I18N.MODULES}
220-
</NavLink>
221-
<NavLink exact to={URLS.PACKAGES} activeClassName={css.tabActive}>
222-
{I18N.PACKAGES}
223-
</NavLink>
224-
</Tabs>
225-
</Container>
226-
227-
<div className={css.tabsContent}>
228-
<Switch>
229-
<Route
230-
exact
231-
path={URLS.ASSETS}
232-
render={({ location }) => (
233-
<Container>
234-
<Stack space="medium">
235-
<Summary
236-
keys={METRICS_WEBPACK_ASSETS}
237-
data={summary}
238-
budgets={insights?.webpack?.budgets}
239-
showSummaryItemDelta={jobs.length !== 1}
240-
/>
241-
<Box outline>
242-
<BundleAssets
243-
jobs={jobs}
244-
setState={bundleStatsSetState}
245-
{...bundleStatsState}
246-
key={`${location.pathname}_${location.search}`}
247-
/>
248-
</Box>
249-
</Stack>
250-
</Container>
251-
)}
252-
/>
253-
<Route
254-
exact
255-
path={URLS.MODULES}
256-
render={() => (
257-
<Container>
258-
<Stack space="medium">
259-
<Summary
260-
keys={METRICS_WEBPACK_MODULES}
261-
data={summary}
262-
budgets={insights?.webpack?.budgets}
263-
showSummaryItemDelta={jobs.length !== 1}
264-
/>
265-
<Box outline>
266-
<BundleModules
267-
jobs={jobs}
268-
setState={bundleModulesSetState}
269-
{...bundleModulesState}
270-
/>
271-
</Box>
272-
</Stack>
273-
</Container>
274-
)}
275-
/>
276-
<Route
277-
exact
278-
path={URLS.PACKAGES}
279-
render={({ location }) => (
280-
<Container>
281-
<Stack space="medium">
282-
<Summary
283-
keys={METRICS_WEBPACK_PACKAGES}
284-
data={summary}
285-
budgets={insights?.webpack?.budgets}
286-
showSummaryItemDelta={jobs.length !== 1}
287-
/>
288-
<Box outline>
289-
<BundlePackages
290-
jobs={jobs}
291-
{...bundlePackagesState}
292-
setState={bundlePackagesSetState}
293-
key={`${location.pathname}_${location.search}`}
294-
/>
295-
</Box>
296-
</Stack>
297-
</Container>
298-
)}
299-
/>
300-
<Route
301-
exact
302-
path={URLS.OVERVIEW}
303-
render={() => (
304-
<Stack space="medium">
305-
{duplicatePackagesInsights && (
306-
<Container>
307-
<DuplicatePackagesWarning
308-
duplicatePackagesCount={duplicatePackagesCount}
309-
showDelta={jobs.length > 1}
310-
/>
311-
</Container>
312-
)}
313-
{insights?.webpack?.budgets && (
314-
<Container>
315-
<BudgetInsights source="webpack" budgets={insights.webpack.budgets} />
316-
</Container>
317-
)}
318-
<Container>
319-
<Stack space="small">
320-
<TotalSizeTypeTitle />
321-
<BundleAssetsTotalsChartBars jobs={jobs} />
322-
<Box outline>
323-
<BundleAssetsTotalsTable jobs={jobs} />
324-
</Box>
325-
</Stack>
326-
</Container>
327-
</Stack>
328-
)}
329-
>>>>>>> 7812671e (refactor(ui): App - memo summary, insights)
330189
/>
331190
</Container>
332191
<Container className={css.tabsContainer}>

packages/ui/src/components/summary/summary.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export const Summary = ({
3434
size={size}
3535
id={metricId}
3636
data={get(data, metricId)}
37-
budget={get(budgets, metricId)}
37+
budget={get(budgets, getSourceMetricId(metricId))}
3838
loading={loading}
3939
showMetricDescription
4040
showDelta={showSummaryItemDelta && metricOptions.showDelta !== false}

0 commit comments

Comments
 (0)