Merge branch 'main' into feedback_notifications

backstage · Oct 2, 2024 · c0b347b · c0b347b
2 parents 525ecf2 + 2873d5f
commit c0b347b
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 6 deletions.
diff --git a/workspaces/bazaar/.changeset/hungry-stingrays-obey.md 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
@@ -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
@@ -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';