paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 23 Packages Projects Releases Wiki Activity

app: revert most react router migration changes

Browse Source 
Co-authored-by: blam <ben@blam.sh>
Co-authored-by: Johan Haals <johan.haals@gmail.com>
Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
This commit is contained in:
Patrik Oldsberg
2022-08-24 14:21:16 +02:00
parent ab801e121f
commit bbdefa2038
3 changed files with 71 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/app/src/App.tsx
+25 -25
View File
@@ -145,20 +145,20 @@ const AppRouter = app.getRouter();
const routes = (
<FlatRoutes>
<Route element={<Navigate to="catalog" />} />
<Navigate key="/" to="catalog" />
{/* TODO(rubenl): Move this to / once its more mature and components exist */}
<Route path="home" element={<HomepageCompositionRoot />}>
<Route path="/home" element={<HomepageCompositionRoot />}>
{homePage}
</Route>
<Route path="catalog" element={<CatalogIndexPage />} />
<Route path="/catalog" element={<CatalogIndexPage />} />
<Route
path="catalog/:namespace/:kind/:name"
path="/catalog/:namespace/:kind/:name"
element={<CatalogEntityPage />}
>
{entityPage}
</Route>
<Route
path="catalog-import"
path="/catalog-import"
element={
<RequirePermission permission={catalogEntityCreatePermission}>
<CatalogImportPage />
@@ -166,7 +166,7 @@ const routes = (
}
/>
<Route
path="catalog-graph"
path="/catalog-graph"
element={
<CatalogGraphPage
initialState={{
@@ -187,9 +187,9 @@ const routes = (
/>
}
/>
<Route path="docs" element={<TechDocsIndexPage />} />
<Route path="/docs" element={<TechDocsIndexPage />} />
<Route
path="docs/:namespace/:kind/:name/*"
path="/docs/:namespace/:kind/:name/*"
element={<TechDocsReaderPage />}
>
{techDocsPage}
@@ -200,7 +200,7 @@ const routes = (
</TechDocsAddons>
</Route>
<Route
path="create"
path="/create"
element={
<ScaffolderPage
defaultPreviewTemplate={defaultPreviewTemplate}
@@ -219,7 +219,7 @@ const routes = (
</ScaffolderFieldExtensions>
</Route>
<Route
path="create/next"
path="/create/next"
element={
<NextScaffolderPage
groups={[
@@ -236,35 +236,35 @@ const routes = (
<DelayingComponentFieldExtension />
</ScaffolderFieldExtensions>
</Route>
<Route path="explore" element={<ExplorePage />} />
<Route path="/explore" element={<ExplorePage />} />
<Route
path="tech-radar"
path="/tech-radar"
element={<TechRadarPage width={1500} height={800} />}
/>
<Route path="graphiql" element={<GraphiQLPage />} />
<Route path="lighthouse" element={<LighthousePage />} />
<Route path="api-docs" element={<ApiExplorerPage />} />
<Route path="gcp-projects" element={<GcpProjectsPage />} />
<Route path="newrelic" element={<NewRelicPage />} />
<Route path="search" element={<SearchPage />}>
<Route path="/graphiql" element={<GraphiQLPage />} />
<Route path="/lighthouse" element={<LighthousePage />} />
<Route path="/api-docs" element={<ApiExplorerPage />} />
<Route path="/gcp-projects" element={<GcpProjectsPage />} />
<Route path="/newrelic" element={<NewRelicPage />} />
<Route path="/search" element={<SearchPage />}>
{searchPage}
</Route>
<Route path="cost-insights" element={<CostInsightsPage />} />
<Route path="/cost-insights" element={<CostInsightsPage />} />
<Route
path="cost-insights/investigating-growth"
path="/cost-insights/investigating-growth"
element={<CostInsightsProjectGrowthInstructionsPage />}
/>
<Route
path="cost-insights/labeling-jobs"
path="/cost-insights/labeling-jobs"
element={<CostInsightsLabelDataflowInstructionsPage />}
/>
<Route path="settings" element={<UserSettingsPage />}>
<UserSettingsTab path="advanced" title="Advanced">
<Route path="/settings" element={<UserSettingsPage />}>
<UserSettingsTab path="/advanced" title="Advanced">
<AdvancedSettings />
</UserSettingsTab>
</Route>
<Route path="azure-pull-requests" element={<AzurePullRequestsPage />} />
<Route path="apache-airflow" element={<ApacheAirflowPage />} />
<Route path="/azure-pull-requests" element={<AzurePullRequestsPage />} />
<Route path="/apache-airflow" element={<ApacheAirflowPage />} />
</FlatRoutes>
);
packages/app/src/components/catalog/EntityPage.test.tsx
+1 -1
View File
@@ -64,7 +64,7 @@ describe('EntityPage Test', () => {
>
<EntityProvider entity={entity}>
<EntityLayout>
<EntityLayout.Route path="ci-cd" title="CI-CD">
<EntityLayout.Route path="/ci-cd" title="CI-CD">
{cicdContent}
</EntityLayout.Route>
</EntityLayout>
packages/app/src/components/catalog/EntityPage.tsx
+45 -39
View File
@@ -388,17 +388,19 @@ const overviewContent = (
const serviceEntityPage = (
<EntityLayoutWrapper>
<EntityLayout.Route title="Overview">{overviewContent}</EntityLayout.Route>
<EntityLayout.Route path="/" title="Overview">
{overviewContent}
</EntityLayout.Route>
<EntityLayout.Route path="ci-cd" title="CI/CD">
<EntityLayout.Route path="/ci-cd" title="CI/CD">
{cicdContent}
</EntityLayout.Route>
<EntityLayout.Route path="errors" title="Errors">
<EntityLayout.Route path="/errors" title="Errors">
{errorsContent}
</EntityLayout.Route>
<EntityLayout.Route path="api" title="API">
<EntityLayout.Route path="/api" title="API">
<Grid container spacing={3} alignItems="stretch">
<Grid item xs={12} md={6}>
<EntityProvidedApisCard />
@@ -409,7 +411,7 @@ const serviceEntityPage = (
</Grid>
</EntityLayout.Route>
<EntityLayout.Route path="dependencies" title="Dependencies">
<EntityLayout.Route path="/dependencies" title="Dependencies">
<Grid container spacing={3} alignItems="stretch">
<Grid item xs={12} md={6}>
<EntityDependsOnComponentsCard variant="gridItem" />
@@ -420,31 +422,31 @@ const serviceEntityPage = (
</Grid>
</EntityLayout.Route>
<EntityLayout.Route path="docs" title="Docs">
<EntityLayout.Route path="/docs" title="Docs">
{techdocsContent}
</EntityLayout.Route>
<EntityLayout.Route
if={isNewRelicDashboardAvailable}
path="newrelic-dashboard"
path="/newrelic-dashboard"
title="New Relic Dashboard"
>
<EntityNewRelicDashboardContent />
</EntityLayout.Route>
<EntityLayout.Route path="kubernetes" title="Kubernetes">
<EntityLayout.Route path="/kubernetes" title="Kubernetes">
<EntityKubernetesContent />
</EntityLayout.Route>
<EntityLayout.Route path="pull-requests" title="Pull Requests">
<EntityLayout.Route path="/pull-requests" title="Pull Requests">
{pullRequestsContent}
</EntityLayout.Route>
<EntityLayout.Route path="code-insights" title="Code Insights">
<EntityLayout.Route path="/code-insights" title="Code Insights">
<EntityGithubInsightsContent />
</EntityLayout.Route>
<EntityLayout.Route path="tech-insights" title="Scorecards">
<EntityLayout.Route path="/tech-insights" title="Scorecards">
<Grid container spacing={3} alignItems="stretch">
<Grid item xs={12} md={6}>
<EntityTechInsightsScorecardCard
@@ -462,20 +464,20 @@ const serviceEntityPage = (
</Grid>
</EntityLayout.Route>
<EntityLayout.Route path="code-coverage" title="Code Coverage">
<EntityLayout.Route path="/code-coverage" title="Code Coverage">
<EntityCodeCoverageContent />
</EntityLayout.Route>
<EntityLayout.Route path="kafka" title="Kafka">
<EntityLayout.Route path="/kafka" title="Kafka">
<EntityKafkaContent />
</EntityLayout.Route>
<EntityLayout.Route path="todos" title="TODOs">
<EntityLayout.Route path="/todos" title="TODOs">
<EntityTodoContent />
</EntityLayout.Route>
<EntityLayout.Route
path="dynatrace"
path="/dynatrace"
title="Dynatrace"
if={isDynatraceAvailable}
>
@@ -486,21 +488,23 @@ const serviceEntityPage = (
const websiteEntityPage = (
<EntityLayoutWrapper>
<EntityLayout.Route title="Overview">{overviewContent}</EntityLayout.Route>
<EntityLayout.Route path="/" title="Overview">
{overviewContent}
</EntityLayout.Route>
<EntityLayout.Route path="ci-cd" title="CI/CD">
<EntityLayout.Route path="/ci-cd" title="CI/CD">
{cicdContent}
</EntityLayout.Route>
<EntityLayout.Route path="lighthouse" title="Lighthouse">
<EntityLayout.Route path="/lighthouse" title="Lighthouse">
<EntityLighthouseContent />
</EntityLayout.Route>
<EntityLayout.Route path="errors" title="Errors">
<EntityLayout.Route path="/errors" title="Errors">
{errorsContent}
</EntityLayout.Route>
<EntityLayout.Route path="dependencies" title="Dependencies">
<EntityLayout.Route path="/dependencies" title="Dependencies">
<Grid container spacing={3} alignItems="stretch">
<Grid item md={6}>
<EntityDependsOnComponentsCard variant="gridItem" />
@@ -511,24 +515,24 @@ const websiteEntityPage = (
</Grid>
</EntityLayout.Route>
<EntityLayout.Route path="docs" title="Docs">
<EntityLayout.Route path="/docs" title="Docs">
{techdocsContent}
</EntityLayout.Route>
<EntityLayout.Route
if={isNewRelicDashboardAvailable}
path="newrelic-dashboard"
path="/newrelic-dashboard"
title="New Relic Dashboard"
>
<EntityNewRelicDashboardContent />
</EntityLayout.Route>
<EntityLayout.Route path="kubernetes" title="Kubernetes">
<EntityLayout.Route path="/kubernetes" title="Kubernetes">
<EntityKubernetesContent />
</EntityLayout.Route>
<EntityLayout.Route
path="dynatrace"
path="/dynatrace"
title="Dynatrace"
if={isDynatraceAvailable}
>
@@ -537,25 +541,25 @@ const websiteEntityPage = (
<EntityLayout.Route
if={isAzureDevOpsAvailable}
path="git-tags"
path="/git-tags"
title="Git Tags"
>
<EntityAzureGitTagsContent />
</EntityLayout.Route>
<EntityLayout.Route path="pull-requests" title="Pull Requests">
<EntityLayout.Route path="/pull-requests" title="Pull Requests">
{pullRequestsContent}
</EntityLayout.Route>
<EntityLayout.Route path="code-insights" title="Code Insights">
<EntityLayout.Route path="/code-insights" title="Code Insights">
<EntityGithubInsightsContent />
</EntityLayout.Route>
<EntityLayout.Route path="code-coverage" title="Code Coverage">
<EntityLayout.Route path="/code-coverage" title="Code Coverage">
<EntityCodeCoverageContent />
</EntityLayout.Route>
<EntityLayout.Route path="todos" title="TODOs">
<EntityLayout.Route path="/todos" title="TODOs">
<EntityTodoContent />
</EntityLayout.Route>
</EntityLayoutWrapper>
@@ -563,13 +567,15 @@ const websiteEntityPage = (
const defaultEntityPage = (
<EntityLayoutWrapper>
<EntityLayout.Route title="Overview">{overviewContent}</EntityLayout.Route>
<EntityLayout.Route path="/" title="Overview">
{overviewContent}
</EntityLayout.Route>
<EntityLayout.Route path="docs" title="Docs">
<EntityLayout.Route path="/docs" title="Docs">
{techdocsContent}
</EntityLayout.Route>
<EntityLayout.Route path="todos" title="TODOs">
<EntityLayout.Route path="/todos" title="TODOs">
<EntityTodoContent />
</EntityLayout.Route>
</EntityLayoutWrapper>
@@ -591,7 +597,7 @@ const componentPage = (
const apiPage = (
<EntityLayoutWrapper>
<EntityLayout.Route title="Overview">
<EntityLayout.Route path="/" title="Overview">
<Grid container spacing={3}>
{entityWarningContent}
<Grid item md={6} xs={12}>
@@ -613,7 +619,7 @@ const apiPage = (
</Grid>
</EntityLayout.Route>
<EntityLayout.Route path="definition" title="Definition">
<EntityLayout.Route path="/definition" title="Definition">
<Grid container spacing={3}>
<Grid item xs={12}>
<EntityApiDefinitionCard />
@@ -625,7 +631,7 @@ const apiPage = (
const userPage = (
<EntityLayoutWrapper>
<EntityLayout.Route title="Overview">
<EntityLayout.Route path="/" title="Overview">
<Grid container spacing={3}>
{entityWarningContent}
<Grid item xs={12} md={6}>
@@ -644,7 +650,7 @@ const userPage = (
const groupPage = (
<EntityLayoutWrapper>
<EntityLayout.Route title="Overview">
<EntityLayout.Route path="/" title="Overview">
<Grid container spacing={3}>
{entityWarningContent}
<Grid item xs={12} md={6}>
@@ -666,7 +672,7 @@ const groupPage = (
const systemPage = (
<EntityLayoutWrapper>
<EntityLayout.Route title="Overview">
<EntityLayout.Route path="/" title="Overview">
<Grid container spacing={3} alignItems="stretch">
{entityWarningContent}
<Grid item md={6}>
@@ -686,7 +692,7 @@ const systemPage = (
</Grid>
</Grid>
</EntityLayout.Route>
<EntityLayout.Route path="diagram" title="Diagram">
<EntityLayout.Route path="/diagram" title="Diagram">
<EntityCatalogGraphCard
variant="gridItem"
direction={Direction.TOP_BOTTOM}
@@ -710,7 +716,7 @@ const systemPage = (
const domainPage = (
<EntityLayoutWrapper>
<EntityLayout.Route title="Overview">
<EntityLayout.Route path="/" title="Overview">
<Grid container spacing={3} alignItems="stretch">
{entityWarningContent}
<Grid item md={6}>