Merge branch 'dev' of https://github.com/SharePoint/sp-dev-fx-control…

…s-react into dev
pnp · Mar 4, 2024 · f11250c · f11250c
2 parents dcf33e3 + f62c218
commit f11250c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/controls/dynamicForm/DynamicForm.tsx b/src/controls/dynamicForm/DynamicForm.tsx
@@ -921,11 +921,11 @@ export class DynamicForm extends React.Component<
     try {
 
       // Fetch form rendering information from SharePoint
-      const listInfo = await this._spService.getListFormRenderInfo(listId);
+      const listInfo = await this._spService.getListFormRenderInfo(listId, this.webURL);
 
       // Fetch additional information about fields from SharePoint
       // (Number fields for min and max values, and fields with validation)
-      const additionalInfo = await this._spService.getAdditionalListFormFieldInfo(listId);
+      const additionalInfo = await this._spService.getAdditionalListFormFieldInfo(listId, this.webURL);
       const numberFields = additionalInfo.filter((f) => f.TypeAsString === "Number" || f.TypeAsString === "Currency");
 
       // Build a dictionary of validation formulas and messages
@@ -1178,7 +1178,8 @@ export class DynamicForm extends React.Component<
             const response = await this._spService.getSingleManagedMetadataLabel(
               listId,
               listItemId,
-              field.InternalName
+              field.InternalName,
+              this.webURL
             );
             if (response) {
               selectedTags.push({
@@ -1243,7 +1244,7 @@ export class DynamicForm extends React.Component<
           }
 
           dateFormat = field.DateFormat || "DateOnly";
-          defaultDayOfWeek = (await this._spService.getRegionalWebSettings()).FirstDayOfWeek;
+          defaultDayOfWeek = (await this._spService.getRegionalWebSettings(this.webURL)).FirstDayOfWeek;
         }
 
         // Setup Thumbnail, Location and Boolean fields
@@ -1333,7 +1334,8 @@ export class DynamicForm extends React.Component<
         listItemId,
         file.fileName,
         buffer,
-        undefined
+        undefined,
+        this.webURL
       );
     }
   };

diff --git a/src/services/SPService.ts b/src/services/SPService.ts
@@ -654,9 +654,9 @@ export default class SPService implements ISPService {
     }
   }
 
-  public async getSingleManagedMetadataLabel(listId: string, listItemId: number, fieldName: string): Promise<any> { // eslint-disable-line @typescript-eslint/no-explicit-any
+  public async getSingleManagedMetadataLabel(listId: string, listItemId: number, fieldName: string, webUrl?: string): Promise<any> { // eslint-disable-line @typescript-eslint/no-explicit-any
     try {
-      const webAbsoluteUrl = this._context.pageContext.web.absoluteUrl;
+      const webAbsoluteUrl = !webUrl ? this._context.pageContext.web.absoluteUrl : webUrl;
       const apiUrl = `${webAbsoluteUrl}/_api/web/lists(@listId)/RenderListDataAsStream?@listId=guid'${encodeURIComponent(listId)}'`;
       const data = await this._context.spHttpClient.post(apiUrl, SPHttpClient.configurations.v1, {
         body: JSON.stringify({