Merge pull request #1663 from iamfaran/fix/environments-workspace-apps

FalkWolsky · web-flow · commit 6633573f82d9 · 2025-04-30T21:19:09.000+02:00
[FIX] Fetch workspace apps correctly
diff --git a/client/packages/lowcoder/src/pages/setting/environments/EnvironmentDetail.tsx b/client/packages/lowcoder/src/pages/setting/environments/EnvironmentDetail.tsx
@@ -88,7 +88,6 @@ const EnvironmentDetail: React.FC = () => {
       {/* Add more menu items here if needed */}
     </Menu>
   );
-  debugger
   
   if (isLoadingEnvironment) {
     return (
diff --git a/client/packages/lowcoder/src/pages/setting/environments/services/environments.service.ts b/client/packages/lowcoder/src/pages/setting/environments/services/environments.service.ts
@@ -291,23 +291,22 @@ export async function getWorkspaceApps(
       Authorization: `Bearer ${apiKey}`
     };
     
-    // Make the API request to get apps
-    // Include the orgId as a query parameter if needed
+    // First, switch to the target workspace
+    await axios.put(`${apiServiceUrl}/api/organizations/switchOrganization/${workspaceId}`, {}, { 
+      headers 
+    });
+    
+    // Then fetch applications without the orgId parameter
     const response = await axios.get(`${apiServiceUrl}/api/applications/list`, { 
-      headers,
-      params: {
-        orgId: workspaceId
-      }
+      headers
     });
     
     // Check if response is valid
     if (!response.data || !response.data.data) {
       return [];
     }
     
-    const filteredApps = response.data.data.filter((app: App) => app.orgId === workspaceId);
-    
-    return filteredApps;
+    return response.data.data;
   
   } catch (error) {
     // Handle and transform error
@@ -430,7 +429,7 @@ export async function getWorkspaceQueries(
       headers,
       params
     });
-    debugger
+    
     // Check if response is valid
     if (!response.data) {
       return { queries: [], total: 0 };
