diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 502805c598..c616b75c99 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -18,11 +18,11 @@ /workspaces/adoption-insights @redhat-developer/rhdh-ui @rohitkrai03 @karthikjeeyar @eswaraiahsapram /workspaces/ai-integrations @redhat-developer/rhdh-ui @rohitkrai03 @karthikjeeyar @lucifergene @johnmcollier @gabemontero /workspaces/bulk-import @redhat-developer/rhdh-plugins @rm3l @redhat-developer/rhdh-ui @debsmita1 @its-mitesh-kumar +/workspaces/extensions @redhat-developer/rhdh-ui @christoph-jerolimov @karthikjeeyar /workspaces/global-floating-action-button @redhat-developer/rhdh-ui @debsmita1 @divyanshiGupta /workspaces/global-header @redhat-developer/rhdh-ui @ciiay @divyanshiGupta /workspaces/homepage @redhat-developer/rhdh-ui @christoph-jerolimov @eswaraiahsapram /workspaces/lightspeed @redhat-developer/rhdh-ui @karthikjeeyar @rohitkrai03 @yangcao77 -/workspaces/marketplace @redhat-developer/rhdh-ui @christoph-jerolimov @karthikjeeyar /workspaces/mcp-integrations @johnmcollier @gabemontero @thepetk /workspaces/openshift-image-registry @redhat-developer/rhdh-ui @divyanshiGupta @its-mitesh-kumar /workspaces/orchestrator @batzionb @mareklibra @gciavarrini diff --git a/.github/renovate-presets/workspace/rhdh-marketplace-presets.json b/.github/renovate-presets/workspace/rhdh-marketplace-presets.json index 35dbf33047..b1cbbb1a1d 100644 --- a/.github/renovate-presets/workspace/rhdh-marketplace-presets.json +++ b/.github/renovate-presets/workspace/rhdh-marketplace-presets.json @@ -1,28 +1,28 @@ { "packageRules": [ { - "description": "all marketplace minor updates", - "matchFileNames": ["workspaces/marketplace/**"], + "description": "all extensions minor updates", + "matchFileNames": ["workspaces/extensions/**"], "extends": [ "github>redhat-developer/rhdh-plugins//.github/renovate-presets/base/rhdh-minor-presets(Marketplace)" ], - "addLabels": ["team/rhdh", "marketplace"] + "addLabels": ["team/rhdh", "extensions"] }, { - "description": "all marketplace patch updates", - "matchFileNames": ["workspaces/marketplace/**"], + "description": "all extensions patch updates", + "matchFileNames": ["workspaces/extensions/**"], "extends": [ "github>redhat-developer/rhdh-plugins//.github/renovate-presets/base/rhdh-patch-presets(Marketplace)" ], - "addLabels": ["team/rhdh", "marketplace"] + "addLabels": ["team/rhdh", "extensions"] }, { - "description": "all marketplace dev dependency updates", - "matchFileNames": ["workspaces/marketplace/**"], + "description": "all extensions dev dependency updates", + "matchFileNames": ["workspaces/extensions/**"], "extends": [ "github>redhat-developer/rhdh-plugins//.github/renovate-presets/base/rhdh-devdependency-presets(Marketplace)" ], - "addLabels": ["team/rhdh", "marketplace"] + "addLabels": ["team/rhdh", "extensions"] } ] } diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 94da570a03..9e41ef54b5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -308,7 +308,7 @@ When a Plugin Owner wants to upgrade their workspace(s) to the latest version of 3. In the menu that appears use the following: 1. For "Use workflow from" use the default "Branch: main" 2. For "Release Line" use the default "main" - 3. For "Workspace (this much be a JSON array)" you will enter the name(s) of the workspace(s). For example for a single workspace it would look like this: `["bulk-import"]` and for multiple workspaces it would look like this: `["lightspeed", "homepage", "marketplace"]` + 3. For "Workspace (this much be a JSON array)" you will enter the name(s) of the workspace(s). For example for a single workspace it would look like this: `["bulk-import"]` and for multiple workspaces it would look like this: `["lightspeed", "homepage", "extensions"]` 4. For "Specifies the type of version update to apply" use the default "minor" 4. Now click the "Run workflow" button 5. The workflow will then run and create a PR to upgrade each of the specified workspaces to the latest `main` release of Backstage diff --git a/catalog-info-plugins.yaml b/catalog-info-plugins.yaml index 690ff44a5f..d403426f2f 100644 --- a/catalog-info-plugins.yaml +++ b/catalog-info-plugins.yaml @@ -15,7 +15,7 @@ spec: - ./workspaces/global-header/catalog-info.yaml - ./workspaces/homepage/catalog-info.yaml - ./workspaces/lightspeed/catalog-info.yaml - - ./workspaces/marketplace/catalog-info.yaml + - ./workspaces/extensions/catalog-info.yaml - ./workspaces/openshift-image-registry/catalog-info.yaml - ./workspaces/orchestrator/catalog-info.yaml - ./workspaces/theme/catalog-info.yaml diff --git a/workspaces/adoption-insights/plugins/README.md b/workspaces/adoption-insights/plugins/README.md index d7865fdba3..4fc1756606 100644 --- a/workspaces/adoption-insights/plugins/README.md +++ b/workspaces/adoption-insights/plugins/README.md @@ -5,5 +5,3 @@ separate folder of its own. If you want to create a new plugin here, go to your project root directory, run the command `yarn new`, and follow the on-screen instructions. - -You can also check out existing plugins on [the plugin marketplace](https://backstage.io/plugins)! diff --git a/workspaces/ai-integrations/plugins/README.md b/workspaces/ai-integrations/plugins/README.md index d7865fdba3..4fc1756606 100644 --- a/workspaces/ai-integrations/plugins/README.md +++ b/workspaces/ai-integrations/plugins/README.md @@ -5,5 +5,3 @@ separate folder of its own. If you want to create a new plugin here, go to your project root directory, run the command `yarn new`, and follow the on-screen instructions. - -You can also check out existing plugins on [the plugin marketplace](https://backstage.io/plugins)! diff --git a/workspaces/bulk-import/plugins/README.md b/workspaces/bulk-import/plugins/README.md index d7865fdba3..4fc1756606 100644 --- a/workspaces/bulk-import/plugins/README.md +++ b/workspaces/bulk-import/plugins/README.md @@ -5,5 +5,3 @@ separate folder of its own. If you want to create a new plugin here, go to your project root directory, run the command `yarn new`, and follow the on-screen instructions. - -You can also check out existing plugins on [the plugin marketplace](https://backstage.io/plugins)! diff --git a/workspaces/extensions/README.md b/workspaces/extensions/README.md index 1f939678dc..f9e18cca10 100644 --- a/workspaces/extensions/README.md +++ b/workspaces/extensions/README.md @@ -66,7 +66,7 @@ To start the development environment: ```bash git clone https://github.com/redhat-developer/rhdh-plugins.git -cd rhdh-plugins/workspaces/marketplace +cd rhdh-plugins/workspaces/extensions yarn install yarn start ``` diff --git a/workspaces/extensions/plugins/catalog-backend-module-extensions/README.md b/workspaces/extensions/plugins/catalog-backend-module-extensions/README.md index 5adc07fa9f..4cada1467f 100644 --- a/workspaces/extensions/plugins/catalog-backend-module-extensions/README.md +++ b/workspaces/extensions/plugins/catalog-backend-module-extensions/README.md @@ -44,10 +44,8 @@ The module looks for extension YAML files in a directory. You can configure a cu **Priority order:** 1. Configured directory (if specified in `extensions.directory`) -2. `opt/app-root/src/dynamic-plugins-root/extensions` directory -3. `opt/app-root/src/dynamic-plugins-root/marketplace` directory -4. `/extensions` directory (filesystem root) -5. `/marketplace` directory (filesystem root) +2. `/extensions` directory (filesystem root) +3. `/marketplace` directory (filesystem root) **Example configuration:** diff --git a/workspaces/global-floating-action-button/plugins/README.md b/workspaces/global-floating-action-button/plugins/README.md index d7865fdba3..4fc1756606 100644 --- a/workspaces/global-floating-action-button/plugins/README.md +++ b/workspaces/global-floating-action-button/plugins/README.md @@ -5,5 +5,3 @@ separate folder of its own. If you want to create a new plugin here, go to your project root directory, run the command `yarn new`, and follow the on-screen instructions. - -You can also check out existing plugins on [the plugin marketplace](https://backstage.io/plugins)! diff --git a/workspaces/global-header/plugins/README.md b/workspaces/global-header/plugins/README.md index d7865fdba3..4fc1756606 100644 --- a/workspaces/global-header/plugins/README.md +++ b/workspaces/global-header/plugins/README.md @@ -5,5 +5,3 @@ separate folder of its own. If you want to create a new plugin here, go to your project root directory, run the command `yarn new`, and follow the on-screen instructions. - -You can also check out existing plugins on [the plugin marketplace](https://backstage.io/plugins)! diff --git a/workspaces/homepage/plugins/README.md b/workspaces/homepage/plugins/README.md index d7865fdba3..4fc1756606 100644 --- a/workspaces/homepage/plugins/README.md +++ b/workspaces/homepage/plugins/README.md @@ -5,5 +5,3 @@ separate folder of its own. If you want to create a new plugin here, go to your project root directory, run the command `yarn new`, and follow the on-screen instructions. - -You can also check out existing plugins on [the plugin marketplace](https://backstage.io/plugins)! diff --git a/workspaces/lightspeed/plugins/README.md b/workspaces/lightspeed/plugins/README.md index d7865fdba3..4fc1756606 100644 --- a/workspaces/lightspeed/plugins/README.md +++ b/workspaces/lightspeed/plugins/README.md @@ -5,5 +5,3 @@ separate folder of its own. If you want to create a new plugin here, go to your project root directory, run the command `yarn new`, and follow the on-screen instructions. - -You can also check out existing plugins on [the plugin marketplace](https://backstage.io/plugins)! diff --git a/workspaces/mcp-integrations/plugins/README.md b/workspaces/mcp-integrations/plugins/README.md index d7865fdba3..4fc1756606 100644 --- a/workspaces/mcp-integrations/plugins/README.md +++ b/workspaces/mcp-integrations/plugins/README.md @@ -5,5 +5,3 @@ separate folder of its own. If you want to create a new plugin here, go to your project root directory, run the command `yarn new`, and follow the on-screen instructions. - -You can also check out existing plugins on [the plugin marketplace](https://backstage.io/plugins)! diff --git a/workspaces/openshift-image-registry/plugins/README.md b/workspaces/openshift-image-registry/plugins/README.md index d7865fdba3..4fc1756606 100644 --- a/workspaces/openshift-image-registry/plugins/README.md +++ b/workspaces/openshift-image-registry/plugins/README.md @@ -5,5 +5,3 @@ separate folder of its own. If you want to create a new plugin here, go to your project root directory, run the command `yarn new`, and follow the on-screen instructions. - -You can also check out existing plugins on [the plugin marketplace](https://backstage.io/plugins)! diff --git a/workspaces/quickstart/plugins/README.md b/workspaces/quickstart/plugins/README.md index d7865fdba3..4fc1756606 100644 --- a/workspaces/quickstart/plugins/README.md +++ b/workspaces/quickstart/plugins/README.md @@ -5,5 +5,3 @@ separate folder of its own. If you want to create a new plugin here, go to your project root directory, run the command `yarn new`, and follow the on-screen instructions. - -You can also check out existing plugins on [the plugin marketplace](https://backstage.io/plugins)! diff --git a/workspaces/redhat-resource-optimization/plugins/README.md b/workspaces/redhat-resource-optimization/plugins/README.md index d7865fdba3..4fc1756606 100644 --- a/workspaces/redhat-resource-optimization/plugins/README.md +++ b/workspaces/redhat-resource-optimization/plugins/README.md @@ -5,5 +5,3 @@ separate folder of its own. If you want to create a new plugin here, go to your project root directory, run the command `yarn new`, and follow the on-screen instructions. - -You can also check out existing plugins on [the plugin marketplace](https://backstage.io/plugins)! diff --git a/workspaces/repo-tools/packages/cli/src/lib/workspaces/templates/workspace/plugins/README.md b/workspaces/repo-tools/packages/cli/src/lib/workspaces/templates/workspace/plugins/README.md index d7865fdba3..4fc1756606 100644 --- a/workspaces/repo-tools/packages/cli/src/lib/workspaces/templates/workspace/plugins/README.md +++ b/workspaces/repo-tools/packages/cli/src/lib/workspaces/templates/workspace/plugins/README.md @@ -5,5 +5,3 @@ separate folder of its own. If you want to create a new plugin here, go to your project root directory, run the command `yarn new`, and follow the on-screen instructions. - -You can also check out existing plugins on [the plugin marketplace](https://backstage.io/plugins)! diff --git a/workspaces/sandbox/plugins/README.md b/workspaces/sandbox/plugins/README.md index d7865fdba3..4fc1756606 100644 --- a/workspaces/sandbox/plugins/README.md +++ b/workspaces/sandbox/plugins/README.md @@ -5,5 +5,3 @@ separate folder of its own. If you want to create a new plugin here, go to your project root directory, run the command `yarn new`, and follow the on-screen instructions. - -You can also check out existing plugins on [the plugin marketplace](https://backstage.io/plugins)! diff --git a/workspaces/scorecard/plugins/README.md b/workspaces/scorecard/plugins/README.md index d7865fdba3..4fc1756606 100644 --- a/workspaces/scorecard/plugins/README.md +++ b/workspaces/scorecard/plugins/README.md @@ -5,5 +5,3 @@ separate folder of its own. If you want to create a new plugin here, go to your project root directory, run the command `yarn new`, and follow the on-screen instructions. - -You can also check out existing plugins on [the plugin marketplace](https://backstage.io/plugins)! diff --git a/workspaces/theme/plugins/README.md b/workspaces/theme/plugins/README.md index d7865fdba3..4fc1756606 100644 --- a/workspaces/theme/plugins/README.md +++ b/workspaces/theme/plugins/README.md @@ -5,5 +5,3 @@ separate folder of its own. If you want to create a new plugin here, go to your project root directory, run the command `yarn new`, and follow the on-screen instructions. - -You can also check out existing plugins on [the plugin marketplace](https://backstage.io/plugins)! diff --git a/workspaces/translations/plugins/translations-backend/src/service/TranslationService.ts b/workspaces/translations/plugins/translations-backend/src/service/TranslationService.ts index 260fb4890c..5a4d5264ec 100644 --- a/workspaces/translations/plugins/translations-backend/src/service/TranslationService.ts +++ b/workspaces/translations/plugins/translations-backend/src/service/TranslationService.ts @@ -60,7 +60,7 @@ export class TranslationService { /** * Finds the topmost folder with the given name by searching up the directory tree - * Similar to the approach used in marketplace plugin + * Similar to the approach used in extensions plugin */ private findTopmostFolder( folderName: string,