setup redux, sagas for the new myorg endpoint

iamfaran · iamfaran · commit 98695fb34760 · 2025-06-16T23:23:58.000+05:00
diff --git a/client/packages/lowcoder/src/api/userApi.ts b/client/packages/lowcoder/src/api/userApi.ts
@@ -62,11 +62,13 @@ export type GetCurrentUserResponse = GenericApiResponse<CurrentUser>;
 
 export interface GetMyOrgsResponse extends ApiResponse {
   data: {
-    items: Org[];
-    totalCount: number;
-    currentPage: number;
+    data: Array<{
+      orgId: string;
+      orgName: string;
+    }>;
+    pageNum: number;
     pageSize: number;
-    hasMore: boolean;
+    total: number;
   };
 }
 
diff --git a/client/packages/lowcoder/src/pages/common/profileDropdown.tsx b/client/packages/lowcoder/src/pages/common/profileDropdown.tsx
@@ -4,6 +4,7 @@ import { Input } from "antd";
 import { Org, OrgRoleInfo } from "constants/orgConstants";
 import { ORGANIZATION_SETTING } from "constants/routesURL";
 import { User } from "constants/userConstants";
+import { getWorkspaces } from "redux/selectors/orgSelectors";
 import {
   AddIcon,
   CheckoutIcon,
@@ -17,9 +18,9 @@ import {
   SearchIcon,
 } from "lowcoder-design";
 import ProfileSettingModal from "pages/setting/profile";
-import React, { useMemo, useState } from "react";
+import React, { useEffect, useMemo, useState } from "react";
 import { useDispatch, useSelector } from "react-redux";
-import { createOrgAction, switchOrg } from "redux/reduxActions/orgActions";
+import { createOrgAction, fetchWorkspacesAction, switchOrg } from "redux/reduxActions/orgActions";
 import styled from "styled-components";
 import history from "util/history";
 import ProfileImage from "pages/common/profileImage";
@@ -221,6 +222,8 @@ type DropDownProps = {
 export default function ProfileDropdown(props: DropDownProps) {
   const { avatarUrl, username, orgs, currentOrgId } = props.user;
   const currentOrgRoleId = props.user.orgRoleMap.get(currentOrgId);
+  const workspaces = useSelector(getWorkspaces);
+  console.log("workspaces", workspaces);
   const currentOrg = useMemo(
     () => props.user.orgs.find((o) => o.id === currentOrgId),
     [props.user, currentOrgId]
@@ -231,6 +234,14 @@ export default function ProfileDropdown(props: DropDownProps) {
   const [searchTerm, setSearchTerm] = useState("");
   const [dropdownVisible, setDropdownVisible] = useState(false);
 
+
+  // Load workspaces when dropdown opens for the first time
+  useEffect(() => {
+    if (dropdownVisible && workspaces.items.length === 0) {
+      dispatch(fetchWorkspacesAction(1));
+    }
+  }, [dropdownVisible, workspaces.items.length, dispatch]);
+
   const filteredOrgs = useMemo(() => {
     if (!searchTerm.trim()) return orgs;
     return orgs.filter(org => 
diff --git a/client/packages/lowcoder/src/redux/sagas/orgSagas.ts b/client/packages/lowcoder/src/redux/sagas/orgSagas.ts
@@ -340,18 +340,29 @@ export function* fetchWorkspacesSaga(action: ReduxAction<{page: number, search?:
     );
     
     if (validateResponse(response)) {
+      const apiData = response.data.data;
+      console.log("apiData", apiData);
+      const hasMore = (apiData.pageNum * apiData.pageSize) < apiData.total;
+      
+      // Transform orgId/orgName to match Org interface
+      const transformedItems = apiData.data.map(item => ({
+        id: item.orgId,
+        name: item.orgName,
+        // Add other Org properties if needed (logoUrl, etc.)
+      }));
+      
       const actionType = isLoadMore 
         ? ReduxActionTypes.LOAD_MORE_WORKSPACES_SUCCESS
         : ReduxActionTypes.FETCH_WORKSPACES_SUCCESS;
         
       yield put({
         type: actionType,
         payload: {
-          items: response.data.data.items,
-          totalCount: response.data.data.totalCount,
-          currentPage: response.data.data.currentPage,
-          pageSize: response.data.data.pageSize,
-          hasMore: response.data.data.hasMore,
+          items: transformedItems,
+          totalCount: apiData.total,
+          currentPage: apiData.pageNum,
+          pageSize: apiData.pageSize,
+          hasMore: hasMore,
           searchQuery: search || ""
         }
       });
