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.

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

[fix] inventory combo boxes fixes #50

Merged
merged 16 commits into from
Dec 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
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
9 changes: 6 additions & 3 deletions src/containers/panel/PanelRoutes.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { lazy } from 'react'
import { Navigate, Route, Routes } from 'react-router-dom'
import { AccountCheckGuard } from 'src/shared/layouts/panel-layout'
import { AccountCheckGuard, BenchmarkCheckGuard } from 'src/shared/layouts/panel-layout'

const HomePage = lazy(
() =>
Expand Down Expand Up @@ -39,9 +39,12 @@ export function PanelRoutes() {
<Routes>
<Route path="/">
<Route element={<AccountCheckGuard />}>
<Route index element={<HomePage />} />
<Route element={<BenchmarkCheckGuard />}>
<Route index element={<HomePage />} />
<Route path="inventory" element={<InventoryPage />} />
</Route>

<Route path="accounts" element={<AccountsPage />} />
<Route path="inventory" element={<InventoryPage />} />
</Route>
<Route path="setup-cloud" element={<SetupCloudPage />} />
</Route>
Expand Down
70 changes: 41 additions & 29 deletions src/locales/de-DE/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ msgstr "© 2023 Some Engineering Services GMBH. Alle Rechte vorbehalten."
#: src/pages/panel/accounts/AccountsTable.tsx:31
#: src/pages/panel/inventory/InventoryTable.error.tsx:74
#: src/pages/panel/inventory/InventoryTable.tsx:79
#: src/pages/panel/inventory/utils/getAutoCompleteFromKey.tsx:75
#: src/pages/panel/inventory/utils/getAutoCompleteFromKey.tsx:84
#: src/shared/layouts/panel-layout/UserProfileButton.tsx:103
msgid "Accounts"
msgstr "Konten"

#: src/pages/panel/home/Overview.tsx:112
#: src/pages/panel/home/Overview.tsx:90
msgid "Accounts Summary"
msgstr "Zusammenfassung der Konten"

Expand All @@ -73,7 +73,7 @@ msgstr "Aktionen"
msgid "Add an account"
msgstr "Füge ein Konto hinzu"

#: src/pages/panel/inventory/ResourceDetail.tsx:187
#: src/pages/panel/inventory/ResourceDetail.tsx:186
msgid "Age"
msgstr "Alter"

Expand Down Expand Up @@ -105,7 +105,7 @@ msgstr "Automatisches Cloud Setup"
msgid "AWS Marketplace has been successfully subscribed"
msgstr "AWS Marketplace wurde erfolgreich abonniert"

#: src/pages/panel/inventory/ResourceDetail.tsx:173
#: src/pages/panel/inventory/ResourceDetail.tsx:172
msgid "Basic Information"
msgstr "Grundinformation"

Expand All @@ -120,7 +120,7 @@ msgstr "Benchmarks"
msgid "Cancel"
msgstr "Stornieren"

#: src/pages/panel/home/Overview.tsx:64
#: src/pages/panel/home/Overview.tsx:42
msgid "Changes in the past 7 days"
msgstr "Änderungen in den letzten 7 Tagen"

Expand All @@ -135,10 +135,22 @@ msgid "Cloud"
msgstr "Cloud"

#: src/shared/event-button/EventButton.tsx:56
msgid "Cloud account added, id: {0}"
msgstr "Cloud-Konto hinzugefügt, ID: {0}"
msgid "Cloud account configured, id: {0}"
msgstr "Cloud-Konto konfiguriert, ID: {0}"

#: src/pages/panel/inventory/utils/getAutoCompleteFromKey.tsx:71
#: src/shared/event-button/EventButton.tsx:63
msgid "Cloud account degraded, id: {0}"
msgstr "Cloud-Konto beeinträchtigt, ID: {0}"

#: src/shared/event-button/EventButton.tsx:70
msgid "Cloud account deleted, id: {0}"
msgstr "Cloud-Konto gelöscht, ID: {0}"

#: src/shared/event-button/EventButton.tsx:77
msgid "Cloud account discovered, id: {0}"
msgstr "Cloud-Konto entdeckt, ID: {0}"

#: src/pages/panel/inventory/utils/getAutoCompleteFromKey.tsx:80
msgid "Clouds"
msgstr "Wolken"

Expand All @@ -160,15 +172,15 @@ msgstr "In die Zwischenablage kopiert!"
msgid "Copy"
msgstr "Kopieren"

#: src/pages/panel/inventory/ResourceDetail.tsx:183
#: src/pages/panel/inventory/ResourceDetail.tsx:182
msgid "Created Time"
msgstr "Erstellte Zeit"

#: src/shared/defined-messages/getMessage.ts:5
msgid "Critical"
msgstr "Kritisch"

#: src/shared/layouts/panel-layout/menuList.tsx:28
#: src/shared/layouts/panel-layout/menuList.tsx:30
msgid "Dashboard"
msgstr "Dashboard"

Expand All @@ -192,7 +204,7 @@ msgstr "Löschen"
msgid "Deploy Stack"
msgstr "Deploy Stack"

#: src/pages/panel/inventory/ResourceDetail.tsx:215
#: src/pages/panel/inventory/ResourceDetail.tsx:214
msgid "Details"
msgstr "Einzelheiten"

Expand All @@ -218,7 +230,7 @@ msgstr "Email"
msgid "Enabled"
msgstr "Ermöglicht"

#: src/shared/event-button/EventButton.tsx:90
#: src/shared/event-button/EventButton.tsx:111
msgid "Events"
msgstr "Veranstaltungen"

Expand Down Expand Up @@ -263,7 +275,7 @@ msgstr "Wie repariert man"
#: src/pages/panel/accounts/AccountRow.tsx:278
#: src/pages/panel/accounts/AccountsTable.tsx:38
#: src/pages/panel/home/AccountCard.tsx:30
#: src/pages/panel/inventory/ResourceDetail.tsx:180
#: src/pages/panel/inventory/ResourceDetail.tsx:179
msgid "ID"
msgstr "ID"

Expand All @@ -275,15 +287,15 @@ msgstr "Verbessert"
msgid "In the next step we are going to set up the trust between FIX and your AWS cloud account."
msgstr "Im nächsten Schritt richten wir einen Trust zwischen FIX und Ihrem AWS Konto ein."

#: src/shared/layouts/panel-layout/menuList.tsx:33
#: src/shared/layouts/panel-layout/menuList.tsx:35
msgid "Inventory"
msgstr "Inventar"

#: src/pages/panel/inventory/ResourceDetail.tsx:244
#~ msgid "Issues"
#~ msgstr "Probleme"

#: src/pages/panel/inventory/ResourceDetail.tsx:179
#: src/pages/panel/inventory/ResourceDetail.tsx:178
msgid "Kind"
msgstr "Art"

Expand Down Expand Up @@ -326,7 +338,7 @@ msgstr "Am meisten verbesserte Ressourcen"

#: src/pages/panel/accounts/AccountRow.tsx:284
#: src/pages/panel/accounts/AccountsTable.tsx:41
#: src/pages/panel/inventory/ResourceDetail.tsx:181
#: src/pages/panel/inventory/ResourceDetail.tsx:180
msgid "Name"
msgstr "Name"

Expand Down Expand Up @@ -359,7 +371,7 @@ msgstr "Noch nichts zu zeigen"
msgid "Null"
msgstr "Null"

#: src/pages/panel/inventory/InventoryAdvanceSearch.tsx:129
#: src/pages/panel/inventory/InventoryAdvanceSearch.tsx:133
msgid "Oops! It looks like your query didn't match our format. Please check and try again."
msgstr "Ups! Ihre Eingabe entspricht nicht unserem Format. Bitte überprüfen Sie sie und versuchen Sie es erneut."

Expand Down Expand Up @@ -405,11 +417,11 @@ msgstr "Privilegiert"
msgid "Profile"
msgstr "Profil"

#: src/pages/panel/inventory/InventoryFormFilterRowProperty.tsx:213
#: src/pages/panel/inventory/InventoryFormFilterRowProperty.tsx:240
msgid "Property"
msgstr "Eigentum"

#: src/pages/panel/inventory/utils/getAutoCompleteFromKey.tsx:79
#: src/pages/panel/inventory/utils/getAutoCompleteFromKey.tsx:88
msgid "Regions"
msgstr "Regionen"

Expand All @@ -425,24 +437,24 @@ msgstr "Ressourcen"
msgid "Risk"
msgstr "Risiko"

#: src/pages/panel/inventory/ResourceDetail.tsx:235
#: src/pages/panel/inventory/ResourceDetail.tsx:234
msgid "Security Issues"
msgstr "Sicherheitsprobleme"

#: src/pages/panel/home/Overview.tsx:32
#: src/shared/layouts/panel-layout/BenchmarkCheckGuard.tsx:24
msgid "Security Scan in Progress"
msgstr "Sicherheitsscan läuft"

#: src/pages/panel/home/Overview.tsx:50
#: src/pages/panel/home/Overview.tsx:74
#: src/pages/panel/home/Overview.tsx:28
#: src/pages/panel/home/Overview.tsx:52
msgid "Security Score"
msgstr "Sicherheitsbewertung"

#: src/shared/language-button/LanguageButton.tsx:40
msgid "Select Language"
msgstr "Sprache auswählen"

#: src/pages/panel/inventory/utils/getAutoCompleteFromKey.tsx:97
#: src/pages/panel/inventory/utils/getAutoCompleteFromKey.tsx:114
msgid "Severity"
msgstr "Schwere"

Expand Down Expand Up @@ -470,7 +482,7 @@ msgid "Submit"
msgstr "Einreichen"

#: src/pages/panel/inventory/InventoryTagAutoComplete.tsx:72
#: src/pages/panel/inventory/ResourceDetail.tsx:201
#: src/pages/panel/inventory/ResourceDetail.tsx:200
msgid "Tags"
msgstr "Stichworte"

Expand Down Expand Up @@ -502,8 +514,8 @@ msgstr "Top 3 der verbesserten Konten"
msgid "Top 3 Non-Compliant Accounts"
msgstr "Top 3 der nicht konformen Konten"

#: src/pages/panel/home/Overview.tsx:84
#: src/pages/panel/home/Overview.tsx:101
#: src/pages/panel/home/Overview.tsx:62
#: src/pages/panel/home/Overview.tsx:79
msgid "Top 5 Security Enhancements"
msgstr "Die fünf wichtigsten Sicherheitsverbesserungen"

Expand All @@ -520,7 +532,7 @@ msgid "Try again"
msgstr "Versuchen Sie es erneut"

#: src/pages/panel/inventory/InventoryFormFilterRowValues.tsx:128
#: src/pages/panel/inventory/utils/getAutoCompleteFromKey.tsx:101
#: src/pages/panel/inventory/utils/getAutoCompleteFromKey.tsx:118
msgid "Value"
msgstr "Wert"

Expand All @@ -544,6 +556,6 @@ msgstr "Wir haben {0} nicht konforme Ressourcen von insgesamt {1} durch {2} {3}-
msgid "You have successfully verified your account."
msgstr "Sie haben Ihr Konto erfolgreich verifiziert."

#: src/pages/panel/home/Overview.tsx:35
#: src/shared/layouts/panel-layout/BenchmarkCheckGuard.tsx:27
msgid "Your cloud account has been added successfully! We are currently performing a security scan. This can take up to an hour depending on the size of your account. Your dashboard will be available shortly after the scan is complete."
msgstr "Ihr Cloud-Konto wurde erfolgreich hinzugefügt! Wir führen derzeit einen Sicherheitsscan durch. Dies kann je nach Größe Ihres Kontos bis zu eine Stunde dauern. Ihr Dashboard wird kurz nach Abschluss des Scans verfügbar sein."
Loading