Merge branch 'main' into my-jira-tickets

RoadieHQ · Sep 19, 2024 · 6cd7995 · 6cd7995
2 parents 7537b12 + 6a19519
commit 6cd7995
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 11 deletions.
diff --git a/.changeset/rude-bananas-watch.md b/.changeset/rude-bananas-watch.md
diff --git a/.changeset/witty-geese-lay.md b/.changeset/witty-geese-lay.md
@@ -0,0 +1,6 @@
+---
+'@roadiehq/backstage-plugin-argo-cd-backend': patch
+'@roadiehq/backstage-plugin-argo-cd': patch
+---
+
+fix: Align pluginId metadata to id set during plugin initialization
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "engines": {
-    "node": "14 || 16 || 18"
+    "node": "14 || 16 || 18 || 20"
   },
   "scripts": {
     "dev": "concurrently \"yarn start\" \"yarn start-backend\"",

diff --git a/plugins/backend/backstage-plugin-argo-cd-backend/package.json b/plugins/backend/backstage-plugin-argo-cd-backend/package.json
@@ -11,7 +11,7 @@
   },
   "backstage": {
     "role": "backend-plugin",
-    "pluginId": "backstage-plugin-argo-cd-backend",
+    "pluginId": "argocd",
     "pluginPackages": [
       "@roadiehq/backstage-plugin-argo-cd",
       "@roadiehq/backstage-plugin-argo-cd-backend"

diff --git a/plugins/frontend/backstage-plugin-argo-cd/CHANGELOG.md b/plugins/frontend/backstage-plugin-argo-cd/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @roadiehq/backstage-plugin-argo-cd
 
+## 2.8.1
+
+### Patch Changes
+
+- 1e83f94: Modify linking functionality construction to construct the link
+
 ## 2.8.0
 
 ### Minor Changes

diff --git a/plugins/frontend/backstage-plugin-argo-cd/package.json b/plugins/frontend/backstage-plugin-argo-cd/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@roadiehq/backstage-plugin-argo-cd",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,7 +21,7 @@
   },
   "backstage": {
     "role": "frontend-plugin",
-    "pluginId": "backstage-plugin-argo-cd",
+    "pluginId": "argocd",
     "pluginPackages": [
       "@roadiehq/backstage-plugin-argo-cd",
       "@roadiehq/backstage-plugin-argo-cd-backend"

diff --git a/plugins/frontend/backstage-plugin-argo-cd/src/components/ArgoCDHistoryTable.tsx b/plugins/frontend/backstage-plugin-argo-cd/src/components/ArgoCDHistoryTable.tsx
@@ -58,7 +58,7 @@ export const ArgoCDHistoryTable = ({
       render: (row: any): React.ReactNode =>
         linkUrl ? (
           <Link
-            href={`${linkUrl}/applications/${
+            href={`${linkUrl(row)}/applications/${
               namespaced ? `${row.appNamespace}/${row.app}` : row.app
             }`}
             target="_blank"

diff --git a/plugins/frontend/backstage-plugin-datadog/CHANGELOG.md b/plugins/frontend/backstage-plugin-datadog/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @roadiehq/backstage-plugin-datadog
 
+## 2.3.2
+
+### Patch Changes
+
+- cb3300c: Filter entity cards and content to components and resources by default, add documentation on how to override if needed
+
 ## 2.3.1
 
 ### Patch Changes

diff --git a/plugins/frontend/backstage-plugin-datadog/package.json b/plugins/frontend/backstage-plugin-datadog/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@roadiehq/backstage-plugin-datadog",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",