Skip to content

Fixed Deep Sub-Folder Issue #214

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
gudatta merged 3 commits into from
Feb 28, 2026
Merged

Fixed Deep Sub-Folder Issue #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a6bc397
Updated the logic for getting all the files and folders in a library.
gudatta Feb 28, 2026
d11f9bc
Fixed error when getting folder.
gudatta Feb 28, 2026
d1e1dd9
Revert debug.
gudatta Feb 28, 2026
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"datatables.net": "^2.3.2",
"datatables.net-bs5": "^2.3.2",
"dattatable": "^2.11.62",
"gd-sprest-bs": "^10.15.39",
"gd-sprest-bs": "^10.15.43",
"jquery": "^3.7.1",
"moment": "^2.30.1"
},
Expand Down
53 changes: 28 additions & 25 deletions src/ds.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,22 +509,21 @@ export class DataSource {
}

// Loads the files for a drive
static loadFiles(webId: string, listName?: string, folder?: Types.SP.Folder, onFile?: (file: Types.Microsoft.Graph.driveItem) => void): PromiseLike<Types.Microsoft.Graph.driveItem[]> {
static loadFiles(webId: string, listName: string, folder?: Types.SP.Folder, onFile?: (file: Types.Microsoft.Graph.driveItem) => void): PromiseLike<Types.Microsoft.Graph.driveItem[]> {
let files = [];

// Loads the files for a drive
let getFiles = (driveId: string, folder: string = "") => {
let drive = v2.sites({
let getFiles = (driveId: string, folderId: string) => {
let driveFolder = v2.sites({
siteId: this.Site.Id, webId, targetInfo: {
disableProcessing: true,
keepalive: true
}
}).drives(driveId);
}).drives(driveId).items(folderId);

// Return a promise
return new Promise(resolve => {
// Get the files for the folder
let driveFolder = folder ? drive.getFolder(folder) : drive.root();
driveFolder.children().query({
GetAllItems: true,
Select: ["createdBy", "driveId", "file", "folder", "id", "name", "parentReference", "sensitivityLabel", "webUrl"],
Expand All @@ -539,9 +538,11 @@ export class DataSource {

// Append the file
files.push(driveItem);
} else {
}
// Else, it's a folder
else if (driveItem.folder) {
// Get the items for this folder
return getFiles(driveId, (folder ? folder + "/" : "") + driveItem.name);
return getFiles(driveId, driveItem.id);
}
}).then(() => {
// Resolve the request
Expand All @@ -553,27 +554,29 @@ export class DataSource {

// Return a promise
return new Promise((resolve, reject) => {
// Get the libraries for this site
// Get the library
v2.sites({ siteId: DataSource.Site.Id, webId, targetInfo: { keepalive: true } }).drives().execute(resp => {
let drives: Types.Microsoft.Graph.drive[] = [];

// See if we are searching for a specific library
if (listName) {
// Find the target drive
let drive = resp.results.find(a => { return a.name == listName; });
if (drive) { drives.push(drive); }
} else {
// Parse the drives
for (let i = 0; i < resp.results.length; i++) {
let drive = resp.results.find(a => { return a.name == drives[i].name; });
if (drive) { drives.push(drive); }
// Find the target drive
let drive = resp.results.find(a => { return a.name == listName; });
if (drive) {
// See if we are getting a specific folder
if (folder) {
// Get the folder
drive.getFolder(folder.Name).execute(folder => {
// Get the files
getFiles(drive.id, folder.id).then(() => { resolve(files); });
});
} else {
// Get the root folder
drive.root().execute(rootFolder => {
// Get the files
getFiles(drive.id, rootFolder.id).then(() => { resolve(files); });
});
}
} else {
// Resolve the request
resolve(files);
}

// Parse the drives
Helper.Executor(drives, drive => {
return getFiles(drive.id, folder?.Name);
}).then(() => { resolve(files); });
}, reject);
});
}
Expand Down