Merge branch 'master' into feature/cassandra

.github/workflows/build-app-pro-beta.yaml

@@ -39,7 +39,7 @@ jobs:
           repository: dbgate/dbgate-pro
           token: '${{ secrets.GH_TOKEN }}'
           path: dbgate-pro
-          ref: a2f824dc711b510a5e8235d3faf4aafab1965184
+          ref: ca1a1664e4c45945d7afe9534c43ca6cbb0b06e3
       - name: Merge dbgate/dbgate-pro
         run: |
           mkdir ../dbgate-pro

.github/workflows/build-app-pro.yaml

@@ -39,7 +39,7 @@ jobs:
           repository: dbgate/dbgate-pro
           token: '${{ secrets.GH_TOKEN }}'
           path: dbgate-pro
-          ref: a2f824dc711b510a5e8235d3faf4aafab1965184
+          ref: ca1a1664e4c45945d7afe9534c43ca6cbb0b06e3
       - name: Merge dbgate/dbgate-pro
         run: |
           mkdir ../dbgate-pro

.github/workflows/build-aws-pro.yaml

@@ -36,7 +36,7 @@ jobs:
           repository: dbgate/dbgate-pro
           token: '${{ secrets.GH_TOKEN }}'
           path: dbgate-pro
-          ref: a2f824dc711b510a5e8235d3faf4aafab1965184
+          ref: ca1a1664e4c45945d7afe9534c43ca6cbb0b06e3
       - name: Merge dbgate/dbgate-pro
         run: |
           mkdir ../dbgate-pro

.github/workflows/build-docker-pro.yaml

@@ -44,7 +44,7 @@ jobs:
           repository: dbgate/dbgate-pro
           token: '${{ secrets.GH_TOKEN }}'
           path: dbgate-pro
-          ref: a2f824dc711b510a5e8235d3faf4aafab1965184
+          ref: ca1a1664e4c45945d7afe9534c43ca6cbb0b06e3
       - name: Merge dbgate/dbgate-pro
         run: |
           mkdir ../dbgate-pro

.github/workflows/build-npm-pro.yaml

@@ -32,7 +32,7 @@ jobs:
           repository: dbgate/dbgate-pro
           token: '${{ secrets.GH_TOKEN }}'
           path: dbgate-pro
-          ref: a2f824dc711b510a5e8235d3faf4aafab1965184
+          ref: ca1a1664e4c45945d7afe9534c43ca6cbb0b06e3
       - name: Merge dbgate/dbgate-pro
         run: |
           mkdir ../dbgate-pro

.github/workflows/e2e-pro.yaml

@@ -26,7 +26,7 @@ jobs:
           repository: dbgate/dbgate-pro
           token: '${{ secrets.GH_TOKEN }}'
           path: dbgate-pro
-          ref: a2f824dc711b510a5e8235d3faf4aafab1965184
+          ref: ca1a1664e4c45945d7afe9534c43ca6cbb0b06e3
       - name: Merge dbgate/dbgate-pro
         run: |
           mkdir ../dbgate-pro

e2e-tests/cypress/e2e/browse-data.cy.js

@@ -355,6 +355,8 @@ describe('Data browser data', () => {
     cy.contains('MyChinook').click();
     cy.testid('TabsPanel_buttonNewQuery').click();
     cy.testid('QueryTab_switchAiAssistantButton').click();
+    cy.testid('QueryAiAssistant_allowSendToAiServiceButton').click();
+    cy.testid('ConfirmModal_okButton').click();
     cy.testid('QueryAiAssistant_promptInput').type('album names');
     cy.testid('QueryAiAssistant_queryFromQuestionButton').click();
     cy.contains('Use this').click();

e2e-tests/e2eTestTools.js

@@ -22,6 +22,9 @@ function clearTestingData() {
   if (fs.existsSync(path.join(baseDir, 'connections-e2etests.jsonl'))) {
     fs.unlinkSync(path.join(baseDir, 'connections-e2etests.jsonl'));
   }
+  if (fs.existsSync(path.join(baseDir, 'settings-e2etests.jsonl'))) {
+    fs.unlinkSync(path.join(baseDir, 'settings-e2etests.jsonl'));
+  }
   if (fs.existsSync(path.join(baseDir, 'files-e2etests'))) {
     fs.rmdirSync(path.join(baseDir, 'files-e2etests'), { recursive: true });
   }

packages/api/src/controllers/config.js

@@ -136,7 +136,7 @@ module.exports = {
 
   deleteSettings_meta: true,
   async deleteSettings() {
-    await fs.unlink(path.join(datadir(), 'settings.json'));
+    await fs.unlink(path.join(datadir(), processArgs.runE2eTests ? 'settings-e2etests.json' : 'settings.json'));
     return true;
   },
 
@@ -161,7 +161,10 @@ module.exports = {
 
   async loadSettings() {
     try {
-      const settingsText = await fs.readFile(path.join(datadir(), 'settings.json'), { encoding: 'utf-8' });
+      const settingsText = await fs.readFile(
+        path.join(datadir(), processArgs.runE2eTests ? 'settings-e2etests.json' : 'settings.json'),
+        { encoding: 'utf-8' }
+      );
       return {
         ...this.fillMissingSettings(JSON.parse(settingsText)),
         'other.licenseKey': platformInfo.isElectron ? await this.loadLicenseKey() : undefined,
@@ -247,7 +250,10 @@ module.exports = {
           ...currentValue,
           ..._.omit(values, ['other.licenseKey']),
         };
-        await fs.writeFile(path.join(datadir(), 'settings.json'), JSON.stringify(updated, undefined, 2));
+        await fs.writeFile(
+          path.join(datadir(), processArgs.runE2eTests ? 'settings-e2etests.json' : 'settings.json'),
+          JSON.stringify(updated, undefined, 2)
+        );
         // this.settingsValue = updated;
 
         if (currentValue['other.licenseKey'] != values['other.licenseKey']) {

workflow-templates/includes.tpl.yaml

@@ -7,7 +7,7 @@ checkout-and-merge-pro:
       repository: dbgate/dbgate-pro
       token: ${{ secrets.GH_TOKEN }}
       path: dbgate-pro
-      ref: a2f824dc711b510a5e8235d3faf4aafab1965184
+      ref: ca1a1664e4c45945d7afe9534c43ca6cbb0b06e3
   - name: Merge dbgate/dbgate-pro
     run: |
       mkdir ../dbgate-pro