Skip to content

Commit 7ead10b

Browse files
committed
Fix link managed issue for the deployable items
1 parent c1d68dc commit 7ead10b

File tree

7 files changed

+14
-7
lines changed

7 files changed

+14
-7
lines changed

client/packages/lowcoder/src/pages/setting/environments/config/apps.config.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ export const appsConfig: DeployableItemConfig = {
5050
publishOnTarget: values.publishOnTarget,
5151
publicToAll: values.publicToAll,
5252
publicToMarketplace: values.publicToMarketplace,
53+
applicationGid: item.applicationGid,
5354
};
5455
},
5556
execute: (params: any) => deployApp(params)

client/packages/lowcoder/src/pages/setting/environments/config/data-sources.config.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ export const dataSourcesConfig: DeployableItemConfig = {
2323
envId: sourceEnv.environmentId,
2424
targetEnvId: targetEnv.environmentId,
2525
datasourceId: item.id,
26-
updateDependenciesIfNeeded: values.updateDependenciesIfNeeded
26+
updateDependenciesIfNeeded: values.updateDependenciesIfNeeded,
27+
datasourceGid: item.gid
2728
};
2829
},
2930
execute: (params: any) => deployDataSource(params)

client/packages/lowcoder/src/pages/setting/environments/config/query.config.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ export const queryConfig: DeployableItemConfig = {
2424
envId: sourceEnv.environmentId,
2525
targetEnvId: targetEnv.environmentId,
2626
queryId: item.id,
27-
updateDependenciesIfNeeded: values.updateDependenciesIfNeeded
27+
updateDependenciesIfNeeded: values.updateDependenciesIfNeeded,
28+
queryGid: item.gid,
2829
};
2930
},
3031
execute: (params: any) => deployQuery(params)

client/packages/lowcoder/src/pages/setting/environments/services/apps.service.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ export interface DeployAppParams {
1818
envId: string;
1919
targetEnvId: string;
2020
applicationId: string;
21+
applicationGid: string;
2122
updateDependenciesIfNeeded?: boolean;
2223
publishOnTarget?: boolean;
2324
publicToAll?: boolean;
@@ -125,7 +126,7 @@ export const deployApp = async (params: DeployAppParams): Promise<boolean> => {
125126

126127
if (response.status === 200) {
127128
await transferManagedObject(
128-
params.applicationId,
129+
params.applicationGid,
129130
params.envId,
130131
params.targetEnvId,
131132
ManagedObjectType.APP

client/packages/lowcoder/src/pages/setting/environments/services/datasources.service.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ export interface DeployDataSourceParams {
2020
envId: string;
2121
targetEnvId: string;
2222
datasourceId: string;
23+
datasourceGid: string;
2324
updateDependenciesIfNeeded?: boolean;
25+
2426
}
2527
// Get data sources for a workspace - using your correct implementation
2628
export async function getWorkspaceDataSources(
@@ -157,12 +159,12 @@ export async function deployDataSource(params: DeployDataSourceParams): Promise<
157159
envId: params.envId,
158160
targetEnvId: params.targetEnvId,
159161
datasourceId: params.datasourceId,
160-
updateDependenciesIfNeeded: params.updateDependenciesIfNeeded ?? false
162+
updateDependenciesIfNeeded: params.updateDependenciesIfNeeded ?? false,
161163
}
162164
});
163165
if (response.status === 200) {
164166
await transferManagedObject(
165-
params.datasourceId,
167+
params.datasourceGid,
166168
params.envId,
167169
params.targetEnvId,
168170
ManagedObjectType.DATASOURCE

client/packages/lowcoder/src/pages/setting/environments/services/query.service.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export interface MergedQueriesResult {
1515
targetEnvId: string;
1616
queryId: string;
1717
updateDependenciesIfNeeded?: boolean;
18+
queryGid: string;
1819
}
1920

2021

@@ -84,7 +85,7 @@ export interface MergedQueriesResult {
8485
});
8586
if (response.status === 200) {
8687
await transferManagedObject(
87-
params.queryId,
88+
params.queryGid,
8889
params.envId,
8990
params.targetEnvId,
9091
ManagedObjectType.QUERY

client/packages/lowcoder/src/pages/setting/environments/services/workspace.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ export async function deployWorkspace(params: {
9999
// After successful deployment, set the managed object in target environment
100100
if (response.status === 200) {
101101
await transferManagedObject(
102-
params.workspaceId,
102+
params.workspaceId, // first param has to be GID
103103
params.envId,
104104
params.targetEnvId,
105105
ManagedObjectType.ORG

0 commit comments

Comments
 (0)