From 00d6e1d7f8da008527b94bcc711776a712b3c924 Mon Sep 17 00:00:00 2001 From: Josh Hunt Date: Wed, 20 Mar 2024 17:39:39 +0000 Subject: [PATCH] E2C: Move frontend feature folder up one (#84851) * E2C: Move frontedn folder up one * codeowners --- .github/CODEOWNERS | 2 +- public/app/core/reducers/root.ts | 2 +- .../features/{admin => }/migrate-to-cloud/MigrateToCloud.tsx | 0 public/app/features/{admin => }/migrate-to-cloud/api.ts | 0 .../features/{admin => }/migrate-to-cloud/cloud/InfoPane.tsx | 0 .../cloud/MigrationTokenPane/DeleteMigrationTokenModal.tsx | 0 .../cloud/MigrationTokenPane/MigrationTokenModal.tsx | 0 .../cloud/MigrationTokenPane/MigrationTokenPane.tsx | 0 .../migrate-to-cloud/cloud/MigrationTokenPane/TokenStatus.tsx | 0 public/app/features/{admin => }/migrate-to-cloud/cloud/Page.tsx | 0 .../features/{admin => }/migrate-to-cloud/fixtures/mswAPI.ts | 0 .../{admin => }/migrate-to-cloud/onprem/DisconnectModal.tsx | 0 .../onprem/EmptyState/CallToAction/CallToAction.tsx | 0 .../onprem/EmptyState/CallToAction/ConnectModal.tsx | 0 .../migrate-to-cloud/onprem/EmptyState/EmptyState.tsx | 0 .../migrate-to-cloud/onprem/EmptyState/InfoPaneLeft.tsx | 0 .../migrate-to-cloud/onprem/EmptyState/InfoPaneRight.tsx | 0 .../app/features/{admin => }/migrate-to-cloud/onprem/Page.tsx | 0 .../{admin => }/migrate-to-cloud/onprem/ResourcesTable.tsx | 0 .../features/{admin => }/migrate-to-cloud/shared/InfoItem.tsx | 0 public/app/routes/routes.tsx | 2 +- public/app/store/configureStore.ts | 2 +- 22 files changed, 4 insertions(+), 4 deletions(-) rename public/app/features/{admin => }/migrate-to-cloud/MigrateToCloud.tsx (100%) rename public/app/features/{admin => }/migrate-to-cloud/api.ts (100%) rename public/app/features/{admin => }/migrate-to-cloud/cloud/InfoPane.tsx (100%) rename public/app/features/{admin => }/migrate-to-cloud/cloud/MigrationTokenPane/DeleteMigrationTokenModal.tsx (100%) rename public/app/features/{admin => }/migrate-to-cloud/cloud/MigrationTokenPane/MigrationTokenModal.tsx (100%) rename public/app/features/{admin => }/migrate-to-cloud/cloud/MigrationTokenPane/MigrationTokenPane.tsx (100%) rename public/app/features/{admin => }/migrate-to-cloud/cloud/MigrationTokenPane/TokenStatus.tsx (100%) rename public/app/features/{admin => }/migrate-to-cloud/cloud/Page.tsx (100%) rename public/app/features/{admin => }/migrate-to-cloud/fixtures/mswAPI.ts (100%) rename public/app/features/{admin => }/migrate-to-cloud/onprem/DisconnectModal.tsx (100%) rename public/app/features/{admin => }/migrate-to-cloud/onprem/EmptyState/CallToAction/CallToAction.tsx (100%) rename public/app/features/{admin => }/migrate-to-cloud/onprem/EmptyState/CallToAction/ConnectModal.tsx (100%) rename public/app/features/{admin => }/migrate-to-cloud/onprem/EmptyState/EmptyState.tsx (100%) rename public/app/features/{admin => }/migrate-to-cloud/onprem/EmptyState/InfoPaneLeft.tsx (100%) rename public/app/features/{admin => }/migrate-to-cloud/onprem/EmptyState/InfoPaneRight.tsx (100%) rename public/app/features/{admin => }/migrate-to-cloud/onprem/Page.tsx (100%) rename public/app/features/{admin => }/migrate-to-cloud/onprem/ResourcesTable.tsx (100%) rename public/app/features/{admin => }/migrate-to-cloud/shared/InfoItem.tsx (100%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 27019ee64f9..fb50ac01cbf 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -388,7 +388,7 @@ playwright.config.ts @grafana/plugins-platform-frontend /public/app/features/admin/ @grafana/identity-access-team # Temp owners until Enterprise team takes over -/public/app/features/admin/migrate-to-cloud @grafana/grafana-frontend-platform +/public/app/features/migrate-to-cloud @grafana/grafana-frontend-platform /public/app/features/auth-config/ @grafana/identity-access-team /public/app/features/annotations/ @grafana/dashboards-squad diff --git a/public/app/core/reducers/root.ts b/public/app/core/reducers/root.ts index 33d86889aee..c776ce8c49c 100644 --- a/public/app/core/reducers/root.ts +++ b/public/app/core/reducers/root.ts @@ -2,7 +2,6 @@ import { ReducersMapObject } from '@reduxjs/toolkit'; import { AnyAction, combineReducers } from 'redux'; import sharedReducers from 'app/core/reducers'; -import { migrateToCloudAPI } from 'app/features/admin/migrate-to-cloud/api'; import ldapReducers from 'app/features/admin/state/reducers'; import alertingReducers from 'app/features/alerting/state/reducers'; import apiKeysReducers from 'app/features/api-keys/state/reducers'; @@ -17,6 +16,7 @@ import exploreReducers from 'app/features/explore/state/main'; import foldersReducers from 'app/features/folders/state/reducers'; import invitesReducers from 'app/features/invites/state/reducers'; import importDashboardReducers from 'app/features/manage-dashboards/state/reducers'; +import { migrateToCloudAPI } from 'app/features/migrate-to-cloud/api'; import organizationReducers from 'app/features/org/state/reducers'; import panelsReducers from 'app/features/panel/state/reducers'; import { reducer as pluginsReducer } from 'app/features/plugins/admin/state/reducer'; diff --git a/public/app/features/admin/migrate-to-cloud/MigrateToCloud.tsx b/public/app/features/migrate-to-cloud/MigrateToCloud.tsx similarity index 100% rename from public/app/features/admin/migrate-to-cloud/MigrateToCloud.tsx rename to public/app/features/migrate-to-cloud/MigrateToCloud.tsx diff --git a/public/app/features/admin/migrate-to-cloud/api.ts b/public/app/features/migrate-to-cloud/api.ts similarity index 100% rename from public/app/features/admin/migrate-to-cloud/api.ts rename to public/app/features/migrate-to-cloud/api.ts diff --git a/public/app/features/admin/migrate-to-cloud/cloud/InfoPane.tsx b/public/app/features/migrate-to-cloud/cloud/InfoPane.tsx similarity index 100% rename from public/app/features/admin/migrate-to-cloud/cloud/InfoPane.tsx rename to public/app/features/migrate-to-cloud/cloud/InfoPane.tsx diff --git a/public/app/features/admin/migrate-to-cloud/cloud/MigrationTokenPane/DeleteMigrationTokenModal.tsx b/public/app/features/migrate-to-cloud/cloud/MigrationTokenPane/DeleteMigrationTokenModal.tsx similarity index 100% rename from public/app/features/admin/migrate-to-cloud/cloud/MigrationTokenPane/DeleteMigrationTokenModal.tsx rename to public/app/features/migrate-to-cloud/cloud/MigrationTokenPane/DeleteMigrationTokenModal.tsx diff --git a/public/app/features/admin/migrate-to-cloud/cloud/MigrationTokenPane/MigrationTokenModal.tsx b/public/app/features/migrate-to-cloud/cloud/MigrationTokenPane/MigrationTokenModal.tsx similarity index 100% rename from public/app/features/admin/migrate-to-cloud/cloud/MigrationTokenPane/MigrationTokenModal.tsx rename to public/app/features/migrate-to-cloud/cloud/MigrationTokenPane/MigrationTokenModal.tsx diff --git a/public/app/features/admin/migrate-to-cloud/cloud/MigrationTokenPane/MigrationTokenPane.tsx b/public/app/features/migrate-to-cloud/cloud/MigrationTokenPane/MigrationTokenPane.tsx similarity index 100% rename from public/app/features/admin/migrate-to-cloud/cloud/MigrationTokenPane/MigrationTokenPane.tsx rename to public/app/features/migrate-to-cloud/cloud/MigrationTokenPane/MigrationTokenPane.tsx diff --git a/public/app/features/admin/migrate-to-cloud/cloud/MigrationTokenPane/TokenStatus.tsx b/public/app/features/migrate-to-cloud/cloud/MigrationTokenPane/TokenStatus.tsx similarity index 100% rename from public/app/features/admin/migrate-to-cloud/cloud/MigrationTokenPane/TokenStatus.tsx rename to public/app/features/migrate-to-cloud/cloud/MigrationTokenPane/TokenStatus.tsx diff --git a/public/app/features/admin/migrate-to-cloud/cloud/Page.tsx b/public/app/features/migrate-to-cloud/cloud/Page.tsx similarity index 100% rename from public/app/features/admin/migrate-to-cloud/cloud/Page.tsx rename to public/app/features/migrate-to-cloud/cloud/Page.tsx diff --git a/public/app/features/admin/migrate-to-cloud/fixtures/mswAPI.ts b/public/app/features/migrate-to-cloud/fixtures/mswAPI.ts similarity index 100% rename from public/app/features/admin/migrate-to-cloud/fixtures/mswAPI.ts rename to public/app/features/migrate-to-cloud/fixtures/mswAPI.ts diff --git a/public/app/features/admin/migrate-to-cloud/onprem/DisconnectModal.tsx b/public/app/features/migrate-to-cloud/onprem/DisconnectModal.tsx similarity index 100% rename from public/app/features/admin/migrate-to-cloud/onprem/DisconnectModal.tsx rename to public/app/features/migrate-to-cloud/onprem/DisconnectModal.tsx diff --git a/public/app/features/admin/migrate-to-cloud/onprem/EmptyState/CallToAction/CallToAction.tsx b/public/app/features/migrate-to-cloud/onprem/EmptyState/CallToAction/CallToAction.tsx similarity index 100% rename from public/app/features/admin/migrate-to-cloud/onprem/EmptyState/CallToAction/CallToAction.tsx rename to public/app/features/migrate-to-cloud/onprem/EmptyState/CallToAction/CallToAction.tsx diff --git a/public/app/features/admin/migrate-to-cloud/onprem/EmptyState/CallToAction/ConnectModal.tsx b/public/app/features/migrate-to-cloud/onprem/EmptyState/CallToAction/ConnectModal.tsx similarity index 100% rename from public/app/features/admin/migrate-to-cloud/onprem/EmptyState/CallToAction/ConnectModal.tsx rename to public/app/features/migrate-to-cloud/onprem/EmptyState/CallToAction/ConnectModal.tsx diff --git a/public/app/features/admin/migrate-to-cloud/onprem/EmptyState/EmptyState.tsx b/public/app/features/migrate-to-cloud/onprem/EmptyState/EmptyState.tsx similarity index 100% rename from public/app/features/admin/migrate-to-cloud/onprem/EmptyState/EmptyState.tsx rename to public/app/features/migrate-to-cloud/onprem/EmptyState/EmptyState.tsx diff --git a/public/app/features/admin/migrate-to-cloud/onprem/EmptyState/InfoPaneLeft.tsx b/public/app/features/migrate-to-cloud/onprem/EmptyState/InfoPaneLeft.tsx similarity index 100% rename from public/app/features/admin/migrate-to-cloud/onprem/EmptyState/InfoPaneLeft.tsx rename to public/app/features/migrate-to-cloud/onprem/EmptyState/InfoPaneLeft.tsx diff --git a/public/app/features/admin/migrate-to-cloud/onprem/EmptyState/InfoPaneRight.tsx b/public/app/features/migrate-to-cloud/onprem/EmptyState/InfoPaneRight.tsx similarity index 100% rename from public/app/features/admin/migrate-to-cloud/onprem/EmptyState/InfoPaneRight.tsx rename to public/app/features/migrate-to-cloud/onprem/EmptyState/InfoPaneRight.tsx diff --git a/public/app/features/admin/migrate-to-cloud/onprem/Page.tsx b/public/app/features/migrate-to-cloud/onprem/Page.tsx similarity index 100% rename from public/app/features/admin/migrate-to-cloud/onprem/Page.tsx rename to public/app/features/migrate-to-cloud/onprem/Page.tsx diff --git a/public/app/features/admin/migrate-to-cloud/onprem/ResourcesTable.tsx b/public/app/features/migrate-to-cloud/onprem/ResourcesTable.tsx similarity index 100% rename from public/app/features/admin/migrate-to-cloud/onprem/ResourcesTable.tsx rename to public/app/features/migrate-to-cloud/onprem/ResourcesTable.tsx diff --git a/public/app/features/admin/migrate-to-cloud/shared/InfoItem.tsx b/public/app/features/migrate-to-cloud/shared/InfoItem.tsx similarity index 100% rename from public/app/features/admin/migrate-to-cloud/shared/InfoItem.tsx rename to public/app/features/migrate-to-cloud/shared/InfoItem.tsx diff --git a/public/app/routes/routes.tsx b/public/app/routes/routes.tsx index 8ff4daa10ec..fc6a9873644 100644 --- a/public/app/routes/routes.tsx +++ b/public/app/routes/routes.tsx @@ -366,7 +366,7 @@ export function getAppRoutes(): RouteDescriptor[] { path: '/admin/migrate-to-cloud', roles: () => ['Admin'], component: SafeDynamicImport( - () => import(/* webpackChunkName: "MigrateToCloud" */ 'app/features/admin/migrate-to-cloud/MigrateToCloud') + () => import(/* webpackChunkName: "MigrateToCloud" */ 'app/features/migrate-to-cloud/MigrateToCloud') ), }, // LOGIN / SIGNUP diff --git a/public/app/store/configureStore.ts b/public/app/store/configureStore.ts index 4794d46d7e0..ce1a65c1f0b 100644 --- a/public/app/store/configureStore.ts +++ b/public/app/store/configureStore.ts @@ -1,9 +1,9 @@ import { configureStore as reduxConfigureStore, createListenerMiddleware } from '@reduxjs/toolkit'; import { setupListeners } from '@reduxjs/toolkit/query'; -import { migrateToCloudAPI } from 'app/features/admin/migrate-to-cloud/api'; import { browseDashboardsAPI } from 'app/features/browse-dashboards/api/browseDashboardsAPI'; import { publicDashboardApi } from 'app/features/dashboard/api/publicDashboardApi'; +import { migrateToCloudAPI } from 'app/features/migrate-to-cloud/api'; import { StoreState } from 'app/types/store'; import { buildInitialState } from '../core/reducers/navModel';