Merge branch 'main' into addExampleAppFor3ScalePlugin

backstage · Oct 2, 2024 · 799d4d2 · 799d4d2
2 parents 883e850 + 9328fa7
commit 799d4d2
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 7 deletions.
diff --git 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/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/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",

diff --git 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 = ({
           <InputSelector
             control={control}
             name="status"
-            options={['proposed', 'ongoing']}
+            options={['proposed', 'ongoing', 'completed']}
           />
 
           <InputSelector

diff --git a/workspaces/bazaar/plugins/bazaar/src/components/StatusTag/StatusTag.tsx b/workspaces/bazaar/plugins/bazaar/src/components/StatusTag/StatusTag.tsx
@@ -15,7 +15,11 @@
  */
 
 import React from 'react';
-import { StatusOK, StatusWarning } from '@backstage/core-components';
+import {
+  StatusOK,
+  StatusPending,
+  StatusWarning,
+} from '@backstage/core-components';
 import { Status } from '../../types';
 
 interface StatusComponent {
@@ -24,7 +28,8 @@ interface StatusComponent {
 
 const statuses: StatusComponent = {
   proposed: <StatusWarning>proposed</StatusWarning>,
-  ongoing: <StatusOK>ongoing</StatusOK>,
+  ongoing: <StatusPending>ongoing</StatusPending>,
+  completed: <StatusOK>completed</StatusOK>,
 };
 
 type Props = {

diff --git 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';