put org_uuid base check for status filter functionality on the org ho…

…mepage
stakwork · Jan 23, 2024 · 9eebef7 · 9eebef7
1 parent 18747e8
commit 9eebef7
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 15 deletions.
diff --git a/frontend/app/src/pages/tickets/org/OrgTickets.tsx b/frontend/app/src/pages/tickets/org/OrgTickets.tsx
@@ -35,7 +35,7 @@ function OrgBodyComponent() {
       await main.getBadgeList();
       await main.getPeople();
       if (uuid) {
-        await main.getOrganizationBounties(uuid, { page: 1, resetPage: true });
+        await main.getSpecificOrganizationBounties(uuid, { page: 1, resetPage: true });
       }
       setLoading(false);
     })();
@@ -188,6 +188,7 @@ function OrgBodyComponent() {
                 fromBountyPage={true}
                 selectedWidget={selectedWidget}
                 loading={loading}
+                org_uuid={uuid}
               />
             </div>
           </div>

diff --git a/frontend/app/src/pages/tickets/org/orgHeader/index.tsx b/frontend/app/src/pages/tickets/org/orgHeader/index.tsx
@@ -316,7 +316,7 @@ export const OrgHeader = ({
 
   useEffect(() => {
     if (org_uuid) {
-      main.getOrganizationBounties(org_uuid, {
+      main.getSpecificOrganizationBounties(org_uuid, {
         page: 1,
         resetPage: true,
         ...checkboxIdToSelectedMap,

diff --git a/frontend/app/src/people/widgetViews/WidgetSwitchViewer.tsx b/frontend/app/src/people/widgetViews/WidgetSwitchViewer.tsx
@@ -96,7 +96,7 @@ function WidgetSwitchViewer(props: any) {
 
   const { peoplePosts, peopleBounties, peopleOffers } = main;
 
-  const { selectedWidget, onPanelClick } = props;
+  const { selectedWidget, onPanelClick, org_uuid } = props;
 
   if (!selectedWidget) {
     return <div style={{ height: 200 }} />;
@@ -110,6 +110,9 @@ function WidgetSwitchViewer(props: any) {
 
   const activeList = [...listSource[selectedWidget]].filter(({ body }: any) => {
     const value = { ...body };
+    if (org_uuid) {
+      return value.org_uuid === org_uuid;
+    }
     return value;
   });
 

diff --git a/frontend/app/src/people/widgetViews/__tests__/OrgHeader.spec.tsx b/frontend/app/src/people/widgetViews/__tests__/OrgHeader.spec.tsx
@@ -19,7 +19,7 @@ const MockProps: OrgBountyHeaderProps = {
 
 describe('OrgHeader Component', () => {
   beforeEach(() => {
-    jest.spyOn(mainStore, 'getOrganizationBounties').mockReset();
+    jest.spyOn(mainStore, 'getSpecificOrganizationBounties').mockReset();
   });
 
   afterEach(() => {
@@ -70,7 +70,7 @@ describe('OrgHeader Component', () => {
         <OrgHeader {...MockProps} checkboxIdToSelectedMap={updatedCheckboxIdToSelectedMap} />
       );
 
-      expect(mainStore.getOrganizationBounties).toHaveBeenCalledWith(MockProps.org_uuid, {
+      expect(mainStore.getSpecificOrganizationBounties).toHaveBeenCalledWith(MockProps.org_uuid, {
         page: 1,
         resetPage: true,
         ...updatedCheckboxIdToSelectedMap,

diff --git a/frontend/app/src/store/main.ts b/frontend/app/src/store/main.ts
@@ -300,7 +300,7 @@ export interface OrgBountyStatus {
 }
 
 export const defaultOrgBountyStatus: OrgBountyStatus = {
-  Open: true,
+  Open: false,
   Assigned: false,
   Paid: false,
   Completed: false
@@ -1088,8 +1088,8 @@ export class MainStore {
     }
   }
 
-  getWantedsOrgPrevParams?: QueryParams = {};
-  async getOrganizationBounties(uuid: string, params?: any): Promise<PersonBounty[]> {
+  getWantedsSpecOrgPrevParams?: QueryParams = {};
+  async getSpecificOrganizationBounties(uuid: string, params?: any): Promise<PersonBounty[]> {
     const queryParams: QueryParams = {
       limit: queryLimit,
       sortBy: 'created',
@@ -1101,7 +1101,7 @@ export class MainStore {
 
     if (params) {
       // save previous params
-      this.getWantedsOrgPrevParams = queryParams;
+      this.getWantedsSpecOrgPrevParams = queryParams;
     }
 
     // if we don't pass the params, we should use previous params for invalidate query
@@ -1129,13 +1129,63 @@ export class MainStore {
             organization = { ...ps2[i].organization };
           }
 
-          if (bounty.org_uuid === uuid) {
-            ps3.push({
-              body: { ...bounty, assignee: assignee || '' },
-              person: { ...owner, wanteds: [] } || { wanteds: [] },
-              organization: { ...organization }
-            });
+          ps3.push({
+            body: { ...bounty, assignee: assignee || '' },
+            person: { ...owner, wanteds: [] } || { wanteds: [] },
+            organization: { ...organization }
+          });
+        }
+      }
+
+      // for search always reset page
+      if (queryParams && queryParams.resetPage) {
+        this.setPeopleBounties(ps3);
+        uiStore.setPeopleBountiesPageNumber(1);
+      } else {
+        // all other cases, merge
+        const wanteds = this.doPageListMerger(
+          this.peopleBounties,
+          ps3,
+          (n: any) => uiStore.setPeopleBountiesPageNumber(n),
+          queryParams,
+          'wanted'
+        );
+
+        this.setPeopleBounties(wanteds);
+      }
+      return ps3;
+    } catch (e) {
+      console.log('fetch failed getOrganizationBounties: ', e);
+      return [];
+    }
+  }
+
+  async getOrganizationBounties(uuid: string, queryParams?: any): Promise<PersonBounty[]> {
+    queryParams = { ...queryParams, search: uiStore.searchText };
+    try {
+      const ps2 = await api.get(`organizations/bounties/${uuid}`);
+      const ps3: any[] = [];
+
+      if (ps2 && ps2.length) {
+        for (let i = 0; i < ps2.length; i++) {
+          const bounty = { ...ps2[i].bounty };
+          let assignee;
+          let organization;
+          const owner = { ...ps2[i].owner };
+
+          if (bounty.assignee) {
+            assignee = { ...ps2[i].assignee };
+          }
+
+          if (bounty.org_uuid) {
+            organization = { ...ps2[i].organization };
           }
+
+          ps3.push({
+            body: { ...bounty, assignee: assignee || '' },
+            person: { ...owner, wanteds: [] } || { wanteds: [] },
+            organization: { ...organization }
+          });
         }
       }