diff --git a/packages/editor-ui/.eslintrc.js b/packages/editor-ui/.eslintrc.js index 35ff091cef..96dcf7d915 100644 --- a/packages/editor-ui/.eslintrc.js +++ b/packages/editor-ui/.eslintrc.js @@ -39,7 +39,6 @@ module.exports = { '@typescript-eslint/restrict-plus-operands': 'warn', '@typescript-eslint/ban-ts-comment': ['warn', { 'ts-ignore': true }], '@typescript-eslint/no-redundant-type-constituents': 'warn', - '@typescript-eslint/no-base-to-string': 'warn', '@typescript-eslint/no-unsafe-enum-comparison': 'warn', }, }; diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue index 01aaab7c58..d19df016a5 100644 --- a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue +++ b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue @@ -887,8 +887,9 @@ export default defineComponent({ this.testedSuccessfully = false; } - const usesExternalSecrets = Object.entries(credentialDetails.data || {}).some(([, value]) => - /=.*\{\{[^}]*\$secrets\.[^}]+}}.*/.test(`${value}`), + const usesExternalSecrets = Object.entries(credentialDetails.data || {}).some( + ([, value]) => + typeof value !== 'object' && /=.*\{\{[^}]*\$secrets\.[^}]+}}.*/.test(`${value}`), ); const trackProperties: ITelemetryTrackProperties = { diff --git a/packages/editor-ui/src/components/RunDataAi/useAiContentParsers.ts b/packages/editor-ui/src/components/RunDataAi/useAiContentParsers.ts index dc7d7bc1a6..53275675d6 100644 --- a/packages/editor-ui/src/components/RunDataAi/useAiContentParsers.ts +++ b/packages/editor-ui/src/components/RunDataAi/useAiContentParsers.ts @@ -132,7 +132,11 @@ const outputTypeParsers: { } else if (content.id.includes('SystemMessage')) { message = `**System Message:** ${message}`; } - if (execData.action && execData.action !== 'getMessages') { + if ( + execData.action && + typeof execData.action !== 'object' && + execData.action !== 'getMessages' + ) { message = `## Action: ${execData.action}\n\n${message}`; } diff --git a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue index f51798ea88..a236a9164b 100644 --- a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue +++ b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue @@ -459,7 +459,7 @@ export default defineComponent({ onModalClose() { if (!this.hasOnceBeenSaved) { this.workflowsStore.removeNode(this.node); - if (this.nodeParameters.id) { + if (this.nodeParameters.id && typeof this.nodeParameters.id !== 'object') { this.logStreamingStore.removeDestination(this.nodeParameters.id.toString()); } } @@ -480,7 +480,9 @@ export default defineComponent({ this.uiStore.stateIsDirty = false; const destinationType = ( - this.nodeParameters.__type ? `${this.nodeParameters.__type}` : 'unknown' + this.nodeParameters.__type && typeof this.nodeParameters.__type !== 'object' + ? `${this.nodeParameters.__type}` + : 'unknown' ) .replace('$$MessageEventBusDestination', '') .toLowerCase(); diff --git a/packages/editor-ui/src/composables/useRunWorkflow.ts b/packages/editor-ui/src/composables/useRunWorkflow.ts index 599f5e356d..08b184cd87 100644 --- a/packages/editor-ui/src/composables/useRunWorkflow.ts +++ b/packages/editor-ui/src/composables/useRunWorkflow.ts @@ -306,7 +306,8 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType 1) { return `${prevValue} ${newParamValue}`; } else if (prevValue && ['string', 'json'].includes(parameter.type)) { - return prevValue === '=' ? `=${newParamValue}` : `=${prevValue} ${newParamValue}`; + return prevValue === '=' || typeof prevValue === 'object' + ? `=${newParamValue}` + : `=${prevValue} ${newParamValue}`; } return `=${newParamValue}`;