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

fix(editor): Fix notification rendering HTML as text #10642

Merged
merged 2 commits into from
Sep 3, 2024
Merged

fix(editor): Fix notification rendering HTML as text #10642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b35938
added new message component
r00gm Sep 3, 2024
79b616d
implement message component
r00gm Sep 3, 2024
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
18 changes: 18 additions & 0 deletions packages/editor-ui/src/components/NodeViewUnfinishedWorkflowMessage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<script lang="ts" setup>
import { useI18n } from '@/composables/useI18n';
const i18 = useI18n();
</script>

<template>
<div>
<a data-action="reload">{{ i18.baseText('nodeView.refresh') }}</a>
{{ i18.baseText('nodeView.toSeeTheLatestStatus') }}.
<br />
<a
href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.wait/"
target="_blank"
>
{{ i18.baseText('nodeView.moreInfo') }}
</a>
</div>
</template>
8 changes: 3 additions & 5 deletions packages/editor-ui/src/views/NodeView.v2.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
ref,
useCssModule,
watch,
h,
} from 'vue';
import { useRoute, useRouter } from 'vue-router';
import WorkflowCanvas from '@/components/canvas/WorkflowCanvas.vue';
Expand Down Expand Up @@ -97,6 +98,7 @@ import type { PinDataSource } from '@/composables/usePinnedData';
import { useClipboard } from '@/composables/useClipboard';
import { useBeforeUnload } from '@/composables/useBeforeUnload';
import { getResourcePermissions } from '@/permissions';
import NodeViewUnfinishedWorkflowMessage from '@/components/NodeViewUnfinishedWorkflowMessage.vue';

const LazyNodeCreation = defineAsyncComponent(
async () => await import('@/components/Node/NodeCreation.vue'),
Expand Down Expand Up @@ -1062,11 +1064,7 @@ function onExecutionOpenedWithWaitTill(data: IExecutionResponse) {
if ((data as ExecutionSummary).waitTill) {
toast.showMessage({
title: i18n.baseText('nodeView.thisExecutionHasntFinishedYet'),
message: `<a data-action="reload">${i18n.baseText('nodeView.refresh')}</a> ${i18n.baseText(
'nodeView.toSeeTheLatestStatus',
)}.<br/> <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.wait/" target="_blank">${i18n.baseText(
'nodeView.moreInfo',
)}</a>`,
message: h(NodeViewUnfinishedWorkflowMessage),
type: 'warning',
duration: 0,
});
Expand Down
11 changes: 3 additions & 8 deletions packages/editor-ui/src/views/NodeView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import { defineAsyncComponent, defineComponent, nextTick, ref } from 'vue';
import { defineAsyncComponent, defineComponent, nextTick, ref, h } from 'vue';
import { mapStores, storeToRefs } from 'pinia';

import type {
Expand Down Expand Up @@ -182,6 +182,7 @@ import { usePostHog } from '@/stores/posthog.store';
import { useNpsSurveyStore } from '@/stores/npsSurvey.store';
import { getResourcePermissions } from '@/permissions';
import { useBeforeUnload } from '@/composables/useBeforeUnload';
import NodeViewUnfinishedWorkflowMessage from '@/components/NodeViewUnfinishedWorkflowMessage.vue';

interface AddNodeOptions {
position?: XYPosition;
Expand Down Expand Up @@ -1063,13 +1064,7 @@ export default defineComponent({
if ((data as ExecutionSummary).waitTill) {
this.showMessage({
title: this.$locale.baseText('nodeView.thisExecutionHasntFinishedYet'),
message: `<a data-action="reload">${this.$locale.baseText(
'nodeView.refresh',
)}</a> ${this.$locale.baseText(
'nodeView.toSeeTheLatestStatus',
)}.<br/> <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.wait/" target="_blank">${this.$locale.baseText(
'nodeView.moreInfo',
)}</a>`,
message: h(NodeViewUnfinishedWorkflowMessage),
type: 'warning',
duration: 0,
});
Expand Down
Loading