Skip to content

fix(#7594): prevent extra doc duplication when editing reports #11068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shivv23 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(#7594): prevent extra doc duplication when editing reports #11068

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions webapp/src/ts/services/enketo.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,8 @@ export class EnketoService {
return form;
}

private xmlToDocs(doc, formXml, xmlVersion, record) {
private xmlToDocs(doc, form, record, isEdit = false) {
const { xml: formXml, xmlVersion } = form;
const recordDoc = $.parseXML(record);
const $record = $($(recordDoc).children()[0]);
const repeatPaths = this.enketoTranslationService.getRepeatPaths(formXml);
Expand Down Expand Up @@ -465,7 +466,7 @@ export class EnketoService {
$element.text(refId);
});

const docsToStore = $record
const docsToStore = isEdit ? [] : $record
.find('[db-doc=true]')
.map((idx, element) => {
const docToStore: any = this.enketoTranslationService.reportRecordToJs(getOuterHTML(element));
Expand Down Expand Up @@ -576,21 +577,21 @@ export class EnketoService {
await this.prepareForSave(form);
return this.ngZone.runOutsideAngular(async () => {
const doc = this.create(formInternalId, contact);
return this._save(form, formDoc, doc);
return this._save(form, formDoc, doc, false);
});
}

async completeExistingReport(form, formDoc, docId) {
await this.prepareForSave(form);
return this.ngZone.runOutsideAngular(async () => {
const doc = await this.update(docId);
return this._save(form, formDoc, doc);
return this._save(form, formDoc, doc, true);
});
}

private async _save(form, formDoc, doc) {
private async _save(form, formDoc, doc, isEdit = false) {
const dataString = form.getDataStr({ irrelevant: false });
return this.xmlToDocs(doc, formDoc.xml, formDoc.doc.xmlVersion, dataString);
return this.xmlToDocs(doc, { xml: formDoc.xml, xmlVersion: formDoc.doc.xmlVersion }, dataString, isEdit);
}

unload(form) {
Expand Down