Skip to content

Commit 5b54276

Browse files
committed
[Fix]: query deployment param
1 parent b35861b commit 5b54276

File tree

4 files changed

+12
-13
lines changed

4 files changed

+12
-13
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@ export const queryConfig: DeployableItemConfig = {
1717
label: 'Update Dependencies If Needed',
1818
type: 'checkbox',
1919
defaultValue: false
20+
},
21+
{
22+
name: 'deployCredential',
23+
label: 'Overwrite Credentials',
24+
type: 'checkbox',
25+
defaultValue: false
2026
}
2127
],
2228
prepareParams: (item: Query, values: any, sourceEnv: Environment, targetEnv: Environment) => {
@@ -26,6 +32,7 @@ export const queryConfig: DeployableItemConfig = {
2632
queryId: item.id,
2733
updateDependenciesIfNeeded: values.updateDependenciesIfNeeded,
2834
queryGid: item.gid,
35+
deployCredential: values.deployCredential ?? false
2936
};
3037
},
3138
execute: (params: any) => deployQuery(params)

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

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,13 @@ import { Environment } from '../types/environment.types';
55
import { deployWorkspace } from '../services/workspace.service';
66
import { Workspace } from '../types/workspace.types';
77

8-
9-
108
export const workspaceConfig: DeployableItemConfig = {
119

1210
// Deploy configuration
1311
deploy: {
1412
singularLabel: 'Workspace',
1513
fields: [
16-
{
17-
name: 'deployCredential',
18-
label: 'Overwrite Credentials',
19-
type: 'checkbox',
20-
defaultValue: false
21-
}
14+
// Removed deployCredential field as workspaces don't need credential overwrite
2215
],
2316
prepareParams: (item: Workspace, values: any, sourceEnv: Environment, targetEnv: Environment) => {
2417
if (!item.gid) {
@@ -30,7 +23,7 @@ export const workspaceConfig: DeployableItemConfig = {
3023
envId: sourceEnv.environmentId,
3124
targetEnvId: targetEnv.environmentId,
3225
workspaceId: item.gid,
33-
deployCredential: values.deployCredential ?? false
26+
// Removed deployCredential parameter
3427
};
3528
},
3629
execute: (params: any) => deployWorkspace(params)

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ export interface MergedQueriesResult {
1616
queryId: string;
1717
updateDependenciesIfNeeded?: boolean;
1818
queryGid: string;
19+
deployCredential: boolean;
1920
}
2021

2122

@@ -71,7 +72,8 @@ export interface MergedQueriesResult {
7172
envId: params.envId,
7273
targetEnvId: params.targetEnvId,
7374
queryId: params.queryId,
74-
updateDependenciesIfNeeded: params.updateDependenciesIfNeeded ?? false
75+
updateDependenciesIfNeeded: params.updateDependenciesIfNeeded ?? false,
76+
deployCredential: params.deployCredential
7577
}
7678
});
7779
if (response.status === 200) {

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ export async function deployWorkspace(params: {
8484
envId: string;
8585
targetEnvId: string;
8686
workspaceId: string;
87-
deployCredential: boolean; // Mandatory parameter
8887
}): Promise<boolean> {
8988
try {
9089
// Use the new endpoint format with only essential parameters
@@ -93,7 +92,6 @@ export async function deployWorkspace(params: {
9392
orgGid: params.workspaceId, // Using workspaceId as orgGid
9493
envId: params.envId,
9594
targetEnvId: params.targetEnvId,
96-
deployCredential: params.deployCredential
9795
}
9896
});
9997

@@ -107,7 +105,6 @@ export async function deployWorkspace(params: {
107105
);
108106
}
109107

110-
111108
return response.status === 200;
112109
} catch (error) {
113110
const errorMessage = error instanceof Error ? error.message : 'Failed to deploy workspace';

0 commit comments

Comments
 (0)