From 37497def3d7a58c50df871b52112d1ddff668efc Mon Sep 17 00:00:00 2001 From: Christoph Jerolimov Date: Wed, 6 Nov 2024 19:27:45 +0100 Subject: [PATCH] chore(acr): fix dev page and update rhdh theme (dev dependency) Signed-off-by: Christoph Jerolimov --- workspaces/acr/app-config.yaml | 113 +++++++++++++++++++++++ workspaces/acr/plugins/acr/dev/index.tsx | 12 ++- workspaces/acr/plugins/acr/package.json | 2 +- workspaces/acr/yarn.lock | 10 +- 4 files changed, 129 insertions(+), 8 deletions(-) create mode 100644 workspaces/acr/app-config.yaml diff --git a/workspaces/acr/app-config.yaml b/workspaces/acr/app-config.yaml new file mode 100644 index 0000000000..ca52ec530c --- /dev/null +++ b/workspaces/acr/app-config.yaml @@ -0,0 +1,113 @@ +app: + title: Scaffolded Backstage App + baseUrl: http://localhost:3000 + +organization: + name: My Company + +backend: + # Used for enabling authentication, secret is shared by all backend plugins + # See https://backstage.io/docs/auth/service-to-service-auth for + # information on the format + # auth: + # keys: + # - secret: ${BACKEND_SECRET} + baseUrl: http://localhost:7007 + listen: + port: 7007 + # Uncomment the following host directive to bind to specific interfaces + # host: 127.0.0.1 + csp: + connect-src: ["'self'", 'http:', 'https:'] + # Content-Security-Policy directives follow the Helmet format: https://helmetjs.github.io/#reference + # Default Helmet Content-Security-Policy values can be removed by setting the key to false + cors: + origin: http://localhost:3000 + methods: [GET, HEAD, PATCH, POST, PUT, DELETE] + credentials: true + # This is for local development only, it is not recommended to use this in production + # The production database configuration is stored in app-config.production.yaml + database: + client: better-sqlite3 + connection: ':memory:' + # workingDirectory: /tmp # Use this to configure a working directory for the scaffolder, defaults to the OS temp-dir + +integrations: + github: + - host: github.com + # This is a Personal Access Token or PAT from GitHub. You can find out how to generate this token, and more information + # about setting up the GitHub integration here: https://backstage.io/docs/integrations/github/locations#configuration + token: ${GITHUB_TOKEN} + ### Example for how to add your GitHub Enterprise instance using the API: + # - host: ghe.example.net + # apiBaseUrl: https://ghe.example.net/api/v3 + # token: ${GHE_TOKEN} + +proxy: + ### Example for how to add a proxy endpoint for the frontend. + ### A typical reason to do this is to handle HTTPS and CORS for internal services. + # endpoints: + # '/test': + # target: 'https://example.com' + # changeOrigin: true + +# Reference documentation http://backstage.io/docs/features/techdocs/configuration +# Note: After experimenting with basic setup, use CI/CD to generate docs +# and an external cloud storage when deploying TechDocs for production use-case. +# https://backstage.io/docs/features/techdocs/how-to-guides#how-to-migrate-from-techdocs-basic-to-recommended-deployment-approach +techdocs: + builder: 'local' # Alternatives - 'external' + generator: + runIn: 'docker' # Alternatives - 'local' + publisher: + type: 'local' # Alternatives - 'googleGcs' or 'awsS3'. Read documentation for using alternatives. + +auth: + # see https://backstage.io/docs/auth/ to learn about auth providers + providers: + # See https://backstage.io/docs/auth/guest/provider + guest: {} + +scaffolder: + # see https://backstage.io/docs/features/software-templates/configuration for software template options + +catalog: + import: + entityFilename: catalog-info.yaml + pullRequestBranchName: backstage-integration + rules: + - allow: [Component, System, API, Resource, Location] + locations: + # Local example data, file locations are relative to the backend process, typically `packages/backend` + - type: file + target: ../../examples/entities.yaml + + # Local example template + - type: file + target: ../../examples/template/template.yaml + rules: + - allow: [Template] + + # Local example organizational data + - type: file + target: ../../examples/org.yaml + rules: + - allow: [User, Group] + + ## Uncomment these lines to add more example data + # - type: url + # target: https://github.com/backstage/backstage/blob/master/packages/catalog-model/examples/all.yaml + + ## Uncomment these lines to add an example org + # - type: url + # target: https://github.com/backstage/backstage/blob/master/packages/catalog-model/examples/acme-corp.yaml + # rules: + # - allow: [User, Group] + +kubernetes: + # see https://backstage.io/docs/features/kubernetes/configuration for kubernetes configuration options + +# see https://backstage.io/docs/permissions/getting-started for more on the permission framework +permission: + # setting this to `false` will disable permissions + enabled: true diff --git a/workspaces/acr/plugins/acr/dev/index.tsx b/workspaces/acr/plugins/acr/dev/index.tsx index b9305e9202..1a569c9702 100644 --- a/workspaces/acr/plugins/acr/dev/index.tsx +++ b/workspaces/acr/plugins/acr/dev/index.tsx @@ -1,8 +1,9 @@ import React from 'react'; import { createDevApp } from '@backstage/dev-utils'; -import { EntityProvider } from '@backstage/plugin-catalog-react'; import { TestApiProvider } from '@backstage/test-utils'; +import { Page, Header, TabbedLayout } from '@backstage/core-components'; +import { EntityProvider } from '@backstage/plugin-catalog-react'; import { getAllThemes } from '@redhat-developer/red-hat-developer-hub-theme'; @@ -43,7 +44,14 @@ createDevApp() ]} > - + +
+ + + + + + ), diff --git a/workspaces/acr/plugins/acr/package.json b/workspaces/acr/plugins/acr/package.json index ff113675f5..0e4055ce14 100644 --- a/workspaces/acr/plugins/acr/package.json +++ b/workspaces/acr/plugins/acr/package.json @@ -49,7 +49,7 @@ "@backstage/core-app-api": "^1.15.1", "@backstage/dev-utils": "^1.1.2", "@backstage/test-utils": "^1.7.0", - "@redhat-developer/red-hat-developer-hub-theme": "0.2.0", + "@redhat-developer/red-hat-developer-hub-theme": "0.4.0", "@testing-library/jest-dom": "6.6.2", "@testing-library/react": "14.3.1", "@testing-library/react-hooks": "8.0.1", diff --git a/workspaces/acr/yarn.lock b/workspaces/acr/yarn.lock index 619033115b..56c29a77d5 100644 --- a/workspaces/acr/yarn.lock +++ b/workspaces/acr/yarn.lock @@ -2526,7 +2526,7 @@ __metadata: "@material-ui/core": ^4.9.13 "@material-ui/icons": ^4.11.3 "@material-ui/lab": ^4.0.0-alpha.45 - "@redhat-developer/red-hat-developer-hub-theme": 0.2.0 + "@redhat-developer/red-hat-developer-hub-theme": 0.4.0 "@testing-library/jest-dom": 6.6.2 "@testing-library/react": 14.3.1 "@testing-library/react-hooks": 8.0.1 @@ -6214,9 +6214,9 @@ __metadata: languageName: node linkType: hard -"@redhat-developer/red-hat-developer-hub-theme@npm:0.2.0": - version: 0.2.0 - resolution: "@redhat-developer/red-hat-developer-hub-theme@npm:0.2.0" +"@redhat-developer/red-hat-developer-hub-theme@npm:0.4.0": + version: 0.4.0 + resolution: "@redhat-developer/red-hat-developer-hub-theme@npm:0.4.0" peerDependencies: "@backstage/theme": ^0.5.2 "@emotion/react": ^11.11.1 @@ -6225,7 +6225,7 @@ __metadata: "@material-ui/icons": ^4.11.3 "@mui/icons-material": ^5.14.19 "@mui/material": ^5.14.20 - checksum: 2a5d52e2ba31c5a6ff2cfe75d78b1de1afa00690b522875e52d8ddc8805a3ccc5c202414a0304790efe0ed0ea2c570b9c8bf7472c7895d4bbe416c6541435196 + checksum: 8684f8faa2fe87100dba2c19f1e1a306e808cf98bc65da829c3203a325ea6520a93e54c174e25a220ccf8280ecc2750a178a0d18b12f5ba354c7c415e8a9dc7b languageName: node linkType: hard