Merge pull request #251 from qianmoQ/1.22.0-SNAPSHOT

Support ElasticSearch (query and data source management)

Author: qianmoQ

README.md

@@ -91,12 +91,13 @@ DBM can query data from any SQL-speaking datastore or data engine (ClickHouse an
 Here are some of the major database solutions that are supported:
 
 <p align="center">
-  <img src="./src/shared/assets/integrate/clickhouse.png" alt="ClickHouse" class="a" width="133" height="34" />
-  <img src="./src/shared/assets/integrate/trino.png" alt="Trino" class="a" width="46" height="46"/>
-  <img src="./src/shared/assets/integrate/presto.png" alt="Presto" class="a" width="152" height="46"/>
-  <img src="./src/shared/assets/integrate/mysql.png" alt="MySQL" class="a" width="auto" height="50"/>
-  <img src="./src/shared/assets/integrate/postgresql.png" alt="PostgreSQL" class="a" width="auto" height="50"/>
-  <img src="./src/shared/assets/integrate/druid.png" alt="Druid" class="a" width="auto" height="34"/>
+  <a href="https://clickhouse.com" target="_blank"><img src="./src/shared/assets/integrate/clickhouse.png" alt="ClickHouse" class="a" width="133" height="34" /></a>
+  <a href="https://trino.io" target="_blank"><img src="./src/shared/assets/integrate/trino.png" alt="Trino" class="a" width="46" height="46"/></a>
+  <a href="https://prestodb.io" target="_blank"><img src="./src/shared/assets/integrate/presto.png" alt="Presto" class="a" width="152" height="46"/></a>
+  <a href="https://www.mysql.com" target="_blank"><img src="./src/shared/assets/integrate/mysql.png" alt="MySQL" class="a" width="auto" height="50"/></a>
+  <a href="https://www.postgresql.org" target="_blank"><img src="./src/shared/assets/integrate/postgresql.png" alt="PostgreSQL" class="a" width="auto" height="50"/></a>
+  <a href="https://druid.apache.org" target="_blank"><img src="./src/shared/assets/integrate/druid.png" alt="Druid" class="a" width="auto" height="34"/></a>
+  <a href="https://www.elastic.co/cn/elasticsearch" target="_blank"><img src="./src/shared/assets/integrate/elasticsearch.svg" alt="ElasticSearch" class="a" width="auto" height="34"/></a>
 </p>
 
 ## Features

docs/docs/download.md

@@ -91,11 +91,11 @@ The current Trino release is version <img src="https://img.shields.io/github/v/r
     * **Source Code**: [Code](https://github.com/trinodb/trino)
     * **YouTube channel** [YouTube channel](https://www.youtube.com/c/trinodb)
 
-- __Druid__
+- __Apache Druid__
 
     ---
 
-    * **Documentation**: [trino.io](https://druid.apache.org/docs/latest/design/)
+    * **Documentation**: [druid.apache.org](https://druid.apache.org/docs/latest/design/)
     * **Issues**: [GitHub issues](https://github.com/apache/druid/issues)
     * **Source Code**: [Code](https://github.com/apache/druid)
     * **Meetups** [Meetups](https://www.meetup.com/topics/apache-druid/)

electron-builder.yml

@@ -18,42 +18,20 @@ releaseInfo:
 
     ---
 
-    - Support custom file names for downloading result data
-    - Add multiple editor theme
+    - Support the new editor to delete the data table shortcut menu
 
     #### Dependencies
 
     ---
 
-    - Bump eslint-plugin-jsdoc from 35.3.2 to 39.3.3
-    - Bump angular-highcharts from 13.0.1 to 14.1.5
-    - Bump karma-jasmine-html-reporter from 1.7.0 to 2.0.0
-
     #### MySQL
 
     ---
 
-    - Support metadata management to build data tables [issues-180](https://github.com/EdurtIO/dbm/issues/180)
-    - Support metadata management to filter tables [issues-180](https://github.com/EdurtIO/dbm/issues/180)
-    - Support metadata management to show database ddl [issues-180](https://github.com/EdurtIO/dbm/issues/180)
-    - Support metadata management to delete database [issues-180](https://github.com/EdurtIO/dbm/issues/180)
-    - Support metadata management to preview table [issues-180](https://github.com/EdurtIO/dbm/issues/180)
-    - Support metadata management to show table ddl [issues-180](https://github.com/EdurtIO/dbm/issues/180)
-    - Support metadata management to delete table [issues-180](https://github.com/EdurtIO/dbm/issues/180)
-    - Support metadata management to rename table, truncate table [issues-180](https://github.com/EdurtIO/dbm/issues/180)
-    - Support metadata management to preview column [issues-180](https://github.com/EdurtIO/dbm/issues/180)
-    - Support metadata management to create column, delete column [issues-180](https://github.com/EdurtIO/dbm/issues/180)
-    - Support metadata management to rename column [issues-180](https://github.com/EdurtIO/dbm/issues/180)
-    - Support metadata management to add column comment [issues-180](https://github.com/EdurtIO/dbm/issues/180)
-
     #### PostgreSQL
 
     ---
 
-    - Supports quick query
-    - Support metadata management menu server related operations
-    - Supports metadata management of disk usage
-
 directories:
   output: ./release
 

package.json

@@ -1,13 +1,14 @@
 {
   "name": "dbm",
-  "version": "1.21.0",
+  "version": "1.22.0-SNAPSHOT",
   "author": "qianmoQ <shicheng@ttxit.com>",
-  "description": "DataBase GUI",
+  "description": "Full platform database management tool, supports ClickHouse, Presto, Trino, MySQL, PostgreSQL...",
   "github": "https://github.com/EdurtIO/dbm.git",
   "homepage": "https://dbm.edurt.io",
   "keywords": [
     "angular",
     "angular 12",
+    "angular 14",
     "electron",
     "typescript",
     "windows",
@@ -17,7 +18,9 @@
     "clickhouse",
     "trino",
     "presto",
-    "mysql"
+    "mysql",
+    "apache druid",
+    "postgresql"
   ],
   "publish": [
     {

src/renderer/app/layout/layout.module.ts

@@ -17,6 +17,10 @@ import { PrestoService } from "@renderer/services/presto.service";
 import { FactoryService } from "@renderer/services/factory.service";
 import { MySQLService } from "@renderer/services/plugin/mysql.service";
 import { PostgresqlService } from "@renderer/services/plugin/postgresql.service";
+import { PluginFactory } from "@renderer/factory/plugin.factory";
+import { PluginToken } from "@renderer/token/plugin.token";
+import { ClickHousePlugin } from "@renderer/plugin/clickhouse.plugin";
+import { ElasticsearchPlugin } from "@renderer/plugin/elasticsearch.plugin";
 
 const httpLoaderFactory = (http: HttpClient): TranslateHttpLoader =>
   new TranslateHttpLoader(http, './renderer/assets/i18n/', '.json');
@@ -48,7 +52,10 @@ const httpLoaderFactory = (http: HttpClient): TranslateHttpLoader =>
     PrestoService,
     FactoryService,
     MySQLService,
-    PostgresqlService
+    PostgresqlService,
+    PluginFactory,
+    {provide: PluginToken, useClass: ClickHousePlugin, multi: true},
+    {provide: PluginToken, useClass: ElasticsearchPlugin, multi: true}
   ]
 })
 export class LayoutModule {

src/renderer/app/pages/management/datasource/datasource.component.html

@@ -112,8 +112,8 @@
         <div *ngFor="let engine of sourceTypes" [nzSpan]="24" nz-col>
           <app-component-antd-drivider [description]="engine.description" [title]="engine.name">
           </app-component-antd-drivider>
-          <div *ngIf="engine.engines; else notHasEngines" [nzGutter]="[8, 8]" nz-row>
-            <div *ngFor="let value of engine.engines" [nzSpan]="6" nz-col>
+          <div *ngIf="engine.engines; else notHasEngines" [nzGutter]="[3, 20]" nz-row>
+            <div *ngFor="let value of engine.engines" [nzSpan]="6" nz-col style="text-align: center;">
               <div class="">
                 <nz-radio-group [(ngModel)]="formInfo.type" (ngModelChange)="handlerChange(value)">
                   <label [nzValue]="value.name" nz-radio-button>

src/renderer/app/pages/management/datasource/datasource.module.ts

@@ -27,6 +27,9 @@ import {
     DatasourcePostgresqlComponent
 } from "@renderer/components/datasource/postgresql/datasource.postgresql.component";
 import { DatasourceDruidComponent } from "@renderer/components/datasource/druid/datasource.druid.component";
+import {
+    DatasourceElasticSearchComponent
+} from "@renderer/components/datasource/elasticsearch/datasource.elasticsearch.component";
 
 const DATASOURCE_ROUTES: Routes = [
   {path: '', component: DatasourceComponent}
@@ -53,7 +56,8 @@ const DATASOURCE_ROUTES: Routes = [
         DatasourceMysqlComponent,
         DatasourceDeleteComponent,
         DatasourcePostgresqlComponent,
-        DatasourceDruidComponent
+        DatasourceDruidComponent,
+        DatasourceElasticSearchComponent
     ],
   providers: [
     DatasourceService,

src/renderer/app/pages/management/metadata/metadata.component.ts

@@ -56,10 +56,11 @@ export class MetadataComponent extends BaseComponent implements OnInit {
         configModel.title = k.alias;
         configModel.type = TypeEnum.disk;
         configModel.disabled = k.status ? false : true;
-        if (k.type === DatabaseEnum.presto || k.type === DatabaseEnum.trino || k.type === DatabaseEnum.druid) {
+        if (k.type === DatabaseEnum.presto || k.type === DatabaseEnum.trino || k.type === DatabaseEnum.druid
+          || k.type === DatabaseEnum.elasticsearch) {
           configModel.isLeaf = true;
         }
-        if (k.type === DatabaseEnum.druid) {
+        if (k.type === DatabaseEnum.druid || k.type === DatabaseEnum.elasticsearch) {
           configModel.disabled = true;
         }
         if (configModel.disabled) {

src/renderer/app/pages/monitor/connection/monitor.connection.component.ts

@@ -30,7 +30,7 @@ export class MonitorConnectionComponent extends BaseComponent implements OnDestr
     super();
     this.datasourceService.getAll().then(response => {
       this.dataSources = response.map(item => {
-        if (item.type === DatabaseEnum.postgresql || item.type === DatabaseEnum.druid) {
+        if (item.type === DatabaseEnum.postgresql || item.type === DatabaseEnum.druid || item.type === DatabaseEnum.elasticsearch) {
           item.status = false;
         }
         return item;

src/renderer/app/pages/monitor/mutations/monitor.mutations.component.ts

@@ -35,7 +35,8 @@ export class MonitorMutationsComponent extends BaseComponent implements OnDestro
         if (item.type === DatabaseEnum.trino || item.type === DatabaseEnum.presto
           || item.type === DatabaseEnum.mysql
           || item.type === DatabaseEnum.postgresql
-          || item.type === DatabaseEnum.druid) {
+          || item.type === DatabaseEnum.druid
+          || item.type === DatabaseEnum.elasticsearch) {
           item.status = false;
         }
         return item;