chore(release): 0.5.17

.github/workflows/create-artifact-macos.yml

@@ -0,0 +1,31 @@
+name: Create artifact [MAC]
+
+on: 
+  workflow_dispatch: {}
+
+jobs:
+  build:
+    runs-on: macos-latest
+    steps:
+      - name: Check out Git repository
+        uses: actions/checkout@v3
+
+      - name: Install Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+
+      - name: npm install & build
+        run: |
+          npm install
+          npm run build
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: macos-build
+          retention-days: 3
+          path: |
+            build
+            !build/*-unpacked
+            !build/.icon-ico

.vscode/settings.json

@@ -7,7 +7,8 @@
       "SQLite",
       "Windows",
       "translation",
-      "Linux"
+      "Linux",
+      "MacOS"
    ],
    "svg.preview.background": "transparent"
 }

CHANGELOG.md

@@ -2,6 +2,22 @@
 
 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.17](https://github.com/antares-sql/antares/compare/v0.5.16...v0.5.17) (2022-09-22)
+
+
+### Features
+
+* added more editor font sizes, closes [#440](https://github.com/antares-sql/antares/issues/440) ([d114f8a](https://github.com/antares-sql/antares/commit/d114f8a65164f702b23175095e6fc2b021e0e038))
+
+
+### Bug Fixes
+
+* "run or reload" shortcut triggers on all connections open ([01f607c](https://github.com/antares-sql/antares/commit/01f607cd40c18ab0f9761b2a05705a966aaae43a))
+* cant run procedures with parameters from leftbar ([efe134a](https://github.com/antares-sql/antares/commit/efe134a059700ca87333dc6e66166d6ec8d289e8))
+* editor font size doesn't change on new tabs, fixes [#442](https://github.com/antares-sql/antares/issues/442) ([84168d1](https://github.com/antares-sql/antares/commit/84168d1d75460acc2c844bfece7d85f0c977e74c))
+* empty definer when editing a view, fixes [#437](https://github.com/antares-sql/antares/issues/437) ([498a9b4](https://github.com/antares-sql/antares/commit/498a9b48e25ee061960f5f649c953cdaf6ff1a58))
+* **MacOS:** empty options on macos menubar ([a142d3c](https://github.com/antares-sql/antares/commit/a142d3c4d77e31375dfbea148eec54ce1f635192))
+
 ### [0.5.16](https://github.com/antares-sql/antares/compare/v0.5.15...v0.5.16) (2022-08-26)
 
 

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "antares",
-  "version": "0.5.16",
+  "version": "0.5.17",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "antares",
-      "version": "0.5.16",
+      "version": "0.5.17",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "antares",
   "productName": "Antares",
-  "version": "0.5.16",
+  "version": "0.5.17",
   "description": "A modern, fast and productivity driven SQL client with a focus in UX.",
   "license": "MIT",
   "repository": "https://github.com/antares-sql/antares.git",

src/main/libs/ShortcutRegister.ts

@@ -76,6 +76,7 @@ export class ShortcutRegister {
                try {
                   this._menu.append(new MenuItem({
                      label: 'Shortcuts',
+                     visible: false,
                      submenu: [{
                         label: String(key),
                         accelerator: key,

src/main/libs/clients/MySQLClient.ts

@@ -940,7 +940,7 @@ export class MySQLClient extends AntaresCore {
 
       return {
          algorithm: algorithm[0]['Create View'].match(/(?<=CREATE ALGORITHM=).*?(?=\s)/gs)[0],
-         definer: viewInfo[0].DEFINER,
+         definer: viewInfo[0].DEFINER.split('@').map((str: string) => `\`${str}\``).join('@'),
          security: viewInfo[0].SECURITY_TYPE,
          updateOption: viewInfo[0].CHECK_OPTION === 'NONE' ? '' : viewInfo[0].CHECK_OPTION,
          sql: viewInfo[0].VIEW_DEFINITION,
@@ -1588,7 +1588,8 @@ export class MySQLClient extends AntaresCore {
          let timeStop: Date;
          let keysArr: antares.QueryForeign[] = [];
 
-         const { rows, report, fields, keys, duration } = await new Promise((resolve, reject) => {
+         // eslint-disable-next-line @typescript-eslint/no-explicit-any
+         const { rows, report, fields, keys, duration }: any = await new Promise((resolve, reject) => {
             connection.query({ sql: query, nestTables }).then(async ([response, fields]) => {
                timeStop = new Date();
                const queryResult = response;

src/main/libs/clients/PostgreSQLClient.ts

@@ -1426,7 +1426,8 @@ export class PostgreSQLClient extends AntaresCore {
          let timeStop: Date;
          let keysArr: antares.QueryForeign[] = [];
 
-         const { rows, report, fields, keys, duration } = await new Promise((resolve, reject) => {
+         // eslint-disable-next-line @typescript-eslint/no-explicit-any
+         const { rows, report, fields, keys, duration }: any = await new Promise((resolve, reject) => {
             (async () => {
                try {
                   const res = await connection.query({ rowMode: args.nest ? 'array' : null, text: query });

src/main/libs/clients/SQLiteClient.ts

@@ -628,7 +628,8 @@ export class SQLiteClient extends AntaresCore {
          let timeStop;
          const keysArr: antares.QueryForeign[] = [];
 
-         const { rows, report, fields, keys, duration } = await new Promise((resolve, reject) => {
+         // eslint-disable-next-line @typescript-eslint/no-explicit-any
+         const { rows, report, fields, keys, duration }: any = await new Promise((resolve, reject) => {
             (async () => {
                let queryRunResult: sqlite.RunResult;
                // eslint-disable-next-line @typescript-eslint/no-explicit-any

src/renderer/components/BaseTextEditor.vue

@@ -51,14 +51,17 @@ watch(editorTheme, () => {
 
 watch(editorFontSize, () => {
    const sizes = {
-      small: 12,
-      medium: 14,
-      large: 16
+      xsmall: '10px',
+      small: '12px',
+      medium: '14px',
+      large: '16px',
+      xlarge: '18px',
+      xxlarge: '20px'
    };
 
    if (editor) {
       editor.setOptions({
-         fontSize: sizes[editorFontSize.value as undefined as 'small' | 'medium' | 'large']
+         fontSize: sizes[editorFontSize.value]
       });
    }
 });

src/renderer/components/ModalSettings.vue

@@ -239,7 +239,7 @@
                            <div class="column col-12 h6 text-uppercase mb-2 mt-4">
                               {{ t('message.editorTheme') }}
                            </div>
-                           <div class="column col-6 h5 mb-4">
+                           <div class="column col-5 h5 mb-4">
                               <BaseSelect
                                  v-model="localEditorTheme"
                                  class="form-select"
@@ -251,28 +251,49 @@
                                  @change="changeEditorTheme(localEditorTheme)"
                               />
                            </div>
-                           <div class="column col-6 mb-4">
+                           <div class="column col-7 mb-4">
                               <div class="btn-group btn-group-block">
+                                 <button
+                                    class="btn btn-dark cut-text"
+                                    :class="{'active': editorFontSize === 'xsmall'}"
+                                    @click="changeEditorFontSize('xsmall')"
+                                 >
+                                    10px
+                                 </button>
                                  <button
                                     class="btn btn-dark cut-text"
                                     :class="{'active': editorFontSize === 'small'}"
                                     @click="changeEditorFontSize('small')"
                                  >
-                                    {{ t('word.small') }}
+                                    12px
                                  </button>
                                  <button
                                     class="btn btn-dark cut-text"
                                     :class="{'active': editorFontSize === 'medium'}"
                                     @click="changeEditorFontSize('medium')"
                                  >
-                                    {{ t('word.medium') }}
+                                    14px
                                  </button>
                                  <button
                                     class="btn btn-dark cut-text"
                                     :class="{'active': editorFontSize === 'large'}"
                                     @click="changeEditorFontSize('large')"
                                  >
-                                    {{ t('word.large') }}
+                                    16px
+                                 </button>
+                                 <button
+                                    class="btn btn-dark cut-text"
+                                    :class="{'active': editorFontSize === 'xlarge'}"
+                                    @click="changeEditorFontSize('xlarge')"
+                                 >
+                                    18px
+                                 </button>
+                                 <button
+                                    class="btn btn-dark cut-text"
+                                    :class="{'active': editorFontSize === 'xxlarge'}"
+                                    @click="changeEditorFontSize('xxlarge')"
+                                 >
+                                    20px
                                  </button>
                               </div>
                            </div>

src/renderer/components/QueryEditor.vue

@@ -34,6 +34,15 @@ const {
    lineWrap
 } = storeToRefs(settingsStore);
 
+const sizes = {
+   xsmall: '10px',
+   small: '12px',
+   medium: '14px',
+   large: '16px',
+   xlarge: '18px',
+   xxlarge: '20px'
+};
+
 const props = defineProps({
    modelValue: String,
    workspace: Object as Prop<Workspace>,
@@ -240,12 +249,6 @@ watch(editorTheme, () => {
 });
 
 watch(editorFontSize, () => {
-   const sizes = {
-      small: '12px',
-      medium: '14px',
-      large: '16px'
-   };
-
    if (editor.value) {
       editor.value.setOptions({
          fontSize: sizes[editorFontSize.value]
@@ -305,7 +308,8 @@ onMounted(() => {
       enableBasicAutocompletion: true,
       wrap: lineWrap.value,
       enableSnippets: true,
-      enableLiveAutocompletion: autoComplete.value
+      enableLiveAutocompletion: autoComplete.value,
+      fontSize: sizes[editorFontSize.value]
    });
 
    if (!baseCompleter.value.length)

src/renderer/components/Workspace.vue

@@ -326,7 +326,7 @@
                v-if="tab.type ==='query'"
                :tab-uid="tab.uid"
                :tab="tab"
-               :is-selected="selectedTab === tab.uid"
+               :is-selected="selectedTab === tab.uid && isSelected"
                :connection="connection"
             />
             <WorkspaceTabTable
@@ -334,7 +334,7 @@
                v-once
                :tab-uid="tab.uid"
                :connection="connection"
-               :is-selected="selectedTab === tab.uid"
+               :is-selected="selectedTab === tab.uid && isSelected"
                :table="tab.elementName"
                :schema="tab.schema"
                :element-type="tab.elementType"
@@ -344,14 +344,14 @@
                :tab-uid="tab.uid"
                :tab="tab"
                :connection="connection"
-               :is-selected="selectedTab === tab.uid"
+               :is-selected="selectedTab === tab.uid && isSelected"
                :schema="tab.schema"
             />
             <WorkspaceTabPropsTable
                v-else-if="tab.type === 'table-props'"
                :tab-uid="tab.uid"
                :connection="connection"
-               :is-selected="selectedTab === tab.uid"
+               :is-selected="selectedTab === tab.uid && isSelected"
                :table="tab.elementName"
                :schema="tab.schema"
             />
@@ -360,13 +360,13 @@
                :tab-uid="tab.uid"
                :tab="tab"
                :connection="connection"
-               :is-selected="selectedTab === tab.uid"
+               :is-selected="selectedTab === tab.uid && isSelected"
                :schema="tab.schema"
             />
             <WorkspaceTabPropsView
                v-else-if="tab.type === 'view-props'"
                :tab-uid="tab.uid"
-               :is-selected="selectedTab === tab.uid"
+               :is-selected="selectedTab === tab.uid && isSelected"
                :connection="connection"
                :view="tab.elementName"
                :schema="tab.schema"
@@ -376,7 +376,7 @@
                :tab-uid="tab.uid"
                :tab="tab"
                :connection="connection"
-               :is-selected="selectedTab === tab.uid"
+               :is-selected="selectedTab === tab.uid && isSelected"
                :trigger="tab.elementName"
                :schema="tab.schema"
             />
@@ -384,7 +384,7 @@
                v-else-if="['temp-trigger-props', 'trigger-props'].includes(tab.type)"
                :tab-uid="tab.uid"
                :connection="connection"
-               :is-selected="selectedTab === tab.uid"
+               :is-selected="selectedTab === tab.uid && isSelected"
                :trigger="tab.elementName"
                :schema="tab.schema"
             />
@@ -393,7 +393,7 @@
                :tab-uid="tab.uid"
                :tab="tab"
                :connection="connection"
-               :is-selected="selectedTab === tab.uid"
+               :is-selected="selectedTab === tab.uid && isSelected"
                :trigger="tab.elementName"
                :schema="tab.schema"
             />
@@ -401,7 +401,7 @@
                v-else-if="['temp-trigger-function-props', 'trigger-function-props'].includes(tab.type)"
                :tab-uid="tab.uid"
                :connection="connection"
-               :is-selected="selectedTab === tab.uid"
+               :is-selected="selectedTab === tab.uid && isSelected"
                :function="tab.elementName"
                :schema="tab.schema"
             />
@@ -410,7 +410,7 @@
                :tab-uid="tab.uid"
                :tab="tab"
                :connection="connection"
-               :is-selected="selectedTab === tab.uid"
+               :is-selected="selectedTab === tab.uid && isSelected"
                :trigger="tab.elementName"
                :schema="tab.schema"
             />
@@ -418,7 +418,7 @@
                v-else-if="['temp-routine-props', 'routine-props'].includes(tab.type)"
                :tab-uid="tab.uid"
                :connection="connection"
-               :is-selected="selectedTab === tab.uid"
+               :is-selected="selectedTab === tab.uid && isSelected"
                :routine="tab.elementName"
                :schema="tab.schema"
             />
@@ -427,7 +427,7 @@
                :tab-uid="tab.uid"
                :tab="tab"
                :connection="connection"
-               :is-selected="selectedTab === tab.uid"
+               :is-selected="selectedTab === tab.uid && isSelected"
                :trigger="tab.elementName"
                :schema="tab.schema"
             />
@@ -435,7 +435,7 @@
                v-else-if="['temp-function-props', 'function-props'].includes(tab.type)"
                :tab-uid="tab.uid"
                :connection="connection"
-               :is-selected="selectedTab === tab.uid"
+               :is-selected="selectedTab === tab.uid && isSelected"
                :function="tab.elementName"
                :schema="tab.schema"
             />
@@ -444,7 +444,7 @@
                :tab-uid="tab.uid"
                :tab="tab"
                :connection="connection"
-               :is-selected="selectedTab === tab.uid"
+               :is-selected="selectedTab === tab.uid && isSelected"
                :trigger="tab.elementName"
                :schema="tab.schema"
             />
@@ -452,7 +452,7 @@
                v-else-if="['temp-scheduler-props', 'scheduler-props'].includes(tab.type)"
                :tab-uid="tab.uid"
                :connection="connection"
-               :is-selected="selectedTab === tab.uid"
+               :is-selected="selectedTab === tab.uid && isSelected"
                :scheduler="tab.elementName"
                :schema="tab.schema"
             />

src/renderer/components/WorkspaceExploreBarMiscContext.vue

@@ -217,7 +217,7 @@ const runElementCheck = () => {
 };
 
 const runElement = (params: string[]) => {
-   if (props.selectedMisc.type === 'procedure')
+   if (['procedure', 'routine'].includes(props.selectedMisc.type))
       runRoutine(params);
    else if (props.selectedMisc.type === 'function')
       runFunction(params);

src/renderer/stores/settings.ts

@@ -10,7 +10,7 @@ const isDarkTheme = window.matchMedia('(prefers-color-scheme: dark)');
 const defaultAppTheme = isDarkTheme.matches ? 'dark' : 'light';
 const defaultEditorTheme = isDarkTheme.matches ? 'twilight' : 'sqlserver';
 
-export type EditorFontSize = 'small' | 'medium' | 'large';
+export type EditorFontSize = 'xsmall' | 'small' | 'medium' | 'large' | 'xlarge' | 'xxlarge';
 export type ApplicationTheme = 'light' | 'dark';
 
 export const useSettingsStore = defineStore('settings', {