From a8cf29638924b338c1fb0b32e716dabc775c41c5 Mon Sep 17 00:00:00 2001 From: Ekko Chang Date: Wed, 5 Jun 2019 16:30:34 +0800 Subject: [PATCH] Add UI support for HDFS Issue-ID: DCAEGEN2-1188 Change-Id: Ica357fa392e9f597656b6e1d62c5cdd01f8ae213 Signed-off-by: Ekko Chang --- .../admin/src/src/app/app.module.ts | 3 + .../database-add-modal.component.html | 154 ++--------------- .../database-list/database-list.component.html | 105 +++++++++++ .../database-list/database-list.component.ts | 8 + .../admin/src/src/app/feeder/feeder.component.ts | 3 +- .../topics/topic-list/topic-list.component.html | 192 +++++++++++++++++++++ .../datalake-handler/admin/src/src/styles.css | 4 + 7 files changed, 324 insertions(+), 145 deletions(-) diff --git a/components/datalake-handler/admin/src/src/app/app.module.ts b/components/datalake-handler/admin/src/src/app/app.module.ts index 7249e1dd..a299c734 100644 --- a/components/datalake-handler/admin/src/src/app/app.module.ts +++ b/components/datalake-handler/admin/src/src/app/app.module.ts @@ -61,6 +61,7 @@ import { DatabaseListComponent } from "./database/database-list/database-list.co import { NgxDatatableModule } from "@swimlane/ngx-datatable"; import { CouchbaseComponent } from "./database/database-list/dbs-modal/couchbase/couchbase.component"; import { MongodbComponent } from "./database/database-list/dbs-modal/mongodb/mongodb.component"; +import { HdfsComponent } from "./database/database-list/dbs-modal/hdfs/hdfs.component"; import { DatabaseAddModalComponent } from "./database/database-list/database-add-modal/database-add-modal.component"; import { ElasticsearchComponent } from "./database/database-list/dbs-modal/elasticsearch/elasticsearch.component"; import { DruidComponent } from "./database/database-list/dbs-modal/druid/druid.component"; @@ -87,6 +88,7 @@ import { NgxSpinnerModule } from "ngx-spinner"; DatabaseListComponent, CouchbaseComponent, MongodbComponent, + HdfsComponent, DatabaseAddModalComponent, ElasticsearchComponent, DruidComponent, @@ -121,6 +123,7 @@ import { NgxSpinnerModule } from "ngx-spinner"; DruidComponent, ElasticsearchComponent, MongodbComponent, + HdfsComponent, TopicDetailModalComponent, TopicConfigModalComponent ] diff --git a/components/datalake-handler/admin/src/src/app/database/database-list/database-add-modal/database-add-modal.component.html b/components/datalake-handler/admin/src/src/app/database/database-list/database-add-modal/database-add-modal.component.html index b454f61e..490bf49e 100644 --- a/components/datalake-handler/admin/src/src/app/database/database-list/database-add-modal/database-add-modal.component.html +++ b/components/datalake-handler/admin/src/src/app/database/database-list/database-add-modal/database-add-modal.component.html @@ -41,6 +41,8 @@ limitations under the License. Search Engine + Hadoop @@ -87,6 +89,14 @@ limitations under the License. aria-selected="true">Elasticsearch + + +
+ +
@@ -109,147 +119,5 @@ limitations under the License.
- - - - - - - - - - + \ No newline at end of file diff --git a/components/datalake-handler/admin/src/src/app/database/database-list/database-list.component.html b/components/datalake-handler/admin/src/src/app/database/database-list/database-list.component.html index a675270d..8b71f529 100644 --- a/components/datalake-handler/admin/src/src/app/database/database-list/database-list.component.html +++ b/components/datalake-handler/admin/src/src/app/database/database-list/database-list.component.html @@ -128,6 +128,111 @@ limitations under the License. + + +
+ + + + + + + + + + +
diff --git a/components/datalake-handler/admin/src/src/app/database/database-list/database-list.component.ts b/components/datalake-handler/admin/src/src/app/database/database-list/database-list.component.ts index d0c3a1cb..13a6274a 100644 --- a/components/datalake-handler/admin/src/src/app/database/database-list/database-list.component.ts +++ b/components/datalake-handler/admin/src/src/app/database/database-list/database-list.component.ts @@ -37,6 +37,7 @@ import { CouchbaseComponent } from "./dbs-modal/couchbase/couchbase.component"; import { DruidComponent } from "./dbs-modal/druid/druid.component"; import { ElasticsearchComponent } from "./dbs-modal/elasticsearch/elasticsearch.component"; import { MongodbComponent } from "./dbs-modal/mongodb/mongodb.component"; +import { HdfsComponent } from "./dbs-modal/hdfs/hdfs.component"; import { AlertComponent } from "src/app/core/alert/alert.component"; // Notify @@ -190,6 +191,13 @@ export class DatabaseListComponent implements OnInit { }); break; } + case "HDFS": { + modalRef = this.modalService.open(HdfsComponent, { + size: "lg", + centered: true + }); + break; + } default: { break; } diff --git a/components/datalake-handler/admin/src/src/app/feeder/feeder.component.ts b/components/datalake-handler/admin/src/src/app/feeder/feeder.component.ts index b3c766d1..f5d05bb7 100644 --- a/components/datalake-handler/admin/src/src/app/feeder/feeder.component.ts +++ b/components/datalake-handler/admin/src/src/app/feeder/feeder.component.ts @@ -52,8 +52,7 @@ export class FeederComponent implements OnInit { this.adminService.setTitle("SIDEBAR.FEDDFER"); this.restApiService.getTopicsFromFeeder().subscribe( res => { - // TODO: -1, because __consumer_offsets - this.topicContent = (res.length - 1).toString(); + this.topicContent = res.length.toString(); setTimeout(() => { this.spinner.hide(); }, 500); diff --git a/components/datalake-handler/admin/src/src/app/topics/topic-list/topic-list.component.html b/components/datalake-handler/admin/src/src/app/topics/topic-list/topic-list.component.html index 8c84e447..1e4ed1cc 100644 --- a/components/datalake-handler/admin/src/src/app/topics/topic-list/topic-list.component.html +++ b/components/datalake-handler/admin/src/src/app/topics/topic-list/topic-list.component.html @@ -343,6 +343,198 @@ limitations under the License. + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/components/datalake-handler/admin/src/src/styles.css b/components/datalake-handler/admin/src/src/styles.css index 04479213..889e89a0 100644 --- a/components/datalake-handler/admin/src/src/styles.css +++ b/components/datalake-handler/admin/src/src/styles.css @@ -380,6 +380,10 @@ hr { } /* Input: checkbox */ +.input-group-text { + padding: .375rem 16px; +} + .dl-input-chk { font-family: "Open Sans", sans-serif; font-weight: 400; -- 2.16.6