From c7417809f4036f7800f7d731f4fb9717587447ef Mon Sep 17 00:00:00 2001 From: Fabio Di Stasio Date: Sat, 7 May 2022 16:13:22 +0200 Subject: [PATCH 01/13] refactor: minor improvement in changelog parsing --- src/renderer/components/ModalSettingsChangelog.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/renderer/components/ModalSettingsChangelog.vue b/src/renderer/components/ModalSettingsChangelog.vue index 2a60c0ad..02dcebfe 100644 --- a/src/renderer/components/ModalSettingsChangelog.vue +++ b/src/renderer/components/ModalSettingsChangelog.vue @@ -42,12 +42,16 @@ export default { methods: { async getChangelog () { try { - const apiRes = await fetch(`https://api.github.com/repos/Fabio286/antares/releases/tags/v${this.appVersion}`, { + const apiRes = await fetch(`https://api.github.com/repos/antares-sql/antares/releases/tags/v${this.appVersion}`, { method: 'GET' }); const { body } = await apiRes.json(); - const markdown = body.substr(0, body.indexOf('### Download')); + const cutOffset = body.indexOf('### Download'); + const markdown = cutOffset >= 0 + ? body.substr(0, cutOffset) + : body; + const renderer = { link (href, title, text) { return text; From da6481f458f731a504bd5e9d5a5a5a99d2415f3e Mon Sep 17 00:00:00 2001 From: Fabio Di Stasio Date: Sat, 7 May 2022 22:50:11 +0200 Subject: [PATCH 02/13] build: fix compilation issues --- package.json | 150 ++++++++++++++++++------------------- webpack.renderer.config.js | 2 +- 2 files changed, 76 insertions(+), 76 deletions(-) diff --git a/package.json b/package.json index 34f7468c..3059bd86 100644 --- a/package.json +++ b/package.json @@ -109,83 +109,83 @@ } }, "dependencies": { - "@electron/remote": "^2.0.1", - "@faker-js/faker": "^6.1.2", - "@mdi/font": "^6.1.95", - "@turf/helpers": "^6.5.0", - "@vscode/vscode-languagedetection": "^1.0.21", - "ace-builds": "^1.4.13", - "better-sqlite3": "^7.5.0", - "electron-log": "^4.4.1", - "electron-store": "^8.0.1", - "electron-updater": "^5.0.1", - "electron-window-state": "^5.0.3", - "encoding": "^0.1.13", - "leaflet": "^1.7.1", - "marked": "^4.0.0", - "moment": "^2.29.1", - "mysql2": "^2.3.2", - "pg": "^8.7.1", - "pg-query-stream": "^4.2.3", - "pgsql-ast-parser": "^7.2.1", - "pinia": "^2.0.13", - "source-map-support": "^0.5.20", - "spectre.css": "^0.5.9", - "sql-formatter": "^4.0.2", - "ssh2-promise": "^1.0.2", - "v-mask": "^2.3.0", - "vue": "^3.2.33", - "vue-i18n": "^9.1.9", - "vuedraggable": "^4.1.0" + "@electron/remote": "~2.0.1", + "@faker-js/faker": "~6.1.2", + "@mdi/font": "~6.1.95", + "@turf/helpers": "~6.5.0", + "@vscode/vscode-languagedetection": "~1.0.21", + "ace-builds": "~1.4.13", + "better-sqlite3": "~7.5.0", + "electron-log": "~4.4.1", + "electron-store": "~8.0.1", + "electron-updater": "~5.0.1", + "electron-window-state": "~5.0.3", + "encoding": "~0.1.13", + "leaflet": "~1.7.1", + "marked": "~4.0.0", + "moment": "~2.29.1", + "mysql2": "~2.3.2", + "pg": "~8.7.1", + "pg-query-stream": "~4.2.3", + "pgsql-ast-parser": "~7.2.1", + "pinia": "~2.0.13", + "source-map-support": "~0.5.20", + "spectre.css": "~0.5.9", + "sql-formatter": "~4.0.2", + "ssh2-promise": "~1.0.2", + "v-mask": "~2.3.0", + "vue": "~3.2.33", + "vue-i18n": "~9.1.9", + "vuedraggable": "~4.1.0" }, "devDependencies": { - "@babel/eslint-parser": "^7.15.7", - "@babel/preset-env": "^7.15.8", - "@babel/preset-typescript": "^7.16.7", - "@playwright/test": "^1.21.1", - "@types/better-sqlite3": "^7.5.0", - "@types/node": "^17.0.23", - "@types/pg": "^8.6.5", - "@typescript-eslint/eslint-plugin": "^5.18.0", - "@typescript-eslint/parser": "^5.18.0", - "@vue/compiler-sfc": "^3.2.33", - "all-contributors-cli": "^6.20.0", - "babel-loader": "^8.2.3", - "chalk": "^4.1.2", - "cross-env": "^7.0.2", - "css-loader": "^6.5.0", - "electron": "^17.0.1", - "electron-builder": "^23.0.3", - "eslint": "^7.32.0", - "eslint-config-standard": "^16.0.3", - "eslint-plugin-import": "^2.24.2", - "eslint-plugin-node": "^11.1.0", - "eslint-plugin-promise": "^5.2.0", - "eslint-plugin-vue": "^8.0.3", - "file-loader": "^6.2.0", - "html-webpack-plugin": "^5.5.0", + "@babel/eslint-parser": "~7.15.7", + "@babel/preset-env": "~7.15.8", + "@babel/preset-typescript": "~7.16.7", + "@playwright/test": "~1.21.1", + "@types/better-sqlite3": "~7.5.0", + "@types/node": "~17.0.23", + "@types/pg": "~8.6.5", + "@typescript-eslint/eslint-plugin": "~5.18.0", + "@typescript-eslint/parser": "~5.18.0", + "@vue/compiler-sfc": "~3.2.33", + "all-contributors-cli": "~6.20.0", + "babel-loader": "~8.2.3", + "chalk": "~4.1.2", + "cross-env": "~7.0.2", + "css-loader": "~6.5.0", + "electron": "~17.4.3", + "electron-builder": "~23.0.3", + "eslint": "~7.32.0", + "eslint-config-standard": "~16.0.3", + "eslint-plugin-import": "~2.24.2", + "eslint-plugin-node": "~11.1.0", + "eslint-plugin-promise": "~5.2.0", + "eslint-plugin-vue": "~8.0.3", + "file-loader": "~6.2.0", + "html-webpack-plugin": "~5.5.0", "mini-css-extract-plugin": "~2.4.5", - "node-loader": "^2.0.0", - "playwright": "^1.21.1", - "playwright-core": "^1.21.1", - "progress-webpack-plugin": "^1.0.12", - "rimraf": "^3.0.2", - "sass": "^1.42.1", - "sass-loader": "^12.3.0", - "standard-version": "^9.3.1", - "style-loader": "^3.3.1", - "stylelint": "^13.13.1", - "stylelint-config-standard": "^22.0.0", - "stylelint-scss": "^3.21.0", - "tree-kill": "^1.2.2", - "ts-loader": "^9.2.8", - "typescript": "^4.6.3", - "unzip-crx-3": "^0.2.0", - "vue-eslint-parser": "^8.3.0", - "vue-loader": "^16.8.3", - "webpack": "^5.60.0", - "webpack-cli": "^4.9.1", - "webpack-dev-server": "^4.4.0", - "xvfb-maybe": "^0.2.1" + "node-loader": "~2.0.0", + "playwright": "~1.21.1", + "playwright-core": "~1.21.1", + "progress-webpack-plugin": "~1.0.12", + "rimraf": "~3.0.2", + "sass": "~1.42.1", + "sass-loader": "~12.3.0", + "standard-version": "~9.3.1", + "style-loader": "~3.3.1", + "stylelint": "~13.13.1", + "stylelint-config-standard": "~22.0.0", + "stylelint-scss": "~3.21.0", + "tree-kill": "~1.2.2", + "ts-loader": "~9.2.8", + "typescript": "~4.6.3", + "unzip-crx-3": "~0.2.0", + "vue-eslint-parser": "~8.3.0", + "vue-loader": "~16.8.3", + "webpack": "~5.60.0", + "webpack-cli": "~4.9.1", + "webpack-dev-server": "~4.4.0", + "xvfb-maybe": "~0.2.1" } } diff --git a/webpack.renderer.config.js b/webpack.renderer.config.js index 59133f18..f300182d 100644 --- a/webpack.renderer.config.js +++ b/webpack.renderer.config.js @@ -14,7 +14,7 @@ const parsedContributors = contributors.reduce((acc, c) => { }, []).join(','); const isDevMode = process.env.NODE_ENV !== 'production'; -const whiteListedModules = ['.bin', 'vue', '@vue', 'pinia', 'vue-i18n']; +const whiteListedModules = ['.bin']; const externals = {}; fs.readdirSync('node_modules') From fd5dca2450b498903c7fd4ba0f1f5d4dcbab1d13 Mon Sep 17 00:00:00 2001 From: Fabio Di Stasio Date: Sat, 7 May 2022 23:20:31 +0200 Subject: [PATCH 03/13] ci: e2e tests on separate github action --- .github/workflows/build-linux.yml | 3 --- .github/workflows/build-mac.yml | 3 --- .github/workflows/build-win.yml | 3 --- .github/workflows/test-e2e-linux.yml | 26 ++++++++++++++++++++++++++ package.json | 4 ++-- 5 files changed, 28 insertions(+), 11 deletions(-) create mode 100644 .github/workflows/test-e2e-linux.yml diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index edb77ac1..aac24863 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -21,9 +21,6 @@ jobs: - name: Install dependencies run: npm i - - - name: Run tests - run: npm run test - name: Build/release Electron app uses: samuelmeuli/action-electron-builder@v1 diff --git a/.github/workflows/build-mac.yml b/.github/workflows/build-mac.yml index 9981e0a8..8c79ef4c 100644 --- a/.github/workflows/build-mac.yml +++ b/.github/workflows/build-mac.yml @@ -22,9 +22,6 @@ jobs: - name: Install dependencies run: npm i - - name: Run tests - run: npm run test - - name: Build/release Electron app uses: samuelmeuli/action-electron-builder@v1 with: diff --git a/.github/workflows/build-win.yml b/.github/workflows/build-win.yml index 2f3a9ac9..4f6ccdab 100644 --- a/.github/workflows/build-win.yml +++ b/.github/workflows/build-win.yml @@ -22,9 +22,6 @@ jobs: - name: Install dependencies run: npm i - - name: Run tests - run: npm run test - - name: Build/release Electron app uses: samuelmeuli/action-electron-builder@v1 with: diff --git a/.github/workflows/test-e2e-linux.yml b/.github/workflows/test-e2e-linux.yml new file mode 100644 index 00000000..407fc365 --- /dev/null +++ b/.github/workflows/test-e2e-linux.yml @@ -0,0 +1,26 @@ +name: Test end-to-end [linux] + +on: push + +jobs: + release: + runs-on: ${{ matrix.os }} + + strategy: + matrix: + os: [ubuntu-latest] + + steps: + - name: Check out Git repository + uses: actions/checkout@v2 + + - name: Install Node.js, NPM and Yarn + uses: actions/setup-node@v1 + with: + node-version: 14 + + - name: Install dependencies + run: npm i + + - name: Run tests + run: npm run test:e2e diff --git a/package.json b/package.json index 3059bd86..63f7d284 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,8 @@ "release:pre": "npm run release -- --prerelease alpha", "devtools:install": "node scripts/devtoolsInstaller", "postinstall": "electron-builder install-app-deps && npm run devtools:install", - "test": "npm run compile && npm run test:dry", - "test:dry": "xvfb-maybe -- playwright test", + "test:e2e": "npm run compile && npm run test:e2e-dry", + "test:e2e-dry": "xvfb-maybe -- playwright test", "lint": "eslint . --ext .js,.vue && stylelint \"./src/**/*.{css,scss,sass,vue}\"", "lint:fix": "eslint . --ext .js,.vue --fix && stylelint \"./src/**/*.{css,scss,sass,vue}\" --fix", "contributors:add": "all-contributors add", From 2a7433da164e4d1ec58bf80be2bf39d7953906d2 Mon Sep 17 00:00:00 2001 From: Fabio Di Stasio Date: Sun, 8 May 2022 00:12:23 +0200 Subject: [PATCH 04/13] refactor: removed pinia ipc plugins --- src/renderer/index.js | 57 +++++++++++++++++++- src/renderer/stores/index.js | 13 ----- src/renderer/stores/plugins/ipcExceptions.js | 7 --- src/renderer/stores/plugins/ipcShortcuts.js | 12 ----- src/renderer/stores/plugins/ipcUpdates.js | 36 ------------- 5 files changed, 55 insertions(+), 70 deletions(-) delete mode 100644 src/renderer/stores/index.js delete mode 100644 src/renderer/stores/plugins/ipcExceptions.js delete mode 100644 src/renderer/stores/plugins/ipcShortcuts.js delete mode 100644 src/renderer/stores/plugins/ipcUpdates.js diff --git a/src/renderer/index.js b/src/renderer/index.js index 6d5539ad..cb67257c 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -1,13 +1,17 @@ 'use strict'; +import { ipcRenderer } from 'electron'; import { createApp } from 'vue'; +import { createPinia } from 'pinia'; import '@mdi/font/css/materialdesignicons.css'; import 'leaflet/dist/leaflet.css'; import '@/scss/main.scss'; import { VueMaskDirective } from 'v-mask'; + +import { useApplicationStore } from '@/stores/application'; import { useSettingsStore } from '@/stores/settings'; +import { useNotificationsStore } from '@/stores/notifications'; import App from '@/App.vue'; -import { pinia } from '@/stores'; import i18n from '@/i18n'; // https://github.com/probil/v-mask/issues/498#issuecomment-827027834 @@ -20,9 +24,58 @@ const vMaskV3 = { createApp(App) .directive('mask', vMaskV3) - .use(pinia) + .use(createPinia()) .use(i18n) .mount('#app'); const { locale } = useSettingsStore(); i18n.global.locale = locale; + +// IPC exceptions +ipcRenderer.on('unhandled-exception', (event, error) => { + useNotificationsStore().addNotification({ status: 'error', message: error.message }); +}); + +// IPC app updates +ipcRenderer.on('checking-for-update', () => { + useApplicationStore().updateStatus = 'checking'; +}); + +ipcRenderer.on('update-available', () => { + useApplicationStore().updateStatus = 'available'; +}); + +ipcRenderer.on('update-not-available', () => { + useApplicationStore().updateStatus = 'noupdate'; +}); + +ipcRenderer.on('check-failed', () => { + useApplicationStore().updateStatus = 'nocheck'; +}); + +ipcRenderer.on('no-auto-update', () => { + useApplicationStore().updateStatus = 'disabled'; +}); + +ipcRenderer.on('download-progress', (event, data) => { + useApplicationStore().updateStatus = 'downloading'; + useApplicationStore().downloadprogress = data.percent; +}); + +ipcRenderer.on('update-downloaded', () => { + useApplicationStore().updateStatus = 'downloaded'; +}); + +ipcRenderer.on('link-to-download', () => { + useApplicationStore().updateStatus = 'link'; +}); + +// IPC shortcuts +ipcRenderer.on('toggle-preferences', () => { + useApplicationStore().showSettingModal('general'); +}); + +ipcRenderer.on('open-updates-preferences', () => { + useApplicationStore().showSettingModal('update'); + ipcRenderer.send('check-for-updates'); +}); diff --git a/src/renderer/stores/index.js b/src/renderer/stores/index.js deleted file mode 100644 index 27c2d4a9..00000000 --- a/src/renderer/stores/index.js +++ /dev/null @@ -1,13 +0,0 @@ -// @ts-check -import { createPinia } from 'pinia'; -import { ipcUpdates } from './plugins/ipcUpdates'; -import { ipcShortcuts } from './plugins/ipcShortcuts'; -import { ipcExceptions } from './plugins/ipcExceptions'; - -const pinia = createPinia(); -pinia - .use(ipcUpdates) - .use(ipcShortcuts) - .use(ipcExceptions); - -export { pinia }; diff --git a/src/renderer/stores/plugins/ipcExceptions.js b/src/renderer/stores/plugins/ipcExceptions.js deleted file mode 100644 index 45c4fd69..00000000 --- a/src/renderer/stores/plugins/ipcExceptions.js +++ /dev/null @@ -1,7 +0,0 @@ -import { ipcRenderer } from 'electron'; - -export function ipcExceptions ({ store }) { - ipcRenderer.on('unhandled-exception', (event, error) => { - store.notifications.addNotification({ status: 'error', message: error.message }); - }); -} diff --git a/src/renderer/stores/plugins/ipcShortcuts.js b/src/renderer/stores/plugins/ipcShortcuts.js deleted file mode 100644 index df8526e1..00000000 --- a/src/renderer/stores/plugins/ipcShortcuts.js +++ /dev/null @@ -1,12 +0,0 @@ -import { ipcRenderer } from 'electron'; - -export function ipcShortcuts ({ store }) { - ipcRenderer.on('toggle-preferences', () => { - store.application.showSettingModal('general'); - }); - - ipcRenderer.on('open-updates-preferences', () => { - store.application.showSettingModal('update'); - ipcRenderer.send('check-for-updates'); - }); -} diff --git a/src/renderer/stores/plugins/ipcUpdates.js b/src/renderer/stores/plugins/ipcUpdates.js deleted file mode 100644 index 71a06d62..00000000 --- a/src/renderer/stores/plugins/ipcUpdates.js +++ /dev/null @@ -1,36 +0,0 @@ -import { ipcRenderer } from 'electron'; - -export function ipcUpdates ({ store }) { - ipcRenderer.on('checking-for-update', () => { - store.application.updateStatus = 'checking'; - }); - - ipcRenderer.on('update-available', () => { - store.application.updateStatus = 'available'; - }); - - ipcRenderer.on('update-not-available', () => { - store.application.updateStatus = 'noupdate'; - }); - - ipcRenderer.on('check-failed', () => { - store.application.updateStatus = 'nocheck'; - }); - - ipcRenderer.on('no-auto-update', () => { - store.application.updateStatus = 'disabled'; - }); - - ipcRenderer.on('download-progress', (event, data) => { - store.application.updateStatus = 'downloading'; - store.application.downloadprogress = data.percent; - }); - - ipcRenderer.on('update-downloaded', () => { - store.application.updateStatus = 'downloaded'; - }); - - ipcRenderer.on('link-to-download', () => { - store.application.updateStatus = 'link'; - }); -} From a93e71d7513a62813114edfc87d050b63454a5a3 Mon Sep 17 00:00:00 2001 From: Fabio Di Stasio Date: Sun, 8 May 2022 09:25:59 +0200 Subject: [PATCH 05/13] chore(release): 0.5.3 --- CHANGELOG.md | 31 +++++++++++++++++++++++++++++++ package.json | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cfa0b9c4..476d66bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,37 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [0.5.3](https://github.com/antares-sql/antares/compare/v0.5.2...v0.5.3) (2022-05-08) + + +### Features + +* default open schema if only one present ([0fa22fb](https://github.com/antares-sql/antares/commit/0fa22fbe72fd4e3b2cfff6fc1847347f69fafda6)) + + +### Bug Fixes + +* can not use vue teleport with props as root element ([88eb9f7](https://github.com/antares-sql/antares/commit/88eb9f7ab80c407ec6517206c27cce715c41eb24)) +* importer webpack config ([f82db96](https://github.com/antares-sql/antares/commit/f82db96f34579c5f5f0c025ba82aff13047eb045)) +* importer webpack config ([b4d9821](https://github.com/antares-sql/antares/commit/b4d9821300991bf000846ae38ed18d79564db67b)) +* LIKE operator in table filter not properly working, closes [#242](https://github.com/antares-sql/antares/issues/242) ([eb1afed](https://github.com/antares-sql/antares/commit/eb1afed108d97e2acb7ea5279aabd582014c3c58)) +* locale change ([6af0c33](https://github.com/antares-sql/antares/commit/6af0c33461dfab868bca757e55ae62e6c6094c6c)) +* missing storeToRefs imports ([ff8bb45](https://github.com/antares-sql/antares/commit/ff8bb45d6d19303b2e7701639d22e52e4ae2976c)) +* missing tabs uid ([18b66b5](https://github.com/antares-sql/antares/commit/18b66b50323e69ed9d0090a4cbbe0ada9e10838d)) +* **MySQL:** creating temporary tables on export to overcome view dependency errors ([e4c5d9b](https://github.com/antares-sql/antares/commit/e4c5d9b404c2b20cf113607a80ee928b810e6f05)) +* **MySQL:** support to ANSI_QUOTES mode not working, closes [#243](https://github.com/antares-sql/antares/issues/243) ([9fcc7d1](https://github.com/antares-sql/antares/commit/9fcc7d1cefc3c035a63e843616c3138c772037f1)) +* prevents query tabs targets previous schema if not in explorebar, closes [#236](https://github.com/antares-sql/antares/issues/236) ([5e4abd3](https://github.com/antares-sql/antares/commit/5e4abd3e81d70bcb9b3a897d38d6f8ec3ff0706b)) +* query editor table fields suggestion ([e9dedfa](https://github.com/antares-sql/antares/commit/e9dedfaf3203f5621e54fd707003a47e6e5a5c4d)) +* **SQLite:** tables with sqlite in name not visible, closes [#239](https://github.com/antares-sql/antares/issues/239) ([690cdcb](https://github.com/antares-sql/antares/commit/690cdcb2eb1c7bf514271000c31211d1c0b33e54)) +* unable to add parameters to new routines/functions ([350d536](https://github.com/antares-sql/antares/commit/350d53642e2491fd2dedbbf999579ba9c9bc59a0)) +* unable to disconnect from database ([47e1f27](https://github.com/antares-sql/antares/commit/47e1f27bb83b99288157185ad8b62d190a9e7881)) +* unable to set an empty string as field default ([bfdb463](https://github.com/antares-sql/antares/commit/bfdb463390453a55963af29ef0e7cd3aea26f4cf)) +* undefined uid variable in the setting bar ([3cca3ed](https://github.com/antares-sql/antares/commit/3cca3ed2b31c5763794c52cce34ccba1e848efe2)) +* various warnings and exceptions ([c50cbc5](https://github.com/antares-sql/antares/commit/c50cbc577f667c17ba676960cf2c840d24366c80)) +* verbose devtool loggin with missing sourcemap ([1174bab](https://github.com/antares-sql/antares/commit/1174bab0cc895c4e294804d810b0789166602725)) +* wrong path module importation ([472fa6f](https://github.com/antares-sql/antares/commit/472fa6f4300b7e3fbf8c8079a548ca34d941f5fb)) +* wrong path module importation ([9a0f982](https://github.com/antares-sql/antares/commit/9a0f98272342d201e9bc979d5bc5768cfd20f3fb)) + ### [0.5.2](https://github.com/antares-sql/antares/compare/v0.5.1...v0.5.2) (2022-04-10) diff --git a/package.json b/package.json index 63f7d284..75a582f4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "antares", "productName": "Antares", - "version": "0.5.2", + "version": "0.5.3", "description": "A modern, fast and productivity driven SQL client with a focus in UX.", "license": "MIT", "repository": "https://github.com/antares-sql/antares.git", From e0f85f469fd621df7b1a4ae6d1b2259fca00b465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ng=C3=B4=20Qu=E1=BB=91c=20=C4=90=E1=BA=A1t?= <56961917+datlechin@users.noreply.github.com> Date: Sun, 8 May 2022 19:09:24 +0700 Subject: [PATCH 06/13] Added missing translations for vi-VN --- src/renderer/i18n/vi-VN.js | 43 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/src/renderer/i18n/vi-VN.js b/src/renderer/i18n/vi-VN.js index f1013e95..89df64a3 100644 --- a/src/renderer/i18n/vi-VN.js +++ b/src/renderer/i18n/vi-VN.js @@ -80,6 +80,7 @@ module.exports = { deterministic: 'Xác định', context: 'Context', export: 'Xuất', + import: 'Nhập', returns: 'Returns', timing: 'Thời gian', state: 'Trạng thái', @@ -122,9 +123,23 @@ module.exports = { select: 'Chọn', passphrase: 'Cụm mật khẩu', filter: 'Bộ lọc', + change: 'Thay đổi', + views: 'Xem', + triggers: 'Trình kích hoạt', + routines: 'Routines', + functions: 'Functions', + schedulers: 'Lên lịch', + includes: 'Includes', + drop: 'Drop', + completed: 'Completed', + aborted: 'Aborted', disabled: 'Đã tắt', enable: 'Bật', - disable: 'Tắt' + disable: 'Tắt', + commit: 'Cam kết', + rollback: 'Hoàn nguyên', + connectionString: 'Chuỗi kết nối', + contributors: 'Người đóng góp' }, message: { appWelcome: 'Chào bạn đến với Antares SQL Client!', @@ -250,8 +265,32 @@ module.exports = { searchForQueries: 'Tìm kiếm truy vấn', killProcess: 'Huỷ quá trình', closeTab: 'Đóng tab', + exportSchema: 'Xuất lược đồ', + importSchema: 'Nhập lược đồ', + directoryPath: 'Đường dẫn thu mục', + newInserStmtEvery: 'Câu lệnh INSERT mới mỗi', + processingTableExport: 'Đang tiến hành {table}', + fechingTableExport: 'Đang lấy dữ liệu {table}', + writingTableExport: 'Đang ghi dữ liệu {table}', + checkAllTables: 'Chọn tất cả các bảng', + uncheckAllTables: 'Bỏ chọn tất cả các bảng', goToDownloadPage: 'Tới trang tải về', - readOnlyMode: 'Chế độ chỉ đọc' + readOnlyMode: 'Chế độ chỉ đọc', + killQuery: 'Hủy truy vấn', + insertRow: 'Chèn hàng | Chèn hàng', + commitMode: 'Chế độ cam kết', + autoCommit: 'Cam kết tự động', + manualCommit: 'Cam kết thủ công', + actionSuccessful: '{action} thành công', + importQueryErrors: 'Cảnh báo: {n} lỗi đã xảy ra | Carh báo: {n} lỗi đã xảy ra', + executedQueries: '{n} truy vấn đã chạy | {n} truy vấn đã chạy', + ourputFormat: 'Định dạng đầu ra', + singleFile: 'Một tệp {ext}', + zipCompressedFile: 'Tệp nén zip {ext}', + disableBlur: 'Tắt làm mờ', + untrustedConnection: 'Kết nối không đáng tin cậy', + missingOrIncompleteTranslation: 'Bản dịch thiếu hoặc không đầy đủ?', + findOutHowToContribute: 'Tìm hiểu cách đóng góp' }, faker: { address: 'Địa chỉ', From 58611bf07f343e6899a7446bfcd1247b0c75fc7f Mon Sep 17 00:00:00 2001 From: Fabio Di Stasio Date: Tue, 10 May 2022 14:43:08 +0200 Subject: [PATCH 07/13] fix: file upload input not working --- src/renderer/components/BaseUploadInput.vue | 7 +++---- src/renderer/components/FakerSelect.vue | 2 +- .../components/WorkspaceAddConnectionPanel.vue | 10 +++++----- .../components/WorkspaceEditConnectionPanel.vue | 10 +++++----- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/renderer/components/BaseUploadInput.vue b/src/renderer/components/BaseUploadInput.vue index 5289a603..789f7bc4 100644 --- a/src/renderer/components/BaseUploadInput.vue +++ b/src/renderer/components/BaseUploadInput.vue @@ -23,6 +23,8 @@