mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-12-24 20:24:05 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(editor): Allow $secrets to resolve on credentials (#10093)

Browse source
This commit is contained in:
Iván Ovejero 2024-07-19 12:00:07 +02:00 committed by GitHub
parent dd54390b0a
commit bf57f38d1c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 43 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/editor-ui/src/components/ParameterInputHint.vue
View file

@ -7,7 +7,7 @@
[$style.highlight]: highlight,
}"
>
<span v-html="simplyText"></span>
<span data-test-id="parameter-input-hint" v-html="simplyText"></span>
</div>
<div
v-else

39
packages/editor-ui/src/components/ParameterInputWrapper.test.ts Normal file
View file

@ -0,0 +1,39 @@
import { renderComponent } from '@/__tests__/render';
import { createTestingPinia } from '@pinia/testing';
import ParameterInputWrapper from './ParameterInputWrapper.vue';
describe('ParameterInputWrapper.vue', () => {
test('should resolve expression', async () => {
const { getByTestId } = renderComponent(ParameterInputWrapper, {
pinia: createTestingPinia({
initialState: {
ndv: {
activeNodeName: 'testNode',
input: { nodeName: 'inputNode' },
},
},
}),
props: {
parameter: {
name: 'test',
type: 'string',
},
path: 'params.test',
modelValue: '={{ $secrets.infisical.password }}',
isForCredential: true,
},
global: {
mocks: {
$workflowHelpers: {
resolveExpression: vi.fn(() => 'topSecret'),
},
$ndvStore: {
activeNode: vi.fn(() => ({ test: 'test' })),
},
},
},
});
expect(getByTestId('parameter-input-hint')).toHaveTextContent('[ERROR: ]');
});
});

2
packages/editor-ui/src/components/ParameterInputWrapper.vue
View file

@ -177,6 +177,8 @@ const evaluatedExpression = computed<Result<unknown, Error>>(() => {
};
}
if (props.isForCredential) opts.additionalKeys = resolvedAdditionalExpressionData.value;
return { ok: true, result: workflowHelpers.resolveExpression(value, undefined, opts) };
} catch (error) {
return { ok: false, error };

3
packages/editor-ui/src/composables/useExpressionEditor.ts
View file

@ -293,14 +293,13 @@ export const useExpressionEditor = ({
// e.g. credential modal
result.resolved = Expression.resolveWithoutWorkflow(resolvable, toValue(additionalData));
} else {
let opts;
let opts: Record<string, unknown> = { additionalKeys: toValue(additionalData) };
if (ndvStore.isInputParentOfActiveNode) {
opts = {
targetItem: target ?? undefined,
inputNodeName: ndvStore.ndvInputNodeName,
inputRunIndex: ndvStore.ndvInputRunIndex,
inputBranchIndex: ndvStore.ndvInputBranchIndex,
additionalKeys: toValue(additionalData),
};
}
result.resolved = workflowHelpers.resolveExpression('=' + resolvable, undefined, opts);