Skip to content

Commit 3b9187c

Browse files
albegutAlberto Gutierrez Perez
andauthored
Fix/file picker org assets root site (#1954)
* Fixed path in root site organization assets libraries * Change functionality from get to set --------- Co-authored-by: Alberto Gutierrez Perez <[email protected]>
1 parent 7c5533c commit 3b9187c

File tree

1 file changed

+18
-5
lines changed

1 file changed

+18
-5
lines changed

src/services/OrgAssetsService.ts

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,19 @@ export class OrgAssetsService extends FileBrowserService {
1010
// Site organization assets library server relative URL
1111
private _orgAssetsLibraryServerRelativeSiteUrl: string = null;
1212

13+
private get orgAssetsLibraryServerRelativeSiteUrl(): string {
14+
return this._orgAssetsLibraryServerRelativeSiteUrl;
15+
}
16+
17+
private set orgAssetsLibraryServerRelativeSiteUrl(value: string) {
18+
if (value === "/") {
19+
this._orgAssetsLibraryServerRelativeSiteUrl = "";
20+
}
21+
else {
22+
this._orgAssetsLibraryServerRelativeSiteUrl = value?.replace(/\/$/, "") ?? null
23+
}
24+
}
25+
1326
/**
1427
* Constructor
1528
* @param context Component context
@@ -35,11 +48,11 @@ export class OrgAssetsService extends FileBrowserService {
3548
}
3649

3750
// Remove all the rest of the folder path
38-
let libName = folderPath.replace(`${this._orgAssetsLibraryServerRelativeSiteUrl}/`, '');
51+
let libName = folderPath.replace(`${this.orgAssetsLibraryServerRelativeSiteUrl}/`, '');
3952
libName = libName.split('/')[0];
4053

4154
// Build absolute library URL
42-
const libFullUrl = this.buildAbsoluteUrl(`${this._orgAssetsLibraryServerRelativeSiteUrl}/${libName}`);
55+
const libFullUrl = this.buildAbsoluteUrl(`${this.orgAssetsLibraryServerRelativeSiteUrl}/${libName}`);
4356

4457
let queryStringParams: string = "";
4558
// Do not pass FolderServerRelativeUrl as query parameter
@@ -66,7 +79,7 @@ export class OrgAssetsService extends FileBrowserService {
6679
/**
6780
* Gets document and media libraries from the site
6881
* @param includePageLibraries Unused parameter (not used in this implementation)
69-
* @returns Document and media libraries from the site
82+
* @returns Document and media libraries from the site
7083
*/
7184
public getSiteMediaLibraries = async (includePageLibraries: boolean = false): Promise<ILibrary[]> => {
7285
try {
@@ -81,7 +94,7 @@ export class OrgAssetsService extends FileBrowserService {
8194
return null;
8295
}
8396

84-
this._orgAssetsLibraryServerRelativeSiteUrl = orgAssetsData ? orgAssetsData.OrgAssets.Url.DecodedUrl : null;
97+
this.orgAssetsLibraryServerRelativeSiteUrl = orgAssetsData ? orgAssetsData.OrgAssets.Url.DecodedUrl : null;
8598
const libs: ILibrary[] = orgAssetsData && orgAssetsData.OrgAssets ? orgAssetsData.OrgAssets.OrgAssetsLibraries.Items.map((libItem) => { return this._parseOrgAssetsLibraryItem(libItem); }) : [];
8699
return libs;
87100
} catch (error) {
@@ -100,7 +113,7 @@ export class OrgAssetsService extends FileBrowserService {
100113
absoluteUrl: this.buildAbsoluteUrl(libItem.LibraryUrl.DecodedUrl),
101114
title: libItem.DisplayName,
102115
serverRelativeUrl: libItem.LibraryUrl.DecodedUrl,
103-
iconPath: libItem.ThumbnailUrl && libItem.ThumbnailUrl.DecodedUrl ? this.buildAbsoluteUrl(`${this._orgAssetsLibraryServerRelativeSiteUrl}/${libItem.ThumbnailUrl.DecodedUrl}`) : null
116+
iconPath: libItem.ThumbnailUrl && libItem.ThumbnailUrl.DecodedUrl ? this.buildAbsoluteUrl(`${this.orgAssetsLibraryServerRelativeSiteUrl}/${libItem.ThumbnailUrl.DecodedUrl}`) : null
104117
};
105118

106119
return orgAssetsLibrary;

0 commit comments

Comments
 (0)