synapse-react-client 3.1.37 → 3.1.38

package/dist/index.js

@@ -39399,6 +39399,7 @@ function DataAccessRequestAccessorsEditor(props) {
         /* @__PURE__ */ import_react135.default.createElement(IconSvg_default, { icon: "clear" })
       ),
       // Renewal/Revoke data access, only display if isRenewal is true
+      // TODO: It's possible to that the accessors list is in an illegal state with no way to recover -- see PLFM-7893
       isRenewal && user?.ownerId !== ac.userId && ac.type !== "GAIN_ACCESS" /* GAIN_ACCESS */ && /* @__PURE__ */ import_react135.default.createElement(import_react135.default.Fragment, null, /* @__PURE__ */ import_react135.default.createElement(
         RadioGroup,
         {
@@ -39431,7 +39432,8 @@ var FileUpload = (props) => {
     id,
     buttonProps = { variant: "contained" },
     label = "Browse...",
-    uploadCallback
+    onUploadStart,
+    onComplete
   } = props;
   const { accessToken } = useSynapseContext();
   const hiddenFileInput = import_react136.default.useRef(null);
@@ -39442,6 +39444,9 @@ var FileUpload = (props) => {
   };
   const changeHandler = async (e) => {
     if (e.target.files && e.target.files.length > 0) {
+      if (onUploadStart) {
+        onUploadStart();
+      }
       const file = e.target.files[0];
       try {
         const resp = await uploadFile(
@@ -39449,16 +39454,16 @@ var FileUpload = (props) => {
           file.name,
           file
         );
-        if (uploadCallback) {
-          uploadCallback({
+        if (onComplete) {
+          onComplete({
             success: true,
             resp
           });
         }
       } catch (e2) {
         console.log("FileUpload: fail to upload file", e2);
-        if (uploadCallback) {
-          uploadCallback({
+        if (onComplete) {
+          onComplete({
             success: false,
             error: e2
           });
@@ -39494,16 +39499,12 @@ function DirectDownloadButton(props) {
       includeFileHandles: false,
       includePreviewPreSignedURLs: false
     };
-    try {
-      const file = await getFiles(batchFileRequest, accessToken);
-      const preSignedURL = file.requestedFiles[0].preSignedURL;
-      if (!preSignedURL) {
-        console.log("Fail to get file download link");
-      } else {
-        window.open(preSignedURL);
-      }
-    } catch (e) {
-      console.log("Fail to get file download link", e);
+    const file = await getFiles(batchFileRequest, accessToken);
+    const preSignedURL = file.requestedFiles[0].preSignedURL;
+    if (!preSignedURL) {
+      console.log("Fail to get file download link");
+    } else {
+      window.open(preSignedURL);
     }
   };
   return /* @__PURE__ */ import_react137.default.createElement(
@@ -39528,8 +39529,10 @@ function UploadDocumentField(props) {
     id,
     documentName,
     isMultiFileUpload = false,
-    onClearAttachment
+    onClearAttachment,
+    isLoading = false
   } = props;
+  const [isUploading, setIsUploading] = (0, import_react138.useState)(false);
   const { data: fileData } = useGetFileBatch(
     {
       includeFileHandles: true,
@@ -39554,9 +39557,14 @@ function UploadDocumentField(props) {
       FileUpload_default,
       {
         id: `${id}-upload`,
-        uploadCallback,
+        onUploadStart: () => setIsUploading(true),
+        onComplete: (res) => {
+          setIsUploading(false);
+          uploadCallback(res);
+        },
         label: `Upload ${documentName}`,
         buttonProps: {
+          disabled: isLoading,
           variant: "outlined",
           endIcon: /* @__PURE__ */ import_react138.default.createElement(IconSvg_default, { icon: "upload", wrap: false })
         }
@@ -39590,7 +39598,16 @@ function UploadDocumentField(props) {
         },
         /* @__PURE__ */ import_react138.default.createElement(IconSvg_default, { icon: "clear" })
       ));
-    })
+    }),
+    isUploading && /* @__PURE__ */ import_react138.default.createElement(
+      Button_default,
+      {
+        disabled: true,
+        variant: "text",
+        endIcon: /* @__PURE__ */ import_react138.default.createElement(IconSvg_default, { icon: "download", wrap: false })
+      },
+      "Uploading..."
+    )
   );
 }
 
@@ -39639,6 +39656,23 @@ function DocumentTemplate(props) {
 }
 
 // src/components/AccessRequirementList/ManagedACTAccessRequirementRequestFlow/DataAccessRequestAccessorsFilesForm.tsx
+var import_utils148 = require("@rjsf/utils");
+function AccessorRequirementHelpText(props) {
+  const { managedACTAccessRequirement } = props;
+  let link = "";
+  let msg = "";
+  if (managedACTAccessRequirement.isCertifiedUserRequired && managedACTAccessRequirement.isValidatedProfileRequired) {
+    link = "https://help.synapse.org/docs/User-Types.2007072795.html";
+    msg = "All data requesters must be certified users and have a validated user profile.";
+  } else if (managedACTAccessRequirement.isCertifiedUserRequired) {
+    link = "https://help.synapse.org/docs/User-Types.2007072795.html#UserAccountTiers-CertifiedUsers";
+    msg = "All data requesters must be a certified user.";
+  } else if (managedACTAccessRequirement.isValidatedProfileRequired) {
+    link = "https://help.synapse.org/docs/User-Types.2007072795.html#UserAccountTiers-ValidatedUsers";
+    msg = "All data requesters must have a validated user profile.";
+  }
+  return link && msg ? /* @__PURE__ */ import_react140.default.createElement(import_react140.default.Fragment, null, managedACTAccessRequirement.isDUCRequired ? /* @__PURE__ */ import_react140.default.createElement(import_react140.default.Fragment, null, "This list should match those listed on your DUC.", /* @__PURE__ */ import_react140.default.createElement("br", null)) : "", msg, " ", /* @__PURE__ */ import_react140.default.createElement(Link_default, { href: link, target: "_blank", rel: "noreferrer" }, "Learn more")) : /* @__PURE__ */ import_react140.default.createElement(import_react140.default.Fragment, null);
+}
 function DataAccessRequestAccessorsFilesForm(props) {
   const {
     onSubmissionCreated,
@@ -39647,45 +39681,19 @@ function DataAccessRequestAccessorsFilesForm(props) {
     researchProjectId,
     onCancel
   } = props;
-  const { data: user } = useGetCurrentUserProfile();
+  const { accessToken } = useSynapseContext();
+  const isLoggedIn = Boolean(accessToken);
+  const { data: user } = useGetCurrentUserProfile({ enabled: isLoggedIn });
   const [alert2, setAlert] = (0, import_react140.useState)();
-  const [dataAccessRequest, setDataAccessRequest] = (0, import_react140.useState)();
-  useGetDataAccessRequestForUpdate(String(managedACTAccessRequirement.id), {
-    // We append the current user onto the accessorChanges, so we wait for that data to populate
-    enabled: !!user,
+  const [accessorChanges, setAccessorChanges] = (0, import_react140.useState)();
+  const [summaryOfUse, setSummaryOfUse] = (0, import_react140.useState)();
+  const [publication, setPublication] = (0, import_react140.useState)();
+  const { data: dataAccessRequest, isLoading: isLoadingGetDataAccessRequest } = useGetDataAccessRequestForUpdate(String(managedACTAccessRequirement.id), {
+    enabled: isLoggedIn,
     // Infinite staleTime ensures this won't get re-fetched unless explicitly invalidated by the mutation
     staleTime: Infinity,
-    select: (data) => {
-      const isRenewal2 = data.concreteType === "org.sagebionetworks.repo.model.dataaccess.Renewal";
-      const currentUserWithGainAccess = {
-        userId: user.ownerId,
-        type: isRenewal2 ? "RENEW_ACCESS" /* RENEW_ACCESS */ : "GAIN_ACCESS" /* GAIN_ACCESS */
-      };
-      if (!data.accessorChanges) {
-        data.accessorChanges = [currentUserWithGainAccess];
-      } else {
-        data.accessorChanges = [
-          currentUserWithGainAccess,
-          ...data.accessorChanges
-        ];
-      }
-      const seen = /* @__PURE__ */ new Set();
-      data.accessorChanges = data.accessorChanges.filter((accessorChange) => {
-        return seen.has(accessorChange.userId) ? false : seen.add(accessorChange.userId);
-      });
-      data.researchProjectId = researchProjectId;
-      return data;
-    },
-    onSuccess: (data) => {
-      setAlert(void 0);
-      setDataAccessRequest(data);
-    },
-    onError: (err) => {
-      setAlert({
-        key: "error",
-        message: err.reason
-      });
-    }
+    // This call should never fail, so if we run into an error, throwing to an error boundary is acceptable
+    useErrorBoundary: true
   });
   const isRenewal = dataAccessRequest?.concreteType === "org.sagebionetworks.repo.model.dataaccess.Renewal";
   function onError(e) {
@@ -39695,18 +39703,87 @@ function DataAccessRequestAccessorsFilesForm(props) {
       message: getErrorMessage(e.reason)
     });
   }
-  const { mutate: submit } = useSubmitDataAccessRequest({
+  const { mutate: submit, isLoading: isLoadingSubmitDataAccessRequest } = useSubmitDataAccessRequest({
     onSuccess: () => {
       onSubmissionCreated();
     },
     onError
   });
-  const { mutateAsync: updateRequestAsync } = useUpdateDataAccessRequest({
+  const {
+    mutateAsync: updateRequestAsync,
+    isLoading: isLoadingUpdateDataAccessRequest
+  } = useUpdateDataAccessRequest({
     onError
   });
+  const isLoading = isLoadingGetDataAccessRequest || isLoadingUpdateDataAccessRequest || isLoadingSubmitDataAccessRequest;
+  (0, import_react140.useEffect)(() => {
+    if (dataAccessRequest && user) {
+      let shouldUpdate = false;
+      if (!dataAccessRequest.researchProjectId) {
+        dataAccessRequest.researchProjectId = researchProjectId;
+        shouldUpdate = true;
+      }
+      const currentUserWithGainAccess = {
+        userId: user.ownerId,
+        type: isRenewal ? "RENEW_ACCESS" /* RENEW_ACCESS */ : "GAIN_ACCESS" /* GAIN_ACCESS */
+      };
+      if (!dataAccessRequest.accessorChanges || !dataAccessRequest.accessorChanges.find(
+        (item) => (0, import_utils148.deepEquals)(item, currentUserWithGainAccess)
+      )) {
+        dataAccessRequest.accessorChanges = [
+          currentUserWithGainAccess,
+          ...dataAccessRequest.accessorChanges || []
+        ];
+        shouldUpdate = true;
+      }
+      const seen = /* @__PURE__ */ new Set();
+      const uniqueAccessorChanges = dataAccessRequest.accessorChanges.filter(
+        (accessorChange) => {
+          return seen.has(accessorChange.userId) ? false : seen.add(accessorChange.userId);
+        }
+      );
+      if (uniqueAccessorChanges.length !== dataAccessRequest.accessorChanges.length) {
+        dataAccessRequest.accessorChanges = uniqueAccessorChanges;
+        shouldUpdate = true;
+      }
+      if (shouldUpdate) {
+        updateRequestAsync(dataAccessRequest);
+      }
+    }
+  }, [
+    dataAccessRequest,
+    isRenewal,
+    researchProjectId,
+    updateRequestAsync,
+    user
+  ]);
+  (0, import_react140.useEffect)(() => {
+    if (dataAccessRequest) {
+      if (dataAccessRequest.accessorChanges && accessorChanges == void 0) {
+        setAccessorChanges(dataAccessRequest.accessorChanges);
+      }
+      if (isRenewal && dataAccessRequest.publication && publication == void 0) {
+        setPublication(dataAccessRequest.publication);
+      }
+      if (isRenewal && dataAccessRequest.summaryOfUse && summaryOfUse == void 0) {
+        setSummaryOfUse(dataAccessRequest.summaryOfUse);
+      }
+    }
+  }, [dataAccessRequest]);
+  function getDataAccessRequestWithLocalState() {
+    return {
+      ...dataAccessRequest,
+      // append local state to the request
+      accessorChanges,
+      publication,
+      summaryOfUse
+    };
+  }
   async function handleSubmit() {
     if (dataAccessRequest) {
-      const requestObject = await updateRequestAsync(dataAccessRequest);
+      const requestObject = await updateRequestAsync(
+        getDataAccessRequestWithLocalState()
+      );
       submit({
         request: {
           requestId: requestObject.id,
@@ -39722,41 +39799,30 @@ function DataAccessRequestAccessorsFilesForm(props) {
     return /* @__PURE__ */ import_react140.default.createElement(import_react140.default.Fragment, null, /* @__PURE__ */ import_react140.default.createElement("strong", null, "Sorry, there is an error in submitting your request."), /* @__PURE__ */ import_react140.default.createElement("br", null), reason);
   };
   const onAccessorChange = (updater) => {
-    setDataAccessRequest((req) => ({
-      ...req,
-      // Copy the array so the caller doesn't have to worry about immutability
-      accessorChanges: [...updater(req.accessorChanges || [])]
-    }));
+    setAccessorChanges([...updater(accessorChanges || [])]);
   };
   const onClearAttachment = (fid) => {
-    setDataAccessRequest((req) => {
-      if (req) {
-        return {
-          ...req,
-          attachments: req.attachments?.filter((item) => item !== fid)
-        };
-      }
-      return req;
+    updateRequestAsync({
+      ...dataAccessRequest,
+      attachments: dataAccessRequest.attachments?.filter((item) => item !== fid)
     });
   };
   const uploadCallback = (data, context) => {
     if (data.resp && data.success) {
       const uploadResponse = data.resp;
       if (context === "attachments") {
-        setDataAccessRequest((req) => {
-          return {
-            ...req,
-            attachments: [
-              ...req.attachments || [],
-              uploadResponse.fileHandleId
-            ]
-          };
+        updateRequestAsync({
+          ...dataAccessRequest,
+          attachments: [
+            ...dataAccessRequest.attachments || [],
+            uploadResponse.fileHandleId
+          ]
         });
       } else {
-        setDataAccessRequest((req) => ({
-          ...req,
+        updateRequestAsync({
+          ...dataAccessRequest,
           [context]: uploadResponse.fileHandleId
-        }));
+        });
       }
     } else if (!data.success && data.error) {
       console.log(
@@ -39769,46 +39835,24 @@ function DataAccessRequestAccessorsFilesForm(props) {
       });
     }
   };
-  const handleTextAreaInputChange = (e, key) => {
-    const value = e.target.value;
-    setDataAccessRequest((req) => ({
-      ...req,
-      [key]: value
-    }));
-  };
-  const AccessorRequirementHelpText = () => {
-    let link = "";
-    let msg = "";
-    if (managedACTAccessRequirement.isCertifiedUserRequired && managedACTAccessRequirement.isValidatedProfileRequired) {
-      link = "https://help.synapse.org/docs/User-Types.2007072795.html";
-      msg = "All data requesters must be certified users and have a validated user profile.";
-    } else if (managedACTAccessRequirement.isCertifiedUserRequired) {
-      link = "https://help.synapse.org/docs/User-Types.2007072795.html#UserAccountTiers-CertifiedUsers";
-      msg = "All data requesters must be a certified user.";
-    } else if (managedACTAccessRequirement.isValidatedProfileRequired) {
-      link = "https://help.synapse.org/docs/User-Types.2007072795.html#UserAccountTiers-ValidatedUsers";
-      msg = "All data requesters must have a validated user profile.";
-    }
-    return link && msg ? /* @__PURE__ */ import_react140.default.createElement(import_react140.default.Fragment, null, managedACTAccessRequirement.isDUCRequired ? /* @__PURE__ */ import_react140.default.createElement(import_react140.default.Fragment, null, "This list should match those listed on your DUC.", /* @__PURE__ */ import_react140.default.createElement("br", null)) : "", msg, " ", /* @__PURE__ */ import_react140.default.createElement(Link_default, { href: link, target: "_blank", rel: "noreferrer" }, "Learn more")) : /* @__PURE__ */ import_react140.default.createElement(import_react140.default.Fragment, null);
-  };
   const ducFileHandleAssociation = dataAccessRequest?.ducFileHandleId ? [
     {
       fileHandleId: dataAccessRequest?.ducFileHandleId,
-      associateObjectType: "AccessRequirementAttachment" /* AccessRequirementAttachment */,
-      associateObjectId: String(managedACTAccessRequirement.id)
+      associateObjectType: "DataAccessRequestAttachment" /* DataAccessRequestAttachment */,
+      associateObjectId: String(dataAccessRequest.id)
     }
   ] : [];
   const irbFileHandleAssociation = dataAccessRequest?.irbFileHandleId ? [
     {
       fileHandleId: dataAccessRequest.irbFileHandleId,
-      associateObjectType: "AccessRequirementAttachment" /* AccessRequirementAttachment */,
-      associateObjectId: String(managedACTAccessRequirement.id)
+      associateObjectType: "DataAccessRequestAttachment" /* DataAccessRequestAttachment */,
+      associateObjectId: String(dataAccessRequest.id)
     }
   ] : [];
   const attachmentFileHandleAssociations = (dataAccessRequest?.attachments || []).map((attachmentFileHandleId) => ({
     fileHandleId: attachmentFileHandleId,
-    associateObjectType: "AccessRequirementAttachment" /* AccessRequirementAttachment */,
-    associateObjectId: String(managedACTAccessRequirement.id)
+    associateObjectType: "DataAccessRequestAttachment" /* DataAccessRequestAttachment */,
+    associateObjectId: String(dataAccessRequest.id)
   })) ?? [];
   return /* @__PURE__ */ import_react140.default.createElement(import_react140.default.Fragment, null, /* @__PURE__ */ import_react140.default.createElement(DialogTitle_default, null, /* @__PURE__ */ import_react140.default.createElement(Stack_default, { direction: "row", alignItems: "center", gap: "5px" }, "Request Access", /* @__PURE__ */ import_react140.default.createElement(Box_default, { sx: { flexGrow: 1 } }), /* @__PURE__ */ import_react140.default.createElement(IconButton_default, { onClick: props.onHide }, /* @__PURE__ */ import_react140.default.createElement(IconSvg_default, { icon: "close", wrap: false, sx: { color: "grey.700" } })))), /* @__PURE__ */ import_react140.default.createElement(DialogContent_default, null, /* @__PURE__ */ import_react140.default.createElement(
     ManagedACTAccessRequirementFormWikiWrapper,
@@ -39826,13 +39870,18 @@ function DataAccessRequestAccessorsFilesForm(props) {
         onSubmit: (e) => e.preventDefault()
       },
       /* @__PURE__ */ import_react140.default.createElement(Typography_default, { variant: "body1", sx: { mb: 2 } }, "Please provide the information below to submit the request for access."),
-      dataAccessRequest && /* @__PURE__ */ import_react140.default.createElement(
+      dataAccessRequest && user && /* @__PURE__ */ import_react140.default.createElement(
         DataAccessRequestAccessorsEditor,
         {
-          accessorChanges: dataAccessRequest.accessorChanges || [],
+          accessorChanges: accessorChanges || [],
           onChange: onAccessorChange,
           isRenewal,
-          helpText: /* @__PURE__ */ import_react140.default.createElement(AccessorRequirementHelpText, null)
+          helpText: /* @__PURE__ */ import_react140.default.createElement(
+            AccessorRequirementHelpText,
+            {
+              managedACTAccessRequirement
+            }
+          )
         }
       ),
       (managedACTAccessRequirement?.isDUCRequired || managedACTAccessRequirement?.isIRBApprovalRequired || managedACTAccessRequirement?.areOtherAttachmentsRequired || isRenewal) && /* @__PURE__ */ import_react140.default.createElement(Divider_default, { sx: { my: 4 } }),
@@ -39848,56 +39897,61 @@ function DataAccessRequestAccessorsFilesForm(props) {
           },
           downloadButtonText: "Download DUC Template"
         }
-      ), /* @__PURE__ */ import_react140.default.createElement(Typography_default, { variant: "headline3", sx: { mt: 4, mb: 2 } }, "Fill out and upload a Data Use Certificate"), /* @__PURE__ */ import_react140.default.createElement(Typography_default, { variant: "body1", sx: { my: 2 } }, "You must download and fill out a Data Use Certificate (DUC). Be sure to upload the completed DUC below once you've completed it."), /* @__PURE__ */ import_react140.default.createElement(Typography_default, { variant: "body1", component: "ol" }, /* @__PURE__ */ import_react140.default.createElement("li", null, "Download the DUC template file."), /* @__PURE__ */ import_react140.default.createElement("li", null, "Fill out the DUC template, following the instructions in the file."), /* @__PURE__ */ import_react140.default.createElement("li", null, "Upload the completed certificate using the button below:")), /* @__PURE__ */ import_react140.default.createElement(
+      ), /* @__PURE__ */ import_react140.default.createElement(Typography_default, { variant: "headline3", sx: { mt: 4, mb: 2 } }, "Fill out and upload a Data Use Certificate"), /* @__PURE__ */ import_react140.default.createElement(Typography_default, { variant: "body1", sx: { my: 2 } }, "You must download and fill out a Data Use Certificate (DUC). Be sure to upload the completed DUC below once you've completed it."), /* @__PURE__ */ import_react140.default.createElement(Typography_default, { variant: "body1", component: "ol" }, /* @__PURE__ */ import_react140.default.createElement("li", null, "Download the DUC template file."), /* @__PURE__ */ import_react140.default.createElement("li", null, "Fill out the DUC template, following the instructions in the file."), /* @__PURE__ */ import_react140.default.createElement("li", null, "Upload the completed certificate using the button below:")), /* @__PURE__ */ import_react140.default.createElement(SynapseErrorBoundary, null, /* @__PURE__ */ import_react140.default.createElement(
         UploadDocumentField,
         {
           id: "duc",
+          isLoading,
           uploadCallback: (resp) => uploadCallback(resp, "ducFileHandleId"),
           documentName: "Data Use Certificate",
           fileHandleAssociations: ducFileHandleAssociation
         }
-      ), (managedACTAccessRequirement?.isIRBApprovalRequired || managedACTAccessRequirement?.areOtherAttachmentsRequired || isRenewal) && /* @__PURE__ */ import_react140.default.createElement(Divider_default, { sx: { my: 4 } })),
-      managedACTAccessRequirement?.isIRBApprovalRequired && /* @__PURE__ */ import_react140.default.createElement(import_react140.default.Fragment, null, /* @__PURE__ */ import_react140.default.createElement(Typography_default, { variant: "headline3", sx: { my: 2 } }, "IRB Approval"), /* @__PURE__ */ import_react140.default.createElement(Typography_default, { variant: "body1", sx: { my: 2 } }, "Upload a signed IRB letter on institutional letterhead. The letter must include the names of all the datasets requested, as well as the names of the data requesters above. Use the button below to upload the document."), /* @__PURE__ */ import_react140.default.createElement(
+      )), (managedACTAccessRequirement?.isIRBApprovalRequired || managedACTAccessRequirement?.areOtherAttachmentsRequired || isRenewal) && /* @__PURE__ */ import_react140.default.createElement(Divider_default, { sx: { my: 4 } })),
+      managedACTAccessRequirement?.isIRBApprovalRequired && /* @__PURE__ */ import_react140.default.createElement(import_react140.default.Fragment, null, /* @__PURE__ */ import_react140.default.createElement(Typography_default, { variant: "headline3", sx: { my: 2 } }, "IRB Approval"), /* @__PURE__ */ import_react140.default.createElement(Typography_default, { variant: "body1", sx: { my: 2 } }, "Upload a signed IRB letter on institutional letterhead. The letter must include the names of all the datasets requested, as well as the names of the data requesters above. Use the button below to upload the document."), /* @__PURE__ */ import_react140.default.createElement(SynapseErrorBoundary, null, /* @__PURE__ */ import_react140.default.createElement(
         UploadDocumentField,
         {
           id: "irb",
+          isLoading,
           documentName: "IRB Approval Letter",
           uploadCallback: (resp) => uploadCallback(resp, "irbFileHandleId"),
           fileHandleAssociations: irbFileHandleAssociation
         }
-      ), (managedACTAccessRequirement?.areOtherAttachmentsRequired || isRenewal) && /* @__PURE__ */ import_react140.default.createElement(Divider_default, { sx: { my: 4 } })),
+      )), (managedACTAccessRequirement?.areOtherAttachmentsRequired || isRenewal) && /* @__PURE__ */ import_react140.default.createElement(Divider_default, { sx: { my: 4 } })),
       /* Attachments */
-      managedACTAccessRequirement?.areOtherAttachmentsRequired && /* @__PURE__ */ import_react140.default.createElement(import_react140.default.Fragment, null, /* @__PURE__ */ import_react140.default.createElement(Typography_default, { variant: "headline3", sx: { my: 2 } }, "Upload other required documents"), /* @__PURE__ */ import_react140.default.createElement(Typography_default, { variant: "body1", sx: { my: 2 } }, "You must upload other required documents. Please review the instructions to gain data access to determine which documents must also be uploaded."), /* @__PURE__ */ import_react140.default.createElement(
+      managedACTAccessRequirement?.areOtherAttachmentsRequired && /* @__PURE__ */ import_react140.default.createElement(import_react140.default.Fragment, null, /* @__PURE__ */ import_react140.default.createElement(Typography_default, { variant: "headline3", sx: { my: 2 } }, "Upload other required documents"), /* @__PURE__ */ import_react140.default.createElement(Typography_default, { variant: "body1", sx: { my: 2 } }, "You must upload other required documents. Please review the instructions to gain data access to determine which documents must also be uploaded."), /* @__PURE__ */ import_react140.default.createElement(SynapseErrorBoundary, null, /* @__PURE__ */ import_react140.default.createElement(
         UploadDocumentField,
         {
           id: "file-attachment",
+          isLoading,
           documentName: "Attachment",
           uploadCallback: (res) => uploadCallback(res, "attachments"),
           isMultiFileUpload: true,
           fileHandleAssociations: attachmentFileHandleAssociations,
           onClearAttachment
         }
-      ), isRenewal && /* @__PURE__ */ import_react140.default.createElement(Divider_default, { sx: { my: 4 } })),
+      )), isRenewal && /* @__PURE__ */ import_react140.default.createElement(Divider_default, { sx: { my: 4 } })),
       // Publications & Summary of Use
       isRenewal && /* @__PURE__ */ import_react140.default.createElement(import_react140.default.Fragment, null, /* @__PURE__ */ import_react140.default.createElement(
         TextField3,
         {
           id: "publications",
           label: "Publication(s)",
+          disabled: isLoadingSubmitDataAccessRequest,
           multiline: true,
           rows: 3,
-          value: dataAccessRequest?.publication,
-          onChange: (e) => handleTextAreaInputChange(e, "publication")
+          value: publication,
+          onChange: (e) => setPublication(e.target.value)
         }
       ), /* @__PURE__ */ import_react140.default.createElement(
         TextField3,
         {
           id: "summaryOfUse",
           label: "Summary of use",
-          value: dataAccessRequest?.summaryOfUse,
+          value: summaryOfUse,
+          disabled: isLoadingSubmitDataAccessRequest,
           multiline: true,
           rows: 3,
-          onChange: (e) => handleTextAreaInputChange(e, "summaryOfUse")
+          onChange: (e) => setSummaryOfUse(e.target.value)
         }
       ))
     )
@@ -39905,9 +39959,10 @@ function DataAccessRequestAccessorsFilesForm(props) {
     Button_default,
     {
       variant: "outlined",
+      disabled: isLoadingSubmitDataAccessRequest,
       onClick: () => {
         if (dataAccessRequest) {
-          onCancel(dataAccessRequest);
+          onCancel(getDataAccessRequestWithLocalState());
         }
       }
     },
@@ -39916,6 +39971,7 @@ function DataAccessRequestAccessorsFilesForm(props) {
     Button_default,
     {
       variant: "contained",
+      disabled: isLoadingSubmitDataAccessRequest,
       onClick: () => {
         handleSubmit();
       }
@@ -52061,7 +52117,7 @@ var DateTimeWidget = ({
 };
 
 // src/components/SchemaDrivenAnnotationEditor/template/ObjectFieldTemplate.tsx
-var import_utils171 = require("@rjsf/utils");
+var import_utils173 = require("@rjsf/utils");
 var import_react315 = __toESM(require("react"));
 var import_use_deep_compare_effect8 = require("use-deep-compare-effect");
 function ObjectFieldTemplate(props) {
@@ -52079,13 +52135,13 @@ function ObjectFieldTemplate(props) {
     title,
     uiSchema
   } = props;
-  const options = (0, import_utils171.getUiOptions)(uiSchema);
-  const TitleFieldTemplate = (0, import_utils171.getTemplate)(
+  const options = (0, import_utils173.getUiOptions)(uiSchema);
+  const TitleFieldTemplate = (0, import_utils173.getTemplate)(
     "TitleFieldTemplate",
     registry,
     options
   );
-  const DescriptionFieldTemplate2 = (0, import_utils171.getTemplate)("DescriptionFieldTemplate", registry, options);
+  const DescriptionFieldTemplate2 = (0, import_utils173.getTemplate)("DescriptionFieldTemplate", registry, options);
   const previousSchemaDefinedProperties = (0, import_react315.useRef)(/* @__PURE__ */ new Set());
   (0, import_use_deep_compare_effect8.useDeepCompareEffectNoCheck)(() => {
     if ("properties" in schema && schema.properties) {
@@ -52093,7 +52149,7 @@ function ObjectFieldTemplate(props) {
       const schemaDefinedProperties = new Set(
         propertyKeys.filter((key) => {
           const propertyObject = schema.properties[key];
-          return !propertyObject[import_utils171.ADDITIONAL_PROPERTY_FLAG];
+          return !propertyObject[import_utils173.ADDITIONAL_PROPERTY_FLAG];
         })
       );
       if (previousSchemaDefinedProperties.current != null) {
@@ -52144,7 +52200,7 @@ function ObjectFieldTemplate(props) {
       registry,
       schema
     }
-  ), properties.map((prop) => prop.content), (0, import_utils171.canExpand)(schema, uiSchema, formData) && /* @__PURE__ */ import_react315.default.createElement(Tooltip_default, { title: "Add a new custom field", placement: "top" }, /* @__PURE__ */ import_react315.default.createElement(
+  ), properties.map((prop) => prop.content), (0, import_utils173.canExpand)(schema, uiSchema, formData) && /* @__PURE__ */ import_react315.default.createElement(Tooltip_default, { title: "Add a new custom field", placement: "top" }, /* @__PURE__ */ import_react315.default.createElement(
     Button_default,
     {
       sx: { my: 2 },
@@ -52182,7 +52238,7 @@ var import_validator_ajv82 = __toESM(require("@rjsf/validator-ajv8"));
 // src/components/SchemaDrivenAnnotationEditor/field/CustomObjectField.tsx
 var import_react317 = __toESM(require("react"));
 var import_core3 = require("@rjsf/core");
-var import_utils172 = require("@rjsf/utils");
+var import_utils174 = require("@rjsf/utils");
 function CustomObjectField(props) {
   const {
     fields: { ObjectField }
@@ -52190,11 +52246,11 @@ function CustomObjectField(props) {
   (0, import_react317.useEffect)(() => {
     const { schema, formData, onChange } = props;
     const newFormData = { ...formData };
-    if (schema[import_utils172.PROPERTIES_KEY]) {
-      Object.entries(schema[import_utils172.PROPERTIES_KEY]).forEach(
+    if (schema[import_utils174.PROPERTIES_KEY]) {
+      Object.entries(schema[import_utils174.PROPERTIES_KEY]).forEach(
         ([key, propertySchema]) => {
           const data = newFormData[key];
-          if (propertySchema[import_utils172.ADDITIONAL_PROPERTY_FLAG]) {
+          if (propertySchema[import_utils174.ADDITIONAL_PROPERTY_FLAG]) {
             if (!Array.isArray(data)) {
               newFormData[key] = convertToArray(data);
             }
@@ -52205,7 +52261,7 @@ function CustomObjectField(props) {
           }
         }
       );
-      if (!(0, import_utils172.deepEquals)(formData, newFormData)) {
+      if (!(0, import_utils174.deepEquals)(formData, newFormData)) {
         onChange(newFormData);
       }
     }
@@ -52306,20 +52362,20 @@ function ArrayFieldItemTemplate(props) {
 }
 
 // src/components/SchemaDrivenAnnotationEditor/template/ArrayFieldTemplate.tsx
-var import_utils173 = require("@rjsf/utils");
+var import_utils175 = require("@rjsf/utils");
 var import_react319 = __toESM(require("react"));
 var import_icons_material12 = require("@mui/icons-material");
 function ArrayFieldTemplate(props) {
   const { idSchema, uiSchema, items, registry, schema } = props;
-  const uiOptions = (0, import_utils173.getUiOptions)(uiSchema);
-  const ArrayFieldTitleTemplate2 = (0, import_utils173.getTemplate)("ArrayFieldTitleTemplate", registry, uiOptions);
-  const ArrayFieldDescriptionTemplate2 = (0, import_utils173.getTemplate)("ArrayFieldDescriptionTemplate", registry, uiOptions);
-  const ArrayFieldItemTemplate2 = (0, import_utils173.getTemplate)(
+  const uiOptions = (0, import_utils175.getUiOptions)(uiSchema);
+  const ArrayFieldTitleTemplate2 = (0, import_utils175.getTemplate)("ArrayFieldTitleTemplate", registry, uiOptions);
+  const ArrayFieldDescriptionTemplate2 = (0, import_utils175.getTemplate)("ArrayFieldDescriptionTemplate", registry, uiOptions);
+  const ArrayFieldItemTemplate2 = (0, import_utils175.getTemplate)(
     "ArrayFieldItemTemplate",
     registry,
     uiOptions
   );
-  const isAdditionalProperty = !!props.schema[import_utils173.ADDITIONAL_PROPERTY_FLAG];
+  const isAdditionalProperty = !!props.schema[import_utils175.ADDITIONAL_PROPERTY_FLAG];
   const additionalPropertyContext = useAdditionalPropertyContext();
   const [showDetails, setShowDetails] = (0, import_react319.useState)(false);
   (0, import_react319.useEffect)(() => {
@@ -52380,7 +52436,7 @@ function ArrayFieldTemplate(props) {
 var ArrayFieldTemplate_default = ArrayFieldTemplate;
 
 // src/components/SchemaDrivenAnnotationEditor/template/WrapIfAdditionalTemplate.tsx
-var import_utils174 = require("@rjsf/utils");
+var import_utils176 = require("@rjsf/utils");
 var import_react320 = __toESM(require("react"));
 function WrapIfAdditionalTemplate(props) {
   const {
@@ -52396,8 +52452,8 @@ function WrapIfAdditionalTemplate(props) {
     registry
   } = props;
   const { translateString } = registry;
-  const keyLabel = translateString(import_utils174.TranslatableString.KeyLabel, [""]);
-  const additional = import_utils174.ADDITIONAL_PROPERTY_FLAG in schema;
+  const keyLabel = translateString(import_utils176.TranslatableString.KeyLabel, [""]);
+  const additional = import_utils176.ADDITIONAL_PROPERTY_FLAG in schema;
   if (!additional) {
     return /* @__PURE__ */ import_react320.default.createElement("div", { className: classNames }, children);
   }
@@ -52423,7 +52479,7 @@ function WrapIfAdditionalTemplate(props) {
 
 // src/components/SchemaDrivenAnnotationEditor/template/FieldTemplate.tsx
 var import_react321 = __toESM(require("react"));
-var import_utils175 = require("@rjsf/utils");
+var import_utils177 = require("@rjsf/utils");
 var import_icons_material13 = require("@mui/icons-material");
 function FieldTemplate(props) {
   const {
@@ -52440,8 +52496,8 @@ function FieldTemplate(props) {
     uiSchema,
     schema
   } = props;
-  const uiOptions = (0, import_utils175.getUiOptions)(uiSchema);
-  const WrapIfAdditionalTemplate2 = (0, import_utils175.getTemplate)("WrapIfAdditionalTemplate", registry, uiOptions);
+  const uiOptions = (0, import_utils177.getUiOptions)(uiSchema);
+  const WrapIfAdditionalTemplate2 = (0, import_utils177.getTemplate)("WrapIfAdditionalTemplate", registry, uiOptions);
   const [showDetails, setShowDetails] = (0, import_react321.useState)(false);
   if (hidden) {
     return /* @__PURE__ */ import_react321.default.createElement("div", { className: "hidden" }, children);
@@ -52477,14 +52533,14 @@ function ArrayFieldTitleTemplate(props) {
 var import_icons_material14 = require("@mui/icons-material");
 var import_react323 = __toESM(require("react"));
 var import_ContentCopy2 = __toESM(require("@mui/icons-material/ContentCopy"));
-var import_utils176 = require("@rjsf/utils");
+var import_utils178 = require("@rjsf/utils");
 var buttonSx = { minWidth: "unset", width: "40px", height: "40px" };
 function AddButton({ uiSchema, registry, ...props }) {
   const { translateString } = registry;
   return /* @__PURE__ */ import_react323.default.createElement(
     Button_default,
     {
-      title: translateString(import_utils176.TranslatableString.AddItemButton),
+      title: translateString(import_utils178.TranslatableString.AddItemButton),
       ...props,
       color: "primary",
       variant: "contained",
@@ -52515,7 +52571,7 @@ function IconButtonTemplate(props) {
   return /* @__PURE__ */ import_react323.default.createElement(
     IconButton_default,
     {
-      title: translateString(import_utils176.TranslatableString.RemoveButton),
+      title: translateString(import_utils178.TranslatableString.RemoveButton),
       ...otherProps,
       color: "default",
       sx: buttonSx
@@ -52584,15 +52640,15 @@ function DescriptionFieldTemplate(props) {
 
 // src/components/SchemaDrivenAnnotationEditor/template/ArrayFieldDescriptionTemplate.tsx
 var import_react326 = __toESM(require("react"));
-var import_utils177 = require("@rjsf/utils");
+var import_utils179 = require("@rjsf/utils");
 function ArrayFieldDescriptionTemplate(props) {
   const { idSchema, description, registry, schema, uiSchema } = props;
-  const options = (0, import_utils177.getUiOptions)(uiSchema, registry.globalUiOptions);
+  const options = (0, import_utils179.getUiOptions)(uiSchema, registry.globalUiOptions);
   const { label: displayLabel } = options;
   if (displayLabel === false) {
     return null;
   }
-  const DescriptionFieldTemplate2 = (0, import_utils177.getTemplate)("DescriptionFieldTemplate", registry, options);
+  const DescriptionFieldTemplate2 = (0, import_utils179.getTemplate)("DescriptionFieldTemplate", registry, options);
   const id = `${idSchema.$id}__description`;
   return /* @__PURE__ */ import_react326.default.createElement(
     DescriptionFieldTemplate2,
@@ -52608,7 +52664,7 @@ function ArrayFieldDescriptionTemplate(props) {
 
 // src/components/SchemaDrivenAnnotationEditor/template/BaseInputTemplate.tsx
 var import_react327 = __toESM(require("react"));
-var import_utils178 = require("@rjsf/utils");
+var import_utils180 = require("@rjsf/utils");
 var TYPES_THAT_SHRINK_LABEL = ["date", "datetime-local", "file", "time"];
 function BaseInputTemplate(props) {
   const {
@@ -52638,14 +52694,14 @@ function BaseInputTemplate(props) {
     ...textFieldProps
   } = props;
   const hideLabel = true;
-  const inputProps = (0, import_utils178.getInputProps)(schema, type, options);
+  const inputProps = (0, import_utils180.getInputProps)(schema, type, options);
   const { step, min, max, ...rest } = inputProps;
   const otherProps = {
     inputProps: {
       step,
       min,
       max,
-      ...schema.examples ? { list: (0, import_utils178.examplesId)(id) } : void 0
+      ...schema.examples ? { list: (0, import_utils180.examplesId)(id) } : void 0
     },
     ...rest
   };
@@ -52666,7 +52722,7 @@ function BaseInputTemplate(props) {
       id,
       name: id,
       placeholder: derivedValuePlaceholder || placeholder,
-      label: (0, import_utils178.labelValue)(label || void 0, hideLabel, false),
+      label: (0, import_utils180.labelValue)(label || void 0, hideLabel, false),
       autoFocus: autofocus,
       required: false,
       disabled: disabled || readonly,
@@ -52681,9 +52737,9 @@ function BaseInputTemplate(props) {
       inputProps: {
         "aria-label": id
       },
-      "aria-describedby": (0, import_utils178.ariaDescribedByIds)(id, !!schema.examples)
+      "aria-describedby": (0, import_utils180.ariaDescribedByIds)(id, !!schema.examples)
     }
-  ), Array.isArray(schema.examples) && /* @__PURE__ */ import_react327.default.createElement("datalist", { id: (0, import_utils178.examplesId)(id) }, schema.examples.concat(
+  ), Array.isArray(schema.examples) && /* @__PURE__ */ import_react327.default.createElement("datalist", { id: (0, import_utils180.examplesId)(id) }, schema.examples.concat(
     schema.default && !schema.examples.includes(schema.default) ? [schema.default] : []
   ).map((example) => {
     return /* @__PURE__ */ import_react327.default.createElement("option", { key: example, value: example });
@@ -52692,13 +52748,13 @@ function BaseInputTemplate(props) {
 
 // src/components/SchemaDrivenAnnotationEditor/template/FieldErrorTemplate.tsx
 var import_react328 = __toESM(require("react"));
-var import_utils179 = require("@rjsf/utils");
+var import_utils181 = require("@rjsf/utils");
 function FieldErrorTemplate(props) {
   const { errors = [], idSchema } = props;
   if (errors.length === 0) {
     return null;
   }
-  const id = (0, import_utils179.errorId)(idSchema);
+  const id = (0, import_utils181.errorId)(idSchema);
   return /* @__PURE__ */ import_react328.default.createElement(List_default, { dense: true, disablePadding: true }, errors.map((error, i) => {
     return /* @__PURE__ */ import_react328.default.createElement(ListItem_default, { key: i, disableGutters: true }, /* @__PURE__ */ import_react328.default.createElement(FormHelperText_default, { id, sx: { color: "error.main" } }, error));
   }));