bug fix

src/app/app.component.ts

@@ -223,7 +223,7 @@ export class AppComponent implements OnInit {
       if (newValue.onSuccess) {
         newValue.onSuccess(newValue);
       }
-      this.util.showMessage('new value added successfully');
+      this.util.showMessage(newValue.edit ? 'The value is updated successfully' : 'New value added successfully');
     }, e => {
       console.error(e.error.message);
       this.util.showMessage('new value add failed, ' + this.util.getErrorMessage(e));

src/app/components/add-value-dialog/add-value-dialog.component.ts

@@ -1,7 +1,9 @@
 import {Component, Inject, OnInit} from '@angular/core';
-import {MAT_DIALOG_DATA, MatDialogRef, MatSnackBar} from '@angular/material';
+import {MAT_DIALOG_DATA, MatDialog, MatDialogRef, MatSnackBar} from '@angular/material';
 import {UtilService} from '../../services/util.service';
 import _ from 'lodash';
+import {ConfirmDialogComponent} from '../confirm-dialog/confirm-dialog.component';
+import {RedisService} from '../../services/redis.service';
 
 
 /**
@@ -37,7 +39,9 @@ export class AddValueDialogComponent implements OnInit {
     public dialogRef: MatDialogRef<AddValueDialogComponent>,
     @Inject(MAT_DIALOG_DATA) public data: ValueMode,
     private snackBar: MatSnackBar,
-    private util: UtilService
+    private util: UtilService,
+    private redisService: RedisService,
+    private dialogService: MatDialog
   ) {
   }
 
@@ -127,8 +131,10 @@ export class AddValueDialogComponent implements OnInit {
           return this.showError('duplicate keys found');
         }
         for (let i = 0; i < values.length; i++) {
-          this.data.rawLine.push('HMSET');
-          this.data.rawLine.push(this.data.key);
+          if (i === 0) {
+            this.data.rawLine.push('HMSET');
+            this.data.rawLine.push(this.data.key);
+          }
           values[i].value = getValue(values[i].value);
           values[i].key = getValue(values[i].key);
           if (!values[i].key) {
@@ -144,7 +150,48 @@ export class AddValueDialogComponent implements OnInit {
         break;
       }
     }
-    this.dialogRef.close(this.data);
+    this.checkIsExist(this.data, () => {
+      this.dialogRef.close(this.data);
+    });
+  }
+
+  /**
+   * remove exist key
+   * @param ret the ret include id and key
+   * @param cb the callback
+   */
+  removeExistKey(ret, cb) {
+    this.redisService.call(ret.id, [['DEL', ret.key]]).subscribe(() => {
+      cb();
+    }, err => {
+      this.util.showMessage('del key failed, ' + this.util.getErrorMessage(err));
+    });
+  }
+
+  /**
+   * check is exist
+   * @param ret the ret include id and key/values
+   * @param cb the callback
+   */
+  checkIsExist(ret, cb) {
+    this.redisService.call(ret.id, [['EXISTS', ret.key]]).subscribe((r) => {
+      if (r && r.length > 0 && r[0] > 0) { // exist
+        this.dialogService.open(ConfirmDialogComponent, {
+          width: '360px', data: {
+            title: `Key "${ret.key}" Exists`,
+            message: `Are you sure you want to to replace original value ?`
+          }
+        }).afterClosed().subscribe(cr => {
+          if (cr) {
+            this.removeExistKey(ret, cb);
+          }
+        });
+      } else {
+        cb();
+      }
+    }, () => {
+      this.util.showMessage('check key is exist failed');
+    });
   }
 
   /**

src/app/components/add-value-form/add-value-form.component.html

@@ -45,7 +45,7 @@
   </div>
 
   <div class="line buttons">
-    <button mat-button (click)="onAddItem(getItemArray())" [disabled]="isEditMode">
+    <button mat-button (click)="onAddItem(getItemArray())" *ngIf="!isEditMode">
       <i class="material-icons">add</i>Add New Value
     </button>
   </div>

src/app/components/add-value-form/add-value-form.component.ts

@@ -93,7 +93,9 @@ export class AddValueFormComponent implements OnInit {
   onValueChange() {
     this.onValueUpdate.emit({
       orderedValues: this.orderedValues,
-      hashMapValues: _.map(this.hashMapValues, (o) => { return _.omit(o, 'isNew'); }),
+      hashMapValues: _.map(this.hashMapValues, (o) => {
+        return _.omit(o, 'isNew');
+      }),
       values: this.values
     });
   }

src/app/components/data-viewer/data-viewer.component.ts

@@ -237,8 +237,10 @@ export class DataViewerComponent implements OnInit, OnChanges {
 
   /**
    * on add new record
+   * @param values the record base values
+   * @param edit is edit mode
    */
-  onAddNewRecords(values) {
+  onAddNewRecords(values, edit = false) {
     const viewMode = new ValueMode();
     viewMode.type = TYPE_MAP[this.pageData.item.type];
     viewMode.hideType = true;
@@ -274,6 +276,7 @@ export class DataViewerComponent implements OnInit, OnChanges {
             this.fetchData();
           }
         };
+        ret.edit = edit;
         this.onNewValue.emit(ret);
       }
     });
@@ -354,7 +357,7 @@ export class DataViewerComponent implements OnInit, OnChanges {
    * @param elements the element arr
    */
   onEditMapElements(elements) {
-    this.onAddNewRecords({hashMapValues: JSON.parse(JSON.stringify(elements))});
+    this.onAddNewRecords({hashMapValues: JSON.parse(JSON.stringify(elements))}, true);
   }
 
   /**

src/app/components/import-data-dialog/import-data-dialog.component.ts

@@ -4,6 +4,8 @@ import {UtilService} from '../../services/util.service';
 import {RedisService} from '../../services/redis.service';
 import { saveAs } from 'file-saver';
 import _ from 'lodash';
+import {Store} from '@ngrx/store';
+import {REQ_FETCH_TREE} from '../../ngrx/actions/redis-actions';
 
 @Component({
   selector: 'app-import-data-dialog',
@@ -23,6 +25,7 @@ export class ImportDataDialogComponent implements OnInit {
     @Inject(MAT_DIALOG_DATA) public data,
     private dialogRef: MatDialogRef<ImportDataDialogComponent>,
     private redisService: RedisService,
+    private _store: Store<any>,
     public util: UtilService) {
   }
 
@@ -120,6 +123,7 @@ export class ImportDataDialogComponent implements OnInit {
       this.util.showMessage(`${numberOfSucceed} of row import successful, ${totalRow
       - numberOfSucceed} of row import failed.`);
       this.dialogRef.close();
+      this._store.dispatch({type: REQ_FETCH_TREE, payload: {id: this.instanceId}});
     }, err => {
       this.util.showMessage('Import data failed, ' + this.util.getErrorMessage(err));
     });

src/app/components/instance-root-panel/instance-root-panel.component.ts

@@ -31,9 +31,7 @@ export class InstanceRootPanelComponent implements OnInit {
     pageSize: 20,
   };
 
-  constructor(public dialogService: MatDialog, private _store: Store<any>,
-              private util: UtilService,
-              private redisService: RedisService) {
+  constructor(public dialogService: MatDialog, private _store: Store<any>) {
     this.cli$ = this._store.select('cli');
   }
 
@@ -72,27 +70,6 @@ export class InstanceRootPanelComponent implements OnInit {
     });
   }
 
-  checkIsExist(ret) {
-    this.redisService.call(this.pageData.id, [['EXISTS', ret.key]]).subscribe((r) => {
-      if (r && r.length > 0 && r[0] > 0) { // exist
-        this.dialogService.open(ConfirmDialogComponent, {
-          width: '360px', data: {
-            title: `Key "${ret.key}" Exists`,
-            message: `Are you sure you want to to replace original value ?`
-          }
-        }).afterClosed().subscribe(cr => {
-          if (cr) {
-            this.onNewValue.emit(ret);
-          }
-        });
-      } else {
-        this.onNewValue.emit(ret);
-      }
-    }, () => {
-      this.util.showMessage('network error');
-    });
-  }
-
   /**
    * on add new record event, show a dialog
    */
@@ -107,7 +84,7 @@ export class InstanceRootPanelComponent implements OnInit {
       if (ret) {
         ret.from = 'root';
         ret.item = {};
-        this.checkIsExist(ret);
+        this.onNewValue.emit(ret);
       }
     });
   }