From c82c045ee842872d4dcd68ad8af36e6df2e2d577 Mon Sep 17 00:00:00 2001 From: Nikita Nek Dudnik Date: Fri, 24 Jul 2020 15:56:48 +0200 Subject: [PATCH] feat(github-actions): add a separate data mock --- app-config.yaml | 10 +++------- plugins/github-actions/package.json | 3 ++- .../WorkflowRunDetailsPage.tsx | 2 +- .../components/WorkflowRunsTable/useWorkflowRuns.ts | 2 +- .../react-ssr-template/template.yaml | 12 ------------ 5 files changed, 7 insertions(+), 22 deletions(-) diff --git a/app-config.yaml b/app-config.yaml index 9440c57854..35cc7b6e1a 100644 --- a/app-config.yaml +++ b/app-config.yaml @@ -11,19 +11,15 @@ backend: credentials: true proxy: - "/circleci/api": - target: "https://circleci.com/api/v1.1" + '/circleci/api': + target: 'https://circleci.com/api/v1.1' changeOrigin: true pathRewrite: - "^/proxy/circleci/api/": "/" + '^/proxy/circleci/api/': '/' organization: name: Spotify -github-actions: - owner: spotify - repo: backstage - techdocs: storageUrl: https://techdocs-mock-sites.storage.googleapis.com diff --git a/plugins/github-actions/package.json b/plugins/github-actions/package.json index eccc1449f9..3f3e154b7b 100644 --- a/plugins/github-actions/package.json +++ b/plugins/github-actions/package.json @@ -18,7 +18,8 @@ "diff": "backstage-cli plugin:diff", "prepack": "backstage-cli prepack", "postpack": "backstage-cli postpack", - "clean": "backstage-cli clean" + "clean": "backstage-cli clean", + "mock-data": "./scripts/mock-data.sh" }, "dependencies": { "@backstage/catalog-model": "^0.1.1-alpha.16", diff --git a/plugins/github-actions/src/components/WorkflowRunDetailsPage/WorkflowRunDetailsPage.tsx b/plugins/github-actions/src/components/WorkflowRunDetailsPage/WorkflowRunDetailsPage.tsx index a8ddcfef12..308ae297d8 100644 --- a/plugins/github-actions/src/components/WorkflowRunDetailsPage/WorkflowRunDetailsPage.tsx +++ b/plugins/github-actions/src/components/WorkflowRunDetailsPage/WorkflowRunDetailsPage.tsx @@ -156,7 +156,7 @@ export const WorkflowRunDetailsPage = () => { const [owner, repo] = ( useProjectName({ kind: 'Component', - name: 'backstage-site', + name: 'backstage', }) ?? '/' ).split('/'); const details = useWorkflowRunsDetails(repo, owner); diff --git a/plugins/github-actions/src/components/WorkflowRunsTable/useWorkflowRuns.ts b/plugins/github-actions/src/components/WorkflowRunsTable/useWorkflowRuns.ts index 753d08be54..4f72f88de0 100644 --- a/plugins/github-actions/src/components/WorkflowRunsTable/useWorkflowRuns.ts +++ b/plugins/github-actions/src/components/WorkflowRunsTable/useWorkflowRuns.ts @@ -33,7 +33,7 @@ export function useWorkflowRuns() { const projectName = useProjectName({ kind: 'Component', - name: 'backstage-site', + name: 'backstage', }); const { loading, value: runs, retry } = useAsyncRetry< WorkflowRun[] diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/template.yaml b/plugins/scaffolder-backend/sample-templates/react-ssr-template/template.yaml index dc9fb22aa8..ba0e877662 100644 --- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/template.yaml +++ b/plugins/scaffolder-backend/sample-templates/react-ssr-template/template.yaml @@ -25,15 +25,3 @@ spec: title: Description type: string description: Description of the component ---- -apiVersion: backstage.io/v1alpha1 -kind: Component -metadata: - name: backstage-site - description: backstage.io - annotations: - backstage.io/github-actions-id: 'spotify/backstage' -spec: - type: website - lifecycle: production - owner: guest