Skip to content
Merged
9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,12 @@
"license": "ISC",
"dependencies": {
"adm-zip": "^0.5.18",
"datatables.net": "^2.3.2",
"datatables.net-bs5": "^2.3.2",
"dattatable": "^2.11.75",
"datatables.net": "^3.0.0",
"datatables.net-bs5": "^3.0.0",
"dattatable": "^2.11.76",
"exceljs": "^4.4.0",
"fast-xml-parser": "^5.9.3",
"gd-sprest-bs": "^10.15.87",
"jquery": "^3.7.1",
"gd-sprest-bs": "^10.15.90",
"jszip": "^3.10.1",
"mammoth": "^1.12.0",
"moment": "^2.30.1",
Expand Down
6 changes: 4 additions & 2 deletions src/reports/dlp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ export class DLP {
let completed = 0;

// Set the list
let web = this._loadOneDrive ? Web.getOneDrive() : Web(webUrl, { requestDigest: DataSource.SiteContext.FormDigestValue });
let web = this._loadOneDrive ? Web.getOneDrive({ callbackQuery: () => { if (this._stopFl) { list.stop(); } } })
: Web(webUrl, { requestDigest: DataSource.SiteContext.FormDigestValue, callbackQuery: () => { if (this._stopFl) { list.stop(); } } });
let list = web.Lists(lib.Title);

// Get the item ids for this library
Expand Down Expand Up @@ -661,7 +662,8 @@ export class DLP {
// Create the list for the batch requests
let batchRequests = 0;
let completed = 0;
let web = this._loadOneDrive ? Web.getOneDrive() : Web(webUrl, { requestDigest: DataSource.SiteContext.FormDigestValue });
let web = this._loadOneDrive ? Web.getOneDrive({ callbackQuery: () => { if (this._stopFl) { list.stop(); } } })
: Web(webUrl, { requestDigest: DataSource.SiteContext.FormDigestValue, callbackQuery: () => { if (this._stopFl) { list.stop(); } } });
let list = web.Lists().getById(libId);

// Get the item ids for this library
Expand Down
3 changes: 2 additions & 1 deletion src/reports/searchEEEU.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ export class SearchEEEU {
// Create a batch job
let completed = 0;
let ctrBatchJobs = 0;
let batchWeb = this._loadOneDrive ? Web.getOneDrive() : Web(web.Url, { requestDigest: DataSource.SiteContext.FormDigestValue });
let batchWeb = this._loadOneDrive ? Web.getOneDrive({ callbackQuery: () => { if (this._stopFl) { batch.stop(); } } })
: Web(web.Url, { requestDigest: DataSource.SiteContext.FormDigestValue, callbackQuery: () => { if (this._stopFl) { batch.stop(); } } });
let batch = batchWeb.Lists().getById(list.Id);

// Update the dialog
Expand Down
Loading