Merge pull request #1920 from martinlingstuyl/add-retry-mechanism

Adds retry to updating list item in DynamicForm. Closes #1919

src/controls/dynamicForm/DynamicForm.tsx

@@ -32,7 +32,7 @@ import "@pnp/sp/content-types";
 import "@pnp/sp/folders";
 import "@pnp/sp/items";
 import { IFolder } from "@pnp/sp/folders";
-import { IInstalledLanguageInfo } from "@pnp/sp/presets/all";
+import { IInstalledLanguageInfo, IItemUpdateResult, IList } from "@pnp/sp/presets/all";
 import { cloneDeep, isEqual } from "lodash";
 import { ICustomFormatting, ICustomFormattingBodySection, ICustomFormattingNode } from "../../common/utilities/ICustomFormatting";
 import SPservice from "../../services/SPService";
@@ -49,6 +49,10 @@ import { Icon } from "@fluentui/react/lib/Icon";
 
 const stackTokens: IStackTokens = { childrenGap: 20 };
 
+const timeout = (ms: number): Promise<void> => {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+};
+
 /**
  * DynamicForm Class Control
  */
@@ -611,7 +615,7 @@ export class DynamicForm extends React.Component<
             // Set the content type ID for the target item
             objects[contentTypeIdField] = contentTypeId;
             // Update the just created folder or Document Set
-            const iur = await library.items.getById(folderId).update(objects);
+            const iur = await this.updateListItemRetry(library, folderId, objects);
             if (onSubmitted) {
               onSubmitted(
                 iur.data,
@@ -689,7 +693,7 @@ export class DynamicForm extends React.Component<
             // Set the content type ID for the target item
             objects[contentTypeIdField] = contentTypeId;
             // Update the just created file
-            const iur = await library.items.getById(fileId).update(objects);
+            const iur = await this.updateListItemRetry(library, fileId, objects);
             if (onSubmitted) {
               onSubmitted(
                 iur.data,
@@ -1521,4 +1525,27 @@ export class DynamicForm extends React.Component<
     const folder = sp.web.getFolderByServerRelativePath(`${serverRelativeLibraryPath}/${normalizedFolderPath}`);
     return folder;
   };
-}
+
+  /**
+   * Updates a list item and retries the operation if a 409 (Save Conflict) was thrown.
+   * @param list The list/library on which to execute the operation
+   * @param itemId The item ID
+   * @param objects The values to update the item with
+   * @param retry The retry index
+   * @returns An update result
+   */
+  private updateListItemRetry = async (list: IList, itemId: number, objects: {}, retry: number = 0): Promise<IItemUpdateResult> => {
+    try {
+      return await list.items.getById(itemId).update(objects);
+    }
+    catch (error)
+    {      
+      if (error.status === 409 && retry < 3) {
+        await timeout(100);
+        return await this.updateListItemRetry(list, itemId, objects, retry + 1);
+      }
+
+      throw error;
+    }    
+  }
+}