mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-02-02 07:01:30 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(core): Show webhook urls for all webhook nodes (no-changelog) (#7783)

Browse source 
This reverts parts of https://github.com/n8n-io/n8n/pull/7113
This commit is contained in:
कारतोफ्फेलस्क्रिप्ट™ 2023-11-22 17:45:26 +01:00 committed by GitHub
parent 50f568560f
commit 96fd2c51bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
packages/core/bin/generate-ui-types
View file

@ -26,21 +26,6 @@ function findReferencedMethods(obj, refs = {}, latestName = '') {
return refs; return refs;
} }
function addWebhookLifecycle(nodeType) {
if (nodeType.description.webhooks) {
nodeType.description.webhooks = nodeType.description.webhooks.map((webhook) => {
const webhookMethods =
nodeType?.webhookMethods?.[webhook.name] ?? nodeType?.webhookMethods?.default;
webhook.hasLifecycleMethods = Boolean(
webhookMethods?.checkExists && webhookMethods?.create && webhookMethods?.delete,
);
return webhook;
});
}
return nodeType;
}
(async () => { (async () => {
const loader = new PackageDirectoryLoader(packageDir); const loader = new PackageDirectoryLoader(packageDir);
await loader.loadAll(); await loader.loadAll();
@ -79,7 +64,6 @@ function addWebhookLifecycle(nodeType) {
.map((data) => { .map((data) => {
const nodeType = NodeHelpers.getVersionedNodeType(data.type); const nodeType = NodeHelpers.getVersionedNodeType(data.type);
NodeHelpers.applySpecialNodeParameters(nodeType); NodeHelpers.applySpecialNodeParameters(nodeType);
addWebhookLifecycle(nodeType);
return data.type; return data.type;
}) })
.flatMap((nodeType) => .flatMap((nodeType) =>

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

@ -94,7 +94,7 @@ export default defineComponent({
} }
return (this.nodeType as INodeTypeDescription).webhooks!.filter( return (this.nodeType as INodeTypeDescription).webhooks!.filter(
(webhookData) => webhookData.restartWebhook !== true && !webhookData.hasLifecycleMethods, (webhookData) => webhookData.restartWebhook !== true,
); );
}, },
baseText() { baseText() {

1
packages/workflow/src/Interfaces.ts
View file

@ -1650,7 +1650,6 @@ export interface IWebhookDescription {
responseMode?: WebhookResponseMode | string; responseMode?: WebhookResponseMode | string;
responseData?: WebhookResponseData | string; responseData?: WebhookResponseData | string;
restartWebhook?: boolean; restartWebhook?: boolean;
hasLifecycleMethods?: boolean; // set automatically by generate-ui-types
ndvHideUrl?: boolean; // If true the webhook will not be displayed in the editor ndvHideUrl?: boolean; // If true the webhook will not be displayed in the editor
ndvHideMethod?: boolean; // If true the method will not be displayed in the editor ndvHideMethod?: boolean; // If true the method will not be displayed in the editor
} }