mirror of
https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git
synced 2025-12-18 10:31:15 +00:00
refactor(editor): Turn showMessage mixin to composable (#6081)
* refactor(editor): move $getExecutionError from showMessages mixin to pushConnection (it is used there only) * refactor(editor): resolve showMessage mixin methods * fix(editor): use composable instead of mixin * fix(editor): resolve conflicts * fix(editor): replace clearAllStickyNotifications * fix(editor): replace confirmMessage * fix(editor): replace confirmMessage * fix(editor): replace confirmMessage * fix(editor): remove last confirmMessage usage * fix(editor): remove $prompt usage * fix(editor): remove $show methods * fix(editor): lint fix * fix(editor): lint fix * fix(editor): fixes after review
This commit is contained in:
@@ -70,16 +70,15 @@
|
||||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
import mixins from 'vue-typed-mixins';
|
||||
|
||||
import { showMessage } from '@/mixins/showMessage';
|
||||
import Modal from './Modal.vue';
|
||||
import type { IUser } from '../Interface';
|
||||
import { defineComponent } from 'vue';
|
||||
import { useToast } from '@/composables';
|
||||
import Modal from '@/components/Modal.vue';
|
||||
import type { IUser } from '@/Interface';
|
||||
import { mapStores } from 'pinia';
|
||||
import { useUsersStore } from '@/stores/users.store';
|
||||
import { createEventBus } from '@/event-bus';
|
||||
|
||||
export default mixins(showMessage).extend({
|
||||
export default defineComponent({
|
||||
components: {
|
||||
Modal,
|
||||
},
|
||||
@@ -92,6 +91,11 @@ export default mixins(showMessage).extend({
|
||||
type: String,
|
||||
},
|
||||
},
|
||||
setup() {
|
||||
return {
|
||||
...useToast(),
|
||||
};
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
modalBus: createEventBus(),
|
||||
@@ -169,7 +173,7 @@ export default mixins(showMessage).extend({
|
||||
}
|
||||
}
|
||||
|
||||
this.$showMessage({
|
||||
this.showMessage({
|
||||
type: 'success',
|
||||
title: this.$locale.baseText('settings.users.userDeleted'),
|
||||
message,
|
||||
@@ -177,7 +181,7 @@ export default mixins(showMessage).extend({
|
||||
|
||||
this.modalBus.emit('close');
|
||||
} catch (error) {
|
||||
this.$showError(error, this.$locale.baseText('settings.users.userDeletedError'));
|
||||
this.showError(error, this.$locale.baseText('settings.users.userDeletedError'));
|
||||
}
|
||||
this.loading = false;
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user