From 881acb0dbc76a20ba4c2dab2fb831e2822c17a83 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 1 Apr 2022 14:44:26 +0200
Subject: [PATCH] scaffolder: add editRouteRef and updated route declarations
 to use route refs

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 plugins/scaffolder/src/components/Router.tsx  | 15 ++++++++++-----
 plugins/scaffolder/src/next/Router/Router.tsx |  4 ++--
 plugins/scaffolder/src/routes.ts              |  6 ++++++
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/plugins/scaffolder/src/components/Router.tsx b/plugins/scaffolder/src/components/Router.tsx
index 3ab3b03dd8..774bc61638 100644
--- a/plugins/scaffolder/src/components/Router.tsx
+++ b/plugins/scaffolder/src/components/Router.tsx
@@ -32,6 +32,12 @@ import {
   DEFAULT_SCAFFOLDER_FIELD_EXTENSIONS,
 } from '../extensions';
 import { useElementFilter } from '@backstage/core-plugin-api';
+import {
+  actionsRouteRef,
+  editRouteRef,
+  scaffolderTaskRouteRef,
+  selectedTemplateRouteRef,
+} from '../routes';
 
 /**
  * The props for the entrypoint `ScaffolderPage` component the plugin.
@@ -96,7 +102,6 @@ export const Router = (props: RouterProps) => {
   return (
     <Routes>
       <Route
-        path="/"
         element={
           <ScaffolderPage
             groups={groups}
@@ -106,17 +111,17 @@ export const Router = (props: RouterProps) => {
         }
       />
       <Route
-        path="/templates/:templateName"
+        path={selectedTemplateRouteRef.path}
         element={
           <SecretsContextProvider>
             <TemplatePage customFieldExtensions={fieldExtensions} />
           </SecretsContextProvider>
         }
       />
-      <Route path="/tasks/:taskId" element={<TaskPageElement />} />
-      <Route path="/actions" element={<ActionsPage />} />
+      <Route path={scaffolderTaskRouteRef.path} element={<TaskPageElement />} />
+      <Route path={actionsRouteRef.path} element={<ActionsPage />} />
       <Route
-        path="/edit"
+        path={editRouteRef.path}
         element={
           <SecretsContextProvider>
             <TemplateEditorPage
diff --git a/plugins/scaffolder/src/next/Router/Router.tsx b/plugins/scaffolder/src/next/Router/Router.tsx
index 580d41d27b..68bf9fa9e4 100644
--- a/plugins/scaffolder/src/next/Router/Router.tsx
+++ b/plugins/scaffolder/src/next/Router/Router.tsx
@@ -28,6 +28,7 @@ import {
 import { useElementFilter } from '@backstage/core-plugin-api';
 import { TemplateEntityV1beta3 } from '@backstage/plugin-scaffolder-common';
 import { TemplateGroupFilter } from '../TemplateListPage/TemplateGroups';
+import { selectedTemplateRouteRef } from '../../routes';
 
 /**
  * The Props for the Scaffolder Router
@@ -77,7 +78,6 @@ export const Router = (props: PropsWithChildren<NextRouterProps>) => {
   return (
     <Routes>
       <Route
-        path="/"
         element={
           <TemplateListPage
             TemplateCardComponent={TemplateCardComponent}
@@ -87,7 +87,7 @@ export const Router = (props: PropsWithChildren<NextRouterProps>) => {
       />
 
       <Route
-        path="/templates/:templateName"
+        path={selectedTemplateRouteRef.path}
         element={
           <SecretsContextProvider>
             <TemplateWizardPage customFieldExtensions={fieldExtensions} />
diff --git a/plugins/scaffolder/src/routes.ts b/plugins/scaffolder/src/routes.ts
index 97f942d8b9..8ec9f9b68a 100644
--- a/plugins/scaffolder/src/routes.ts
+++ b/plugins/scaffolder/src/routes.ts
@@ -45,3 +45,9 @@ export const actionsRouteRef = createSubRouteRef({
   parent: rootRouteRef,
   path: '/actions',
 });
+
+export const editRouteRef = createSubRouteRef({
+  id: 'scaffolder/edit',
+  parent: rootRouteRef,
+  path: '/edit',
+});