synapse-react-client 3.1.48 → 3.1.49

package/dist/index.js

@@ -40463,6 +40463,10 @@ function UnmanagedACTAccessRequirementItem(props) {
   const { accessRequirement, entityId, onHide } = props;
   const { accessToken } = useSynapseContext();
   const { data: accessRequirementStatus, isLoading: isLoadingStatus } = useGetAccessRequirementStatus(String(accessRequirement.id));
+  const { data: wikiPage } = useGetAccessRequirementWikiPageKey(
+    accessRequirement.id.toString()
+    // ACT ARs may have the contact info embedded in the AR or may have an associated Wiki.
+  );
   const isApproved = accessRequirementStatus?.isApproved;
   const [showACTContactInfoInstructions, setShowACTContactInfoInstructions] = (0, import_react151.useState)(false);
   let acceptButtonText = "";
@@ -40498,6 +40502,19 @@ function UnmanagedACTAccessRequirementItem(props) {
       }
     ];
   }
+  let renderedTerms = /* @__PURE__ */ import_react151.default.createElement(import_react151.default.Fragment, null);
+  if (actContactInfo) {
+    renderedTerms = /* @__PURE__ */ import_react151.default.createElement(MarkdownSynapse_default, { markdown: actContactInfo });
+  } else if (wikiPage) {
+    renderedTerms = /* @__PURE__ */ import_react151.default.createElement(
+      MarkdownSynapse_default,
+      {
+        wikiId: wikiPage?.wikiPageId,
+        ownerId: wikiPage?.ownerObjectId,
+        objectType: wikiPage?.ownerObjectType
+      }
+    );
+  }
   return /* @__PURE__ */ import_react151.default.createElement(
     RequirementItem,
     {
@@ -40514,7 +40531,7 @@ function UnmanagedACTAccessRequirementItem(props) {
         )
       },
       showACTContactInfoInstructions ? "Hide Instructions" : "View Instructions"
-    )), showACTContactInfoInstructions && /* @__PURE__ */ import_react151.default.createElement(Box_default, { sx: { my: 1 } }, /* @__PURE__ */ import_react151.default.createElement(MarkdownSynapse_default, { markdown: actContactInfo }))) : /* @__PURE__ */ import_react151.default.createElement(MarkdownSynapse_default, { markdown: actContactInfo })
+    )), showACTContactInfoInstructions && /* @__PURE__ */ import_react151.default.createElement(Box_default, { sx: { my: 1 } }, renderedTerms)) : renderedTerms
   );
 }
 
@@ -40680,9 +40697,8 @@ function SelfSignAccessRequirementItem(props) {
   const { data: accessRequirementStatus, isLoading: isLoadingStatus } = useGetAccessRequirementStatus(String(accessRequirement.id));
   const isApproved = accessRequirementStatus?.isApproved;
   const { data: wikiPage } = useGetAccessRequirementWikiPageKey(
-    accessRequirement.id.toString(),
-    // TermsOfUse ARs have the terms embedded in the AR, there is no Wiki.
-    { enabled: !isTermsOfUse }
+    accessRequirement.id.toString()
+    // TermsOfUse ARs may have the terms embedded in the AR or an associated Wiki.
   );
   const [showTerms, setShowTerms] = (0, import_react154.useState)(false);
   const {
@@ -40704,7 +40720,7 @@ function SelfSignAccessRequirementItem(props) {
     createAccessApproval2(accessApprovalRequest);
   };
   let renderedTerms = /* @__PURE__ */ import_react154.default.createElement(import_react154.default.Fragment, null);
-  if (isTermsOfUse) {
+  if (isTermsOfUse && accessRequirement.termsOfUse) {
     renderedTerms = /* @__PURE__ */ import_react154.default.createElement(MarkdownSynapse_default, { markdown: accessRequirement.termsOfUse });
   } else if (wikiPage) {
     renderedTerms = /* @__PURE__ */ import_react154.default.createElement(

package/dist/index.mjs

@@ -40507,6 +40507,10 @@ function UnmanagedACTAccessRequirementItem(props) {
   const { accessRequirement, entityId, onHide } = props;
   const { accessToken } = useSynapseContext();
   const { data: accessRequirementStatus, isLoading: isLoadingStatus } = useGetAccessRequirementStatus(String(accessRequirement.id));
+  const { data: wikiPage } = useGetAccessRequirementWikiPageKey(
+    accessRequirement.id.toString()
+    // ACT ARs may have the contact info embedded in the AR or may have an associated Wiki.
+  );
   const isApproved = accessRequirementStatus?.isApproved;
   const [showACTContactInfoInstructions, setShowACTContactInfoInstructions] = useState53(false);
   let acceptButtonText = "";
@@ -40542,6 +40546,19 @@ function UnmanagedACTAccessRequirementItem(props) {
       }
     ];
   }
+  let renderedTerms = /* @__PURE__ */ React233.createElement(React233.Fragment, null);
+  if (actContactInfo) {
+    renderedTerms = /* @__PURE__ */ React233.createElement(MarkdownSynapse_default, { markdown: actContactInfo });
+  } else if (wikiPage) {
+    renderedTerms = /* @__PURE__ */ React233.createElement(
+      MarkdownSynapse_default,
+      {
+        wikiId: wikiPage?.wikiPageId,
+        ownerId: wikiPage?.ownerObjectId,
+        objectType: wikiPage?.ownerObjectType
+      }
+    );
+  }
   return /* @__PURE__ */ React233.createElement(
     RequirementItem,
     {
@@ -40558,7 +40575,7 @@ function UnmanagedACTAccessRequirementItem(props) {
         )
       },
       showACTContactInfoInstructions ? "Hide Instructions" : "View Instructions"
-    )), showACTContactInfoInstructions && /* @__PURE__ */ React233.createElement(Box_default, { sx: { my: 1 } }, /* @__PURE__ */ React233.createElement(MarkdownSynapse_default, { markdown: actContactInfo }))) : /* @__PURE__ */ React233.createElement(MarkdownSynapse_default, { markdown: actContactInfo })
+    )), showACTContactInfoInstructions && /* @__PURE__ */ React233.createElement(Box_default, { sx: { my: 1 } }, renderedTerms)) : renderedTerms
   );
 }
 
@@ -40724,9 +40741,8 @@ function SelfSignAccessRequirementItem(props) {
   const { data: accessRequirementStatus, isLoading: isLoadingStatus } = useGetAccessRequirementStatus(String(accessRequirement.id));
   const isApproved = accessRequirementStatus?.isApproved;
   const { data: wikiPage } = useGetAccessRequirementWikiPageKey(
-    accessRequirement.id.toString(),
-    // TermsOfUse ARs have the terms embedded in the AR, there is no Wiki.
-    { enabled: !isTermsOfUse }
+    accessRequirement.id.toString()
+    // TermsOfUse ARs may have the terms embedded in the AR or an associated Wiki.
   );
   const [showTerms, setShowTerms] = useState55(false);
   const {
@@ -40748,7 +40764,7 @@ function SelfSignAccessRequirementItem(props) {
     createAccessApproval2(accessApprovalRequest);
   };
   let renderedTerms = /* @__PURE__ */ React235.createElement(React235.Fragment, null);
-  if (isTermsOfUse) {
+  if (isTermsOfUse && accessRequirement.termsOfUse) {
     renderedTerms = /* @__PURE__ */ React235.createElement(MarkdownSynapse_default, { markdown: accessRequirement.termsOfUse });
   } else if (wikiPage) {
     renderedTerms = /* @__PURE__ */ React235.createElement(

package/dist/umd/synapse-react-client.development.js

@@ -61481,7 +61481,7 @@ Please use another name.` : (0, _utils.formatMuiErrorMessage)(18));
     "package.json"(exports2, module2) {
       module2.exports = {
         name: "synapse-react-client",
-        version: "3.1.48",
+        version: "3.1.49",
         private: false,
         main: "./dist/index.js",
         module: "./dist/index.mjs",
@@ -138152,6 +138152,10 @@ ${e3.message}`);
     const { accessRequirement, entityId, onHide } = props;
     const { accessToken } = useSynapseContext();
     const { data: accessRequirementStatus, isLoading: isLoadingStatus } = useGetAccessRequirementStatus(String(accessRequirement.id));
+    const { data: wikiPage } = useGetAccessRequirementWikiPageKey(
+      accessRequirement.id.toString()
+      // ACT ARs may have the contact info embedded in the AR or may have an associated Wiki.
+    );
     const isApproved = accessRequirementStatus == null ? void 0 : accessRequirementStatus.isApproved;
     const [showACTContactInfoInstructions, setShowACTContactInfoInstructions] = (0, import_react195.useState)(false);
     let acceptButtonText = "";
@@ -138187,6 +138191,19 @@ ${e3.message}`);
         }
       ];
     }
+    let renderedTerms = /* @__PURE__ */ import_react195.default.createElement(import_react195.default.Fragment, null);
+    if (actContactInfo) {
+      renderedTerms = /* @__PURE__ */ import_react195.default.createElement(MarkdownSynapse_default, { markdown: actContactInfo });
+    } else if (wikiPage) {
+      renderedTerms = /* @__PURE__ */ import_react195.default.createElement(
+        MarkdownSynapse_default,
+        {
+          wikiId: wikiPage == null ? void 0 : wikiPage.wikiPageId,
+          ownerId: wikiPage == null ? void 0 : wikiPage.ownerObjectId,
+          objectType: wikiPage == null ? void 0 : wikiPage.ownerObjectType
+        }
+      );
+    }
     return /* @__PURE__ */ import_react195.default.createElement(
       RequirementItem,
       {
@@ -138203,7 +138220,7 @@ ${e3.message}`);
           )
         },
         showACTContactInfoInstructions ? "Hide Instructions" : "View Instructions"
-      )), showACTContactInfoInstructions && /* @__PURE__ */ import_react195.default.createElement(Box_default, { sx: { my: 1 } }, /* @__PURE__ */ import_react195.default.createElement(MarkdownSynapse_default, { markdown: actContactInfo }))) : /* @__PURE__ */ import_react195.default.createElement(MarkdownSynapse_default, { markdown: actContactInfo })
+      )), showACTContactInfoInstructions && /* @__PURE__ */ import_react195.default.createElement(Box_default, { sx: { my: 1 } }, renderedTerms)) : renderedTerms
     );
   }
 
@@ -138370,9 +138387,8 @@ ${e3.message}`);
     const { data: accessRequirementStatus, isLoading: isLoadingStatus } = useGetAccessRequirementStatus(String(accessRequirement.id));
     const isApproved = accessRequirementStatus == null ? void 0 : accessRequirementStatus.isApproved;
     const { data: wikiPage } = useGetAccessRequirementWikiPageKey(
-      accessRequirement.id.toString(),
-      // TermsOfUse ARs have the terms embedded in the AR, there is no Wiki.
-      { enabled: !isTermsOfUse }
+      accessRequirement.id.toString()
+      // TermsOfUse ARs may have the terms embedded in the AR or an associated Wiki.
     );
     const [showTerms, setShowTerms] = (0, import_react198.useState)(false);
     const {
@@ -138394,7 +138410,7 @@ ${e3.message}`);
       createAccessApproval2(accessApprovalRequest);
     };
     let renderedTerms = /* @__PURE__ */ import_react198.default.createElement(import_react198.default.Fragment, null);
-    if (isTermsOfUse) {
+    if (isTermsOfUse && accessRequirement.termsOfUse) {
       renderedTerms = /* @__PURE__ */ import_react198.default.createElement(MarkdownSynapse_default, { markdown: accessRequirement.termsOfUse });
     } else if (wikiPage) {
       renderedTerms = /* @__PURE__ */ import_react198.default.createElement(