Merge branch 'master' into techdocs/remove-warnings

Signed-off-by: Morgan Bentell <morgan.bentell@gmail.com>

plugins/api-docs/CHANGELOG.md

@@ -1,5 +1,46 @@
 # @backstage/plugin-api-docs
 
+## 0.9.1
+
+### Patch Changes
+
+- 095e755d9b5: Add ApiDefinitionDialog component for fast access to the API definition in ProvidedApiCards and ConsumedApiCards.
+- 8bc7dcec820: Fix dark theme Swagger's clear button font color.
+- 52b0022dab7: Updated dependency `msw` to `^1.0.0`.
+- 9820eb5d24f: Add a `columns` prop to certain components that use the `EntityTable` for easier extensibility.
+- Updated dependencies
+  - @backstage/plugin-catalog@1.9.0
+  - @backstage/core-components@0.12.5
+  - @backstage/plugin-catalog-react@1.4.0
+  - @backstage/core-plugin-api@1.5.0
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.18
+
+## 0.9.1-next.2
+
+### Patch Changes
+
+- 8bc7dcec820: Fix dark theme Swagger's clear button font color.
+- Updated dependencies
+  - @backstage/core-components@0.12.5-next.2
+  - @backstage/plugin-catalog-react@1.4.0-next.2
+  - @backstage/plugin-catalog@1.9.0-next.2
+  - @backstage/core-plugin-api@1.5.0-next.2
+
+## 0.9.1-next.1
+
+### Patch Changes
+
+- 52b0022dab7: Updated dependency `msw` to `^1.0.0`.
+- 9820eb5d24f: Add a `columns` prop to certain components that use the `EntityTable` for easier extensibility.
+- Updated dependencies
+  - @backstage/plugin-catalog@1.9.0-next.1
+  - @backstage/core-components@0.12.5-next.1
+  - @backstage/core-plugin-api@1.4.1-next.1
+  - @backstage/theme@0.2.18-next.0
+  - @backstage/plugin-catalog-react@1.4.0-next.1
+  - @backstage/catalog-model@1.2.1-next.1
+
 ## 0.9.1-next.0
 
 ### Patch Changes

plugins/api-docs/dev/asyncapi-example-api.yaml

@@ -133,6 +133,8 @@ spec:
               description: Light intensity measured in lumens.
             sentAt:
               $ref: "#/components/schemas/sentAt"
+            sentBy:
+              $ref: "#/components/schemas/sentBy"
         turnOnOffPayload:
           type: object
           properties:
@@ -144,6 +146,8 @@ spec:
               description: Whether to turn on or off the light.
             sentAt:
               $ref: "#/components/schemas/sentAt"
+            sentBy:
+              $ref: "#/components/schemas/sentBy"
         dimLightPayload:
           type: object
           properties:
@@ -154,10 +158,25 @@ spec:
               maximum: 100
             sentAt:
               $ref: "#/components/schemas/sentAt"
+            sentBy:
+              $ref: "#/components/schemas/sentBy"
         sentAt:
           type: string
           format: date-time
           description: Date and time when the message was sent.
+        sentBy:
+          type: object
+          description: Description of the message sender.
+          properties:
+            name:
+              type: string
+              description: Name of the sender.
+            type:
+              type: string
+              description: Type of the sender.
+              enum:
+              - user
+              - machine
 
       securitySchemes:
         apiKey:

plugins/api-docs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-api-docs",
   "description": "A Backstage plugin that helps represent API entities in the frontend",
-  "version": "0.9.1-next.0",
+  "version": "0.9.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",

plugins/api-docs/src/components/AsyncApiDefinitionWidget/AsyncApiDefinition.tsx

@@ -76,6 +76,8 @@ const useStyles = makeStyles((theme: BackstageTheme) => ({
       ...theme.typography.button,
       borderRadius: theme.shape.borderRadius,
       color: theme.palette.primary.main,
+      // override whatever may be in the theme's typography to ensure consistency with asyncapi
+      textTransform: 'inherit',
     },
     '& a': {
       color: theme.palette.link,

plugins/api-docs/src/components/OpenApiDefinitionWidget/OpenApiDefinition.tsx

@@ -25,6 +25,9 @@ const useStyles = makeStyles(theme => ({
       fontFamily: theme.typography.fontFamily,
       color: theme.palette.text.primary,
 
+      ['& .btn-clear']: {
+        color: theme.palette.text.primary,
+      },
       [`& .scheme-container`]: {
         backgroundColor: theme.palette.background.default,
       },