Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(designer): Revert - Adding hidden parameter field in ConnectionCreationInfo to pass selected credential id (#4193) #4265

Merged
merged 1 commit into from
Feb 27, 2024
Merged

fix(designer): Revert - Adding hidden parameter field in ConnectionCreationInfo to pass selected credential id (#4193) #4265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 1 addition & 30 deletions ...gner/src/lib/ui/panel/connectionsPanel/createConnection/_test__/createConnection.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { MockHttpClient } from '../../../../../__test__/mock-http-client';
import { CreateConnection, parseParameterValues, type CreateConnectionProps } from '../createConnection';
import { CreateConnection, type CreateConnectionProps } from '../createConnection';
import { UniversalConnectionParameter } from '../formInputs/universalConnectionParameter';
import {
InitConnectionParameterEditorService,
Expand Down Expand Up @@ -578,35 +578,6 @@ describe('ui/createConnection', () => {
const mappingEditors = findParameterComponents(createConnection, CustomCredentialMappingEditor);
expect(mappingEditors).toHaveLength(0);
});

test('parseParameterValues', () => {
const parameterValues: Record<string, any> = {
a: 'foobar',
b: 42,
c: null,
d: undefined,
e: { foo: 'bar' },
f: ['id', 66],
};
const capabilityEnabledParameters: Record<string, ConnectionParameter> = {
a: { type: 'connection' },
z: { type: 'other' },
};

const { visibleParameterValues, additionalParameterValues } = parseParameterValues(parameterValues, capabilityEnabledParameters);
expect(visibleParameterValues).toStrictEqual({ a: 'foobar' });
expect(additionalParameterValues).toStrictEqual({
b: 42,
c: null,
d: undefined,
e: { foo: 'bar' },
f: ['id', 66],
});

const emptyParameters = parseParameterValues({}, capabilityEnabledParameters);
expect(emptyParameters.visibleParameterValues).toStrictEqual({});
expect(emptyParameters.additionalParameterValues).toStrictEqual({});
});
});

function findConnectionCreateDiv(createConnection: ReactElement) {
Expand Down
24 changes: 5 additions & 19 deletions libs/designer/src/lib/ui/panel/connectionsPanel/createConnection/createConnection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ export interface CreateConnectionProps {
parameterValues?: Record<string, any>,
isOAuthConnection?: boolean,
alternativeParameterValues?: Record<string, any>,
identitySelected?: string,
additionalParameterValues?: Record<string, any>
identitySelected?: string
) => void;
cancelCallback?: () => void;
hideCancelButton?: boolean;
Expand Down Expand Up @@ -302,7 +301,9 @@ export const CreateConnection = (props: CreateConnectionProps) => {
const canSubmit = useMemo(() => !isLoading && validParams, [isLoading, validParams]);

const submitCallback = useCallback(() => {
const { visibleParameterValues, additionalParameterValues } = parseParameterValues(parameterValues, capabilityEnabledParameters);
const visibleParameterValues = Object.fromEntries(
Object.entries(parameterValues).filter(([key]) => Object.keys(capabilityEnabledParameters).includes(key)) ?? []
);

// This value needs to be passed conditionally but the parameter is hidden, so we're manually inputting it here
if (
Expand All @@ -325,8 +326,7 @@ export const CreateConnection = (props: CreateConnectionProps) => {
visibleParameterValues,
isUsingOAuth,
alternativeParameterValues,
identitySelected,
additionalParameterValues
identitySelected
);
}, [
parameterValues,
Expand Down Expand Up @@ -654,17 +654,3 @@ const isServicePrincipalParameterVisible = (key: string, parameter: any): boolea
if (constraints?.hidden === 'true' || constraints?.hideInUI === 'true') return false;
return true;
};

export function parseParameterValues(
parameterValues: Record<string, any>,
capabilityEnabledParameters: Record<string, ConnectionParameter | ConnectionParameterSetParameter>
) {
const visibleParameterValues = Object.fromEntries(
Object.entries(parameterValues).filter(([key]) => Object.keys(capabilityEnabledParameters).includes(key)) ?? []
);
const additionalParameterValues = Object.fromEntries(
Object.entries(parameterValues).filter(([key]) => !Object.keys(capabilityEnabledParameters).includes(key)) ?? []
);

return { visibleParameterValues, additionalParameterValues };
}
4 changes: 1 addition & 3 deletions libs/designer/src/lib/ui/panel/connectionsPanel/createConnection/createConnectionWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,7 @@ export const CreateConnectionWrapper = () => {
parameterValues: Record<string, any> = {},
isOAuthConnection?: boolean,
alternativeParameterValues?: Record<string, any>,
identitySelected?: string,
additionalParameterValues?: Record<string, any>
identitySelected?: string
) => {
if (!connector?.id) return;

Expand Down Expand Up @@ -189,7 +188,6 @@ export const CreateConnectionWrapper = () => {
: undefined,
connectionParameters: outputParameterValues,
alternativeParameterValues,
additionalParameterValues,
};

const parametersMetadata: ConnectionParametersMetadata = {
Expand Down
1 change: 0 additions & 1 deletion libs/services/designer-client-services/src/lib/connection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ export interface ConnectionCreationInfo {
displayName?: string;
parameterName?: string;
appSettings?: Record<string, string>;
additionalParameterValues?: Record<string, string>;
}

export interface ConnectionParametersMetadata {
Expand Down
3 changes: 0 additions & 3 deletions libs/services/designer-client-services/src/lib/standard/connection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ interface ServiceProviderConnectionModel {
};
parameterSetName?: string;
displayName?: string;
additionalParameterValues?: Record<string, string>;
}

interface FunctionsConnectionModel {
Expand Down Expand Up @@ -606,7 +605,6 @@ function convertToServiceProviderConnectionsData(
displayName,
connectionParameters: connectionParameterValues,
connectionParametersSet: connectionParametersSetValues,
additionalParameterValues,
} = connectionInfo;
const connectionParameters = connectionParametersSetValues
? connectionParameterMetadata.connectionParameterSet?.parameters
Expand All @@ -628,7 +626,6 @@ function convertToServiceProviderConnectionsData(
...optional('parameterSetName', connectionParametersSetValues?.name),
serviceProvider: { id: connectorId },
displayName,
...optional('additionalParameterValues', additionalParameterValues),
},
settings: connectionInfo.appSettings ?? {},
pathLocation: [serviceProviderLocation],
Expand Down
Loading