@@ -60,21 +60,33 @@ export default class SiteFilePickerTab extends React.Component<ISiteFilePickerTa
60
60
// folderServRelPath: "/teams/Test/DocLib/Folder"
61
61
let folderServRelPath = folderAbsPath && folderAbsPath . substr ( folderAbsPath . indexOf ( webServRelUrl ) ) ;
62
62
63
+ // folderAbsPath: "https://tenant.sharepoint.com/DocLib/Folder"
64
+ if ( webServRelUrl === "/" ) {
65
+ folderServRelPath = folderAbsPath && folderAbsPath . split ( webAbsUrl ) [ 1 ] ;
66
+ }
67
+
63
68
// folderWebRelPath: "/DocLib/Folder"
64
69
let folderWebRelPath = folderServRelPath && folderServRelPath . substr ( webServRelUrl . length ) ;
65
70
let libInternalName = folderWebRelPath && folderWebRelPath . substring ( 1 , Math . max ( folderWebRelPath . indexOf ( "/" , 2 ) , 0 ) || undefined ) ;
71
+ if ( webServRelUrl === "/" ) {
72
+ libInternalName = folderWebRelPath && folderWebRelPath . substring ( 0 , Math . max ( folderWebRelPath . indexOf ( "/" , 2 ) , 0 ) || undefined ) ;
73
+ }
66
74
67
75
// libraryServRelUrl: "/teams/Test/DocLib/"
68
76
let libraryServRelUrl = urlCombine ( webServRelUrl , libInternalName ) ;
69
77
70
78
let tenantUrl = folderAbsPath . substring ( 0 , folderAbsPath . indexOf ( webServRelUrl ) ) ;
79
+ if ( webAbsUrl === "/" ) {
80
+ tenantUrl = webAbsUrl ;
81
+ }
71
82
let folderBreadcrumbs : FilePickerBreadcrumbItem [ ] = this . parseBreadcrumbsFromPaths (
72
83
libraryServRelUrl ,
73
84
folderServRelPath ,
74
85
folderWebRelPath ,
75
86
webAbsUrl ,
76
87
tenantUrl ,
77
- libInternalName
88
+ libInternalName ,
89
+ webServRelUrl
78
90
) ;
79
91
80
92
return { libraryServRelUrl, folderServRelPath, folderAbsPath, folderBreadcrumbs } ;
@@ -86,7 +98,8 @@ export default class SiteFilePickerTab extends React.Component<ISiteFilePickerTa
86
98
folderWebRelPath : string ,
87
99
webAbsUrl : string ,
88
100
tenantUrl : string ,
89
- libInternalName : string
101
+ libInternalName : string ,
102
+ webServRelUrl : string
90
103
) {
91
104
this . _defaultLibraryNamePromise = this . props . fileBrowserService . getLibraryNameByInternalName ( libInternalName ) ;
92
105
let folderBreadcrumbs : FilePickerBreadcrumbItem [ ] = [ ] ;
@@ -104,6 +117,10 @@ export default class SiteFilePickerTab extends React.Component<ISiteFilePickerTa
104
117
105
118
if ( folderServRelPath != libraryServRelUrl ) {
106
119
let folderLibRelPath = folderWebRelPath . substring ( libInternalName . length + 2 ) ;
120
+ if ( webServRelUrl === "/" ) {
121
+ folderLibRelPath = folderWebRelPath . substring ( libInternalName . length + 1 ) ;
122
+ }
123
+
107
124
let breadcrumbFolderServRelPath = libraryServRelUrl ;
108
125
109
126
let crumbs : FilePickerBreadcrumbItem [ ] = folderLibRelPath . split ( "/" ) . map ( ( currFolderName => {
0 commit comments