Skip to content

Commit

Permalink
Merge branch 'main' into pluginImprovements
Browse files Browse the repository at this point in the history
  • Loading branch information
SaachiNayyer committed Apr 29, 2024
2 parents fca6f1a + 64f9890 commit 5b0f895
Show file tree
Hide file tree
Showing 48 changed files with 3,949 additions and 2,202 deletions.
19 changes: 0 additions & 19 deletions .changeset/famous-readers-wonder.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/sharp-apricots-do.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/soft-readers-relax.md

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ jobs:
run: yarn lint

- name: lint openapi yaml files
run: yarn backstage-repo-tools schema openapi lint
run: yarn backstage-repo-tools repo schema openapi lint
2 changes: 1 addition & 1 deletion backstage.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "1.22.2"
"version": "1.26.0"
}
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
]
},
"devDependencies": {
"@backstage/cli": "^0.25.1",
"@backstage/e2e-test-utils": "^0.1.0",
"@backstage/repo-tools": "^0.5.2",
"@backstage/cli": "^0.26.3",
"@backstage/e2e-test-utils": "^0.1.1",
"@backstage/repo-tools": "^0.8.0",
"@changesets/cli": "^2.26.2",
"@playwright/test": "^1.32.3",
"@spotify/prettier-config": "^12.0.0",
Expand Down
37 changes: 37 additions & 0 deletions packages/app/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,42 @@
# app

## 0.4.14

### Patch Changes

- 0535af4: Bumped backstage dependencies to match 1.26.0
- Updated dependencies [0535af4]
- @axis-backstage/plugin-analytics-module-umami@0.2.2
- @axis-backstage/plugin-jira-dashboard-common@1.0.1
- @axis-backstage/plugin-jira-dashboard@1.0.2
- @axis-backstage/plugin-statuspage@0.3.4
- @axis-backstage/plugin-readme@0.7.1

## 0.4.13

### Patch Changes

- Updated dependencies [371f5fd]
- @axis-backstage/plugin-readme@0.7.0

## 0.4.12

### Patch Changes

- Updated dependencies [12f407b]
- @axis-backstage/plugin-jira-dashboard@1.0.1

## 0.4.11

### Patch Changes

- Updated dependencies [517c68a]
- Updated dependencies [603304b]
- Updated dependencies [5457a70]
- @axis-backstage/plugin-jira-dashboard-common@1.0.0
- @axis-backstage/plugin-jira-dashboard@1.0.0
- @axis-backstage/plugin-readme@0.6.0

## 0.4.10

### Patch Changes
Expand Down
54 changes: 27 additions & 27 deletions packages/app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "app",
"version": "0.4.10",
"version": "0.4.14",
"private": true,
"bundled": true,
"backstage": {
Expand All @@ -19,31 +19,31 @@
"@axis-backstage/plugin-jira-dashboard-common": "workspace:^",
"@axis-backstage/plugin-readme": "workspace:^",
"@axis-backstage/plugin-statuspage": "workspace:^",
"@backstage/app-defaults": "^1.4.7",
"@backstage/catalog-model": "^1.4.3",
"@backstage/cli": "^0.25.1",
"@backstage/core-app-api": "^1.11.3",
"@backstage/core-components": "^0.13.10",
"@backstage/core-plugin-api": "^1.8.2",
"@backstage/integration-react": "^1.1.23",
"@backstage/plugin-api-docs": "^0.10.3",
"@backstage/plugin-catalog": "^1.16.1",
"@backstage/plugin-catalog-common": "^1.0.20",
"@backstage/plugin-catalog-graph": "^0.3.3",
"@backstage/plugin-catalog-import": "^0.10.5",
"@backstage/plugin-catalog-react": "^1.9.3",
"@backstage/plugin-github-actions": "^0.6.10",
"@backstage/plugin-org": "^0.6.19",
"@backstage/plugin-permission-react": "^0.4.19",
"@backstage/plugin-scaffolder": "^1.17.1",
"@backstage/plugin-search": "^1.4.5",
"@backstage/plugin-search-react": "^1.7.5",
"@backstage/plugin-tech-radar": "^0.6.12",
"@backstage/plugin-techdocs": "^1.9.3",
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.4",
"@backstage/plugin-techdocs-react": "^1.1.15",
"@backstage/plugin-user-settings": "^0.8.0",
"@backstage/theme": "^0.5.0",
"@backstage/app-defaults": "^1.5.4",
"@backstage/catalog-model": "^1.4.5",
"@backstage/cli": "^0.26.3",
"@backstage/core-app-api": "^1.12.4",
"@backstage/core-components": "^0.14.4",
"@backstage/core-plugin-api": "^1.9.2",
"@backstage/integration-react": "^1.1.26",
"@backstage/plugin-api-docs": "^0.11.4",
"@backstage/plugin-catalog": "^1.19.0",
"@backstage/plugin-catalog-common": "^1.0.22",
"@backstage/plugin-catalog-graph": "^0.4.4",
"@backstage/plugin-catalog-import": "^0.10.10",
"@backstage/plugin-catalog-react": "^1.11.3",
"@backstage/plugin-github-actions": "^0.6.15",
"@backstage/plugin-org": "^0.6.24",
"@backstage/plugin-permission-react": "^0.4.22",
"@backstage/plugin-scaffolder": "^1.19.3",
"@backstage/plugin-search": "^1.4.10",
"@backstage/plugin-search-react": "^1.7.10",
"@backstage/plugin-tech-radar": "^0.7.3",
"@backstage/plugin-techdocs": "^1.10.4",
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.9",
"@backstage/plugin-techdocs-react": "^1.2.3",
"@backstage/plugin-user-settings": "^0.8.5",
"@backstage/theme": "^0.5.3",
"@material-ui/core": "^4.12.4",
"@material-ui/icons": "^4.11.3",
"@mui/material": "^5.15.7",
Expand All @@ -56,7 +56,7 @@
"react-use": "^17.2.4"
},
"devDependencies": {
"@backstage/test-utils": "^1.4.7",
"@backstage/test-utils": "^1.5.4",
"@playwright/test": "^1.32.3",
"@testing-library/dom": "^9.0.0",
"@testing-library/jest-dom": "6.0.0",
Expand Down
30 changes: 30 additions & 0 deletions packages/backend/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,35 @@
# backend

## 0.3.11

### Patch Changes

- 0535af4: Bumped backstage dependencies to match 1.26.0
- Updated dependencies [0535af4]
- Updated dependencies [0535af4]
- Updated dependencies [0535af4]
- Updated dependencies [0535af4]
- @axis-backstage/plugin-jira-dashboard-backend@2.0.0
- @axis-backstage/plugin-statuspage-backend@0.2.1
- @axis-backstage/plugin-readme-backend@0.6.0
- [email protected]

## 0.3.10

### Patch Changes

- Updated dependencies [371f5fd]
- @axis-backstage/plugin-readme-backend@0.5.0
- [email protected]

## 0.3.9

### Patch Changes

- Updated dependencies [9456530]
- @axis-backstage/plugin-jira-dashboard-backend@1.0.0
- [email protected]

## 0.3.8

### Patch Changes
Expand Down
42 changes: 21 additions & 21 deletions packages/backend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "backend",
"version": "0.3.8",
"version": "0.3.11",
"main": "dist/index.cjs.js",
"types": "src/index.ts",
"private": true,
Expand All @@ -19,25 +19,25 @@
"@axis-backstage/plugin-jira-dashboard-backend": "workspace:^",
"@axis-backstage/plugin-readme-backend": "workspace:^",
"@axis-backstage/plugin-statuspage-backend": "workspace:^",
"@backstage/backend-common": "^0.20.1",
"@backstage/backend-defaults": "^0.2.9",
"@backstage/backend-plugin-api": "^0.6.9",
"@backstage/backend-tasks": "^0.5.14",
"@backstage/catalog-client": "^1.5.2",
"@backstage/catalog-model": "^1.4.3",
"@backstage/config": "^1.1.1",
"@backstage/plugin-app-backend": "^0.3.57",
"@backstage/plugin-auth-backend": "^0.20.3",
"@backstage/plugin-auth-node": "^0.4.3",
"@backstage/plugin-catalog-backend": "^1.16.2",
"@backstage/plugin-permission-common": "^0.7.12",
"@backstage/plugin-permission-node": "^0.7.20",
"@backstage/plugin-proxy-backend": "^0.4.7",
"@backstage/plugin-scaffolder-backend": "^1.20.0",
"@backstage/plugin-search-backend": "^1.4.9",
"@backstage/plugin-search-backend-module-pg": "^0.5.18",
"@backstage/plugin-search-backend-node": "^1.2.13",
"@backstage/plugin-techdocs-backend": "^1.9.2",
"@backstage/backend-common": "^0.21.7",
"@backstage/backend-defaults": "^0.2.17",
"@backstage/backend-plugin-api": "^0.6.17",
"@backstage/backend-tasks": "^0.5.22",
"@backstage/catalog-client": "^1.6.4",
"@backstage/catalog-model": "^1.4.5",
"@backstage/config": "^1.2.0",
"@backstage/plugin-app-backend": "^0.3.65",
"@backstage/plugin-auth-backend": "^0.22.4",
"@backstage/plugin-auth-node": "^0.4.12",
"@backstage/plugin-catalog-backend": "^1.21.1",
"@backstage/plugin-permission-common": "^0.7.13",
"@backstage/plugin-permission-node": "^0.7.28",
"@backstage/plugin-proxy-backend": "^0.4.15",
"@backstage/plugin-scaffolder-backend": "^1.22.4",
"@backstage/plugin-search-backend": "^1.5.7",
"@backstage/plugin-search-backend-module-pg": "^0.5.26",
"@backstage/plugin-search-backend-node": "^1.2.21",
"@backstage/plugin-techdocs-backend": "^1.10.4",
"app": "link:../app",
"better-sqlite3": "^8.0.0",
"dockerode": "^3.3.1",
Expand All @@ -47,7 +47,7 @@
"winston": "^3.2.1"
},
"devDependencies": {
"@backstage/cli": "^0.25.1",
"@backstage/cli": "^0.26.3",
"@types/dockerode": "^3.3.0",
"@types/express": "^4.17.6",
"@types/express-serve-static-core": "^4.17.5",
Expand Down
6 changes: 6 additions & 0 deletions plugins/analytics-module-umami/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @axis-backstage/plugin-analytics-module-umami

## 0.2.2

### Patch Changes

- 0535af4: Bumped backstage dependencies to match 1.26.0

## 0.2.1

### Patch Changes
Expand Down
14 changes: 7 additions & 7 deletions plugins/analytics-module-umami/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@axis-backstage/plugin-analytics-module-umami",
"version": "0.2.1",
"version": "0.2.2",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
Expand All @@ -24,17 +24,17 @@
"postpack": "backstage-cli package postpack"
},
"dependencies": {
"@backstage/config": "^1.1.1",
"@backstage/core-components": "^0.13.10",
"@backstage/core-plugin-api": "^1.8.2"
"@backstage/config": "^1.2.0",
"@backstage/core-components": "^0.14.4",
"@backstage/core-plugin-api": "^1.9.2"
},
"peerDependencies": {
"react": "^17.0.0 || ^18.0.0"
},
"devDependencies": {
"@backstage/cli": "^0.25.1",
"@backstage/dev-utils": "^1.0.26",
"@backstage/test-utils": "^1.4.7",
"@backstage/cli": "^0.26.3",
"@backstage/dev-utils": "^1.0.31",
"@backstage/test-utils": "^1.5.4",
"@testing-library/jest-dom": "6.0.0",
"@testing-library/react": "^14.0.0",
"@testing-library/user-event": "^14.5.2"
Expand Down
38 changes: 38 additions & 0 deletions plugins/jira-dashboard-backend/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,43 @@
# @axis-backstage/plugin-jira-dashboard-backend

## 2.0.0

### Major Changes

- 0535af4: **BREAKING** The Jira dashboard backend now uses the new auth service introduced in Backstage v1.24.0. This is only applicable when using this plugin in the new Backstage backend. This could break the usage in Backstage installations older than v1.24.0 if the new backend system is used.

### Patch Changes

- 0535af4: Bumped backstage dependencies to match 1.26.0
- 0535af4: Updated the installation instructions for the new backend system.
- Updated dependencies [0535af4]
- @axis-backstage/plugin-jira-dashboard-common@1.0.1

## 1.0.0

### Major Changes

- 9456530: Updated the getIssuesByFilter function to accept an array of components,
enabling the construction of more flexible JQL queries.
Introduced a new variable named componentQuery to represent the portion of the JQL query related to components.

Enhanced the getIssuesFromFilters function to include support for filtering by components.
Now, along with project keys and filters, the function also accepts an array of components.
This change allows for more comprehensive filtering options when retrieving issues from Jira.

Modified the router implementation to pass the array of components to the getIssuesFromFilters function.
By including components in the request, users can now specify additional criteria for filtering Jira issues,
resulting in more refined search results.

The introduced changes provide users with greater flexibility and control when retrieving Jira issues,
allowing for more precise filtering based on project keys, components, and filter criteria.
This enhancement improves the overall usability and effectiveness of the Jira integration functionality.

### Patch Changes

- Updated dependencies [517c68a]
- @axis-backstage/plugin-jira-dashboard-common@1.0.0

## 0.7.4

### Patch Changes
Expand Down
3 changes: 1 addition & 2 deletions plugins/jira-dashboard-backend/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,9 @@ The Jira Dashboard backend plugin has support for the [new backend system](https
In your `packages/backend/src/index.ts` make the following changes:

```diff
+ import { jiraDashboardPlugin } from '@axis-backstage/plugin-jira-dashboard-backend';
const backend = createBackend();
+ backend.add(jiraDashboardPlugin());
+ backend.add(import('@axis-backstage/plugin-jira-dashboard-backend'));
// ... other feature additions
backend.start();
Expand Down
Loading

0 comments on commit 5b0f895

Please sign in to comment.