Skip to content

Commit 275c9af

Browse files
sijavsijav
committed
fix(compliance-page): fix header
1 parent a825423 commit 275c9af

File tree

4 files changed

+56
-56
lines changed

4 files changed

+56
-56
lines changed

‎src/locales/de-DE/messages.po‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ msgid "All {name}"
427427
msgstr ""
428428

429429
#: src/pages/panel/compliance/ComplianceDetail.tsx:35
430-
#: src/pages/panel/compliance/ComplianceSummary.tsx:96
430+
#: src/pages/panel/compliance/ComplianceSummary.tsx:97
431431
msgid "All accounts"
432432
msgstr ""
433433

@@ -627,7 +627,6 @@ msgstr "Benchmark"
627627
msgid "Benchmark: {0}"
628628
msgstr "Benchmark: {0}"
629629

630-
#: src/pages/panel/compliance/CompliancePage.tsx:36
631630
#: src/pages/panel/resource-detail/utils/ResourceDetailChangeLogSelectedHistoryAccordion.tsx:54
632631
#: src/pages/panel/shared/utils/chartToShow.tsx:16
633632
#: src/pages/panel/user-settings-notifications/UserSettingsNotificationsPage.tsx:27
@@ -660,11 +659,11 @@ msgstr ""
660659
msgid "Business"
661660
msgstr "Business"
662661

663-
#: src/pages/panel/compliance/ComplianceSummary.tsx:92
662+
#: src/pages/panel/compliance/ComplianceSummary.tsx:93
664663
msgid "By account"
665664
msgstr ""
666665

667-
#: src/pages/panel/compliance/ComplianceSummary.tsx:72
666+
#: src/pages/panel/compliance/ComplianceSummary.tsx:73
668667
msgid "By framework"
669668
msgstr ""
670669

@@ -874,7 +873,7 @@ msgstr "Clouds"
874873
msgid "Community support"
875874
msgstr "Gemeinschaftliche Unterstützung"
876875

877-
#: src/pages/panel/compliance/ComplianceSummary.tsx:67
876+
#: src/pages/panel/compliance/CompliancePage.tsx:38
878877
#: src/pages/panel/security/OverallCard.tsx:76
879878
#: src/shared/layouts/panel-layout/menuList.tsx:30
880879
msgid "Compliance"
@@ -2560,7 +2559,7 @@ msgstr ""
25602559
msgid "Select Members (3)"
25612560
msgstr ""
25622561

2563-
#: src/pages/panel/compliance/ComplianceSummary.tsx:81
2562+
#: src/pages/panel/compliance/ComplianceSummary.tsx:82
25642563
msgid "Select one"
25652564
msgstr ""
25662565

‎src/locales/en-US/messages.po‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ msgid "All {name}"
427427
msgstr "All {name}"
428428

429429
#: src/pages/panel/compliance/ComplianceDetail.tsx:35
430-
#: src/pages/panel/compliance/ComplianceSummary.tsx:96
430+
#: src/pages/panel/compliance/ComplianceSummary.tsx:97
431431
msgid "All accounts"
432432
msgstr "All accounts"
433433

@@ -627,7 +627,6 @@ msgstr "Benchmark"
627627
msgid "Benchmark: {0}"
628628
msgstr "Benchmark: {0}"
629629

630-
#: src/pages/panel/compliance/CompliancePage.tsx:36
631630
#: src/pages/panel/resource-detail/utils/ResourceDetailChangeLogSelectedHistoryAccordion.tsx:54
632631
#: src/pages/panel/shared/utils/chartToShow.tsx:16
633632
#: src/pages/panel/user-settings-notifications/UserSettingsNotificationsPage.tsx:27
@@ -660,11 +659,11 @@ msgstr "Book a call"
660659
msgid "Business"
661660
msgstr "Business"
662661

663-
#: src/pages/panel/compliance/ComplianceSummary.tsx:92
662+
#: src/pages/panel/compliance/ComplianceSummary.tsx:93
664663
msgid "By account"
665664
msgstr "By account"
666665

667-
#: src/pages/panel/compliance/ComplianceSummary.tsx:72
666+
#: src/pages/panel/compliance/ComplianceSummary.tsx:73
668667
msgid "By framework"
669668
msgstr "By framework"
670669

@@ -874,7 +873,7 @@ msgstr "Clouds"
874873
msgid "Community support"
875874
msgstr "Community support"
876875

877-
#: src/pages/panel/compliance/ComplianceSummary.tsx:67
876+
#: src/pages/panel/compliance/CompliancePage.tsx:38
878877
#: src/pages/panel/security/OverallCard.tsx:76
879878
#: src/shared/layouts/panel-layout/menuList.tsx:30
880879
msgid "Compliance"
@@ -2560,7 +2559,7 @@ msgstr "Select Members (2)"
25602559
msgid "Select Members (3)"
25612560
msgstr "Select Members (3)"
25622561

2563-
#: src/pages/panel/compliance/ComplianceSummary.tsx:81
2562+
#: src/pages/panel/compliance/ComplianceSummary.tsx:82
25642563
msgid "Select one"
25652564
msgstr "Select one"
25662565

‎src/pages/panel/compliance/CompliancePage.tsx‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import { Trans } from '@lingui/macro'
2-
import { Stack, stackClasses, Typography } from '@mui/material'
2+
import { Stack, stackClasses } from '@mui/material'
33
import { useSuspenseQuery } from '@tanstack/react-query'
44
import { useUserProfile } from 'src/core/auth'
55
import { getWorkspaceInventoryReportSummaryQuery } from 'src/pages/panel/shared/queries'
66
import { Heatmap } from 'src/shared/charts'
7+
import { HelpSlider } from 'src/shared/right-slider'
78
import { ComplianceSummary } from './ComplianceSummary'
9+
import { slides } from './slides'
810

911
export default function CompliancePage() {
1012
const { selectedWorkspace } = useUserProfile()
@@ -32,9 +34,9 @@ export default function CompliancePage() {
3234
return (
3335
<>
3436
<Stack spacing={3}>
35-
<Typography variant="h3">
36-
<Trans>Benchmarks</Trans>
37-
</Typography>
37+
<HelpSlider slides={slides}>
38+
<Trans>Compliance</Trans>
39+
</HelpSlider>
3840
<Stack>
3941
<Stack
4042
sx={{ overflowX: 'auto', [`&.${stackClasses.root}`]: { ml: -3 } }}

‎src/pages/panel/compliance/ComplianceSummary.tsx‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,9 @@ import { getWorkspaceCloudAccountsQuery, getWorkspaceInventoryReportBenchmarksQu
88
import { useAbsoluteNavigate } from 'src/shared/absolute-navigate'
99
import { ErrorBoundaryFallback, NetworkErrorBoundary } from 'src/shared/error-boundary-fallback'
1010
import { LoadingSuspenseFallback } from 'src/shared/loading'
11-
import { HelpSlider } from 'src/shared/right-slider'
1211
import { GetWorkspaceCloudAccountsResponse, GetWorkspaceInventoryReportBenchmarksResponse } from 'src/shared/types/server'
1312
import { getAccountName } from 'src/shared/utils/getAccountName'
1413
import { ComplianceDetail } from './ComplianceDetail'
15-
import { slides } from './slides'
1614

1715
export const ComplianceSummary = () => {
1816
const { selectedWorkspace } = useUserProfile()
@@ -62,46 +60,48 @@ export const ComplianceSummary = () => {
6260
: accounts
6361

6462
return (
65-
<Stack direction="row" flexWrap="wrap" gap={3.75} justifyContent="space-between" width="100%">
66-
<HelpSlider slides={slides}>
67-
<Trans>Compliance</Trans>
68-
</HelpSlider>
69-
<Stack direction="row" gap={3.75} alignItems="center" sx={{ overflowX: 'auto', overflowY: 'hidden' }} flexWrap="wrap">
70-
<Stack direction="row" gap={3} alignItems="center">
71-
<Typography variant="subtitle1" color="textSecondary">
72-
<Trans>By framework</Trans>
73-
</Typography>
74-
<Select
75-
value={benchmarkId ?? ''}
76-
onChange={(e) => setFramework(e.target.value)}
77-
sx={{ minWidth: 180, color: !benchmarkId ? ({ palette }) => palette.text.disabled : undefined }}
78-
displayEmpty
79-
>
80-
<MenuItem value="" disabled>
81-
<Trans>Select one</Trans>
63+
<Stack
64+
direction="row"
65+
gap={3.75}
66+
alignItems="center"
67+
justifyContent="end"
68+
sx={{ overflowX: 'auto', overflowY: 'hidden' }}
69+
flexWrap="wrap"
70+
>
71+
<Stack direction="row" gap={3} alignItems="center">
72+
<Typography variant="subtitle1" color="textSecondary">
73+
<Trans>By framework</Trans>
74+
</Typography>
75+
<Select
76+
value={benchmarkId ?? ''}
77+
onChange={(e) => setFramework(e.target.value)}
78+
sx={{ minWidth: 180, color: !benchmarkId ? ({ palette }) => palette.text.disabled : undefined }}
79+
displayEmpty
80+
>
81+
<MenuItem value="" disabled>
82+
<Trans>Select one</Trans>
83+
</MenuItem>
84+
{benchmarks.map((benchmark) => (
85+
<MenuItem key={benchmark.value} value={benchmark.value}>
86+
{benchmark.title}
8287
</MenuItem>
83-
{benchmarks.map((benchmark) => (
84-
<MenuItem key={benchmark.value} value={benchmark.value}>
85-
{benchmark.title}
86-
</MenuItem>
87-
))}
88-
</Select>
89-
</Stack>
90-
<Stack direction="row" gap={3} alignItems="center">
91-
<Typography variant="subtitle1" color="textSecondary">
92-
<Trans>By account</Trans>
93-
</Typography>
94-
<Select value={accountId} onChange={(e) => setAccount(e.target.value)} sx={{ minWidth: 180 }} displayEmpty>
95-
<MenuItem value="">
96-
<Trans>All accounts</Trans>
88+
))}
89+
</Select>
90+
</Stack>
91+
<Stack direction="row" gap={3} alignItems="center">
92+
<Typography variant="subtitle1" color="textSecondary">
93+
<Trans>By account</Trans>
94+
</Typography>
95+
<Select value={accountId} onChange={(e) => setAccount(e.target.value)} sx={{ minWidth: 180 }} displayEmpty>
96+
<MenuItem value="">
97+
<Trans>All accounts</Trans>
98+
</MenuItem>
99+
{cloudFilteredAccounts.map((account) => (
100+
<MenuItem key={account.value} value={account.value}>
101+
{account.title}
97102
</MenuItem>
98-
{cloudFilteredAccounts.map((account) => (
99-
<MenuItem key={account.value} value={account.value}>
100-
{account.title}
101-
</MenuItem>
102-
))}
103-
</Select>
104-
</Stack>
103+
))}
104+
</Select>
105105
</Stack>
106106
{isLoading ? (
107107
<LoadingSuspenseFallback />

0 commit comments

Comments
 (0)