Skip to content

Report last reported sync progress before returning result #916

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

Merged
nikithauc merged 1 commit into from
Aug 8, 2022
Merged

Report last reported sync progress before returning result #916

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,6 @@ samples/lib/

test/development/secrets.ts

.nyc_output/*
.nyc_output/*

.idea/*
14 changes: 9 additions & 5 deletions src/tasks/LargeFileUploadTask.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,8 @@ export class LargeFileUploadTask<T> {
* (rawResponse.status === 200 && responseBody.id) -> This additional condition is applicable only for OneDrive API.
*/
if (rawResponse.status === 201 || (rawResponse.status === 200 && responseBody.id)) {
const uploadResult = UploadResult.CreateUploadResult(responseBody, rawResponse.headers);
return uploadResult;
this.reportProgress(uploadEventHandlers, nextRange);
return UploadResult.CreateUploadResult(responseBody, rawResponse.headers);
}

/* Handling the API issue where the case of Outlook upload response property -'nextExpectedRanges' is not uniform.
Expand All @@ -275,9 +275,13 @@ export class LargeFileUploadTask<T> {
nextExpectedRanges: responseBody.NextExpectedRanges || responseBody.nextExpectedRanges,
};
this.updateTaskStatus(res);
if (uploadEventHandlers && uploadEventHandlers.progress) {
uploadEventHandlers.progress(nextRange, uploadEventHandlers.extraCallbackParam);
}
this.reportProgress(uploadEventHandlers, nextRange);
}
}

private reportProgress(uploadEventHandlers: UploadEventHandlers, nextRange: Range) {
if (uploadEventHandlers && uploadEventHandlers.progress) {
uploadEventHandlers.progress(nextRange, uploadEventHandlers.extraCallbackParam);
}
}

Expand Down
2 changes: 1 addition & 1 deletion test/common/tasks/LargeFileUploadTask.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ describe("LargeFileUploadTask.ts", () => {
assert.isDefined(result);
assert.instanceOf(result, UploadResult);
assert.equal(result["location"], location);
assert.isFalse(isProgressReportCalled);
assert.isTrue(isProgressReportCalled);
});

it("Test without progress callback", async () => {
Expand Down