Merge pull request #156 from EdurtIO/develop

Release notes for 1.16.0

.github/workflows/publish-release-test.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
     branch:
       - 'test'
+    types: [ closed ]
 
 jobs:
   release:

.github/workflows/publish-release.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
     branch:
       - 'master'
+    types: [ closed ]
 
 jobs:
   release:
@@ -79,7 +80,7 @@ jobs:
           asset_path: ./release/latest-mac.yml
           asset_name: latest-mac-inter.yml
           asset_content_type: application/x-yaml
-      
+
       - name: Download and upload to qiniu
         run: |
           wget https://devtools.qiniu.com/qshell-v2.6.2-darwin-amd64.tar.gz
@@ -129,4 +130,4 @@ jobs:
           # echo '--------- End ---------'
           ./qshell account 5eua7TZfgnNb81gmVUBcw4x7PpQuy-v9v1iFyD1R zCwoByIkA9AnlK0qO0DGveH7dKDXLG3CRqZ2mlTW dbm_qiniu
           ./qshell fput edurtio-other dbm/releases/windows/x64/dbm-${{ needs.release.outputs.version }}-windows-x64-nsis-installer.exe ./release/dbm-${{ needs.release.outputs.version }}-windows-x64-nsis-installer.exe
-          
+

docs/docs/development/version/1.16.0-development.md → docs/docs/development/version/1.17.0-development.md

@@ -3,7 +3,7 @@ template: overrides/main.html
 icon: material/gesture-tap-button
 ---
 
-DBM Version for `1.16.0` is development!
+DBM Version for `1.17.0` is development!
 
 !!! danger "Warning"
 

docs/docs/reference/Monitor-Processor.md → docs/docs/reference/monitor/monitor-processor.md

@@ -10,7 +10,7 @@ This document mainly introduces how we use the Processor monitoring function pro
 
 After the mouse moves to the `Monitor` menu, a drop-down box will automatically pop up. Select the `Processor` sub-menu in the drop-down box and click it, and it will jump to the corresponding management page. His snapshot is similar to the following screenshot:
 
-![](https://images.edurt.io/2021/11/02/16358536985404.jpg)
+![](../../assets/images/others/monitor/processor/img.png)
 
 > By default, the selection item after `Server` on the top left is blank, you need to manually select a data source
 
@@ -20,11 +20,11 @@ After the mouse moves to the `Monitor` menu, a drop-down box will automatically
 
 On the right side of the top menu, there will be a `Threshold` (unit/ms) value input window, which is used for our update time interval. When we turn on the `Auto` function on the right, the software will input the value according to `Threshold` Automatically refresh the data.
 
-![](https://images.edurt.io/2021/11/02/16358538862636.jpg)
+![](../../assets/images/others/monitor/processor/img_1.png)
 
 The chart in the middle part is used to mark the total number of processes of the current query of the currently selected server. The chart has a maximum of 20 points by default, and each time point will automatically cover the previous expired data points.
 
-![](https://images.edurt.io/2021/11/02/16358539745671.jpg)
+![](../../assets/images/others/monitor/processor/img_2.png)
 
 The bottom data table is used to render the detailed process of the server's specific query at our current time. It provides the following indicators:
 
@@ -51,9 +51,9 @@ We also provide two operations in the detailed list:
 
 ###### Kill
 
-When our query takes a long time, we can click the <img src="https://images.edurt.io/2021/11/02/16358545339160.jpg" width="40" /> button, and it will A window like the following pops up:
+When our query takes a long time, we can click the :fontawesome-solid-stop:{.red} button, and it will A window like the following pops up:
 
-![](https://images.edurt.io/2021/11/02/16358546469724.jpg)
+![](../../assets/images/others/monitor/processor/img_3.png)
 
 The window gives us two important tips, which need to be read carefully. If you are sure to perform the operation, enter the unique data marked under the `Necessary` prompt in the input box, and then click the `OK` button.
 
@@ -65,8 +65,8 @@ KILL QUERY WHERE query_id = 'f57ae2a8-8aeb-4f71-b395-43d7065ac564'
 
 ###### DDL
 
-When we need to view the specific SQL of this query, we can click the <img src="https://images.edurt.io/2021/11/02/16358548333386.jpg" width="40" /> button, and it will A window like the following pops up:
+When we need to view the specific SQL of this query, we can click the :octicons-search-16:{.blue} button, and it will A window like the following pops up:
 
-![](https://images.edurt.io/2021/11/02/16358548788950.jpg)
+![](../../assets/images/others/monitor/processor/img_4.png)
 
 The editor is the specific SQL statement we query this time.

docs/docs/release/1.16.0-20220513.md

@@ -0,0 +1,60 @@
+---
+template: overrides/main.html
+icon: material/gesture-tap-button
+---
+
+DBM Version for `1.16.0` is released!
+
+Release Time: `2022-05-13`
+
+#### Enhancement
+
+---
+
+- SSH login is supported [issues-40](https://github.com/EdurtIO/dbm/issues/40) <br />
+  ![img.png](../assets/images/versions/1.16.0/img_1.png) <br />
+- Support query ClickHouse to dynamically add configuration <br />
+  ![img.png](../assets/images/versions/1.16.0/img_5.png) <br />
+  ![img.png](../assets/images/versions/1.16.0/img_6.png) <br />
+- Support metadata management to filter the database <br />
+  ![img.png](../assets/images/versions/1.16.0/img_7.png) <br />
+  ![img.png](../assets/images/versions/1.16.0/img_8.png) <br />
+  ![img.png](../assets/images/versions/1.16.0/img_9.png) <br />
+- Support automatic prompt function of code editor <br />
+  ![img.png](../assets/images/versions/1.16.0/img_10.png) <br />
+
+#### UI
+
+---
+
+- Optimize query history display list <br />
+  ![img.png](../assets/images/versions/1.16.0/img.png) <br />
+- Migrate the software update function to the system menu <br />
+- Support editor bracket matching <br />
+  ![img.png](../assets/images/versions/1.16.0/img_4.png) <br />
+
+#### Optimize
+
+----
+
+- Optimize error reporting pop-up window [issues-148](https://github.com/EdurtIO/dbm/issues/148) <br />
+  ![img.png](../assets/images/versions/1.16.0/img_2.png) <br />
+  ![img.png](../assets/images/versions/1.16.0/img_3.png) <br />
+
+#### Docs
+
+---
+
+- Fix Monitor --> Processor document image pointing error
+
+#### Bug
+
+---
+
+- Fix the release error that the new version of the CI tool was not merged with the code release error
+
+#### Contributors (In no particular order)
+
+---
+
+- @qianmoQ

docs/mkdocs.yml

@@ -156,12 +156,13 @@ nav:
       - Management:
         - Datasource: reference/management/management_datasource.md
       - Monitor:
-          - Processor: reference/Monitor-Processor.md
+          - Processor: reference/monitor/monitor-processor.md
           - Connection: reference/monitor/monitor_connection.md
           - Mutations: reference/monitor/monitor_mutations.md
           - Query: reference/monitor/monitor_query.md
   - Release Note:
-      - 1.15.0 (latest): release/1.15.0-20220425.md
+      - 1.16.0 (latest): release/1.16.0-20220513.md
+      - 1.15.0: release/1.15.0-20220425.md
       - 1.14.0: release/1.14.0-20220410.md
       - 1.13.0: release/1.13.0-20220329.md
       - 1.12.0: release/1.12.0-20220318.md
@@ -177,7 +178,7 @@ nav:
       - 1.2.0-SNAPSHOT: release/1.2.0-SNAPSHOT.md
       - 1.1.0-SNAPSHOT: release/1.1.0-SNAPSHOT.md
       - 1.0.0-SNAPSHOT: release/1.0.0-SNAPSHOT.md
-      - Development Version: development/version/1.16.0-development.md
+      - Development Version: development/version/1.17.0-development.md
   - Development:
     - Contribution:
       - Document: development/document.md

electron-builder.yml

@@ -10,40 +10,36 @@ releaseInfo:
 
     ---
 
-    - Support metadata management, add column description information
-    - Support code snippet management
-    - Support query reference code snippet
-    - Support to quickly add code snippets after successful query
-    - The data source supports IndexDB storage
+    - SSH login is supported #40
+    - Support query ClickHouse to dynamically add configuration
+    - Support metadata management to filter the database
+    - Support automatic prompt function of code editor
 
     #### Docs
 
     ---
 
-    - Add snippet docs
-    - Add monitor --> query docs
+    - Fix Monitor --> Processor document image pointing error
 
     #### Optimize
 
     ----
 
-    - Add data sheet deletion prompt greater than 50GB
+    - Optimize error reporting pop-up window #148
 
     #### Bug
 
     ---
 
-    - Fix the problem that invalid metadata management nodes can be clicked
-    - Fix the exception that the optional parameters of the metadata management creation of the MongoDB data table cannot be constructed
-    - Fix the error reported by the metadata management data table console
+    - Fix the release error that the new version of the CI tool was not merged with the code release error
 
     #### UI
 
     ---
 
-    - Add multiple editor themes
-    - Quick query unavailable nodes prohibit operations
-    - It is forbidden to use functions such as quick query if the data source is not selected
+    - Optimize query history display list
+    - Migrate the software update function to the system menu
+    - Support editor bracket matching
 
 directories:
   output: ./release

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dbm",
-  "version": "1.15.0",
+  "version": "1.16.0",
   "author": "qianmoQ <[email protected]>",
   "description": "ClickHouse DataBase GUI",
   "github": "https://github.com/EdurtIO/dbm.git",
@@ -53,6 +53,7 @@
     "codemirror": "^5.64.0",
     "conventional-changelog-cli": "^2.1.1",
     "dexie": "^3.2.1",
+    "electron-ssh2": "^0.1.2",
     "electron-updater": "^4.6.1",
     "export-to-csv": "^0.2.1",
     "font-awesome": "^4.7.0",
@@ -63,6 +64,7 @@
     "ng-zorro-antd": "^12.1.0",
     "ngx-clipboard": "^14.0.2",
     "ngx-easy-table": "^15.2.0",
+    "ngx-ellipsis": "^3.1.6",
     "ngx-markdown": "^13.1.0",
     "ngx-moment": "^6.0.2",
     "node-sql-parser": "^4.1.1",

src/example/electron-ssh2.ts

@@ -1,41 +1,69 @@
-const axios = require('axios');
+const http = require('http');
 const Client = require('electron-ssh2').Client;
 const conn = new Client();
 conn.on('ready', function() {
-  console.log('Client :: ready');
-  const ClickHouse = require('@apla/clickhouse');
-  const ch = new ClickHouse({
-    host: 'localhost',
-    port: 8123,
-    username: '',
-    password: ''
-  });
-  const stream = ch.query('SELECT 1', (err, data) => {
-    console.log(err, data)
-  });
-  stream.pipe(process.stdout);
+  console.log('Ssh Client :: ready');
   conn.forwardOut('', 0, '127.0.0.1', 8123, function(err, stream) {
     if (err) throw err;
-    stream.on('close', function() {
-      console.log('TCP :: CLOSED');
-      conn.end();
-    })
-    .on('data', function(data) {
-      console.log('TCP :: DATA: ' + data);
-    })
-    .end([
-      'HEAD / HTTP/1.1',
-      'User-Agent: curl/7.27.0',
-      'Host: 127.0.0.1',
-      'Accept: */*',
-      'Connection: close',
-      '',
-      ''
-    ].join('\r\n'));
+    console.log('Ssh Client :: forwardOut');
+    // Setup HTTP request parameters
+    const postData = 'select sleep(1), version() format JSON';
+    const requestParams = {
+      method: 'POST',
+      path: '/',
+      headers: {},
+      timeout: 3,
+      createConnection: function() {
+        return stream;
+      }
+    };
+    const request = http.request(requestParams, function(response) {
+      console.log('STATUS: ' + response.statusCode);
+      const bodyArray = [];
+      response.on('data', function(chunk) {
+        bodyArray.push(chunk);
+        // Do whatever you need to do with 'chunk' (the response body)
+        // Note, this may be called more than once if the response data is long
+      })
+      .on('error', function(err) {
+        console.log('HTTP :: ERROR: ' + err);
+        stream.on('close', function() {
+          console.log('HTTP :: Stream closed');
+          conn.end();
+        }).end();
+      })
+      .on('end', function() {
+        console.log('HTTP :: Stream ended');
+        stream.on('close', function() {
+          console.log('HTTP :: Stream closed');
+          conn.end();
+        }).end();
+        const body = Buffer.concat(bodyArray).toString();
+        console.log('HTTP :: Body: ' + body);
+      });
+    });
+    request.on('timeout', function() {
+      console.log('HTTP :: Timeout');
+      request.destroy();
+    });
+    request.on('error', function(err) {
+      console.log('HTTP :: ERROR: ' + err);
+      stream.on('close', function() {
+        console.log('HTTP :: Stream closed');
+        conn.end();
+      }).end();
+    });
+    console.log('HTTP :: Sending request');
+    request.end(postData);
   });
-}).connect({
-  host: 'localhost',
+})
+.on('error', function(err) {
+  console.log('Client :: error :: ' + err);
+})
+.connect({
+  host: '127.0.0.1',
   port: 22,
   username: 'root',
-  password: '12345678'
+  password: '123456',
+  timeout: 6000
 });

src/example/package.json

@@ -47,12 +47,14 @@
     "@angular/platform-browser": "12.1.2",
     "@angular/platform-browser-dynamic": "12.1.2",
     "@angular/router": "12.1.2",
+    "@apla/clickhouse": "^1.6.4",
     "@ctrl/ngx-codemirror": "^5.1.1",
     "@ngx-translate/core": "^14.0.0",
     "@ngx-translate/http-loader": "^7.0.0",
     "angular-highcharts": "^13.0.1",
     "codemirror": "^5.64.0",
     "conventional-changelog-cli": "^2.1.1",
+    "electron-ssh2": "^0.1.2",
     "electron-updater": "^4.6.1",
     "font-awesome": "^4.7.0",
     "highcharts": "^9.3.2",

src/renderer/app/common-share.module.ts

@@ -15,6 +15,7 @@ import { DrividerAntdComponent } from '@renderer/components/antd/drivider/drivid
 import { TableModule } from 'ngx-easy-table';
 import { MomentModule } from 'ngx-moment';
 import { CreateSnippetComponent } from '@renderer/components/snippet/create/create.snippet.component';
+import { EllipsisModule } from 'ngx-ellipsis';
 
 @NgModule({
   imports: [
@@ -27,7 +28,8 @@ import { CreateSnippetComponent } from '@renderer/components/snippet/create/crea
     ChartModule,
     TableModule,
     MomentModule,
-    ReactiveFormsModule
+    ReactiveFormsModule,
+    EllipsisModule
   ],
   declarations: [
     DdlQueryComponent,