From afa23f3ef1b7f7cdfb2a2025632d42b9e613a754 Mon Sep 17 00:00:00 2001 From: Fabio Di Stasio Date: Fri, 22 Apr 2022 12:16:02 +0200 Subject: [PATCH] refactor: emits in components --- src/common/libs/mimeFromHex.js | 2 +- src/common/libs/uidGen.js | 2 +- src/main/ipc-handlers/application.ts | 2 +- src/main/ipc-handlers/connection.ts | 3 --- src/renderer/components/BaseConfirmModal.vue | 1 + src/renderer/components/BaseContextMenu.vue | 1 + src/renderer/components/BaseNotification.vue | 1 + src/renderer/components/BaseTextEditor.vue | 7 ++++--- src/renderer/components/BaseToast.vue | 1 + src/renderer/components/BaseUploadInput.vue | 1 + src/renderer/components/FakerSelect.vue | 1 + src/renderer/components/ForeignKeySelect.vue | 1 + src/renderer/components/ModalAskCredentials.vue | 1 + src/renderer/components/ModalAskParameters.vue | 1 + src/renderer/components/ModalDiscardChanges.vue | 1 + src/renderer/components/ModalEditSchema.vue | 1 + src/renderer/components/ModalExportSchema.vue | 1 + src/renderer/components/ModalFakerRows.vue | 1 + src/renderer/components/ModalHistory.vue | 1 + src/renderer/components/ModalImportSchema.vue | 1 + src/renderer/components/ModalNewSchema.vue | 1 + src/renderer/components/ModalNewTableRow.vue | 1 + src/renderer/components/ModalProcessesList.vue | 1 + src/renderer/components/ModalProcessesListContext.vue | 1 + src/renderer/components/ModalProcessesListRow.vue | 1 + src/renderer/components/QueryEditor.vue | 1 + src/renderer/components/SettingBarContext.vue | 1 + src/renderer/components/TheScratchpad.vue | 1 + src/renderer/components/WorkspaceEmptyState.vue | 1 + .../components/WorkspaceExploreBarMiscContext.vue | 1 + .../WorkspaceExploreBarMiscFolderContext.vue | 1 + src/renderer/components/WorkspaceExploreBarSchema.vue | 1 + .../components/WorkspaceExploreBarSchemaContext.vue | 11 +++++++++++ .../components/WorkspaceExploreBarTableContext.vue | 1 + .../components/WorkspaceTabNewTableEmptyState.vue | 3 ++- .../WorkspaceTabPropsFunctionParamsModal.vue | 1 + .../WorkspaceTabPropsRoutineParamsModal.vue | 1 + .../WorkspaceTabPropsSchedulerTimingModal.vue | 1 + .../components/WorkspaceTabPropsTableContext.vue | 1 + .../components/WorkspaceTabPropsTableFields.vue | 1 + .../components/WorkspaceTabPropsTableForeignModal.vue | 1 + .../components/WorkspaceTabPropsTableIndexesModal.vue | 1 + src/renderer/components/WorkspaceTabPropsTableRow.vue | 1 + src/renderer/components/WorkspaceTabQueryTable.vue | 1 + .../components/WorkspaceTabQueryTableContext.vue | 1 + src/renderer/components/WorkspaceTabQueryTableRow.vue | 1 + src/renderer/components/WorkspaceTabTableFilters.vue | 1 + 47 files changed, 60 insertions(+), 10 deletions(-) diff --git a/src/common/libs/mimeFromHex.js b/src/common/libs/mimeFromHex.js index 837b127e..13613acf 100644 --- a/src/common/libs/mimeFromHex.js +++ b/src/common/libs/mimeFromHex.js @@ -43,4 +43,4 @@ export function mimeFromHex (hex) { } } } -}; +} diff --git a/src/common/libs/uidGen.js b/src/common/libs/uidGen.js index f8def6b1..929fc648 100644 --- a/src/common/libs/uidGen.js +++ b/src/common/libs/uidGen.js @@ -5,4 +5,4 @@ */ export function uidGen (prefix) { return (prefix ? `${prefix}:` : '') + Math.random().toString(36).substr(2, 9).toUpperCase(); -}; +} diff --git a/src/main/ipc-handlers/application.ts b/src/main/ipc-handlers/application.ts index a8033a2d..f9c17654 100644 --- a/src/main/ipc-handlers/application.ts +++ b/src/main/ipc-handlers/application.ts @@ -10,7 +10,7 @@ export default () => { event.returnValue = key; }); - ipcMain.handle('showOpenDialog', (event, options) => { + ipcMain.handle('show-open-dialog', (event, options) => { return dialog.showOpenDialog(options); }); diff --git a/src/main/ipc-handlers/connection.ts b/src/main/ipc-handlers/connection.ts index 50f406ba..36462f3a 100644 --- a/src/main/ipc-handlers/connection.ts +++ b/src/main/ipc-handlers/connection.ts @@ -135,9 +135,6 @@ export default (connections: {[key: string]: antares.Client}) => { await connection.connect(); - // TODO: temporary - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore const structure = await connection.getStructure(new Set()); connections[conn.uid] = connection; diff --git a/src/renderer/components/BaseConfirmModal.vue b/src/renderer/components/BaseConfirmModal.vue index afffd1f6..b30d0118 100644 --- a/src/renderer/components/BaseConfirmModal.vue +++ b/src/renderer/components/BaseConfirmModal.vue @@ -58,6 +58,7 @@ export default { confirmText: String, cancelText: String }, + emits: ['confirm', 'hide'], computed: { hasHeader () { return !!this.$slots.header; diff --git a/src/renderer/components/BaseContextMenu.vue b/src/renderer/components/BaseContextMenu.vue index 1bafc058..feee059e 100644 --- a/src/renderer/components/BaseContextMenu.vue +++ b/src/renderer/components/BaseContextMenu.vue @@ -21,6 +21,7 @@ export default { props: { contextEvent: MouseEvent }, + emits: ['close-context'], data () { return { contextSize: null, diff --git a/src/renderer/components/BaseNotification.vue b/src/renderer/components/BaseNotification.vue index b8cbf8f8..cd769186 100644 --- a/src/renderer/components/BaseNotification.vue +++ b/src/renderer/components/BaseNotification.vue @@ -27,6 +27,7 @@ export default { default: '' } }, + emits: ['close'], data () { return { isExpanded: false diff --git a/src/renderer/components/BaseTextEditor.vue b/src/renderer/components/BaseTextEditor.vue index f8083654..639a25fb 100644 --- a/src/renderer/components/BaseTextEditor.vue +++ b/src/renderer/components/BaseTextEditor.vue @@ -17,7 +17,7 @@ import { mapGetters } from 'vuex'; export default { name: 'BaseTextEditor', props: { - value: String, + modelValue: String, mode: { type: String, default: 'text' }, editorClass: { type: String, default: '' }, autoFocus: { type: Boolean, default: false }, @@ -25,6 +25,7 @@ export default { showLineNumbers: { type: Boolean, default: true }, height: { type: Number, default: 200 } }, + emits: ['update:modelValue'], data () { return { editor: null, @@ -83,7 +84,7 @@ export default { this.editor = ace.edit(`editor-${this.id}`, { mode: `ace/mode/${this.mode}`, theme: `ace/theme/${this.editorTheme}`, - value: this.value || '', + value: this.modelValue || '', fontSize: '14px', printMargin: false, readOnly: this.readOnly, @@ -100,7 +101,7 @@ export default { this.editor.session.on('change', () => { const content = this.editor.getValue(); - this.$emit('update:value', content); + this.$emit('update:modelValue', content); }); if (this.autoFocus) { diff --git a/src/renderer/components/BaseToast.vue b/src/renderer/components/BaseToast.vue index 732d2bdb..6a6a4d86 100644 --- a/src/renderer/components/BaseToast.vue +++ b/src/renderer/components/BaseToast.vue @@ -22,6 +22,7 @@ export default { default: '' } }, + emits: ['close'], data () { return { isVisible: false diff --git a/src/renderer/components/BaseUploadInput.vue b/src/renderer/components/BaseUploadInput.vue index 59ef549a..e19e1db9 100644 --- a/src/renderer/components/BaseUploadInput.vue +++ b/src/renderer/components/BaseUploadInput.vue @@ -35,6 +35,7 @@ export default { type: String } }, + emits: ['change', 'clear'], data () { return { id: null diff --git a/src/renderer/components/FakerSelect.vue b/src/renderer/components/FakerSelect.vue index d3571c84..5c98009e 100644 --- a/src/renderer/components/FakerSelect.vue +++ b/src/renderer/components/FakerSelect.vue @@ -129,6 +129,7 @@ export default { fieldLength: Number, fieldObj: Object }, + emits: ['update:value'], data () { return { localType: null, diff --git a/src/renderer/components/ForeignKeySelect.vue b/src/renderer/components/ForeignKeySelect.vue index c668077c..28e76f3d 100644 --- a/src/renderer/components/ForeignKeySelect.vue +++ b/src/renderer/components/ForeignKeySelect.vue @@ -34,6 +34,7 @@ export default { default: '' } }, + emits: ['update:value', 'blur'], data () { return { foreignList: [] diff --git a/src/renderer/components/ModalAskCredentials.vue b/src/renderer/components/ModalAskCredentials.vue index 796c5402..3cdf1255 100644 --- a/src/renderer/components/ModalAskCredentials.vue +++ b/src/renderer/components/ModalAskCredentials.vue @@ -56,6 +56,7 @@ diff --git a/src/renderer/components/WorkspaceTabPropsFunctionParamsModal.vue b/src/renderer/components/WorkspaceTabPropsFunctionParamsModal.vue index 1ce00213..1e90578b 100644 --- a/src/renderer/components/WorkspaceTabPropsFunctionParamsModal.vue +++ b/src/renderer/components/WorkspaceTabPropsFunctionParamsModal.vue @@ -185,6 +185,7 @@ export default { func: String, workspace: Object }, + emits: ['hide', 'parameters-update'], data () { return { parametersProxy: [], diff --git a/src/renderer/components/WorkspaceTabPropsRoutineParamsModal.vue b/src/renderer/components/WorkspaceTabPropsRoutineParamsModal.vue index 78fd6630..08e39e59 100644 --- a/src/renderer/components/WorkspaceTabPropsRoutineParamsModal.vue +++ b/src/renderer/components/WorkspaceTabPropsRoutineParamsModal.vue @@ -185,6 +185,7 @@ export default { routine: String, workspace: Object }, + emits: ['parameters-update', 'hide'], data () { return { parametersProxy: [], diff --git a/src/renderer/components/WorkspaceTabPropsSchedulerTimingModal.vue b/src/renderer/components/WorkspaceTabPropsSchedulerTimingModal.vue index fbb42e13..ecf37d1f 100644 --- a/src/renderer/components/WorkspaceTabPropsSchedulerTimingModal.vue +++ b/src/renderer/components/WorkspaceTabPropsSchedulerTimingModal.vue @@ -154,6 +154,7 @@ export default { localOptions: Object, workspace: Object }, + emits: ['hide', 'options-update'], data () { return { optionsProxy: {}, diff --git a/src/renderer/components/WorkspaceTabPropsTableContext.vue b/src/renderer/components/WorkspaceTabPropsTableContext.vue index feebd394..96693394 100644 --- a/src/renderer/components/WorkspaceTabPropsTableContext.vue +++ b/src/renderer/components/WorkspaceTabPropsTableContext.vue @@ -56,6 +56,7 @@ export default { indexTypes: Array, selectedField: Object }, + emits: ['close-context', 'duplicate-selected', 'delete-selected', 'add-new-index', 'add-to-index'], computed: { hasPrimary () { return this.indexes.some(index => index.type === 'PRIMARY'); diff --git a/src/renderer/components/WorkspaceTabPropsTableFields.vue b/src/renderer/components/WorkspaceTabPropsTableFields.vue index faa4de04..d888b86d 100644 --- a/src/renderer/components/WorkspaceTabPropsTableFields.vue +++ b/src/renderer/components/WorkspaceTabPropsTableFields.vue @@ -148,6 +148,7 @@ export default { schema: String, mode: String }, + emits: ['add-new-index', 'add-to-index', 'rename-field', 'duplicate-field', 'remove-field'], data () { return { resultsSize: 1000, diff --git a/src/renderer/components/WorkspaceTabPropsTableForeignModal.vue b/src/renderer/components/WorkspaceTabPropsTableForeignModal.vue index 7abc163c..d88a1fc8 100644 --- a/src/renderer/components/WorkspaceTabPropsTableForeignModal.vue +++ b/src/renderer/components/WorkspaceTabPropsTableForeignModal.vue @@ -221,6 +221,7 @@ export default { fields: Array, workspace: Object }, + emits: ['foreigns-update', 'hide'], data () { return { foreignProxy: [], diff --git a/src/renderer/components/WorkspaceTabPropsTableIndexesModal.vue b/src/renderer/components/WorkspaceTabPropsTableIndexesModal.vue index b648d715..ee2bba71 100644 --- a/src/renderer/components/WorkspaceTabPropsTableIndexesModal.vue +++ b/src/renderer/components/WorkspaceTabPropsTableIndexesModal.vue @@ -153,6 +153,7 @@ export default { workspace: Object, indexTypes: Array }, + emits: ['hide', 'indexes-update'], data () { return { indexesProxy: [], diff --git a/src/renderer/components/WorkspaceTabPropsTableRow.vue b/src/renderer/components/WorkspaceTabPropsTableRow.vue index 0cb10856..3b9bc10d 100644 --- a/src/renderer/components/WorkspaceTabPropsTableRow.vue +++ b/src/renderer/components/WorkspaceTabPropsTableRow.vue @@ -358,6 +358,7 @@ export default { foreigns: Array, customizations: Object }, + emits: ['contextmenu', 'rename-field'], data () { return { localRow: {}, diff --git a/src/renderer/components/WorkspaceTabQueryTable.vue b/src/renderer/components/WorkspaceTabQueryTable.vue index 82a9edd5..269d956a 100644 --- a/src/renderer/components/WorkspaceTabQueryTable.vue +++ b/src/renderer/components/WorkspaceTabQueryTable.vue @@ -132,6 +132,7 @@ export default { isSelected: Boolean, elementType: { type: String, default: 'table' } }, + emits: ['update-field', 'delete-selected', 'hard-sort'], data () { return { resultsSize: 0, diff --git a/src/renderer/components/WorkspaceTabQueryTableContext.vue b/src/renderer/components/WorkspaceTabQueryTableContext.vue index f8d20a56..d52ab5d0 100644 --- a/src/renderer/components/WorkspaceTabQueryTableContext.vue +++ b/src/renderer/components/WorkspaceTabQueryTableContext.vue @@ -61,6 +61,7 @@ export default { selectedRows: Array, selectedCell: Object }, + emits: ['show-delete-modal', 'close-context', 'set-null', 'copy-cell', 'copy-row'], methods: { showConfirmModal () { this.$emit('show-delete-modal'); diff --git a/src/renderer/components/WorkspaceTabQueryTableRow.vue b/src/renderer/components/WorkspaceTabQueryTableRow.vue index 2bb9be3c..d40686d9 100644 --- a/src/renderer/components/WorkspaceTabQueryTableRow.vue +++ b/src/renderer/components/WorkspaceTabQueryTableRow.vue @@ -243,6 +243,7 @@ export default { itemHeight: Number, elementType: { type: String, default: 'table' } }, + emits: ['update-field', 'select-row', 'contextmenu'], data () { return { isInlineEditor: {}, diff --git a/src/renderer/components/WorkspaceTabTableFilters.vue b/src/renderer/components/WorkspaceTabTableFilters.vue index 8ba632f8..93c92f48 100644 --- a/src/renderer/components/WorkspaceTabTableFilters.vue +++ b/src/renderer/components/WorkspaceTabTableFilters.vue @@ -79,6 +79,7 @@ export default { fields: Array, connClient: String }, + emits: ['filter-change', 'filter'], data () { return { rows: [],