Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Migrate transforms pages off withRouteProps (#78422)

Romeo Van Snickdee31666b913
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/TransformInspectPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/TransformInspectPage.tsx
index 64da2c313a3..99f5cbf5a57 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/TransformInspectPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/TransformInspectPage.tsx
@@ -3,7 +3,7 @@ import { t } from "ttag";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
-import type { Location } from "metabase/router";
+import { useParams, useRouter } from "metabase/router";
import { TransformDisconnectedDatabaseBanner } from "metabase/transforms/components/TransformDisconnectedDatabaseBanner";
import { TransformHeader } from "metabase/transforms/components/TransformHeader";
import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";
@@ -16,15 +16,9 @@ import * as Urls from "metabase/urls";
import { InspectorContent } from "./components/InspectorContent";
import type { RouteParams } from "./types";
-type TransformInspectPageProps = {
- params: RouteParams;
- location: Location;
-};
-
-export const TransformInspectPage = ({
- params,
- location,
-}: TransformInspectPageProps) => {
+export const TransformInspectPage = () => {
+ const { location } = useRouter();
+ const params = useParams<RouteParams>();
const transformId = Urls.extractEntityId(params.transformId);
const {
transform,
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/InspectorContent.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/InspectorContent.tsx
index 7aff8ae9dce..6f99d3f589d 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/InspectorContent.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/InspectorContent.tsx
@@ -15,7 +15,7 @@ import { getLensKey } from "./LensNavigator/utils";
type InspectorContentProps = {
transform: Transform;
- params: RouteParams;
+ params: Partial<RouteParams>;
location: Location;
};
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensNavigator/useLensNavigation.ts b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensNavigator/useLensNavigation.ts
index 66986b7d9e4..03f271d4bb3 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensNavigator/useLensNavigation.ts
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensNavigator/useLensNavigation.ts
@@ -30,7 +30,7 @@ type UseLensNavigationResult = {
export const useLensNavigation = (
availableLenses: InspectorLensMetadata[],
- params: RouteParams,
+ params: Partial<RouteParams>,
location: Location,
): UseLensNavigationResult => {
const dispatch = useDispatch();
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/routes.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/routes.tsx
index b4bd4db8027..febf71ee526 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/routes.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/routes.tsx
@@ -1,23 +1,18 @@
-import { Route, withRouteProps } from "metabase/router";
+import { Route } from "metabase/router";
import { TransformInspectorUpsellPage } from "metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/TransformInspectorUpsellPage";
import { TransformInspectPage } from "./pages/TransformInspectPage";
-const RoutedTransformInspectorUpsellPage = withRouteProps(
- TransformInspectorUpsellPage,
-);
-const RoutedTransformInspectPage = withRouteProps(TransformInspectPage);
-
export function getInspectorUpsellRoutes() {
return (
<>
<Route
path=":transformId/inspect"
- element={<RoutedTransformInspectorUpsellPage />}
+ element={<TransformInspectorUpsellPage />}
/>
<Route
path=":transformId/inspect/:lensId"
- element={<RoutedTransformInspectorUpsellPage />}
+ element={<TransformInspectorUpsellPage />}
/>
</>
);
@@ -26,13 +21,10 @@ export function getInspectorUpsellRoutes() {
export function getInspectorRoutes() {
return (
<>
- <Route
- path=":transformId/inspect"
- element={<RoutedTransformInspectPage />}
- />
+ <Route path=":transformId/inspect" element={<TransformInspectPage />} />
<Route
path=":transformId/inspect/:lensId"
- element={<RoutedTransformInspectPage />}
+ element={<TransformInspectPage />}
/>
</>
);
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx
index 0fd37e29869..951ff4eac3c 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx
@@ -6,7 +6,7 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErr
import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { useSelector } from "metabase/redux";
-import type { Route } from "metabase/router";
+import { useParams } from "metabase/router";
import { Alert, Box, Card, Stack } from "metabase/ui";
import type * as Urls from "metabase/urls";
import { isResourceNotFoundError } from "metabase/utils/errors";
@@ -21,11 +21,6 @@ import { PythonEditor } from "../../components/PythonEditor";
import { PythonLibraryEditorHeader } from "./PythonLibraryEditorHeader";
import S from "./PythonLibraryEditorPage.module.css";
-type PythonLibraryEditorPageProps = {
- params: Urls.TransformPythonLibraryParams;
- route: Route;
-};
-
const EMPTY_LIBRARY_SOURCE = `
# This is your Python library.
# You can add functions and classes here that can be reused in Python transforms.
@@ -33,11 +28,16 @@ const EMPTY_LIBRARY_SOURCE = `
.trim()
.concat("\n");
-export function PythonLibraryEditorPage({
- params,
- route,
-}: PythonLibraryEditorPageProps) {
- const { path } = params;
+export function PythonLibraryEditorPage() {
+ const { path } = useParams<Urls.TransformPythonLibraryParams>();
+ return path == null ? null : <PythonLibraryEditor path={path} />;
+}
+
+type PythonLibraryEditorProps = {
+ path: string;
+};
+
+function PythonLibraryEditor({ path }: PythonLibraryEditorProps) {
const [source, setSource] = useState(EMPTY_LIBRARY_SOURCE);
const isRemoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);
@@ -127,7 +127,7 @@ export function PythonLibraryEditorPage({
/>
</Card>
</PageContainer>
- <LeaveRouteConfirmModal route={route} isEnabled={isDirty} />
+ <LeaveRouteConfirmModal isEnabled={isDirty} />
</>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/routes.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/routes.tsx
index c7de89f05b5..48235244480 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/routes.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/routes.tsx
@@ -1,20 +1,16 @@
import { modalRoute } from "metabase/common/components/ModalRoute";
-import { Route, withRouteProps } from "metabase/router";
+import { Route } from "metabase/router";
import { NewPythonTransformPage } from "metabase/transforms/pages/NewTransformPage";
import { TransformListPage } from "metabase/transforms/pages/TransformListPage";
import { PythonLibraryEditorPage } from "./pages/PythonLibraryEditorPage";
import { PythonTransformsUpsellModal } from "./upsells/PythonTransformsUpsellModal";
-const RoutedPythonLibraryEditorPage = withRouteProps(PythonLibraryEditorPage);
-const RoutedNewPythonTransformPage = withRouteProps(NewPythonTransformPage);
-const RoutedTransformListPage = withRouteProps(TransformListPage);
-
export function getPythonTransformsRoutes() {
return (
<>
- <Route path="library/:path" element={<RoutedPythonLibraryEditorPage />} />
- <Route path="new/python" element={<RoutedNewPythonTransformPage />} />
+ <Route path="library/:path" element={<PythonLibraryEditorPage />} />
+ <Route path="new/python" element={<NewPythonTransformPage />} />
</>
);
}
@@ -22,7 +18,7 @@ export function getPythonTransformsRoutes() {
export function getPythonUpsellRoutes() {
return (
// Render upsell modal on python transforms routes if feature is not enabled
- <Route path="" element={<RoutedTransformListPage />}>
+ <Route path="" element={<TransformListPage />}>
{modalRoute("library/:path", PythonTransformsUpsellModal, {
noWrap: true,
})}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/TransformInspectorUpsellPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/TransformInspectorUpsellPage.tsx
index 95f9e87a196..1873bf02b8f 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/TransformInspectorUpsellPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/TransformInspectorUpsellPage.tsx
@@ -2,6 +2,7 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErr
import { DottedBackground } from "metabase/common/components/upsells/components/DottedBackground";
import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
import { useSelector } from "metabase/redux/hooks";
+import { useParams } from "metabase/router";
import { getIsHosted } from "metabase/selectors/settings";
import { getStoreUsers } from "metabase/selectors/store-users";
import { getUserIsAdmin } from "metabase/selectors/user";
@@ -13,14 +14,9 @@ import { reload } from "metabase/utils/dom";
import { PythonTransformsUpsell } from "./PythonTransformsUpsellModal";
-type TransformInspectorUpsellPageProps = {
- params: { transformId: string };
-};
-
-export function TransformInspectorUpsellPage({
- params,
-}: TransformInspectorUpsellPageProps) {
- const transformId = Urls.extractEntityId(params.transformId);
+export function TransformInspectorUpsellPage() {
+ const { transformId: transformIdParam } = useParams();
+ const transformId = Urls.extractEntityId(transformIdParam);
const { transform, isLoading, error } = useTransformWithPolling(transformId);
const isHosted = useSelector(getIsHosted);
const { isStoreUser } = useSelector(getStoreUsers);
diff --git a/frontend/src/metabase/transforms/pages/JobPage/JobPage.tsx b/frontend/src/metabase/transforms/pages/JobPage/JobPage.tsx
index 5b9139c97a5..f506d12ca9c 100644
--- a/frontend/src/metabase/transforms/pages/JobPage/JobPage.tsx
+++ b/frontend/src/metabase/transforms/pages/JobPage/JobPage.tsx
@@ -8,6 +8,7 @@ import {
} from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { useMetadataToasts } from "metabase/metadata/hooks";
+import { useParams } from "metabase/router";
import { useJobHeaderState } from "metabase/transforms/hooks/use-job-header-state";
import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";
import { Center } from "metabase/ui";
@@ -32,11 +33,8 @@ type JobPageParsedParams = {
jobId?: TransformJobId;
};
-type JobPageProps = {
- params: JobPageParams;
-};
-
-export function JobPage({ params }: JobPageProps) {
+export function JobPage() {
+ const params = useParams<JobPageParams>();
const { jobId } = getParsedParams(params);
const [isPolling, setIsPolling] = useState(false);
const {
@@ -149,7 +147,9 @@ function JobPageBody({
);
}
-function getParsedParams({ jobId }: JobPageParams): JobPageParsedParams {
+function getParsedParams({
+ jobId,
+}: Partial<JobPageParams>): JobPageParsedParams {
return {
jobId: Urls.extractEntityId(jobId),
};
diff --git a/frontend/src/metabase/transforms/pages/JobPage/JobPage.unit.spec.tsx b/frontend/src/metabase/transforms/pages/JobPage/JobPage.unit.spec.tsx
index 730e8c413ad..3069fdde7ad 100644
--- a/frontend/src/metabase/transforms/pages/JobPage/JobPage.unit.spec.tsx
+++ b/frontend/src/metabase/transforms/pages/JobPage/JobPage.unit.spec.tsx
@@ -8,7 +8,7 @@ import {
setupListTransformTagsEndpoint,
} from "__support__/server-mocks/transform";
import { act, renderWithProviders, screen, within } from "__support__/ui";
-import { Route, withRouteProps } from "metabase/router";
+import { Route } from "metabase/router";
import * as Urls from "metabase/urls";
import type { TransformJob } from "metabase-types/api";
import {
@@ -18,8 +18,6 @@ import {
import { JobPage } from "./JobPage";
-const RoutedJobPage = withRouteProps(JobPage);
-
const TRANSFORMS_DELAY = 1000;
type SetupOpts = {
@@ -41,10 +39,7 @@ const setup = ({
const path = Urls.transformJob(job.id);
renderWithProviders(
- <Route
- path="/data-studio/transforms/jobs/:jobId"
- element={<RoutedJobPage />}
- />,
+ <Route path="/data-studio/transforms/jobs/:jobId" element={<JobPage />} />,
{ withRouter: true, initialRoute: path },
);
};
diff --git a/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunListPage.tsx b/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunListPage.tsx
index b00b7c3eaad..2574f0e9b87 100644
--- a/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunListPage.tsx
+++ b/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunListPage.tsx
@@ -12,8 +12,7 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErr
import { PaginationControls } from "metabase/common/components/PaginationControls";
import { usePageTitle } from "metabase/hooks/use-page-title";
import { useDispatch } from "metabase/redux";
-import type { Location } from "metabase/router";
-import { replace } from "metabase/router";
+import { replace, useParams, useRouter } from "metabase/router";
import { POLLING_INTERVAL } from "metabase/transforms/constants";
import { useJobHeaderState } from "metabase/transforms/hooks/use-job-header-state";
import { formatRunMethod, formatStatus } from "metabase/transforms/utils";
@@ -41,12 +40,9 @@ import { getParsedParams, getSortOptions } from "./utils";
const EMPTY_RUNS: TransformJobRun[] = [];
-type JobRunListPageProps = {
- params: { jobId: string };
- location: Location;
-};
-
-export function JobRunListPage({ params, location }: JobRunListPageProps) {
+export function JobRunListPage() {
+ const { location } = useRouter();
+ const params = useParams<{ jobId: string }>();
usePageTitle(t`Run history`);
const jobId = Urls.extractEntityId(params.jobId);
const parsedParams = getParsedParams(location);
diff --git a/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunListPage.unit.spec.tsx b/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunListPage.unit.spec.tsx
index 47f723b0789..02faed9baf5 100644
--- a/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunListPage.unit.spec.tsx
+++ b/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunListPage.unit.spec.tsx
@@ -17,7 +17,7 @@ import {
waitFor,
within,
} from "__support__/ui";
-import { Route, withRouteProps } from "metabase/router";
+import { Route } from "metabase/router";
import { POLLING_INTERVAL } from "metabase/transforms/constants";
import type {
TransformJobRun,
@@ -33,8 +33,6 @@ import {
import { JobRunListPage } from "./JobRunListPage";
-const RoutedJobRunListPage = withRouteProps(JobRunListPage);
-
const JOB_ID = 3;
type SetupOpts = {
@@ -68,13 +66,10 @@ function setup({
const path = "/data-studio/transforms/jobs/:jobId/runs";
- renderWithProviders(
- <Route path={path} element={<RoutedJobRunListPage />} />,
- {
- withRouter: true,
- initialRoute,
- },
- );
+ renderWithProviders(<Route path={path} element={<JobRunListPage />} />, {
+ withRouter: true,
+ initialRoute,
+ });
return {
setRuns(nextRuns: TransformJobRun[]) {
diff --git a/frontend/src/metabase/transforms/pages/NewJobPage/NewJobPage.tsx b/frontend/src/metabase/transforms/pages/NewJobPage/NewJobPage.tsx
index 6b350c7f802..22d8d63f77f 100644
--- a/frontend/src/metabase/transforms/pages/NewJobPage/NewJobPage.tsx
+++ b/frontend/src/metabase/transforms/pages/NewJobPage/NewJobPage.tsx
@@ -10,7 +10,6 @@ import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmM
import { PaneHeaderActions } from "metabase/common/data-studio/components/PaneHeader";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { useDispatch } from "metabase/redux";
-import type { Route } from "metabase/router";
import { push } from "metabase/router";
import * as Urls from "metabase/urls";
import type { ScheduleDisplayType, TransformTagId } from "metabase-types/api";
@@ -18,11 +17,7 @@ import type { ScheduleDisplayType, TransformTagId } from "metabase-types/api";
import { trackTransformJobCreated } from "../../analytics";
import { JobEditor, type TransformJobInfo } from "../../components/JobEditor";
-type NewJobPageProps = {
- route: Route;
-};
-
-export function NewJobPage({ route }: NewJobPageProps) {
+export function NewJobPage() {
const initialJob = useMemo(() => getNewJobInfo(), []);
const [job, setJob] = useState(initialJob);
const isDirty = useMemo(() => !_.isEqual(job, initialJob), [job, initialJob]);
@@ -83,7 +78,7 @@ export function NewJobPage({ route }: NewJobPageProps) {
onScheduleChange={handleScheduleChange}
onTagListChange={handleTagListChange}
/>
- <LeaveRouteConfirmModal route={route} isEnabled={isDirty && !isSaving} />
+ <LeaveRouteConfirmModal isEnabled={isDirty && !isSaving} />
</>
);
}
diff --git a/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx b/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx
index 67462c8b5f2..d94faa05b57 100644
--- a/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx
+++ b/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx
@@ -16,7 +16,7 @@ import {
import { PLUGIN_REMOTE_SYNC, PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";
import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";
import { useDispatch, useSelector } from "metabase/redux";
-import { Link, type Location, type Route, push } from "metabase/router";
+import { Link, type Location, push, useParams } from "metabase/router";
import { getMetadata } from "metabase/selectors/metadata";
import { useRegisterMetabotTransformContext } from "metabase/transforms/hooks/use-register-transform-metabot-context";
import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";
@@ -45,10 +45,9 @@ import {
type NewTransformPageProps = {
initialSource: DraftTransformSource;
- route: Route;
};
-function NewTransformPage({ initialSource, route }: NewTransformPageProps) {
+function NewTransformPage({ initialSource }: NewTransformPageProps) {
const {
transformsDatabases,
isLoadingDatabases: isLoading,
@@ -87,7 +86,6 @@ function NewTransformPage({ initialSource, route }: NewTransformPageProps) {
<NewTransformPageBody
initialSource={initialSource}
databases={transformsDatabases}
- route={route}
/>
);
}
@@ -95,13 +93,11 @@ function NewTransformPage({ initialSource, route }: NewTransformPageProps) {
type NewTransformPageBodyProps = {
initialSource: DraftTransformSource;
databases: Database[];
- route: Route;
};
function NewTransformPageBody({
initialSource,
databases,
- route,
}: NewTransformPageBodyProps) {
const {
source,
@@ -225,7 +221,6 @@ function NewTransformPageBody({
/>
)}
<LeaveRouteConfirmModal
- route={route}
isEnabled={isDirty}
isLocationAllowed={isLocationAllowed}
onConfirm={rejectProposed}
@@ -235,46 +230,27 @@ function NewTransformPageBody({
);
}
-type NewQueryTransformPageProps = {
- route: Route;
-};
-
-export function NewQueryTransformPage({ route }: NewQueryTransformPageProps) {
+export function NewQueryTransformPage() {
const initialSource = useMemo(() => getInitialQuerySource(), []);
- return <NewTransformPage initialSource={initialSource} route={route} />;
+ return <NewTransformPage initialSource={initialSource} />;
}
-type NewNativeTransformPageProps = {
- route: Route;
-};
-
-export function NewNativeTransformPage({ route }: NewNativeTransformPageProps) {
+export function NewNativeTransformPage() {
const initialSource = useMemo(() => getInitialNativeSource(), []);
- return <NewTransformPage initialSource={initialSource} route={route} />;
+ return <NewTransformPage initialSource={initialSource} />;
}
-type NewPythonTransformPageProps = {
- route: Route;
-};
-
-export function NewPythonTransformPage({ route }: NewPythonTransformPageProps) {
+export function NewPythonTransformPage() {
const initialSource = useMemo(() => getInitialPythonSource(), []);
- return <NewTransformPage initialSource={initialSource} route={route} />;
+ return <NewTransformPage initialSource={initialSource} />;
}
type NewCardTransformPageParams = {
cardId: string;
};
-type NewCardTransformPageProps = {
- params: NewCardTransformPageParams;
- route: Route;
-};
-
-export function NewCardTransformPage({
- params,
- route,
-}: NewCardTransformPageProps) {
+export function NewCardTransformPage() {
+ const params = useParams<NewCardTransformPageParams>();
const cardId = Urls.extractEntityId(params.cardId);
const {
data: card,
@@ -295,5 +271,5 @@ export function NewCardTransformPage({
);
}
- return <NewTransformPage initialSource={initialSource} route={route} />;
+ return <NewTransformPage initialSource={initialSource} />;
}
diff --git a/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsx
index ff8335f69f5..120238ff937 100644
--- a/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsx
+++ b/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsx
@@ -13,8 +13,7 @@ import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/Da
import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";
import { useSetting } from "metabase/common/hooks";
import { useDispatch } from "metabase/redux";
-import type { Location } from "metabase/router";
-import { replace } from "metabase/router";
+import { replace, useRouter } from "metabase/router";
import { DetailedViewSwitch } from "metabase/transforms/components/DetailedViewSwitch";
import { LockedTransformsBanner } from "metabase/transforms/components/LockedTransformsBanner/LockedTransformsBanner";
import { POLLING_INTERVAL } from "metabase/transforms/constants";
@@ -42,11 +41,8 @@ import {
const EMPTY_RUNS: TransformRun[] = [];
-type RunListPageProps = {
- location: Location;
-};
-
-export function RunListPage({ location }: RunListPageProps) {
+export function RunListPage() {
+ const { location } = useRouter();
const params = getParsedParams(location);
const { page = 0 } = params;
const { ref: containerRef, width: containerWidth } = useElementSize();
diff --git a/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.unit.spec.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.unit.spec.tsx
index 8ccd1823269..69e4e1f195c 100644
--- a/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.unit.spec.tsx
+++ b/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.unit.spec.tsx
@@ -12,7 +12,7 @@ import {
screen,
within,
} from "__support__/ui";
-import { Route, withRouteProps } from "metabase/router";
+import { Route } from "metabase/router";
import * as Urls from "metabase/urls";
import type { TransformRun } from "metabase-types/api";
import {
@@ -23,8 +23,6 @@ import {
import { RunListPage } from "./RunListPage";
-const RoutedRunListPage = withRouteProps(RunListPage);
-
type SetupOpts = {
runs?: TransformRun[];
};
@@ -43,7 +41,7 @@ function setup({ runs = [] }: SetupOpts = {}) {
const path = Urls.transformRunList();
- renderWithProviders(<Route path={path} element={<RoutedRunListPage />} />, {
+ renderWithProviders(<Route path={path} element={<RunListPage />} />, {
withRouter: true,
initialRoute: path,
});
diff --git a/frontend/src/metabase/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx b/frontend/src/metabase/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx
index 2f3bf33097d..31e390c48b2 100644
--- a/frontend/src/metabase/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx
@@ -2,7 +2,7 @@ import { skipToken, useGetTransformQuery } from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
-import { Outlet } from "metabase/router";
+import { Outlet, useParams } from "metabase/router";
import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";
import { Card, Center } from "metabase/ui";
import * as Urls from "metabase/urls";
@@ -14,14 +14,9 @@ export type TransformDependenciesPageParams = {
transformId: string;
};
-type TransformDependenciesPageProps = {
- params?: TransformDependenciesPageParams;
-};
-
-export function TransformDependenciesPage({
- params,
-}: TransformDependenciesPageProps) {
- const id = Urls.extractEntityId(params?.transformId);
+export function TransformDependenciesPage() {
+ const params = useParams<TransformDependenciesPageParams>();
+ const id = Urls.extractEntityId(params.transformId);
const {
data: transform,
isLoading: isLoadingTransform,
diff --git a/frontend/src/metabase/transforms/pages/TransformGraphRunListPage/TransformGraphRunListPage.tsx b/frontend/src/metabase/transforms/pages/TransformGraphRunListPage/TransformGraphRunListPage.tsx
index 88cfac2c882..e240d072c5f 100644
--- a/frontend/src/metabase/transforms/pages/TransformGraphRunListPage/TransformGraphRunListPage.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformGraphRunListPage/TransformGraphRunListPage.tsx
@@ -12,8 +12,7 @@ import { PaginationControls } from "metabase/common/components/PaginationControl
import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";
import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";
import { useDispatch } from "metabase/redux";
-import type { Location } from "metabase/router";
-import { replace } from "metabase/router";
+import { replace, useRouter } from "metabase/router";
import { DetailedViewSwitch } from "metabase/transforms/components/DetailedViewSwitch";
import { POLLING_INTERVAL } from "metabase/transforms/constants";
import { isActiveRunStatus } from "metabase/transforms/utils";
@@ -39,13 +38,8 @@ import {
const EMPTY_RUNS: TransformGraphRun[] = [];
-type TransformGraphRunListPageProps = {
- location: Location;
-};
-
-export function TransformGraphRunListPage({
- location,
-}: TransformGraphRunListPageProps) {
+export function TransformGraphRunListPage() {
+ const { location } = useRouter();
const params = useMemo(() => getParsedParams(location), [location]);
const filterOptions = useMemo(() => getFilterOptions(params), [params]);
const { page = 0 } = params;
diff --git a/frontend/src/metabase/transforms/pages/TransformGraphRunListPage/TransformGraphRunListPage.unit.spec.tsx b/frontend/src/metabase/transforms/pages/TransformGraphRunListPage/TransformGraphRunListPage.unit.spec.tsx
index b56c89d6ad3..457c0109f65 100644
--- a/frontend/src/metabase/transforms/pages/TransformGraphRunListPage/TransformGraphRunListPage.unit.spec.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformGraphRunListPage/TransformGraphRunListPage.unit.spec.tsx
@@ -16,7 +16,7 @@ import {
waitFor,
within,
} from "__support__/ui";
-import { Route, withRouteProps } from "metabase/router";
+import { Route } from "metabase/router";
import type { TransformGraphRun } from "metabase-types/api";
import {
createMockListTransformGraphRunsResponse,
@@ -26,10 +26,6 @@ import {
import { TransformGraphRunListPage } from "./TransformGraphRunListPage";
-const RoutedTransformGraphRunListPage = withRouteProps(
- TransformGraphRunListPage,
-);
-
type SetupOpts = {
runs?: TransformGraphRun[];
initialRoute?: string;
@@ -52,7 +48,7 @@ function setup({
const { history } = renderWithProviders(
<Route
path="/data-studio/transforms/runs"
- element={<RoutedTransformGraphRunListPage />}
+ element={<TransformGraphRunListPage />}
/>,
{ withRouter: true, initialRoute },
);
diff --git a/frontend/src/metabase/transforms/pages/TransformIndexesPage/TransformIndexesPage.tsx b/frontend/src/metabase/transforms/pages/TransformIndexesPage/TransformIndexesPage.tsx
index 07d89401759..3661241d4a2 100644
--- a/frontend/src/metabase/transforms/pages/TransformIndexesPage/TransformIndexesPage.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformIndexesPage/TransformIndexesPage.tsx
@@ -13,6 +13,7 @@ import { PageContainer } from "metabase/common/data-studio/components/PageContai
import { TitleSection } from "metabase/common/data-studio/components/TitleSection";
import { useToast } from "metabase/common/hooks";
import { useConfirmation } from "metabase/common/hooks/use-confirmation";
+import { useParams } from "metabase/router";
import { trackTransformIndexDeleted } from "metabase/transforms/analytics";
import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";
import { Center } from "metabase/ui";
@@ -28,13 +29,12 @@ import { NoIndexes } from "./NoIndexes";
import { TransformIndexTable } from "./TransformIndexTable";
import { getKindLabels } from "./TransformIndexTable/utils";
-type TransformIndexesPageProps = {
- params: {
- transformId?: string;
- };
+type TransformIndexesPageParams = {
+ transformId: string;
};
-export function TransformIndexesPage({ params }: TransformIndexesPageProps) {
+export function TransformIndexesPage() {
+ const params = useParams<TransformIndexesPageParams>();
const transformId = Urls.extractEntityId(params.transformId);
const {
data: transform,
diff --git a/frontend/src/metabase/transforms/pages/TransformIndexesPage/TransformIndexesPage.unit.spec.tsx b/frontend/src/metabase/transforms/pages/TransformIndexesPage/TransformIndexesPage.unit.spec.tsx
index 0f47960316c..785351b1ee4 100644
--- a/frontend/src/metabase/transforms/pages/TransformIndexesPage/TransformIndexesPage.unit.spec.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformIndexesPage/TransformIndexesPage.unit.spec.tsx
@@ -12,7 +12,7 @@ import {
screen,
waitForLoaderToBeRemoved,
} from "__support__/ui";
-import { Route, withRouteProps } from "metabase/router";
+import { Route } from "metabase/router";
import * as Urls from "metabase/urls";
import type {
TableIndexEntry,
@@ -30,8 +30,6 @@ import {
import { TransformIndexesPage } from "./TransformIndexesPage";
-const RoutedTransformIndexesPage = withRouteProps(TransformIndexesPage);
-
type SetupOpts = {
transform?: Transform;
indexes?: TableIndexEntry[];
@@ -60,7 +58,7 @@ function setup({
const path = initialRoute.replace(`/${transform.id}/`, "/:transformId/");
renderWithProviders(
- <Route path={path} element={<RoutedTransformIndexesPage />} />,
+ <Route path={path} element={<TransformIndexesPage />} />,
{
withRouter: true,
initialRoute,
diff --git a/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx b/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx
index d8765b88862..ec667fa1fb4 100644
--- a/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx
@@ -19,7 +19,7 @@ import { useHasTokenFeature, useSetting } from "metabase/common/hooks";
import CS from "metabase/css/core/index.css";
import { PLUGIN_REPLACEMENT, PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";
import { useSelector } from "metabase/redux";
-import { Outlet, type WithRouterProps } from "metabase/router";
+import { Outlet, useRouter } from "metabase/router";
import { LockedTransformsBanner } from "metabase/transforms/components/LockedTransformsBanner/LockedTransformsBanner";
import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";
import { getShouldShowPythonTransformsUpsell } from "metabase/transforms/selectors";
@@ -94,9 +94,8 @@ const globalFilterFn = (
);
};
-type TransformListPageProps = WithRouterProps;
-
-export const TransformListPage = ({ location }: TransformListPageProps) => {
+export const TransformListPage = () => {
+ const { location } = useRouter();
const { transformsDatabases = [], isLoadingDatabases } =
useTransformPermissions();
const targetCollectionId =
diff --git a/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.unit.spec.tsx b/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.unit.spec.tsx
index a8802194a4d..3f8f74d0bc2 100644
--- a/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.unit.spec.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.unit.spec.tsx
@@ -13,14 +13,12 @@ import {
waitForLoaderToBeRemoved,
} from "__support__/ui";
import { createMockState } from "metabase/redux/store/mocks";
-import { Route, withRouteProps } from "metabase/router";
+import { Route } from "metabase/router";
import type { TokenFeatures } from "metabase-types/api";
import { createMockTokenFeatures } from "metabase-types/api/mocks";
import { TransformListPage } from "./TransformListPage";
-const RoutedTransformListPage = withRouteProps(TransformListPage);
-
type MockInstance = {
table: {
getRowModel: () => { rows: Array<{ original: { name: string } }> };
@@ -68,14 +66,11 @@ async function setup({ tokenFeatures = {} }: SetupOpts = {}) {
});
const path = "/transforms";
- renderWithProviders(
- <Route path={path} element={<RoutedTransformListPage />} />,
- {
- storeInitialState: state,
- withRouter: true,
- initialRoute: path,
- },
- );
+ renderWithProviders(<Route path={path} element={<TransformListPage />} />, {
+ storeInitialState: state,
+ withRouter: true,
+ initialRoute: path,
+ });
await waitForLoaderToBeRemoved();
}
diff --git a/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsx b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsx
index 0fe759cf02f..e658b2a6278 100644
--- a/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsx
@@ -18,8 +18,7 @@ import { useMetadataToasts } from "metabase/metadata/hooks";
import { PLUGIN_REMOTE_SYNC, PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";
import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";
import { useDispatch, useSelector } from "metabase/redux";
-import type { Route, RouteProps } from "metabase/router";
-import { push } from "metabase/router";
+import { push, useLocation, useParams } from "metabase/router";
import { getMetadata } from "metabase/selectors/metadata";
import { useRegisterMetabotTransformContext } from "metabase/transforms/hooks/use-register-transform-metabot-context";
import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";
@@ -54,12 +53,10 @@ type TransformQueryPageParams = {
transformId: string;
};
-type TransformQueryPageProps = {
- params: TransformQueryPageParams;
- route: RouteProps;
-};
-
-export function TransformQueryPage({ params, route }: TransformQueryPageProps) {
+export function TransformQueryPage() {
+ const params = useParams<TransformQueryPageParams>();
+ const { pathname } = useLocation();
+ const isEditRoute = pathname.endsWith("/edit");
const transformId = Urls.extractEntityId(params.transformId);
const {
data: transform,
@@ -82,10 +79,10 @@ export function TransformQueryPage({ params, route }: TransformQueryPageProps) {
return (
<TransformQueryPageBody
// Add key so the ui state gets reset when switching between edit and view
- key={route.path}
+ key={String(isEditRoute)}
transform={transform}
databases={transformsDatabases}
- route={route}
+ isEditRoute={isEditRoute}
readOnly={readOnly}
/>
);
@@ -94,14 +91,14 @@ export function TransformQueryPage({ params, route }: TransformQueryPageProps) {
type TransformQueryPageBodyProps = {
transform: Transform;
databases: Database[];
- route: RouteProps;
+ isEditRoute: boolean;
readOnly?: boolean;
};
function TransformQueryPageBody({
transform,
databases,
- route,
+ isEditRoute,
readOnly,
}: TransformQueryPageBodyProps) {
const {
@@ -125,7 +122,7 @@ function TransformQueryPageBody({
const [updateTransform, { isLoading: isSaving }] =
useUpdateTransformMutation();
const { sendSuccessToast, sendErrorToast } = useMetadataToasts();
- const isEditMode = !readOnly && !!route.path?.includes("/edit");
+ const isEditMode = !readOnly && isEditRoute;
const [
isTurnOffIncrementalShown,
{ open: openTurnOffIncremental, close: closeTurnOffIncremental },
@@ -304,8 +301,6 @@ function TransformQueryPageBody({
onClose={closeTurnOffIncremental}
/>
<LeaveRouteConfirmModal
- // Unjustified type cast. FIXME
- route={route as Route}
isEnabled={isDirty && !isSaving}
onConfirm={rejectProposed}
/>
diff --git a/frontend/src/metabase/transforms/pages/TransformRunPage/TransformRunPage.tsx b/frontend/src/metabase/transforms/pages/TransformRunPage/TransformRunPage.tsx
index 7f94ca2ccc9..6cef3ac2572 100644
--- a/frontend/src/metabase/transforms/pages/TransformRunPage/TransformRunPage.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformRunPage/TransformRunPage.tsx
@@ -1,5 +1,6 @@
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
+import { useParams } from "metabase/router";
import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";
import { useTransformWithPolling } from "metabase/transforms/hooks/use-transform-with-polling";
import { Center } from "metabase/ui";
@@ -14,11 +15,8 @@ type TransformRunPageParams = {
transformId: string;
};
-type TransformRunPageProps = {
- params: TransformRunPageParams;
-};
-
-export const TransformRunPage = ({ params }: TransformRunPageProps) => {
+export const TransformRunPage = () => {
+ const params = useParams<TransformRunPageParams>();
const transformId = Urls.extractEntityId(params.transformId);
const {
transform,
diff --git a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsPage.tsx b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsPage.tsx
index 1739d79756c..ab71888a03b 100644
--- a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsPage.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsPage.tsx
@@ -1,5 +1,6 @@
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
+import { useParams } from "metabase/router";
import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";
import { Center } from "metabase/ui";
import * as Urls from "metabase/urls";
@@ -14,11 +15,8 @@ type TransformSettingsPageParams = {
transformId: string;
};
-type TransformTargetPageProps = {
- params: TransformSettingsPageParams;
-};
-
-export const TransformSettingsPage = ({ params }: TransformTargetPageProps) => {
+export const TransformSettingsPage = () => {
+ const params = useParams<TransformSettingsPageParams>();
const transformId = Urls.extractEntityId(params.transformId);
const {
transform,
diff --git a/frontend/src/metabase/transforms/routes.tsx b/frontend/src/metabase/transforms/routes.tsx
index 4bfd4e7a16b..1b8ac8feb6d 100644
--- a/frontend/src/metabase/transforms/routes.tsx
+++ b/frontend/src/metabase/transforms/routes.tsx
@@ -3,7 +3,7 @@ import {
PLUGIN_REPLACEMENT,
PLUGIN_TRANSFORMS_PYTHON,
} from "metabase/plugins";
-import { Route, withRouteProps } from "metabase/router";
+import { Route } from "metabase/router";
import { JobListPage } from "./pages/JobListPage";
import { JobPage } from "./pages/JobPage";
@@ -26,59 +26,34 @@ import { TransformRunPage } from "./pages/TransformRunPage";
import { TransformSettingsPage } from "./pages/TransformSettingsPage";
import { TransformsNotDisabled } from "./route-guards";
-const RoutedTransformListPage = withRouteProps(TransformListPage);
-const RoutedRunListPage = withRouteProps(RunListPage);
-const RoutedTransformGraphRunListPage = withRouteProps(
- TransformGraphRunListPage,
-);
-const RoutedNewJobPage = withRouteProps(NewJobPage);
-const RoutedJobPage = withRouteProps(JobPage);
-const RoutedJobRunListPage = withRouteProps(JobRunListPage);
-const RoutedNewQueryTransformPage = withRouteProps(NewQueryTransformPage);
-const RoutedNewNativeTransformPage = withRouteProps(NewNativeTransformPage);
-const RoutedNewCardTransformPage = withRouteProps(NewCardTransformPage);
-const RoutedTransformQueryPage = withRouteProps(TransformQueryPage);
-const RoutedTransformRunPage = withRouteProps(TransformRunPage);
-const RoutedTransformSettingsPage = withRouteProps(TransformSettingsPage);
-const RoutedTransformIndexesPage = withRouteProps(TransformIndexesPage);
-const RoutedTransformDependenciesPage = withRouteProps(
- TransformDependenciesPage,
-);
-
export function getDataStudioTransformRoutes() {
return (
<Route element={<TransformsNotDisabled />}>
- <Route index element={<RoutedTransformListPage />} />
+ <Route index element={<TransformListPage />} />
<Route path="runs" element={<RunsPage />}>
- <Route index element={<RoutedTransformGraphRunListPage />} />
- <Route path="individual" element={<RoutedRunListPage />} />
+ <Route index element={<TransformGraphRunListPage />} />
+ <Route path="individual" element={<RunListPage />} />
</Route>
<Route path="jobs" element={<JobSectionLayout />}>
<Route index element={<JobListPage />} />
- <Route path="new" element={<RoutedNewJobPage />} />
- <Route path=":jobId" element={<RoutedJobPage />} />
- <Route path=":jobId/runs" element={<RoutedJobRunListPage />} />
+ <Route path="new" element={<NewJobPage />} />
+ <Route path=":jobId" element={<JobPage />} />
+ <Route path=":jobId/runs" element={<JobRunListPage />} />
</Route>
- <Route path="new/query" element={<RoutedNewQueryTransformPage />} />
- <Route path="new/native" element={<RoutedNewNativeTransformPage />} />
- <Route path="new/card/:cardId" element={<RoutedNewCardTransformPage />} />
- <Route path=":transformId" element={<RoutedTransformQueryPage />} />
- <Route path=":transformId/edit" element={<RoutedTransformQueryPage />} />
- <Route path=":transformId/run" element={<RoutedTransformRunPage />} />
- <Route
- path=":transformId/settings"
- element={<RoutedTransformSettingsPage />}
- />
- <Route
- path=":transformId/indexes"
- element={<RoutedTransformIndexesPage />}
- />
+ <Route path="new/query" element={<NewQueryTransformPage />} />
+ <Route path="new/native" element={<NewNativeTransformPage />} />
+ <Route path="new/card/:cardId" element={<NewCardTransformPage />} />
+ <Route path=":transformId" element={<TransformQueryPage />} />
+ <Route path=":transformId/edit" element={<TransformQueryPage />} />
+ <Route path=":transformId/run" element={<TransformRunPage />} />
+ <Route path=":transformId/settings" element={<TransformSettingsPage />} />
+ <Route path=":transformId/indexes" element={<TransformIndexesPage />} />
{PLUGIN_TRANSFORMS_PYTHON.getInspectorRoutes()}
{PLUGIN_DEPENDENCIES.isEnabled && (
<Route
path=":transformId/dependencies"
- element={<RoutedTransformDependenciesPage />}
+ element={<TransformDependenciesPage />}
>
<Route index element={<PLUGIN_DEPENDENCIES.DependencyGraphPage />} />
</Route>