Merge branch 'master' into orkohunter/techdocs-publish-to-cloud-storage

.changeset/brave-zoos-fail.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-jenkins': patch
+---
+
+Avoid loading data from Jenkins twice. Don't load data when navigating through the pages as all data from all pages is already loaded.

.changeset/purple-radios-complain.md

@@ -0,0 +1,11 @@
+---
+'@backstage/plugin-jenkins': patch
+---
+
+Improve loading speed of the CI/CD page.
+Only request the necessary fields from Jenkins to keep the request size low.
+In addition everything is loaded in a single request, instead of requesting
+each job and build individually. As this (and also the previous behavior) can
+lead to a big amount of data, this limits the amount of jobs to 50.
+For each job, only the latest build is loaded. Loading the full build history
+of a job can lead to excessive load on the Jenkins instance.

.changeset/rare-cooks-tan.md

@@ -0,0 +1,5 @@
+---
+'@backstage/core': patch
+---
+
+Fix React warning of descendant paragraph tag

.changeset/seven-tips-begin.md

@@ -0,0 +1,13 @@
+---
+'@backstage/plugin-api-docs': minor
+---
+
+Stop exposing a custom router from the `api-docs` plugin. Instead, use the
+widgets exported by the plugin to compose your custom entity pages.
+
+Instead of displaying the API definitions directly in the API tab of the
+component, it now contains tables linking to the API entities. This also adds
+new widgets to display relationships (bot provides & consumes relationships)
+between components and APIs.
+
+See the changelog of `create-app` for a migration guide.

.changeset/seven-tips-more.md

@@ -0,0 +1,136 @@
+---
+'@backstage/create-app': patch
+---
+
+Adjust template to the latest changes in the `api-docs` plugin.
+
+## Template Changes
+
+While updating to the latest `api-docs` plugin, the following changes are
+necessary for the `create-app` template in your
+`app/src/components/catalog/EntityPage.tsx`. This adds:
+
+- A custom entity page for API entities
+- Changes the API tab to include the new `ConsumedApisCard` and
+  `ProvidedApisCard` that link to the API entity.
+
+```diff
+ import {
++  ApiDefinitionCard,
+-  Router as ApiDocsRouter,
++  ConsumedApisCard,
++  ProvidedApisCard,
++  ConsumedApisCard,
++  ConsumingComponentsCard,
++  ProvidedApisCard,
++  ProvidingComponentsCard
+ } from '@backstage/plugin-api-docs';
+
+...
+
++const ComponentApisContent = ({ entity }: { entity: Entity }) => (
++  <Grid container spacing={3} alignItems="stretch">
++    <Grid item md={6}>
++      <ProvidedApisCard entity={entity} />
++    </Grid>
++    <Grid item md={6}>
++      <ConsumedApisCard entity={entity} />
++    </Grid>
++  </Grid>
++);
+
+ const ServiceEntityPage = ({ entity }: { entity: Entity }) => (
+   <EntityPageLayout>
+     <EntityPageLayout.Content
+      path="/"
+      title="Overview"
+      element={<OverviewContent entity={entity} />}
+    />
+    <EntityPageLayout.Content
+      path="/ci-cd/*"
+      title="CI/CD"
+      element={<CICDSwitcher entity={entity} />}
+    />
+    <EntityPageLayout.Content
+      path="/api/*"
+      title="API"
+-     element={<ApiDocsRouter entity={entity} />}
++     element={<ComponentApisContent entity={entity} />}
+    />
+...
+
+-export const EntityPage = () => {
+-  const { entity } = useEntity();
+-  switch (entity?.spec?.type) {
+-    case 'service':
+-      return <ServiceEntityPage entity={entity} />;
+-    case 'website':
+-      return <WebsiteEntityPage entity={entity} />;
+-    default:
+-      return <DefaultEntityPage entity={entity} />;
+-  }
+-};
+
++export const ComponentEntityPage = ({ entity }: { entity: Entity }) => {
++  switch (entity?.spec?.type) {
++    case 'service':
++      return <ServiceEntityPage entity={entity} />;
++    case 'website':
++      return <WebsiteEntityPage entity={entity} />;
++    default:
++      return <DefaultEntityPage entity={entity} />;
++  }
++};
++
++const ApiOverviewContent = ({ entity }: { entity: Entity }) => (
++  <Grid container spacing={3}>
++    <Grid item md={6}>
++      <AboutCard entity={entity} />
++    </Grid>
++    <Grid container item md={12}>
++      <Grid item md={6}>
++        <ProvidingComponentsCard entity={entity} />
++      </Grid>
++      <Grid item md={6}>
++        <ConsumingComponentsCard entity={entity} />
++      </Grid>
++    </Grid>
++  </Grid>
++);
++
++const ApiDefinitionContent = ({ entity }: { entity: ApiEntity }) => (
++  <Grid container spacing={3}>
++    <Grid item xs={12}>
++      <ApiDefinitionCard apiEntity={entity} />
++    </Grid>
++  </Grid>
++);
++
++const ApiEntityPage = ({ entity }: { entity: Entity }) => (
++  <EntityPageLayout>
++    <EntityPageLayout.Content
++      path="/*"
++      title="Overview"
++      element={<ApiOverviewContent entity={entity} />}
++    />
++    <EntityPageLayout.Content
++      path="/definition/*"
++      title="Definition"
++      element={<ApiDefinitionContent entity={entity as ApiEntity} />}
++    />
++  </EntityPageLayout>
++);
++
++export const EntityPage = () => {
++  const { entity } = useEntity();
++
++  switch (entity?.kind?.toLowerCase()) {
++    case 'component':
++      return <ComponentEntityPage entity={entity} />;
++    case 'api':
++      return <ApiEntityPage entity={entity} />;
++    default:
++      return <DefaultEntityPage entity={entity} />;
++  }
++};
+```