diff --git a/.ibm/pipelines/value_files/diff-values_showcase-sanity-plugins.yaml b/.ibm/pipelines/value_files/diff-values_showcase-sanity-plugins.yaml index 14ef7095d2..462056e26e 100644 --- a/.ibm/pipelines/value_files/diff-values_showcase-sanity-plugins.yaml +++ b/.ibm/pipelines/value_files/diff-values_showcase-sanity-plugins.yaml @@ -4,13 +4,13 @@ global: # sanity check https://issues.redhat.com/browse/RHIDP-5301 - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-gitlab-org-dynamic disabled: false - - package: ./dynamic-plugins/dist/roadiehq-backstage-plugin-github-insights + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-backstage-plugin-github-insights:bs_1.45.3__3.4.1!roadiehq-backstage-plugin-github-insights disabled: false - - package: ./dynamic-plugins/dist/roadiehq-backstage-plugin-security-insights + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-backstage-plugin-security-insights:bs_1.45.3__3.3.1!roadiehq-backstage-plugin-security-insights disabled: false - package: ./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-gitlab-dynamic disabled: false - - package: ./dynamic-plugins/dist/immobiliarelabs-backstage-plugin-gitlab + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/immobiliarelabs-backstage-plugin-gitlab:bs_1.45.3__6.13.0!immobiliarelabs-backstage-plugin-gitlab disabled: false - package: ./dynamic-plugins/dist/roadiehq-backstage-plugin-argo-cd-backend-dynamic disabled: false @@ -35,17 +35,15 @@ global: - name: argoInstance1 url: "temp" token: "temp" - - package: ./dynamic-plugins/dist/backstage-community-plugin-redhat-argocd + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-argocd:bs_1.45.3__2.4.0 disabled: false - - package: ./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-azure-dynamic + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-plugin-scaffolder-backend-module-azure:bs_1.45.3__0.2.15!backstage-plugin-scaffolder-backend-module-azure disabled: false - - package: ./dynamic-plugins/dist/backstage-community-plugin-azure-devops-backend-dynamic + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-azure-devops-backend:bs_1.45.3__0.23.0!backstage-community-plugin-azure-devops-backend disabled: false - - package: ./dynamic-plugins/dist/backstage-community-plugin-azure-devops + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-azure-devops:bs_1.45.3__0.23.0!backstage-community-plugin-azure-devops disabled: false - - package: ./dynamic-plugins/dist/parfuemerie-douglas-scaffolder-backend-module-azure-repositories-dynamic - disabled: false - - package: ./dynamic-plugins/dist/backstage-community-plugin-jenkins-backend-dynamic + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-jenkins-backend:bs_1.45.3__0.22.0!backstage-community-plugin-jenkins-backend disabled: false pluginConfig: jenkins: @@ -54,7 +52,7 @@ global: baseUrl: "temp" username: "temp" apiKey: "temp" - - package: ./dynamic-plugins/dist/backstage-community-plugin-jenkins + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-jenkins:bs_1.45.3__0.26.0!backstage-community-plugin-jenkins disabled: false - package: ./dynamic-plugins/dist/backstage-plugin-notifications disabled: false @@ -72,7 +70,7 @@ global: disabled: false - package: ./dynamic-plugins/dist/backstage-plugin-signals disabled: false - - package: ./dynamic-plugins/dist/backstage-community-plugin-sonarqube-backend-dynamic + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-sonarqube-backend:bs_1.45.3__0.15.0!backstage-community-plugin-sonarqube-backend disabled: false pluginConfig: sonarqube: @@ -81,7 +79,7 @@ global: instanceKey: "mySonarqube" baseUrl: "https://default-sonarqube.example.com" apiKey: "123456789abcdef0123456789abcedf012" - - package: ./dynamic-plugins/dist/backstage-community-plugin-sonarqube + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-sonarqube:bs_1.45.3__0.21.0!backstage-community-plugin-sonarqube disabled: false - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-dynamic-home-page disabled: false @@ -97,9 +95,9 @@ global: backstage.plugin-techdocs-module-addons-contrib: techdocsAddons: - importName: ReportIssue - - package: ./dynamic-plugins/dist/pagerduty-backstage-plugin + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/pagerduty-backstage-plugin:bs_1.45.3__0.16.4!pagerduty-backstage-plugin disabled: true - - package: ./dynamic-plugins/dist/pagerduty-backstage-plugin-backend-dynamic + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/pagerduty-backstage-plugin-backend:bs_1.45.3__0.10.1!pagerduty-backstage-plugin-backend disabled: true pluginConfig: pagerDuty: @@ -108,18 +106,18 @@ global: clientId: "temp" clientSecret: "temp" subDomain: "temp" - - package: ./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-gerrit-dynamic + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-plugin-scaffolder-backend-module-gerrit:bs_1.45.3__0.2.15!backstage-plugin-scaffolder-backend-module-gerrit disabled: false - - package: ./dynamic-plugins/dist/roadiehq-scaffolder-backend-module-utils-dynamic + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-scaffolder-backend-module-utils:bs_1.45.3__4.1.1!roadiehq-scaffolder-backend-module-utils disabled: false - package: ./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-kubernetes-dynamic disabled: false - - package: ./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-quay-dynamic + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-scaffolder-backend-module-quay:bs_1.45.3__2.14.0!backstage-community-plugin-scaffolder-backend-module-quay disabled: false - package: ./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-regex-dynamic disabled: false - package: ./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-servicenow-dynamic - disabled: false + disabled: true pluginConfig: servicenow: # The base url of the ServiceNow instance. @@ -128,9 +126,9 @@ global: username: "temp" # The password to use for authentication. password: "temp" - - package: ./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-sonarqube-dynamic + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-scaffolder-backend-module-sonarqube:bs_1.45.3__2.11.0!backstage-community-plugin-scaffolder-backend-module-sonarqube disabled: false - - package: ./dynamic-plugins/dist/backstage-community-plugin-3scale-backend-dynamic + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-3scale-backend:bs_1.45.3__3.10.0!backstage-community-plugin-3scale-backend disabled: true pluginConfig: catalog: @@ -139,7 +137,7 @@ global: default: baseUrl: "temp" accessToken: "temp" - - package: ./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-bitbucket-cloud-dynamic + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-plugin-scaffolder-backend-module-bitbucket-cloud:bs_1.45.3__0.2.15!backstage-plugin-scaffolder-backend-module-bitbucket-cloud disabled: false pluginConfig: # https://backstage.io/docs/integrations/bitbucketCloud/discovery#configuration @@ -148,17 +146,17 @@ global: bitbucketCloud: default: # identifies your ingested dataset workspace: "temp" - - package: ./dynamic-plugins/dist/backstage-community-plugin-dynatrace + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-dynatrace:bs_1.45.3__10.12.1!backstage-community-plugin-dynatrace disabled: false - - package: ./dynamic-plugins/dist/roadiehq-backstage-plugin-jira + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-backstage-plugin-jira:bs_1.45.3__2.14.0!roadiehq-backstage-plugin-jira disabled: false - - package: ./dynamic-plugins/dist/roadiehq-backstage-plugin-datadog + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-backstage-plugin-datadog:bs_1.45.3__2.6.0!roadiehq-backstage-plugin-datadog disabled: false - - package: ./dynamic-plugins/dist/backstage-community-plugin-nexus-repository-manager + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-nexus-repository-manager:bs_1.45.3__1.19.3!backstage-community-plugin-nexus-repository-manager disabled: false - - package: ./dynamic-plugins/dist/backstage-community-plugin-jfrog-artifactory + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-jfrog-artifactory:bs_1.45.3__1.24.0!backstage-community-plugin-jfrog-artifactory disabled: false - - package: ./dynamic-plugins/dist/backstage-community-plugin-lighthouse + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-lighthouse:bs_1.45.3__0.16.0!backstage-community-plugin-lighthouse disabled: false - package: ./dynamic-plugins/dist/backstage-community-plugin-analytics-provider-segment disabled: false diff --git a/.ibm/pipelines/value_files/values_showcase-rbac.yaml b/.ibm/pipelines/value_files/values_showcase-rbac.yaml index bdd11efa68..f552453bf6 100644 --- a/.ibm/pipelines/value_files/values_showcase-rbac.yaml +++ b/.ibm/pipelines/value_files/values_showcase-rbac.yaml @@ -31,13 +31,28 @@ global: seconds: 15 - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-org-dynamic disabled: false - - package: ./dynamic-plugins/dist/backstage-community-plugin-github-issues + pluginConfig: + catalog: + providers: + githubOrg: + id: production + githubUrl: ${GITHUB_URL} + orgs: + - ${GITHUB_ORG} + schedule: + frequency: + minutes: 60 + initialDelay: + seconds: 15 + timeout: + minutes: 15 + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-github-issues:bs_1.45.3__0.16.0!backstage-community-plugin-github-issues disabled: false - - package: ./dynamic-plugins/dist/roadiehq-backstage-plugin-github-pull-requests + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-backstage-plugin-github-pull-requests:bs_1.45.3__3.6.2!roadiehq-backstage-plugin-github-pull-requests disabled: false - - package: ./dynamic-plugins/dist/backstage-community-plugin-github-actions + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-github-actions:bs_1.45.3__0.18.0!backstage-community-plugin-github-actions disabled: false - - package: ./dynamic-plugins/dist/backstage-community-plugin-quay + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-quay:bs_1.45.3__1.28.1!backstage-community-plugin-quay disabled: false - package: ./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-keycloak-dynamic disabled: false @@ -83,8 +98,6 @@ global: disabled: false - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-global-header disabled: false - - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-dynamic-home-page - disabled: false # Enable tech-radar plugin. - package: ./dynamic-plugins/dist/backstage-community-plugin-tech-radar disabled: false diff --git a/.ibm/pipelines/value_files/values_showcase.yaml b/.ibm/pipelines/value_files/values_showcase.yaml index 4aaa76251c..d556485032 100644 --- a/.ibm/pipelines/value_files/values_showcase.yaml +++ b/.ibm/pipelines/value_files/values_showcase.yaml @@ -82,15 +82,30 @@ global: importName: LocationListener - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-org-dynamic disabled: false - - package: ./dynamic-plugins/dist/backstage-community-plugin-github-issues + pluginConfig: + catalog: + providers: + githubOrg: + id: production + githubUrl: ${GITHUB_URL} + orgs: + - ${GITHUB_ORG} + schedule: + frequency: + minutes: 60 + initialDelay: + seconds: 15 + timeout: + minutes: 15 + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-github-issues:bs_1.45.3__0.16.0!backstage-community-plugin-github-issues disabled: false - - package: ./dynamic-plugins/dist/roadiehq-backstage-plugin-github-pull-requests + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-backstage-plugin-github-pull-requests:bs_1.45.3__3.6.2!roadiehq-backstage-plugin-github-pull-requests disabled: false - - package: ./dynamic-plugins/dist/backstage-community-plugin-github-actions + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-github-actions:bs_1.45.3__0.18.0!backstage-community-plugin-github-actions disabled: false - - package: ./dynamic-plugins/dist/backstage-community-plugin-quay + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-quay:bs_1.45.3__1.28.1!backstage-community-plugin-quay disabled: false - - package: ./dynamic-plugins/dist/backstage-community-plugin-scaffolder-backend-module-quay-dynamic + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-scaffolder-backend-module-quay:bs_1.45.3__2.14.0!backstage-community-plugin-scaffolder-backend-module-quay disabled: false - package: ./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-keycloak-dynamic disabled: false @@ -179,7 +194,7 @@ global: disabled: false - package: ./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-scaffolder-relation-processor-dynamic disabled: false - - package: ./dynamic-plugins/dist/immobiliarelabs-backstage-plugin-gitlab-backend-dynamic + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/immobiliarelabs-backstage-plugin-gitlab-backend:bs_1.45.3__6.13.0!immobiliarelabs-backstage-plugin-gitlab-backend disabled: false - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-gitlab-dynamic disabled: false diff --git a/packages/app/src/components/Root/Root.tsx b/packages/app/src/components/Root/Root.tsx index 6c84df8d37..af9af6a0b5 100644 --- a/packages/app/src/components/Root/Root.tsx +++ b/packages/app/src/components/Root/Root.tsx @@ -487,30 +487,38 @@ export const Root = ({ children }: PropsWithChildren<{}>) => { ? menuItemArray.filter(mi => mi.name.includes('admin')) : menuItemArray.filter(mi => !mi.name.includes('admin')); - if (isBottomMenuSection && !canDisplayRBACMenuItem && !loadingPermission) { - menuItemArray[0].children = menuItemArray[0].children?.filter( + if ( + isBottomMenuSection && + !canDisplayRBACMenuItem && + !loadingPermission && + menuItemArray[0]?.children + ) { + menuItemArray[0].children = menuItemArray[0].children.filter( mi => mi.name !== 'rbac', ); } + return ( <> {menuItemArray.map(menuItem => { const isOpen = openItems[menuItem.name] || false; return ( - {menuItem.children!.length === 0 && - getMenuItem(menuItem, false, getMenuText)} - {menuItem.children!.length > 0 && ( + {!menuItem.children || + (menuItem.children!.length === 0 && + getMenuItem(menuItem, false, getMenuText))} + {menuItem.children && menuItem.children.length > 0 && ( handleClick(menuItem.name)} > - {menuItem.children!.length > 0 && renderExpandIcon(isOpen)} + {menuItem.children.length > 0 && renderExpandIcon(isOpen)} )} - {menuItem.children!.length > 0 && + {menuItem.children && + menuItem.children.length > 0 && renderExpandableMenuItems(menuItem, isOpen)} );