Fix UI bugs

Issue-ID: DCAEGEN2-1716

Change-Id: I01a5a3c69ff65afde37650e559619723f100e69a
Signed-off-by: Guobiao Mo <guobiaomo@chinamobile.com>

8 files changed, 16 insertions, 16 deletions

diff --git a/components/datalake-handler/admin/src/src/app/core/services/rest-api.service.ts b/components/datalake-handler/admin/src/src/app/core/services/rest-api.service.ts
index aa34b517..8ccbcc91 100644
--- a/components/datalake-handler/admin/src/src/app/core/services/rest-api.service.ts
+++ b/components/datalake-handler/admin/src/src/app/core/services/rest-api.service.ts
@@ -166,7 +166,7 @@ export class RestApiService {
     Database
   */
   getDbEncryptList(flag): Observable<any> {
-    return this.http.get(prefix + "dbs/list?tool="+flag).pipe(
+    return this.http.get(prefix + "dbs/list?isDb="+flag).pipe(
       retry(1),
       map(this.extractData),
       catchError(this.handleError)
diff --git a/components/datalake-handler/admin/src/src/app/shared/layout/header/header.component.html b/components/datalake-handler/admin/src/src/app/shared/layout/header/header.component.html
index 304879ee..440485c5 100644
--- a/components/datalake-handler/admin/src/src/app/shared/layout/header/header.component.html
+++ b/components/datalake-handler/admin/src/src/app/shared/layout/header/header.component.html
@@ -24,7 +24,7 @@ limitations under the License.
   </div>
 
   <!-- Only for feeder page -->
-  <div class="pt-3 pl-2 align-self-center" *ngIf="this.title == 'SIDEBAR.FEDDFER'">
+  <div class="pt-3 pl-2 align-self-center" *ngIf="this.title == 'SIDEBAR.FEEDER'">
     <label class="dl-switch">
       <input id="switch" type="checkbox" [(ngModel)]="this.feeder.running"
         (ngModelChange)="this.changeFeederStatus()" />
diff --git a/components/datalake-handler/admin/src/src/app/shared/layout/header/header.component.ts b/components/datalake-handler/admin/src/src/app/shared/layout/header/header.component.ts
index 8c39ec18..2d479ea6 100644
--- a/components/datalake-handler/admin/src/src/app/shared/layout/header/header.component.ts
+++ b/components/datalake-handler/admin/src/src/app/shared/layout/header/header.component.ts
@@ -64,7 +64,7 @@ export class HeaderComponent {
     });
     this.selectedLang = this.translateService.defaultLang;
 
-    if ((this.title = "SIDEBAR.FEDDFER")) {
+    if ((this.title = "SIDEBAR.FEEDER")) {
       this.restApiService.getFeederstatus().subscribe((data: {}) => {
         this.feeder = new Feeder();
         this.feeder = data;
diff --git a/components/datalake-handler/admin/src/src/app/shared/layout/sidebar/sidebar.component.html b/components/datalake-handler/admin/src/src/app/shared/layout/sidebar/sidebar.component.html
index 2e463883..a0ed00c4 100644
--- a/components/datalake-handler/admin/src/src/app/shared/layout/sidebar/sidebar.component.html
+++ b/components/datalake-handler/admin/src/src/app/shared/layout/sidebar/sidebar.component.html
@@ -30,7 +30,7 @@ limitations under the License.
         <a class="nav-link" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}"
           routerLink="/feeder">
           <i class="fas fa-tachometer-alt">&nbsp;</i>
-          {{"SIDEBAR.FEDDFER" | translate}}
+          {{"SIDEBAR.FEEDER" | translate}}
         </a>
       </li>
 
diff --git a/components/datalake-handler/admin/src/src/app/views/feeder/feeder.component.ts b/components/datalake-handler/admin/src/src/app/views/feeder/feeder.component.ts
index 921910b8..ceb9e59f 100644
--- a/components/datalake-handler/admin/src/src/app/views/feeder/feeder.component.ts
+++ b/components/datalake-handler/admin/src/src/app/views/feeder/feeder.component.ts
@@ -49,7 +49,7 @@ export class FeederComponent implements OnInit {
     private notificationService: ToastrNotificationService,
     private spinner: NgxSpinnerService
   ) {
-    this.adminService.setTitle("SIDEBAR.FEDDFER");
+    this.adminService.setTitle("SIDEBAR.FEEDER");
     this.restApiService.getTopicsFromFeeder().subscribe(
       res => {
         this.topicContent = res.length.toString();
diff --git a/components/datalake-handler/admin/src/src/assets/i18n/en-us.json b/components/datalake-handler/admin/src/src/assets/i18n/en-us.json
index 233f1377..f0217a8f 100644
--- a/components/datalake-handler/admin/src/src/assets/i18n/en-us.json
+++ b/components/datalake-handler/admin/src/src/assets/i18n/en-us.json
@@ -1,6 +1,6 @@
 {
   "SIDEBAR": {
-    "FEDDFER": "DataLake Feeder",
+    "FEEDER": "DataLake Feeder",
     "KAFKA": "Kafka",
     "TOPICS": "Topics",
     "DATABASE": "Database",
@@ -11,7 +11,7 @@
   },
   "NAME": "Name",
   "STATUS": "Status",
-  "SINK": "Sink",
+  "SINK": "Target",
   "AUTHENTICATION": "Authentication",
   "DATA_FORMAT": "Data format",
   "TTL": "TTL",
@@ -56,7 +56,7 @@
   "NODATA": "No Data",
   "NEW_TEMPLATE": "New design",
   "TEMPLATE_BODY": "Body",
-  "FIELUPLOAD": "Import",
+  "FIELUPLOAD": "Select File ...",
   "SUCCESSFULLY_CREARED": "Successfully created.",
   "FAILED_CREARED": "Failed updated.",
   "SUCCESSFULLY_UPDATED": "Successfully updated.",
diff --git a/components/datalake-handler/admin/src/src/assets/i18n/zh-hans.json b/components/datalake-handler/admin/src/src/assets/i18n/zh-hans.json
index 22bfe424..0ba8503f 100644
--- a/components/datalake-handler/admin/src/src/assets/i18n/zh-hans.json
+++ b/components/datalake-handler/admin/src/src/assets/i18n/zh-hans.json
@@ -1,11 +1,11 @@
 {
   "SIDEBAR": {
-    "FEDDFER": "DataLake Feeder",
+    "FEEDER": "DataLake Feeder",
     "TOPICS": "Topics",
-    "KAFKA":"卡夫卡",
+    "KAFKA":"Kafka",
     "DATABASE": "Database",
-    "DASHBOARD": "仪表板设置",
-    "DASHBOARDLIST": "仪表板",
+    "DASHBOARD": "工具设置",
+    "DASHBOARDLIST": "工具",
     "TEMPLATE": "模板",
     "ABOUT": "About"
   },
diff --git a/components/datalake-handler/admin/src/src/assets/i18n/zh-hant.json b/components/datalake-handler/admin/src/src/assets/i18n/zh-hant.json
index 83e1be99..a3649be0 100644
--- a/components/datalake-handler/admin/src/src/assets/i18n/zh-hant.json
+++ b/components/datalake-handler/admin/src/src/assets/i18n/zh-hant.json
@@ -1,11 +1,11 @@
 {
   "SIDEBAR": {
-    "FEDDFER": "DataLake Feeder",
-    "KAFKA":"卡夫卡",
+    "FEEDER": "DataLake Feeder",
+    "KAFKA":"Kafka",
     "TOPICS": "Topics",
     "DATABASE": "Database",
-    "DASHBOARD": "儀表板設置",
-    "DASHBOARDLIST": "儀表板",
+    "DASHBOARD": "工具設置",
+    "DASHBOARDLIST": "工具",
     "TEMPLATE": "模板",
     "ABOUT": "About"
   },