fix(web): Update set default values on afterCreate

rucken · Oct 21, 2017 · b29f3bf · b29f3bf
1 parent fd4438a
commit b29f3bf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/libs/web/src/base/base-modal/base-modal.component.ts b/libs/web/src/base/base-modal/base-modal.component.ts
@@ -55,10 +55,12 @@ export class BaseModalComponent extends BaseComponent {
         this.afterOpen();
       });
     }
+  }
+  afterCreate() {
     if (this.hideOnClose === undefined) {
       this.hideOnClose = true;
     }
-    if (this.hideButton === false) {
+    if (this.hideButton === undefined) {
       this.hideButton = false;
     }
     if (this.title === undefined) {

diff --git a/libs/web/src/base/base-resources-grid/base-resources-grid.component.ts b/libs/web/src/base/base-resources-grid/base-resources-grid.component.ts
@@ -2,6 +2,7 @@ import { Component, EventEmitter, HostListener, Input, Output } from '@angular/c
 import { EndpointStatusEnum } from '@rucken/core';
 
 import { BaseComponent } from './../../base/base-component/base-component.component';
+import * as _ from 'lodash';
 
 @Component({
   selector: 'base-resources-grid',
@@ -45,7 +46,7 @@ export class BaseResourcesGridComponent extends BaseComponent {
     return {};
   }
   set columns(columns: any) {
-    if (columns && this.cachedResourcesService && JSON.stringify(this.cachedResourcesService.columns) !== JSON.stringify(columns)) {
+    if (!_.isEmpty(columns) && this.cachedResourcesService && !_.isEqual(this.cachedResourcesService.columns, columns)) {
       this.cachedResourcesService.columns = columns;
       this.search(true);
     }
@@ -97,14 +98,13 @@ export class BaseResourcesGridComponent extends BaseComponent {
     }
   }
   afterCreate() {
-
-    if (this.loadAll) {
+    if (this.loadAll === undefined) {
       this.loadAll = true;
     }
-    if (this.onEnterEnabled) {
+    if (this.onEnterEnabled === undefined) {
       this.onEnterEnabled = true;
     }
-    if (this.hardReadonly) {
+    if (this.hardReadonly === undefined) {
       this.hardReadonly = true;
     }
   }