From 2873d5f08ccdc73577505b64ab5f33faff7857e6 Mon Sep 17 00:00:00 2001 From: Rob Heckel <8441943+billabongrob@users.noreply.github.com> Date: Wed, 2 Oct 2024 06:00:22 -0500 Subject: [PATCH 1/2] plugin(bazaar): add a completed status for Bazaar Projects (#1456) Adjusting default fixtures for more coverage Signed-off-by: Rob Heckel --- .../.changeset/hungry-stingrays-obey.md | 5 +++++ .../__fixtures__/get-projects-response.json | 19 +++++++++++++++++-- .../ProjectDialog/ProjectDialog.tsx | 2 +- .../src/components/StatusTag/StatusTag.tsx | 9 +++++++-- workspaces/bazaar/plugins/bazaar/src/types.ts | 2 +- 5 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 workspaces/bazaar/.changeset/hungry-stingrays-obey.md diff --git a/workspaces/bazaar/.changeset/hungry-stingrays-obey.md b/workspaces/bazaar/.changeset/hungry-stingrays-obey.md new file mode 100644 index 0000000000..e1d1c5eafe --- /dev/null +++ b/workspaces/bazaar/.changeset/hungry-stingrays-obey.md @@ -0,0 +1,5 @@ +--- +'@backstage-community/plugin-bazaar': minor +--- + +Adding Completion Capabilities diff --git a/workspaces/bazaar/plugins/bazaar/dev/__fixtures__/get-projects-response.json b/workspaces/bazaar/plugins/bazaar/dev/__fixtures__/get-projects-response.json index 7aee019a6e..7ed2913461 100644 --- a/workspaces/bazaar/plugins/bazaar/dev/__fixtures__/get-projects-response.json +++ b/workspaces/bazaar/plugins/bazaar/dev/__fixtures__/get-projects-response.json @@ -9,7 +9,7 @@ "status": "proposed", "updated_at": "2023-03-10T12:41:41.941Z", "community": "", - "size": "medium", + "size": "small", "start_date": null, "end_date": null, "responsible": "Responsible Adult 1", @@ -21,7 +21,7 @@ "entity_ref": null, "title": "Lorem ipsum 2", "description": "sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud", - "status": "proposed", + "status": "ongoing", "updated_at": "2023-03-09T12:41:41.941Z", "community": "", "size": "medium", @@ -30,6 +30,21 @@ "responsible": "Responsible Adult 2", "docs": null, "members_count": "5" + }, + { + "id": 12, + "entity_ref": null, + "title": "Lorem ipsum 3", + "description": "sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit", + "status": "completed", + "updated_at": "2024-09-09T12:41:41.941Z", + "community": "", + "size": "large", + "start_date": null, + "end_date": null, + "responsible": "Responsible Adult 3", + "docs": null, + "members_count": "15" } ] } diff --git a/workspaces/bazaar/plugins/bazaar/src/components/ProjectDialog/ProjectDialog.tsx b/workspaces/bazaar/plugins/bazaar/src/components/ProjectDialog/ProjectDialog.tsx index 3ec0c87cfe..984f483b11 100644 --- a/workspaces/bazaar/plugins/bazaar/src/components/ProjectDialog/ProjectDialog.tsx +++ b/workspaces/bazaar/plugins/bazaar/src/components/ProjectDialog/ProjectDialog.tsx @@ -111,7 +111,7 @@ export const ProjectDialog = ({ proposed, - ongoing: ongoing, + ongoing: ongoing, + completed: completed, }; type Props = { diff --git a/workspaces/bazaar/plugins/bazaar/src/types.ts b/workspaces/bazaar/plugins/bazaar/src/types.ts index 7ca8e07aad..0dd937813d 100644 --- a/workspaces/bazaar/plugins/bazaar/src/types.ts +++ b/workspaces/bazaar/plugins/bazaar/src/types.ts @@ -22,7 +22,7 @@ export type Member = { userRef?: string; }; -export type Status = 'ongoing' | 'proposed'; +export type Status = 'ongoing' | 'proposed' | 'completed'; export type Size = 'small' | 'medium' | 'large'; From 9328fa7ed0b0cac0fa3af010283ace8155fd8fc7 Mon Sep 17 00:00:00 2001 From: Backstage Service Account <74306126+backstage-service@users.noreply.github.com> Date: Wed, 2 Oct 2024 13:17:52 +0200 Subject: [PATCH 2/2] Version Packages (#1462) Co-authored-by: github-actions[bot] --- workspaces/bazaar/.changeset/hungry-stingrays-obey.md | 5 ----- workspaces/bazaar/plugins/bazaar/CHANGELOG.md | 6 ++++++ workspaces/bazaar/plugins/bazaar/package.json | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) delete mode 100644 workspaces/bazaar/.changeset/hungry-stingrays-obey.md diff --git a/workspaces/bazaar/.changeset/hungry-stingrays-obey.md b/workspaces/bazaar/.changeset/hungry-stingrays-obey.md deleted file mode 100644 index e1d1c5eafe..0000000000 --- a/workspaces/bazaar/.changeset/hungry-stingrays-obey.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage-community/plugin-bazaar': minor ---- - -Adding Completion Capabilities diff --git a/workspaces/bazaar/plugins/bazaar/CHANGELOG.md b/workspaces/bazaar/plugins/bazaar/CHANGELOG.md index bf4ea095c2..008e812801 100644 --- a/workspaces/bazaar/plugins/bazaar/CHANGELOG.md +++ b/workspaces/bazaar/plugins/bazaar/CHANGELOG.md @@ -1,5 +1,11 @@ # @backstage-community/plugin-bazaar +## 0.3.0 + +### Minor Changes + +- 2873d5f: Adding Completion Capabilities + ## 0.2.30 ### Patch Changes diff --git a/workspaces/bazaar/plugins/bazaar/package.json b/workspaces/bazaar/plugins/bazaar/package.json index 68048301cf..9f35b943fc 100644 --- a/workspaces/bazaar/plugins/bazaar/package.json +++ b/workspaces/bazaar/plugins/bazaar/package.json @@ -1,6 +1,6 @@ { "name": "@backstage-community/plugin-bazaar", - "version": "0.2.30", + "version": "0.3.0", "backstage": { "role": "frontend-plugin", "pluginId": "bazaar",