[Enhancement] Support metadata management to filter the database

qianmoQ · qianmoQ · commit 9ed3c39b4944 · 2022-05-12T13:29:39.000+08:00
diff --git a/.github/workflows/publish-release-test.yml b/.github/workflows/publish-release-test.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
     branch:
       - 'test'
+    types: [ closed ]
 
 jobs:
   release:
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
     branch:
       - 'master'
-    types: [closed]
+    types: [ closed ]
 
 jobs:
   release:
diff --git a/docs/docs/assets/images/versions/1.16.0/img_7.png b/docs/docs/assets/images/versions/1.16.0/img_7.png
diff --git a/docs/docs/assets/images/versions/1.16.0/img_8.png b/docs/docs/assets/images/versions/1.16.0/img_8.png
diff --git a/docs/docs/assets/images/versions/1.16.0/img_9.png b/docs/docs/assets/images/versions/1.16.0/img_9.png
diff --git a/docs/docs/development/version/1.16.0-development.md b/docs/docs/development/version/1.16.0-development.md
@@ -18,6 +18,10 @@ DBM Version for `1.16.0` is development!
 - 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 />
 
 #### UI
 
diff --git a/electron-builder.yml b/electron-builder.yml
@@ -12,6 +12,7 @@ releaseInfo:
 
     - SSH login is supported #40
     - Support query ClickHouse to dynamically add configuration
+    - Support metadata management to filter the database
 
     #### Docs
 
diff --git a/src/renderer/app/pages/management/metadata/metadata.component.ts b/src/renderer/app/pages/management/metadata/metadata.component.ts
@@ -104,7 +104,7 @@ export class MetadataComponent extends BaseComponent implements OnInit {
       }
       const request = new RequestModel();
       request.config = await this.dataSourceService.getByAliasAsync(this.rootNode.value);
-      this.metadataService.getChild(request, originNode).then(response => {
+      this.metadataService.getChild(request, originNode, event.filter).then(response => {
         if (response.status) {
           // clear old data
           node['children'] = [];
@@ -134,6 +134,7 @@ export class MetadataComponent extends BaseComponent implements OnInit {
             this.disabledComponent.database.structure = selected;
             break;
           case OperationEnum.rename:
+          case OperationEnum.filter:
             this.disabledComponent.database.common = selected;
             break;
         }
diff --git a/src/renderer/app/pages/management/metadata/metadata.module.ts b/src/renderer/app/pages/management/metadata/metadata.module.ts
@@ -40,6 +40,7 @@ import { CommonDatabaseComponent } from '@renderer/components/database/common/co
 import { DatabaseRenameComponent } from '@renderer/components/database/rename/database.rename.component';
 import { ColumnCreateComponent } from '@renderer/components/column/create/column.create.component';
 import { CommentColumnComponent } from '@renderer/components/column/comment/column.comment.component';
+import { DatabaseFilterComponent } from '@renderer/components/database/filter/database.filter.component';
 
 const MANAGEMENT_METADATA_ROUTES: Routes = [
   {path: '', component: MetadataComponent}
@@ -83,7 +84,8 @@ const MANAGEMENT_METADATA_ROUTES: Routes = [
     CommonDatabaseComponent,
     DatabaseRenameComponent,
     ColumnCreateComponent,
-    CommentColumnComponent
+    CommentColumnComponent,
+    DatabaseFilterComponent
   ],
   providers: [
     DatasourceService,
diff --git a/src/renderer/assets/i18n/en.json b/src/renderer/assets/i18n/en.json
@@ -154,7 +154,9 @@
     "sshUsername": "SSH User",
     "sshPassword": "SSH Password",
     "more": "More",
-    "matchBrackets": "Match Brackets"
+    "matchBrackets": "Match Brackets",
+    "filter": "Filter",
+    "precise": "Precise"
   },
   "language": {
     "english": "English",
diff --git a/src/renderer/assets/i18n/zh.json b/src/renderer/assets/i18n/zh.json
@@ -153,7 +153,9 @@
     "sshUsername": "SSH 用户名",
     "sshPassword": "SSH 密码",
     "more": "更多",
-    "matchBrackets": "匹配括号"
+    "matchBrackets": "匹配括号",
+    "filter": "过滤",
+    "precise": "精确"
   },
   "language": {
     "english": "英语",
diff --git a/src/renderer/components/database/common/common.database.component.html b/src/renderer/components/database/common/common.database.component.html
@@ -4,5 +4,8 @@
     <app-component-rename-database *ngIf="menu.command === operation.rename" [config]="config"
                                    [value]="value?.origin?.key" (emitter)="handlerEmitter($event)">
     </app-component-rename-database>
+    <app-component-filter-database *ngIf="menu.command === operation.filter" [config]="config"
+                                   (emitter)="handlerEmitter($event)">
+    </app-component-filter-database>
   </div>
 </nz-modal>
diff --git a/src/renderer/components/database/common/common.database.component.ts b/src/renderer/components/database/common/common.database.component.ts
@@ -3,7 +3,6 @@ import { BaseComponent } from '@renderer/app/base.component';
 import { OperationEnum } from '@renderer/enum/operation.enum';
 import { ConfigModel } from '@renderer/model/config.model';
 import { MenuModel } from '@renderer/model/menu.model';
-import { visible } from 'chalk';
 
 @Component({
   selector: 'app-component-common-database',
diff --git a/src/renderer/components/database/filter/database.filter.component.html b/src/renderer/components/database/filter/database.filter.component.html
@@ -0,0 +1,27 @@
+<div>
+  <form nz-form>
+    <nz-form-item>
+      <nz-form-label [nzSm]="6" [nzXs]="24">{{'common.name'|translate}}</nz-form-label>
+      <nz-form-control [nzSm]="14" [nzXs]="24">
+        <input nz-input [(ngModel)]="filter.value" name="name" (change)="handlerValidate()"/>
+      </nz-form-control>
+    </nz-form-item>
+    <nz-form-item>
+      <nz-form-label [nzSm]="6" [nzXs]="24">{{'common.precise'|translate}}</nz-form-label>
+      <nz-form-control [nzSm]="14" [nzXs]="24">
+        <nz-switch [(ngModel)]="filter.precise" name="precise"
+                   nzCheckedChildren="{{'common.open'|translate}}"
+                   nzUnCheckedChildren="{{'common.close'|translate}}">
+        </nz-switch>
+      </nz-form-control>
+    </nz-form-item>
+  </form>
+</div>
+<div class="ant-modal-footer" style="padding: 10px;margin-bottom: -20px;margin-top: 20px;">
+  <div class="ng-star-inserted">
+    <button nz-button nzType="primary" [disabled]="disabled.button" [nzLoading]="loading.button"
+            (click)="handlerFilter()">
+      <span>{{'common.filter'|translate}}</span>
+    </button>
+  </div>
+</div>
diff --git a/src/renderer/components/database/filter/database.filter.component.ts b/src/renderer/components/database/filter/database.filter.component.ts
@@ -0,0 +1,35 @@
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { BaseComponent } from '@renderer/app/base.component';
+import { ConfigModel } from '@renderer/model/config.model';
+import { StringUtils } from '@renderer/utils/string.utils';
+import { FilterModel } from '@renderer/model/filter.model';
+
+@Component({
+  selector: 'app-component-filter-database',
+  templateUrl: './database.filter.component.html'
+})
+export class DatabaseFilterComponent extends BaseComponent {
+  @Input()
+  config: ConfigModel;
+  @Output()
+  emitter = new EventEmitter<any>();
+  filter: FilterModel = new FilterModel();
+
+  constructor() {
+    super();
+  }
+
+  handlerValidate() {
+    if (StringUtils.isNotEmpty(this.filter.value)) {
+      this.disabled.button = false;
+    } else {
+      this.disabled.button = true;
+    }
+  }
+
+  async handlerFilter() {
+    this.config.status = true;
+    this.config.filter = this.filter;
+    this.emitter.emit(this.config);
+  }
+}
diff --git a/src/renderer/config/base.config.ts b/src/renderer/config/base.config.ts
@@ -4,6 +4,8 @@ export interface BaseConfig {
   tableDiskUsedRatio: string;
   columnDiskUsedRatio: string;
   databaseItems: string;
+  databaseItemsFilterPrecise: string;
+  databaseItemsFilterFuzzy: string;
   tableItems: string;
   columnItems: string;
 }
diff --git a/src/renderer/config/clickhouse.config.ts b/src/renderer/config/clickhouse.config.ts
@@ -74,6 +74,16 @@ LIMIT {2}
 SELECT name, engine AS value
 FROM "system".databases
   `;
+  databaseItemsFilterPrecise = `
+SELECT name, engine AS value
+FROM "system".databases
+WHERE name = '{0}'
+`;
+  databaseItemsFilterFuzzy = `
+SELECT name, engine AS value
+FROM "system".databases
+WHERE name LIKE '%{0}%'
+`;
   tableItems = `
 SELECT uuid, name, engine AS value, partition_key, sorting_key, total_rows, total_bytes, database
 FROM system.tables
diff --git a/src/renderer/config/operation.config.ts b/src/renderer/config/operation.config.ts
@@ -10,6 +10,7 @@ export class OperationConfig {
     server.type = TypeEnum.disk;
     server.operations = [
       {type: TypeEnum.server, actions: [OperationEnum.info]},
+      {type: TypeEnum.database, actions: [OperationEnum.filter]},
       {type: TypeEnum.database, actions: [OperationEnum.create]}
     ];
     opertions.push(server);
diff --git a/src/renderer/enum/operation.enum.ts b/src/renderer/enum/operation.enum.ts
@@ -10,6 +10,7 @@ export enum OperationEnum {
   optimize = ('optimize'),
   structure = ('structure'),
   comment = ('comment'),
+  filter = ('filter'),
   ttl = ('ttl'),
   ttl_modify = ('ttl_modify'),
   ttl_remove = ('ttl_remove')
diff --git a/src/renderer/model/config.model.ts b/src/renderer/model/config.model.ts
@@ -2,6 +2,7 @@ import { BaseModel } from '@renderer/model/base.model';
 import { TypeEnum } from '@renderer/enum/type.enum';
 import { MenuModel } from '@renderer/model/menu.model';
 import { NzTreeNode } from 'ng-zorro-antd/core/tree/nz-tree-base-node';
+import { FilterModel } from '@renderer/model/filter.model';
 
 export class ConfigModel extends BaseModel {
   title: string;
@@ -12,6 +13,7 @@ export class ConfigModel extends BaseModel {
   table: string;
   isLeaf: boolean;
   status: boolean;
+  filter: FilterModel;
   menu: MenuModel;
   disabled: boolean;
   currentNode: NzTreeNode;
diff --git a/src/renderer/model/datasource.model.ts b/src/renderer/model/datasource.model.ts
@@ -3,7 +3,7 @@ export class DatasourceModel {
   name: string;
   alias: string;
   host: string;
-  port: number;
+  port: number = 8123;
   username: string;
   password: string;
   status = false;
diff --git a/src/renderer/model/filter.model.ts b/src/renderer/model/filter.model.ts
@@ -0,0 +1,4 @@
+export class FilterModel {
+  value: string;
+  precise: boolean = false;
+}
diff --git a/src/renderer/services/context.menu.service.ts b/src/renderer/services/context.menu.service.ts
@@ -68,6 +68,9 @@ export class ContextMenuService {
       case OperationEnum.ttl_modify:
         icon = 'pencil-square-o';
         break;
+      case OperationEnum.filter:
+        icon = 'filter';
+        break;
       default:
         icon = 'info-circle';
     }
diff --git a/src/renderer/services/management/metadata.service.ts b/src/renderer/services/management/metadata.service.ts
@@ -14,6 +14,7 @@ import { PropertyModel } from '@renderer/model/property.model';
 import { SshService } from '@renderer/services/ssh.service';
 import { BasicService } from '@renderer/services/system/basic.service';
 import { ForwardService } from '@renderer/services/forward.service';
+import { FilterModel } from '@renderer/model/filter.model';
 
 @Injectable()
 export class MetadataService extends ForwardService implements BaseService {
@@ -52,11 +53,19 @@ export class MetadataService extends ForwardService implements BaseService {
     return this.getResponse(request, sql);
   }
 
-  getChild(request: RequestModel, config: ConfigModel): Promise<ResponseModel> {
+  getChild(request: RequestModel, config: ConfigModel, filter?: FilterModel): Promise<ResponseModel> {
     let sql;
     switch (config.type) {
       case TypeEnum.server:
-        sql = this.baseConfig.databaseItems;
+        if (filter) {
+          if (filter.precise) {
+            sql = StringUtils.format(this.baseConfig.databaseItemsFilterPrecise, [filter.value]);
+          } else {
+            sql = StringUtils.format(this.baseConfig.databaseItemsFilterFuzzy, [filter.value]);
+          }
+        } else {
+          sql = this.baseConfig.databaseItems;
+        }
         break;
       case TypeEnum.database:
         sql = StringUtils.format(this.baseConfig.tableItems, [config.key]);
