Skip to content

Commit

Permalink
fix(Designer): Removed resolving app settings within connection param…
Browse files Browse the repository at this point in the history
…eters during initialization (#4184)

Removed resolving app settings within connections
  • Loading branch information
rllyy97 committed Feb 13, 2024
1 parent fd0a041 commit 4ba6a0c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 25 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,7 @@ export class WorkflowUtility {
return references;
}

public static resolveConnectionsReferences(
content: string,
parameters: ParametersData | undefined,
appsettings?: Record<string, string> | undefined
): any {
public static resolveConnectionsReferences(content: string, parameters: ParametersData | undefined): any {
let result = content;

if (parameters) {
Expand All @@ -73,14 +69,6 @@ export class WorkflowUtility {
}
}

if (appsettings) {
for (const settingName of Object.keys(appsettings)) {
const settingValue = appsettings[settingName] !== undefined ? appsettings[settingName] : '';
result = replaceAllOccurrences(result, `@appsetting('${settingName}')`, settingValue);
result = replaceAllOccurrences(result, `@{appsetting('${settingName}')}`, settingValue);
}
}

try {
return JSON.parse(result);
} catch (error) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,8 @@ const DesignerEditor = () => {
const { data: runInstanceData } = useRunInstanceStandard(workflowName, onRunInstanceSuccess, appId, runId);

const connectionsData = useMemo(
() =>
WorkflowUtility.resolveConnectionsReferences(
JSON.stringify(clone(originalConnectionsData ?? {})),
parameters,
settingsData?.properties ?? {}
),
[originalConnectionsData, parameters, settingsData?.properties]
() => WorkflowUtility.resolveConnectionsReferences(JSON.stringify(clone(originalConnectionsData ?? {})), parameters),
[originalConnectionsData, parameters]
);

const addConnectionData = async (connectionAndSetting: ConnectionAndAppSetting): Promise<void> => {
Expand All @@ -118,11 +113,7 @@ const DesignerEditor = () => {

if (connectionInfo) {
// TODO(psamband): Add new settings in this blade so that we do not resolve all the appsettings in the connectionInfo.
const resolvedConnectionInfo = WorkflowUtility.resolveConnectionsReferences(
JSON.stringify(connectionInfo),
{},
settingsData?.properties
);
const resolvedConnectionInfo = WorkflowUtility.resolveConnectionsReferences(JSON.stringify(connectionInfo), {});
delete resolvedConnectionInfo.displayName;

return {
Expand Down

0 comments on commit 4ba6a0c

Please sign in to comment.