Commit 6f2a4409c16ad45bfa2628f01bc69dac5cb4ebe6

Authored by Igor Kulikov
Committed by GitHub
2 parents 4c87b36a 58c12d12

Merge pull request #4059 from vvlladd28/bug/entities-panel/merge-additional-info

Fixed merge additional info at updated entity
@@ -44,7 +44,7 @@ import { EntityAction } from '@home/models/entity/entity-component.models'; @@ -44,7 +44,7 @@ import { EntityAction } from '@home/models/entity/entity-component.models';
44 import { Subscription } from 'rxjs'; 44 import { Subscription } from 'rxjs';
45 import { MatTab, MatTabGroup } from '@angular/material/tabs'; 45 import { MatTab, MatTabGroup } from '@angular/material/tabs';
46 import { EntityTabsComponent } from '@home/components/entity/entity-tabs.component'; 46 import { EntityTabsComponent } from '@home/components/entity/entity-tabs.component';
47 -import { deepClone } from '@core/utils'; 47 +import { deepClone, mergeDeep } from '@core/utils';
48 48
49 @Component({ 49 @Component({
50 selector: 'tb-entity-details-panel', 50 selector: 'tb-entity-details-panel',
@@ -280,7 +280,7 @@ export class EntityDetailsPanelComponent extends PageComponent implements OnInit @@ -280,7 +280,7 @@ export class EntityDetailsPanelComponent extends PageComponent implements OnInit
280 280
281 saveEntity() { 281 saveEntity() {
282 if (this.detailsForm.valid) { 282 if (this.detailsForm.valid) {
283 - const editingEntity = {...this.editingEntity, ...this.entityComponent.entityFormValue()}; 283 + const editingEntity = mergeDeep(this.editingEntity, this.entityComponent.entityFormValue());
284 this.entitiesTableConfig.saveEntity(editingEntity).subscribe( 284 this.entitiesTableConfig.saveEntity(editingEntity).subscribe(
285 (entity) => { 285 (entity) => {
286 this.entity = entity; 286 this.entity = entity;