add utility function for merge workspaces

Author: iamfaran

client/packages/lowcoder/src/pages/setting/environments/EnvironmentDetail.tsx

@@ -28,6 +28,8 @@ import { useEnvironmentContext } from "./context/EnvironmentContext";
 import { useEnvironmentWorkspaces } from "./hooks/useEnvironmentWorkspaces";
 import { useEnvironmentUserGroups } from "./hooks/useEnvironmentUserGroups";
 import { useManagedWorkspaces } from "./hooks/enterprise/useManagedWorkspaces";
+import { getMergedWorkspaces } from "./utils/getMergedWorkspaces";
+
 
 const { Title, Text } = Typography;
 const { TabPane } = Tabs;
@@ -51,7 +53,6 @@ const EnvironmentDetail: React.FC = () => {
     loading: workspacesLoading,
     error: workspacesError,
     refresh: refreshWorkspaces,
-    workspaceStats,
   } = useEnvironmentWorkspaces(environment);
 
   const {
@@ -120,6 +121,8 @@ const EnvironmentDetail: React.FC = () => {
     );
   }
 
+  const { merged, stats: workspaceStats } = getMergedWorkspaces(workspaces, managedWorkspaces);
+
   return (
     <div className="environment-detail-container" style={{ padding: "24px" }}>
       {/* Header with environment name and controls */}
@@ -294,7 +297,7 @@ const EnvironmentDetail: React.FC = () => {
 
             {/* Workspaces List */}
             <WorkspacesList
-              workspaces={workspaces}
+              workspaces={merged}
               loading={workspacesLoading && !workspacesError}
               error={workspacesError}
               environmentId={environment.environmentId}

client/packages/lowcoder/src/pages/setting/environments/components/WorkspacesList.tsx

@@ -8,7 +8,7 @@ interface WorkspacesListProps {
   workspaces: Workspace[];
   loading: boolean;
   error?: string | null;
-  environmentId: string
+  environmentId: string;
 }
 
 /**
@@ -18,7 +18,7 @@ const WorkspacesList: React.FC<WorkspacesListProps> = ({
   workspaces,
   loading,
   error,
-  environmentId
+  environmentId,
 }) => {
   // Format timestamp to date string
   const formatDate = (timestamp?: number): string => {
@@ -66,7 +66,16 @@ const WorkspacesList: React.FC<WorkspacesListProps> = ({
           {status}
         </Tag>
       ),
-    }
+    },
+    {
+      title: 'Managed',
+      key: 'managed',
+      render: (record: Workspace) => (
+        <Tag color={record.managed ? 'green' : 'default'}>
+          {record.managed ? 'Managed' : 'Unmanaged'}
+        </Tag>
+      ),
+    },
   ];
 
   // If loading, show spinner
@@ -82,7 +91,7 @@ const WorkspacesList: React.FC<WorkspacesListProps> = ({
   if (!workspaces || workspaces.length === 0 || error) {
     return (
       <Empty
-        description={error || "No workspaces found"}
+        description={error || 'No workspaces found'}
         image={Empty.PRESENTED_IMAGE_SIMPLE}
       />
     );
@@ -97,10 +106,10 @@ const WorkspacesList: React.FC<WorkspacesListProps> = ({
       size="middle"
       onRow={(record) => ({
         onClick: () => handleRowClick(record),
-        style: { cursor: 'pointer' } // Add pointer cursor to indicate clickable rows
+        style: { cursor: 'pointer' }, // Add pointer cursor to indicate clickable rows
       })}
     />
   );
 };
 
-export default WorkspacesList;
+export default WorkspacesList;

client/packages/lowcoder/src/pages/setting/environments/types/enterprise.types.ts

@@ -1,3 +1,4 @@
+import { Workspace } from "../types/workspace.types";
 export interface ManagedOrg {
     orgGid: string;
     environmentId: string;
@@ -6,4 +7,6 @@ export interface ManagedOrg {
     createdAt: string;
     updatedAt: string;
   }
-  
+  
+
+  export type MergedWorkspace = Workspace & { managed: boolean };

client/packages/lowcoder/src/pages/setting/environments/types/workspace.types.ts

@@ -12,4 +12,5 @@ export interface Workspace {
     createdBy?: string;
     isAutoGeneratedOrganization?: boolean | null;
     logoUrl?: string;
+    managed?: boolean;
   }

client/packages/lowcoder/src/pages/setting/environments/utils/getMergedWorkspaces.ts

@@ -0,0 +1,33 @@
+import { Workspace } from "../types/workspace.types";
+import { ManagedOrg } from "../types/enterprise.types";
+
+
+export interface MergedWorkspaceResult {
+  merged: Workspace[];
+  stats: {
+    total: number;
+    managed: number;
+    unmanaged: number;
+  };
+}
+
+export function getMergedWorkspaces(
+  standard: Workspace[],
+  managed: ManagedOrg[]
+): MergedWorkspaceResult {
+  const merged = standard.map((ws) => ({
+    ...ws,
+    managed: managed.some((m) => m.orgGid === ws.gid),
+  }));
+
+  const managedCount = merged.filter((ws) => ws.managed).length;
+
+  return {
+    merged,
+    stats: {
+      total: merged.length,
+      managed: managedCount,
+      unmanaged: merged.length - managedCount,
+    },
+  };
+}