Revert "refactor(editor): Turn showMessage mixin to composable" (#6243)

Revert "refactor(editor): Turn showMessage mixin to composable (#6081)"

This reverts commit b95fcd7323.
This commit is contained in:
Csaba Tuncsik
2023-05-12 16:43:34 +02:00
committed by GitHub
parent 13bcec1661
commit 638e3f209d
75 changed files with 863 additions and 991 deletions

View File

@@ -125,8 +125,8 @@ import {
VIEWS,
} from '@/constants';
import { workflowHelpers } from '@/mixins/workflowHelpers';
import { useToast } from '@/composables';
import Modal from '@/components/Modal.vue';
import { showMessage } from '@/mixins/showMessage';
import Modal from './Modal.vue';
import type { IFormInputs, IPersonalizationLatestVersion, IUser } from '@/Interface';
import { getAccountAge } from '@/utils';
import type { GenericValue } from 'n8n-workflow';
@@ -137,7 +137,7 @@ import { useRootStore } from '@/stores/n8nRoot.store';
import { useUsersStore } from '@/stores/users.store';
import { createEventBus } from '@/event-bus';
export default mixins(workflowHelpers).extend({
export default mixins(showMessage, workflowHelpers).extend({
components: { Modal },
name: 'PersonalizationModal',
data() {
@@ -151,11 +151,6 @@ export default mixins(workflowHelpers).extend({
formBus: createEventBus(),
};
},
setup() {
return {
...useToast(),
};
},
computed: {
...mapStores(useRootStore, useSettingsStore, useUIStore, useUsersStore),
survey() {
@@ -642,7 +637,7 @@ export default mixins(workflowHelpers).extend({
await this.fetchOnboardingPrompt();
} catch (e) {
this.showError(e, 'Error while submitting results');
this.$showError(e, 'Error while submitting results');
}
this.$data.isSaving = false;
@@ -659,7 +654,7 @@ export default mixins(workflowHelpers).extend({
if (onboardingResponse.title && onboardingResponse.description) {
setTimeout(async () => {
this.showToast({
this.$showToast({
type: 'info',
title: onboardingResponse.title,
message: onboardingResponse.description,