Merge branch 'dev' of https://github.com/pnp/sp-dev-fx-property-controls

into dev
pnp · Apr 17, 2024 · 44b13de · 44b13de
2 parents 9216b53 + db773cc
commit 44b13de
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/src/services/OrgAssetsService.ts b/src/services/OrgAssetsService.ts
@@ -48,15 +48,20 @@ export class OrgAssetsService extends FileBrowserService {
   public getListItemsByListId = async (listId: string, folderPath: string, acceptedFilesExtensions?: string[], nextPageQueryStringParams?: string): Promise<FilesQueryResult> => {
     let filesQueryResult: FilesQueryResult = { items: [], nextHref: null };
     try {
+      let orgAssetLibraryServerRelativeUrlWithoutTrailingSlash = this._orgAssetsLibraryServerRelativeSiteUrl;
+      if (orgAssetLibraryServerRelativeUrlWithoutTrailingSlash.charAt(orgAssetLibraryServerRelativeUrlWithoutTrailingSlash.length - 1) === '/') {
+        orgAssetLibraryServerRelativeUrlWithoutTrailingSlash = orgAssetLibraryServerRelativeUrlWithoutTrailingSlash.slice(0, -1);
+      }
+
       // Retrieve Lib path from folder path
       if (folderPath.charAt(0) !== "/") {
         folderPath = `/${folderPath}`;
       }
       // Remove all the rest of the folder path
-      let libName = folderPath.replace(`${this._orgAssetsLibraryServerRelativeSiteUrl}/`, "");
-      libName = libName.split("/")[0];
-      // Buil absolute library URL
-      const libFullUrl = this.buildAbsoluteUrl(`${this._orgAssetsLibraryServerRelativeSiteUrl}/${libName}`);
+      let libName = folderPath.replace(`${orgAssetLibraryServerRelativeUrlWithoutTrailingSlash}/`, "");
+      libName = libName.split("/")[0]; // Get only library name, if navigated to sub folder in the picker
+      // Build absolute library URL
+      const libFullUrl = this.buildAbsoluteUrl(`${orgAssetLibraryServerRelativeUrlWithoutTrailingSlash}/${libName}`);
 
       let queryStringParams: string = "";
       // Do not pass FolderServerRelativeUrl as query parameter
@@ -104,7 +109,7 @@ export class OrgAssetsService extends FileBrowserService {
 
   private _parseOrgAssetsLibraryItem = (libItem: any): ILibrary => { // eslint-disable-line @typescript-eslint/no-explicit-any
     const orgAssetsLibrary: ILibrary = {
-      absoluteUrl: this.buildAbsoluteUrl(libItem.LibraryUrl.DecodedUrl),
+      absoluteUrl: this.buildAbsoluteUrl(`/${libItem.LibraryUrl.DecodedUrl}`),
       title: libItem.DisplayName,
       id: libItem.ListId,
       serverRelativeUrl: libItem.LibraryUrl.DecodedUrl,