Skip to content

Commit ba560c0

Browse files
authored
Fix the deletion of WRC created variables. (#137)
1 parent 72b9273 commit ba560c0

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

webui/src/js/viewModels/model-design-view.js

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,6 @@ function(accUtils, i18n, ko, project, urlCatalog, viewHelper, wktLogger, ViewMod
127127
fileContents: this.project.wdtModel.modelContent()
128128
};
129129

130-
if (!providerOptions.fileContents) {
131-
const modelTemplates = this.designer.getProperty('modelTemplate');
132-
providerOptions.fileContents = modelTemplates.domain;
133-
}
134-
135130
// A name is needed to create a WDT Model File provider.
136131
//
137132
providerOptions['name'] = this.project.wdtModel.getDefaultModelFile();
@@ -174,7 +169,21 @@ function(accUtils, i18n, ko, project, urlCatalog, viewHelper, wktLogger, ViewMod
174169
wktLogger.debug('Received changesAutoDownloaded event with modelContent = %s', event.detail.value);
175170
this.wrcBackendTriggerChange = true;
176171
this.project.wdtModel.modelContent(event.detail.value);
177-
if (event.detail.properties) this.project.wdtModel.getModelPropertiesObject().observable(event.detail.properties);
172+
if (event.detail.properties) {
173+
const existingProperties = this.project.wdtModel.getModelPropertiesObject().observable();
174+
event.detail.properties.forEach((item) => {
175+
const index = existingProperties.map(item1 => item1.uid).indexOf(item.uid);
176+
if (index === -1) {
177+
// Must call addNewItem() in order to get remove() function added
178+
this.project.wdtModel.getModelPropertiesObject().addNewItem({uid: item.uid, Name: item.Name, Value: item.Value});
179+
}
180+
else {
181+
// Update existing properties with data from "Design View"
182+
existingProperties[index].Name = item.Name;
183+
existingProperties[index].Value = item.Value;
184+
}
185+
});
186+
}
178187
};
179188

180189
this.archiveUpdated = (event) => {

0 commit comments

Comments
 (0)