make a util function to link the managed object

iamfaran · iamfaran · commit 23f526dcc5c3 · 2025-05-19T23:25:52.000+05:00
diff --git a/client/packages/lowcoder/src/pages/setting/environments/services/apps.service.ts b/client/packages/lowcoder/src/pages/setting/environments/services/apps.service.ts
@@ -5,6 +5,7 @@ import { getManagedApps } from "./enterprise.service";
 import { App, AppStats } from "../types/app.types";
 import axios from "axios";
 import { getManagedObjects, ManagedObject } from "./managed-objects.service";
+import { ManagedObjectType, transferManagedObject } from "./managed-objects.service";
 
 
 export interface MergedAppsResult {
@@ -122,6 +123,15 @@ export const deployApp = async (params: DeployAppParams): Promise<boolean> => {
       }
     );
     
+    if (response.status === 200) {
+      await transferManagedObject(
+        params.applicationId,
+        params.envId,
+        params.targetEnvId,
+        ManagedObjectType.APP
+      );
+    }
+    
     return response.status === 200;
   } catch (error) {
     const errorMessage = error instanceof Error ? error.message : 'Failed to deploy app';
diff --git a/client/packages/lowcoder/src/pages/setting/environments/services/datasources.service.ts b/client/packages/lowcoder/src/pages/setting/environments/services/datasources.service.ts
@@ -2,7 +2,7 @@
 import axios from 'axios';
 import { message } from "antd";
 import { DataSource, DataSourceWithMeta } from "../types/datasource.types";
-import { getManagedObjects, ManagedObject, ManagedObjectType } from "./managed-objects.service";
+import { getManagedObjects, ManagedObject, ManagedObjectType  , transferManagedObject } from "./managed-objects.service";
 
 export interface DataSourceStats {
   total: number;
@@ -160,6 +160,14 @@ export async function deployDataSource(params: DeployDataSourceParams): Promise<
         updateDependenciesIfNeeded: params.updateDependenciesIfNeeded ?? false
       }
     });
+    if (response.status === 200) {
+      await transferManagedObject(
+        params.datasourceId,
+        params.envId,
+        params.targetEnvId,
+        ManagedObjectType.DATASOURCE
+      );
+    }
     return response.status === 200;
   } catch (error) {
     console.error('Error deploying data source:', error);
diff --git a/client/packages/lowcoder/src/pages/setting/environments/services/managed-objects.service.ts b/client/packages/lowcoder/src/pages/setting/environments/services/managed-objects.service.ts
@@ -190,3 +190,18 @@ export async function getSingleManagedObject(
   }
 }
 
+
+export async function transferManagedObject(objGid: string, sourceEnvId: string, targetEnvId: string, objType: ManagedObjectType): Promise<void> {
+  try {
+    const managedObject = await getSingleManagedObject(objGid, sourceEnvId, objType);
+    if (managedObject) {
+      await setManagedObject(managedObject.objGid, targetEnvId, objType, managedObject.managedId);
+    } else {
+      throw new Error(`Managed object not found for objGid: ${objGid}`);
+    }
+  } catch (error) {
+    console.error('Error transferring managed object:', error);
+    throw error;
+  }
+}
+
diff --git a/client/packages/lowcoder/src/pages/setting/environments/services/query.service.ts b/client/packages/lowcoder/src/pages/setting/environments/services/query.service.ts
@@ -2,7 +2,7 @@
  * Get merged queries (both regular and managed) for a workspace
  */
 import axios from 'axios';
-import { getManagedObjects, ManagedObject, ManagedObjectType } from './managed-objects.service';
+import { getManagedObjects, ManagedObjectType, transferManagedObject } from './managed-objects.service';
 import { getWorkspaceQueries } from './environments.service';
 import { Query, QueryStats } from '../types/query.types';
 export interface MergedQueriesResult {
@@ -82,6 +82,14 @@ export interface MergedQueriesResult {
           updateDependenciesIfNeeded: params.updateDependenciesIfNeeded ?? false
         }
       });
+      if (response.status === 200) {
+        await transferManagedObject(
+          params.queryId,
+          params.envId,
+          params.targetEnvId,
+          ManagedObjectType.QUERY
+        );
+      }
       return response.status === 200;
     } catch (error) {
       console.error('Error deploying query:', error);
diff --git a/client/packages/lowcoder/src/pages/setting/environments/services/workspace.service.ts b/client/packages/lowcoder/src/pages/setting/environments/services/workspace.service.ts
@@ -1,7 +1,7 @@
 // services/workspacesService.ts (or wherever makes sense in your structure)
 import { message } from "antd";
 import { getEnvironmentWorkspaces } from "./environments.service";
-import { getManagedObjects, getSingleManagedObject, ManagedObject, ManagedObjectType, setManagedObject } from "./managed-objects.service";
+import { getManagedObjects, ManagedObject, ManagedObjectType, transferManagedObject } from "./managed-objects.service";
 import { Workspace } from "../types/workspace.types";
 import { ManagedOrg } from "../types/enterprise.types";
 import axios from "axios";
@@ -98,20 +98,11 @@ export async function deployWorkspace(params: {
 
     // After successful deployment, set the managed object in target environment
     if (response.status === 200) {
-      const res = await getSingleManagedObject(
+      await transferManagedObject(
         params.workspaceId,
         params.envId,
-        ManagedObjectType.ORG
-      );
-      // managedID => res.managedId
-      //objGID = res.objGid
-      // targetEnvId = params.targetEnvId
-      // objType = ManagedObjectType.ORG
-      await setManagedObject(
-        res?.objGid!,
         params.targetEnvId,
-        ManagedObjectType.ORG,
-        res?.managedId!
+        ManagedObjectType.ORG
       );
     }
 
