summaryrefslogtreecommitdiffstats
path: root/catalog-ui/src/app/directives
diff options
context:
space:
mode:
Diffstat (limited to 'catalog-ui/src/app/directives')
-rw-r--r--catalog-ui/src/app/directives/graphs-v2/composition-graph/composition-graph.directive.ts3
-rw-r--r--catalog-ui/src/app/directives/property-types/type-map/type-map-directive.ts10
2 files changed, 8 insertions, 5 deletions
diff --git a/catalog-ui/src/app/directives/graphs-v2/composition-graph/composition-graph.directive.ts b/catalog-ui/src/app/directives/graphs-v2/composition-graph/composition-graph.directive.ts
index db03aa53fb..b404a83634 100644
--- a/catalog-ui/src/app/directives/graphs-v2/composition-graph/composition-graph.directive.ts
+++ b/catalog-ui/src/app/directives/graphs-v2/composition-graph/composition-graph.directive.ts
@@ -168,7 +168,7 @@ export class CompositionGraph implements ng.IDirective {
this.ComponentServiceNg2.getCapabilitiesAndRequirements(leftPaletteComponent.componentType, leftPaletteComponent.uniqueId).subscribe((response: ComponentGenericResponse) => {
- let component = this.ComponentFactory.createEmptyComponent(leftPaletteComponent.componentType);
+ let component = this.ComponentFactory.createEmptyComponent(leftPaletteComponent.componentType);
component.uniqueId = component.uniqueId;
component.capabilities = response.capabilities;
component.requirements = response.requirements;
@@ -246,6 +246,7 @@ export class CompositionGraph implements ng.IDirective {
this.eventListenerService.registerObserverCallback(GRAPH_EVENTS.ON_VERSION_CHANGED, (component:Component) => {
scope.component = component;
+ this._cy.elements().remove();
this.loadGraphData(scope);
});
diff --git a/catalog-ui/src/app/directives/property-types/type-map/type-map-directive.ts b/catalog-ui/src/app/directives/property-types/type-map/type-map-directive.ts
index a0c9a6c460..fa71e47804 100644
--- a/catalog-ui/src/app/directives/property-types/type-map/type-map-directive.ts
+++ b/catalog-ui/src/app/directives/property-types/type-map/type-map-directive.ts
@@ -96,15 +96,17 @@ export class TypeMapDirective implements ng.IDirective {
} else {
scope.parentFormObj[fieldName].$setValidity('keyExist', true);
if (!scope.parentFormObj[fieldName].$invalid) {
+ //To preserve the order of the keys, delete each one and recreate
let newObj = {};
- angular.forEach(scope.valueObjRef,function(value:any,key:string){
+ angular.copy(scope.valueObjRef , newObj);
+ angular.forEach(newObj,function(value:any,key:string){
+ delete scope.valueObjRef[key];
if(key == oldKey){
- newObj[newKey] = value;
+ scope.valueObjRef[newKey] = value;
}else{
- newObj[key] = value;
+ scope.valueObjRef[key] = value;
}
});
- scope.valueObjRef = newObj;
}
}
};