From c070b39dae1feaa0acf98693c69be6b0003ee469 Mon Sep 17 00:00:00 2001 From: Josh Hunt Date: Fri, 2 Aug 2024 14:17:14 +0100 Subject: [PATCH] E2C: Add a 'supported types' disclosure to the bottom of the resources table (#91475) --- .../features/migrate-to-cloud/onprem/Page.tsx | 16 ++++++++++------ .../migrate-to-cloud/onprem/ResourcesTable.tsx | 5 +++-- .../onprem/SupportedTypesDisclosure.tsx | 15 +++++++++++++++ public/locales/en-US/grafana.json | 3 +++ public/locales/pseudo-LOCALE/grafana.json | 3 +++ 5 files changed, 34 insertions(+), 8 deletions(-) create mode 100644 public/app/features/migrate-to-cloud/onprem/SupportedTypesDisclosure.tsx diff --git a/public/app/features/migrate-to-cloud/onprem/Page.tsx b/public/app/features/migrate-to-cloud/onprem/Page.tsx index 213a9ef6449..823b4a5e99a 100644 --- a/public/app/features/migrate-to-cloud/onprem/Page.tsx +++ b/public/app/features/migrate-to-cloud/onprem/Page.tsx @@ -23,6 +23,7 @@ import { EmptyState } from './EmptyState/EmptyState'; import { MigrationSummary } from './MigrationSummary'; import { ResourcesTable } from './ResourcesTable'; import { BuildSnapshotCTA, CreatingSnapshotCTA } from './SnapshotCTAs'; +import { SupportedTypesDisclosure } from './SupportedTypesDisclosure'; /** * Here's how migrations work: @@ -231,12 +232,15 @@ export const Page = () => { )} {snapshot.data?.results && snapshot.data.results.length > 0 && ( - + + + + )} diff --git a/public/app/features/migrate-to-cloud/onprem/ResourcesTable.tsx b/public/app/features/migrate-to-cloud/onprem/ResourcesTable.tsx index e2422d5f59b..01e7e464fa3 100644 --- a/public/app/features/migrate-to-cloud/onprem/ResourcesTable.tsx +++ b/public/app/features/migrate-to-cloud/onprem/ResourcesTable.tsx @@ -36,8 +36,9 @@ export function ResourcesTable({ resources, numberOfPages = 0, onChangePage, pag return ( <> - r.refId} /> - + + r.refId} /> + diff --git a/public/app/features/migrate-to-cloud/onprem/SupportedTypesDisclosure.tsx b/public/app/features/migrate-to-cloud/onprem/SupportedTypesDisclosure.tsx new file mode 100644 index 00000000000..3cfb24246cd --- /dev/null +++ b/public/app/features/migrate-to-cloud/onprem/SupportedTypesDisclosure.tsx @@ -0,0 +1,15 @@ +import { Text, TextLink } from '@grafana/ui'; +import { Trans } from 'app/core/internationalization'; + +export function SupportedTypesDisclosure() { + return ( + + + Dashboards, Folders, and built-in core data sources are migrated to your Grafana Cloud stack.{' '} + + Learn about migrating other settings. + + + + ); +} diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json index d1f35a9be67..565a15957bb 100644 --- a/public/locales/en-US/grafana.json +++ b/public/locales/en-US/grafana.json @@ -1175,6 +1175,9 @@ "total-resource-count": "Total resources", "upload-migration": "Upload snapshot" }, + "support-types-disclosure": { + "text": "Dashboards, Folders, and built-in core data sources are migrated to your Grafana Cloud stack. <2>Learn about migrating other settings." + }, "token-status": { "active": "Token created and active", "no-active": "No active token", diff --git a/public/locales/pseudo-LOCALE/grafana.json b/public/locales/pseudo-LOCALE/grafana.json index 0ca6f638913..9d54d949a62 100644 --- a/public/locales/pseudo-LOCALE/grafana.json +++ b/public/locales/pseudo-LOCALE/grafana.json @@ -1175,6 +1175,9 @@ "total-resource-count": "Ŧőŧäľ řęşőūřčęş", "upload-migration": "Ůpľőäđ şʼnäpşĥőŧ" }, + "support-types-disclosure": { + "text": "Đäşĥþőäřđş, Főľđęřş, äʼnđ þūįľŧ-įʼn čőřę đäŧä şőūřčęş äřę mįģřäŧęđ ŧő yőūř Ğřäƒäʼnä Cľőūđ şŧäčĸ. <2>Ŀęäřʼn äþőūŧ mįģřäŧįʼnģ őŧĥęř şęŧŧįʼnģş." + }, "token-status": { "active": "Ŧőĸęʼn čřęäŧęđ äʼnđ äčŧįvę", "no-active": "Ńő äčŧįvę ŧőĸęʼn",