Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
vcheckzen committed Oct 28, 2024
2 parents 769dd77 + 0e70412 commit dbb07bc
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
9 changes: 5 additions & 4 deletions back-end-cf/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -211,10 +211,11 @@ async function fetchFiles(path, passwd, skipToken, orderby) {
path = ':' + encodeURIComponent(EXPOSE_PATH + path) + ':';
}
const accessToken = await fetchAccessToken();
const expand = `/children?select=name,size,parentReference,lastModifiedDateTime,@microsoft.graph.downloadUrl
&$top=200${orderby ? '&$orderby=' + orderby : ''}${
skipToken ? '&skiptoken=' + skipToken : ''
}`;
const expand = [
'/children?select=name,size,parentReference,lastModifiedDateTime,@microsoft.graph.downloadUrl',
orderby ? `&$orderby=${orderby}` : '',
skipToken ? `&skiptoken=${skipToken}` : ''
].join('');
const uri = OAUTH.apiUrl + path + expand;

const pageRes = await getContent(uri, {
Expand Down
7 changes: 6 additions & 1 deletion front-end/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -1895,7 +1895,12 @@
sendRequest(
window.api.method,
window.api.url,
window.api.formatPayload(path /*'', { orderby: orderby }*/),
window.api.formatPayload(
path,
window.fileCache.get(`${path}/.password`),
// Orderby is not working, do not send it.
// { orderby: orderby }
),
window.api.headers,
(data) => {
try {
Expand Down

0 comments on commit dbb07bc

Please sign in to comment.