remove myorg call on initial load

iamfaran · iamfaran · commit 491c8bbed156 · 2025-07-17T17:07:43.000+05:00
diff --git a/client/packages/lowcoder/src/redux/reducers/uiReducers/usersReducer.ts b/client/packages/lowcoder/src/redux/reducers/uiReducers/usersReducer.ts
@@ -25,7 +25,9 @@ const initialState: UsersReduxState = {
   workspaces: {
     items: [],
     totalCount: 0,
-    currentOrg: null
+    currentOrg: null,
+    loading: false,
+    isFetched: false,
     
   }
 };
@@ -198,6 +200,14 @@ const usersReducer = createReducer(initialState, {
     apiKeys: action.payload,
   }),
 
+  [ReduxActionTypes.FETCH_WORKSPACES_INIT]: (state: UsersReduxState) => ({
+      ...state,
+      workspaces: {
+        ...state.workspaces,
+        loading: true,
+      },
+  }),
+
   
   [ReduxActionTypes.FETCH_WORKSPACES_SUCCESS]: (
     state: UsersReduxState,
@@ -208,7 +218,9 @@ const usersReducer = createReducer(initialState, {
       items: action.payload.isLoadMore 
         ? [...state.workspaces.items, ...action.payload.items] // Append for load more
         : action.payload.items, // Replace for new search/initial load
-      totalCount: action.payload.totalCount
+      totalCount: action.payload.totalCount,
+      isFetched: true,
+      loading: false,
     }
   }),
   
@@ -234,6 +246,8 @@ export interface UsersReduxState {
     items: Org[];           // Current page of workspaces
     totalCount: number;     // Total workspaces available
     currentOrg: Org | null;
+    loading: boolean;
+    isFetched: boolean;
   };
 }
 
diff --git a/client/packages/lowcoder/src/redux/sagas/userSagas.ts b/client/packages/lowcoder/src/redux/sagas/userSagas.ts
@@ -77,8 +77,7 @@ export function* getUserSaga() {
         type: ReduxActionTypes.FETCH_USER_DETAILS_SUCCESS,
         payload: user,
       });
-      // fetch all workspaces and store in redux
-      yield put(fetchWorkspacesAction(1, 10));     
+       
     }
   } catch (error: any) {
     yield put({
diff --git a/client/packages/lowcoder/src/util/useWorkspaceManager.ts b/client/packages/lowcoder/src/util/useWorkspaceManager.ts
@@ -1,8 +1,9 @@
 import { useReducer, useEffect, useCallback, useMemo } from 'react';
-import { useSelector } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import { debounce } from 'lodash';
 import { Org } from 'constants/orgConstants';
 import { getWorkspaces } from 'redux/selectors/orgSelectors';
+import { fetchWorkspacesAction } from 'redux/reduxActions/orgActions';
 import UserApi from 'api/userApi';
 
 // State interface for the workspace manager
@@ -73,6 +74,7 @@ export function useWorkspaceManager({
 }: UseWorkspaceManagerOptions) {
   // Get workspaces from Redux
   const workspaces = useSelector(getWorkspaces);
+  const reduxDispatch = useDispatch();
   
   // Initialize reducer with Redux total count
   const [state, dispatch] = useReducer(workspaceReducer, {
@@ -81,6 +83,14 @@ export function useWorkspaceManager({
   });
 
 
+ 
+  /* ----- first-time fetch ------------------------------------------------ */
+  useEffect(() => {
+    if (!workspaces.isFetched && !workspaces.loading) {
+      reduxDispatch(fetchWorkspacesAction(1, pageSize));
+    }
+  }, [workspaces.isFetched, workspaces.loading, pageSize, reduxDispatch]);
+
   // API call to fetch workspaces (memoized for stable reference)
   const fetchWorkspacesPage = useCallback(
     async (page: number, search?: string) => {
@@ -177,7 +187,7 @@ export function useWorkspaceManager({
     // State
     searchTerm: state.searchTerm,
     currentPage: state.currentPage,
-    isLoading: state.isLoading,
+    isLoading: state.isLoading || workspaces.loading,
     displayWorkspaces,
     totalCount: currentTotalCount,
     
