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

fix: post-merge fixes

Browse source
This commit is contained in:
Alex Grozav 2023-07-26 12:52:41 +03:00
parent 85434b0dcb
commit d28685beba
5 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
packages/design-system/theme/preview/index.html
View file

@ -886,9 +886,9 @@
</body> </body>
<!-- import Vue before Element --> <!-- import Vue before Element -->
<!-- <script src="https://unpkg.com/vue/dist/vue.js"></script> --> <!-- <script src="https://unpkg.com/vue/dist/vue.js"></script> -->
<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script> <script src="https://unpkg.com/vue@3/dist/vue.global.js"></script>
<!-- import JavaScript --> <!-- import JavaScript -->
<script src="https://unpkg.com/element-ui/lib/index.js"></script> <script src="https://unpkg.com/element-plus/lib/index.js"></script>
<script> <script>
const original = { const original = {
color_primary: '#409EFF', color_primary: '#409EFF',
@ -919,8 +919,7 @@
}; };
Vue.config.devtools = true; Vue.config.devtools = true;
new Vue({ Vue.createApp({
el: '#app',
data() { data() {
return { return {
global: {}, global: {},
@ -1330,6 +1329,6 @@
this.visible = true; this.visible = true;
}, },
}, },
}); }).mount('#app');
</script> </script>
</html> </html>

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

@ -1,5 +1,5 @@
<script lang="ts" setup> <script lang="ts" setup>
import { computed, nextTick ref } from 'vue'; import { computed, nextTick, ref } from 'vue';
import { useRouter } from 'vue-router'; import { useRouter } from 'vue-router';
import { createEventBus } from 'n8n-design-system/utils'; import { createEventBus } from 'n8n-design-system/utils';
import { useI18n, useLoadingService, useMessage, useToast } from '@/composables'; import { useI18n, useLoadingService, useMessage, useToast } from '@/composables';

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

@ -63,7 +63,7 @@ async function pullWorkfolder() {
}); });
if (hasVariablesOrCredentials) { if (hasVariablesOrCredentials) {
nextTick(() => { void nextTick(() => {
toast.showMessage({ toast.showMessage({
message: i18n.baseText('settings.sourceControl.pull.oneLastStep.description'), message: i18n.baseText('settings.sourceControl.pull.oneLastStep.description'),
title: i18n.baseText('settings.sourceControl.pull.oneLastStep.title'), title: i18n.baseText('settings.sourceControl.pull.oneLastStep.title'),

8
packages/editor-ui/src/components/SourceControlPushModal.ee.vue
View file

@ -268,9 +268,9 @@ async function commitAndPush() {
> >
<div :class="$style.listItemBody"> <div :class="$style.listItemBody">
<n8n-checkbox <n8n-checkbox
:value="staged[file.file]" :modelValue="staged[file.file]"
:class="$style.listItemCheckbox" :class="$style.listItemCheckbox"
@input="setStagedStatus(file, !staged[file.file])" @update:modelValue="setStagedStatus(file, !staged[file.file])"
/> />
<div> <div>
<n8n-text v-if="file.status === 'deleted'" color="text-light"> <n8n-text v-if="file.status === 'deleted'" color="text-light">
@ -300,7 +300,7 @@ async function commitAndPush() {
</n8n-card> </n8n-card>
</div> </div>
<n8n-notice class="mt-0" v-else> <n8n-notice class="mt-0" v-else>
<i18n path="settings.sourceControl.modals.push.noWorkflowChanges"> <i18n-t keypath="settings.sourceControl.modals.push.noWorkflowChanges">
<template #link> <template #link>
<n8n-link size="small" :to="i18n.baseText('settings.sourceControl.docs.using.url')"> <n8n-link size="small" :to="i18n.baseText('settings.sourceControl.docs.using.url')">
{{ {{
@ -308,7 +308,7 @@ async function commitAndPush() {
}} }}
</n8n-link> </n8n-link>
</template> </template>
</i18n> </i18n-t>
</n8n-notice> </n8n-notice>
<n8n-text bold tag="p" class="mt-l mb-2xs"> <n8n-text bold tag="p" class="mt-l mb-2xs">

6
packages/editor-ui/src/views/NodeView.vue
View file

@ -315,7 +315,7 @@ import {
N8nPlusEndpointType, N8nPlusEndpointType,
EVENT_PLUS_ENDPOINT_CLICK, EVENT_PLUS_ENDPOINT_CLICK,
} from '@/plugins/endpoints/N8nPlusEndpointType'; } from '@/plugins/endpoints/N8nPlusEndpointType';
import type { ElNotificationComponent } from 'element-ui/types/notification'; import type { ElNotification } from 'element-plus';
import { sourceControlEventBus } from '@/event-bus/source-control'; import { sourceControlEventBus } from '@/event-bus/source-control';
interface AddNodeOptions { interface AddNodeOptions {
@ -634,7 +634,7 @@ export default defineComponent({
isProductionExecutionPreview: false, isProductionExecutionPreview: false,
enterTimer: undefined as undefined | ReturnType<typeof setTimeout>, enterTimer: undefined as undefined | ReturnType<typeof setTimeout>,
exitTimer: undefined as undefined | ReturnType<typeof setTimeout>, exitTimer: undefined as undefined | ReturnType<typeof setTimeout>,
readOnlyNotification: null as null | ElNotificationComponent, readOnlyNotification: null as null | ElNotification,
// jsplumb automatically deletes all loose connections which is in turn recorded // jsplumb automatically deletes all loose connections which is in turn recorded
// in undo history as a user action. // in undo history as a user action.
// This should prevent automatically removed connections from populating undo stack // This should prevent automatically removed connections from populating undo stack
@ -3845,7 +3845,7 @@ export default defineComponent({
this.readOnlyEnv && this.readOnlyEnv &&
[VIEWS.NEW_WORKFLOW, VIEWS.TEMPLATE_IMPORT].includes(this.$route.name) [VIEWS.NEW_WORKFLOW, VIEWS.TEMPLATE_IMPORT].includes(this.$route.name)
) { ) {
this.$nextTick(async () => { void this.$nextTick(async () => {
this.resetWorkspace(); this.resetWorkspace();
this.uiStore.stateIsDirty = false; this.uiStore.stateIsDirty = false;