Commit23f526d

committed

make a util function to link the managed object

1 parentc1c874b commit23f526dCopy full SHA for 23f526d

File tree

+46

-14

lines changed

+46

-14

lines changed

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import { getManagedApps } from "./enterprise.service";`
`5`	`5`	`import{App,AppStats}from"../types/app.types";`
`6`	`6`	`importaxiosfrom"axios";`
`7`	`7`	`import{getManagedObjects,ManagedObject}from"./managed-objects.service";`
	`8`	`+import{ManagedObjectType,transferManagedObject}from"./managed-objects.service";`
`8`	`9`
`9`	`10`
`10`	`11`	`exportinterfaceMergedAppsResult{`
`@@ -122,6 +123,15 @@ export const deployApp = async (params: DeployAppParams): Promise<boolean> => {`
`122`	`123`	`}`
`123`	`124`	`);`
`124`	`125`
	`126`	`+if(response.status===200){`
	`127`	`+awaittransferManagedObject(`
	`128`	`+params.applicationId,`
	`129`	`+params.envId,`
	`130`	`+params.targetEnvId,`
	`131`	`+ManagedObjectType.APP`
	`132`	`+);`
	`133`	`+}`
	`134`	`+`
`125`	`135`	`returnresponse.status===200;`
`126`	`136`	`}catch(error){`
`127`	`137`	`consterrorMessage=errorinstanceofError ?error.message :'Failed to deploy app';`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`importaxiosfrom'axios';`
`3`	`3`	`import{message}from"antd";`
`4`	`4`	`import{DataSource,DataSourceWithMeta}from"../types/datasource.types";`
`5`		`-import{getManagedObjects,ManagedObject,ManagedObjectType}from"./managed-objects.service";`
	`5`	`+import{getManagedObjects,ManagedObject,ManagedObjectType,transferManagedObject}from"./managed-objects.service";`
`6`	`6`
`7`	`7`	`exportinterfaceDataSourceStats{`
`8`	`8`	`total:number;`
`@@ -160,6 +160,14 @@ export async function deployDataSource(params: DeployDataSourceParams): Promise<`
`160`	`160`	`updateDependenciesIfNeeded:params.updateDependenciesIfNeeded??false`
`161`	`161`	`}`
`162`	`162`	`});`
	`163`	`+if(response.status===200){`
	`164`	`+awaittransferManagedObject(`
	`165`	`+params.datasourceId,`
	`166`	`+params.envId,`
	`167`	`+params.targetEnvId,`
	`168`	`+ManagedObjectType.DATASOURCE`
	`169`	`+);`
	`170`	`+}`
`163`	`171`	`returnresponse.status===200;`
`164`	`172`	`}catch(error){`
`165`	`173`	`console.error('Error deploying data source:',error);`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -190,3 +190,18 @@ export async function getSingleManagedObject(`
`190`	`190`	`}`
`191`	`191`	`}`
`192`	`192`
	`193`	`+`
	`194`	`+exportasyncfunctiontransferManagedObject(objGid:string,sourceEnvId:string,targetEnvId:string,objType:ManagedObjectType):Promise<void>{`
	`195`	`+try{`
	`196`	`+constmanagedObject=awaitgetSingleManagedObject(objGid,sourceEnvId,objType);`
	`197`	`+if(managedObject){`
	`198`	`+awaitsetManagedObject(managedObject.objGid,targetEnvId,objType,managedObject.managedId);`
	`199`	`+}else{`
	`200`	+thrownewError(`Managed object not found for objGid:${objGid}`);
	`201`	`+}`
	`202`	`+}catch(error){`
	`203`	`+console.error('Error transferring managed object:',error);`
	`204`	`+throwerror;`
	`205`	`+}`
	`206`	`+}`
	`207`	`+`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`* Get merged queries (both regular and managed) for a workspace`
`3`	`3`	`*/`
`4`	`4`	`importaxiosfrom'axios';`
`5`		`-import{getManagedObjects,ManagedObject,ManagedObjectType}from'./managed-objects.service';`
	`5`	`+import{getManagedObjects,ManagedObjectType,transferManagedObject}from'./managed-objects.service';`
`6`	`6`	`import{getWorkspaceQueries}from'./environments.service';`
`7`	`7`	`import{Query,QueryStats}from'../types/query.types';`
`8`	`8`	`exportinterfaceMergedQueriesResult{`
`@@ -82,6 +82,14 @@ export interface MergedQueriesResult {`
`82`	`82`	`updateDependenciesIfNeeded:params.updateDependenciesIfNeeded??false`
`83`	`83`	`}`
`84`	`84`	`});`
	`85`	`+if(response.status===200){`
	`86`	`+awaittransferManagedObject(`
	`87`	`+params.queryId,`
	`88`	`+params.envId,`
	`89`	`+params.targetEnvId,`
	`90`	`+ManagedObjectType.QUERY`
	`91`	`+);`
	`92`	`+}`
`85`	`93`	`returnresponse.status===200;`
`86`	`94`	`}catch(error){`
`87`	`95`	`console.error('Error deploying query:',error);`

Lines changed: 3 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`// services/workspacesService.ts (or wherever makes sense in your structure)`
`2`	`2`	`import{message}from"antd";`
`3`	`3`	`import{getEnvironmentWorkspaces}from"./environments.service";`
`4`		`-import{getManagedObjects,getSingleManagedObject,ManagedObject,ManagedObjectType,setManagedObject}from"./managed-objects.service";`
	`4`	`+import{getManagedObjects,ManagedObject,ManagedObjectType,transferManagedObject}from"./managed-objects.service";`
`5`	`5`	`import{Workspace}from"../types/workspace.types";`
`6`	`6`	`import{ManagedOrg}from"../types/enterprise.types";`
`7`	`7`	`importaxiosfrom"axios";`
`@@ -98,20 +98,11 @@ export async function deployWorkspace(params: {`
`98`	`98`
`99`	`99`	`// After successful deployment, set the managed object in target environment`
`100`	`100`	`if(response.status===200){`
`101`		`-constres=awaitgetSingleManagedObject(`
	`101`	`+awaittransferManagedObject(`
`102`	`102`	`params.workspaceId,`
`103`	`103`	`params.envId,`
`104`		`-ManagedObjectType.ORG`
`105`		`-);`
`106`		`-// managedID => res.managedId`
`107`		`-//objGID = res.objGid`
`108`		`-// targetEnvId = params.targetEnvId`
`109`		`-// objType = ManagedObjectType.ORG`
`110`		`-awaitsetManagedObject(`
`111`		`-res?.objGid!,`
`112`	`104`	`params.targetEnvId,`
`113`		`-ManagedObjectType.ORG,`
`114`		`-res?.managedId!`
	`105`	`+ManagedObjectType.ORG`
`115`	`106`	`);`
`116`	`107`	`}`
`117`	`108`

Comments

(0)