Merge branch 'main' into improvements

AxisCommunications · Jul 12, 2024 · e241ddb · e241ddb
2 parents 474a889 + 3d92218
commit e241ddb
Show file tree

Hide file tree

Showing 33 changed files with 358 additions and 222 deletions.
diff --git a/.changeset/big-kiwis-sparkle.md b/.changeset/big-kiwis-sparkle.md
diff --git a/.changeset/warm-singers-relate.md b/.changeset/warm-singers-relate.md
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,22 @@
+## Hey, I just made a Pull Request!
+
+Please describe what you added, and add a screenshot if possible.
+That makes it easier to understand the change so we can :shipit: faster.
+
+### Context
+
+Please provide some context about the why this change is being made and what problem it aims to solve.
+
+### Issue ticket number and link
+
+- Fixes # (issue)
+
+### Checklist before requesting a review
+
+- [ ] I have performed a self-review of my own code
+- [ ] I have verified that the code builds perfectly fine on my local system
+- [ ] I have verified that my code follows the style already available in the repository
+- [ ] A changeset describing the change and affected packages. ([more info](https://github.com/AxisCommunications/backstage-plugins/blob/main/CONTRIBUTING.md#changesets))
+- [ ] Added or updated documentation
+- [ ] Tests for new functionality and regression tests for bug fixes
+- [ ] Screenshots attached (for UI changes)
diff --git a/README.md b/README.md
@@ -13,6 +13,7 @@ At Axis, we've developed our own set of plugins exclusively available to us. Now
 - [The Readme plugin](https://github.com/AxisCommunications/backstage-plugins/blob/main/plugins/readme/README.md)
 - [The Statuspage.io plugin](https://github.com/AxisCommunications/backstage-plugins/blob/main/plugins/statuspage/README.md)
 - [The Umami Analytics plugin](https://github.com/AxisCommunications/backstage-plugins/blob/main/plugins/analytics-module-umami/README.md)
+- [The Vacation Calendar plugin](https://github.com/AxisCommunications/backstage-plugins/blob/main/plugins/vacation-calendar/README.md)
 
 ## Keeping your Axis-Backstage plugins updated
 

diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
  ]
  },
  "devDependencies": {
- "@backstage/cli": "^0.26.6",
+ "@backstage/cli": "^0.26.10",
  "@backstage/e2e-test-utils": "^0.1.1",
  "@backstage/repo-tools": "^0.9.0",
  "@changesets/cli": "^2.26.2",

diff --git a/packages/app/CHANGELOG.md b/packages/app/CHANGELOG.md
@@ -1,5 +1,52 @@
 # app
 
+## 0.7.1
+
+### Patch Changes
+
+- Updated dependencies [a30ae43]
+- Updated dependencies [306fcb8]
+- Updated dependencies [6d21448]
+ - @axis-backstage/plugin-vacation-calendar@0.4.0
+ - @axis-backstage/plugin-statuspage@0.5.1
+
+## 0.7.0
+
+### Minor Changes
+
+- 0b948ea: Generate pluginIds for plugins and bumping @backstage/cli
+
+### Patch Changes
+
+- Updated dependencies [0b948ea]
+ - @axis-backstage/plugin-analytics-module-umami@0.4.0
+ - @axis-backstage/plugin-jira-dashboard-common@1.4.0
+ - @axis-backstage/plugin-vacation-calendar@0.3.0
+ - @axis-backstage/plugin-jira-dashboard@1.4.0
+ - @axis-backstage/plugin-statuspage@0.5.0
+ - @axis-backstage/plugin-readme@0.9.0
+
+## 0.6.1
+
+### Patch Changes
+
+- 120631e: Changed plugin-vacation-calendar dependency in app folder to use workspace.
+
+## 0.6.0
+
+### Minor Changes
+
+- e416aff: Added new plugin for displaying out-of-office events in a react-calendar-timeline. Also added support for microsoft autentication.
+
+### Patch Changes
+
+- Updated dependencies [e416aff]
+- Updated dependencies [e12733a]
+- Updated dependencies [e416aff]
+ - @axis-backstage/plugin-jira-dashboard-common@1.3.0
+ - @axis-backstage/plugin-jira-dashboard@1.3.0
+ - @axis-backstage/plugin-vacation-calendar@0.2.0
+
 ## 0.5.0
 
 ### Minor Changes

diff --git a/packages/app/package.json b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
  "name": "app",
- "version": "0.5.0",
+ "version": "0.7.1",
  "private": true,
  "bundled": true,
  "backstage": {
@@ -19,11 +19,11 @@
  "@axis-backstage/plugin-jira-dashboard-common": "workspace:^",
  "@axis-backstage/plugin-readme": "workspace:^",
  "@axis-backstage/plugin-statuspage": "workspace:^",
- "@axis-backstage/plugin-vacation-calendar": "^0.1.0",
+ "@axis-backstage/plugin-vacation-calendar": "workspace:^",
  "@backstage-community/plugin-github-actions": "^0.6.16",
  "@backstage/app-defaults": "^1.5.5",
  "@backstage/catalog-model": "^1.5.0",
- "@backstage/cli": "^0.26.6",
+ "@backstage/cli": "^0.26.10",
  "@backstage/core-app-api": "^1.12.5",
  "@backstage/core-components": "^0.14.7",
  "@backstage/core-plugin-api": "^1.9.2",

diff --git a/packages/backend/CHANGELOG.md b/packages/backend/CHANGELOG.md
@@ -1,5 +1,31 @@
 # backend
 
+## 0.6.0
+
+### Minor Changes
+
+- 0b948ea: Generate pluginIds for plugins and bumping @backstage/cli
+
+### Patch Changes
+
+- Updated dependencies [0b948ea]
+ - @axis-backstage/plugin-jira-dashboard-backend@2.4.0
+ - @axis-backstage/plugin-statuspage-backend@0.4.0
+ - @axis-backstage/plugin-readme-backend@0.8.0
+ - [email protected]
+
+## 0.5.0
+
+### Minor Changes
+
+- e416aff: Added new plugin for displaying out-of-office events in a react-calendar-timeline. Also added support for microsoft autentication.
+
+### Patch Changes
+
+- Updated dependencies [e416aff]
+ - [email protected]
+ - @axis-backstage/plugin-jira-dashboard-backend@2.3.1
+
 ## 0.4.0
 
 ### Minor Changes

diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -1,6 +1,6 @@
 {
  "name": "backend",
- "version": "0.4.0",
+ "version": "0.6.0",
  "main": "dist/index.cjs.js",
  "types": "src/index.ts",
  "private": true,
@@ -48,7 +48,7 @@
  "winston": "^3.2.1"
  },
  "devDependencies": {
- "@backstage/cli": "^0.26.6",
+ "@backstage/cli": "^0.26.10",
  "@types/dockerode": "^3.3.0",
  "@types/express": "^4.17.6",
  "@types/express-serve-static-core": "^4.17.5",

diff --git a/plugins/analytics-module-umami/CHANGELOG.md b/plugins/analytics-module-umami/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @axis-backstage/plugin-analytics-module-umami
 
+## 0.4.0
+
+### Minor Changes
+
+- 0b948ea: Generate pluginIds for plugins and bumping @backstage/cli
+
 ## 0.3.0
 
 ### Minor Changes

diff --git a/plugins/analytics-module-umami/package.json b/plugins/analytics-module-umami/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@axis-backstage/plugin-analytics-module-umami",
- "version": "0.3.0",
+ "version": "0.4.0",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -11,7 +11,11 @@
  "directory": "_release/package"
  },
  "backstage": {
- "role": "frontend-plugin"
+ "role": "frontend-plugin",
+ "pluginId": "analytics-module-umami",
+ "pluginPackages": [
+ "@axis-backstage/plugin-analytics-module-umami"
+ ]
  },
  "sideEffects": false,
  "scripts": {
@@ -32,7 +36,7 @@
  "react": "^17.0.0 || ^18.0.0"
  },
  "devDependencies": {
- "@backstage/cli": "^0.26.6",
+ "@backstage/cli": "^0.26.10",
  "@backstage/dev-utils": "^1.0.32",
  "@backstage/test-utils": "^1.5.5",
  "@testing-library/jest-dom": "6.0.0",

diff --git a/plugins/jira-dashboard-backend/CHANGELOG.md b/plugins/jira-dashboard-backend/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @axis-backstage/plugin-jira-dashboard-backend
 
+## 2.4.0
+
+### Minor Changes
+
+- 0b948ea: Generate pluginIds for plugins and bumping @backstage/cli
+
+### Patch Changes
+
+- Updated dependencies [0b948ea]
+ - @axis-backstage/plugin-jira-dashboard-common@1.4.0
+
+## 2.3.1
+
+### Patch Changes
+
+- Updated dependencies [e416aff]
+ - @axis-backstage/plugin-jira-dashboard-common@1.3.0
+
 ## 2.3.0
 
 ### Minor Changes

diff --git a/plugins/jira-dashboard-backend/package.json b/plugins/jira-dashboard-backend/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@axis-backstage/plugin-jira-dashboard-backend",
- "version": "2.3.0",
+ "version": "2.4.0",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -11,7 +11,13 @@
  "directory": "_release/package"
  },
  "backstage": {
- "role": "backend-plugin"
+ "role": "backend-plugin",
+ "pluginId": "jira-dashboard",
+ "pluginPackages": [
+ "@axis-backstage/plugin-jira-dashboard",
+ "@axis-backstage/plugin-jira-dashboard-backend",
+ "@axis-backstage/plugin-jira-dashboard-common"
+ ]
  },
  "scripts": {
  "start": "backstage-cli package start",
@@ -40,7 +46,7 @@
  },
  "devDependencies": {
  "@backstage/backend-test-utils": "^0.3.8",
- "@backstage/cli": "^0.26.6",
+ "@backstage/cli": "^0.26.10",
  "@types/supertest": "^2.0.12",
  "msw": "^1.0.0",
  "supertest": "^6.2.4"

diff --git a/plugins/jira-dashboard-common/CHANGELOG.md b/plugins/jira-dashboard-common/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @axis-backstage/plugin-jira-dashboard-common
 
+## 1.4.0
+
+### Minor Changes
+
+- 0b948ea: Generate pluginIds for plugins and bumping @backstage/cli
+
+## 1.3.0
+
+### Minor Changes
+
+- e416aff: Adding Priority Column to the Jira Table
+
 ## 1.2.0
 
 ### Minor Changes

diff --git a/plugins/jira-dashboard-common/package.json b/plugins/jira-dashboard-common/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@axis-backstage/plugin-jira-dashboard-common",
  "description": "Common functionalities for the jira-dashboard plugin",
- "version": "1.2.0",
+ "version": "1.4.0",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -13,7 +13,13 @@
  "directory": "_release/package"
  },
  "backstage": {
- "role": "common-library"
+ "role": "common-library",
+ "pluginId": "jira-dashboard",
+ "pluginPackages": [
+ "@axis-backstage/plugin-jira-dashboard",
+ "@axis-backstage/plugin-jira-dashboard-backend",
+ "@axis-backstage/plugin-jira-dashboard-common"
+ ]
  },
  "sideEffects": false,
  "scripts": {
@@ -25,7 +31,7 @@
  "postpack": "backstage-cli package postpack"
  },
  "devDependencies": {
- "@backstage/cli": "^0.26.6"
+ "@backstage/cli": "^0.26.10"
  },
  "files": [
  "dist"

diff --git a/plugins/jira-dashboard/CHANGELOG.md b/plugins/jira-dashboard/CHANGELOG.md
@@ -1,5 +1,27 @@
 # @axis-backstage/plugin-jira-dashboard
 
+## 1.4.0
+
+### Minor Changes
+
+- 0b948ea: Generate pluginIds for plugins and bumping @backstage/cli
+
+### Patch Changes
+
+- Updated dependencies [0b948ea]
+ - @axis-backstage/plugin-jira-dashboard-common@1.4.0
+
+## 1.3.0
+
+### Minor Changes
+
+- e416aff: Adding Priority Column to the Jira Table
+
+### Patch Changes
+
+- Updated dependencies [e416aff]
+ - @axis-backstage/plugin-jira-dashboard-common@1.3.0
+
 ## 1.2.0
 
 ### Minor Changes

diff --git a/plugins/jira-dashboard/package.json b/plugins/jira-dashboard/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@axis-backstage/plugin-jira-dashboard",
- "version": "1.2.0",
+ "version": "1.4.0",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -11,7 +11,13 @@
  "directory": "_release/package"
  },
  "backstage": {
- "role": "frontend-plugin"
+ "role": "frontend-plugin",
+ "pluginId": "jira-dashboard",
+ "pluginPackages": [
+ "@axis-backstage/plugin-jira-dashboard",
+ "@axis-backstage/plugin-jira-dashboard-backend",
+ "@axis-backstage/plugin-jira-dashboard-common"
+ ]
  },
  "sideEffects": false,
  "scripts": {
@@ -42,7 +48,7 @@
  "react": "^17.0.0 || ^18.0.0"
  },
  "devDependencies": {
- "@backstage/cli": "^0.26.6",
+ "@backstage/cli": "^0.26.10",
  "@backstage/core-app-api": "^1.12.5",
  "@backstage/dev-utils": "^1.0.32",
  "@backstage/plugin-catalog-react": "^1.12.0",

diff --git a/plugins/readme-backend/CHANGELOG.md b/plugins/readme-backend/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @axis-backstage/plugin-readme-backend
 
+## 0.8.0
+
+### Minor Changes
+
+- 0b948ea: Generate pluginIds for plugins and bumping @backstage/cli
+
 ## 0.7.0
 
 ### Minor Changes