Fix request mutations on complete store updates

Signed-off-by: Émile Ré <emile@getprobo.com>

apps/trust/src/components/AuditRow.tsx

@@ -14,7 +14,7 @@ import {
   Table,
   useToast,
 } from "@probo/ui";
-import { type PropsWithChildren, useState } from "react";
+import { type PropsWithChildren } from "react";
 import { useFragment, useMutation } from "react-relay";
 import { useLocation, useNavigate, useSearchParams } from "react-router";
 import { graphql } from "relay-runtime";
@@ -29,8 +29,13 @@ import type { AuditRowFragment$key } from "./__generated__/AuditRowFragment.grap
 const requestAccessMutation = graphql`
   mutation AuditRow_requestAccessMutation($input: RequestReportAccessInput!) {
     requestReportAccess(input: $input) {
-      trustCenterAccess {
+      audit {
+        report {
+          access {
             id
+            status
+          }
+        }
       }
     }
   }
@@ -51,7 +56,10 @@ const auditRowFragment = graphql`
       id
       filename
       isUserAuthorized
-      hasUserRequestedAccess
+      access {
+        id
+        status
+      }
     }
     framework {
       id
@@ -70,9 +78,7 @@ export function AuditRow(props: { audit: AuditRowFragment$key }) {
   const navigate = useNavigate();
 
   const audit = useFragment(auditRowFragment, props.audit);
-  const [hasRequested, setHasRequested] = useState(
+  const hasRequested = !!audit.report?.access;
-    audit.report?.hasUserRequestedAccess,
-  );
 
   const [requestAccess, isRequestingAccess]
     = useMutation<AuditRow_requestAccessMutation>(requestAccessMutation);
@@ -95,7 +101,6 @@ export function AuditRow(props: { audit: AuditRowFragment$key }) {
           });
           return;
         }
-        setHasRequested(true);
         toast({
           title: __("Success"),
           description: __("Access request submitted successfully."),

apps/trust/src/components/DocumentRow.tsx

@@ -9,7 +9,6 @@ import {
   Spinner,
   useToast,
 } from "@probo/ui";
-import { useState } from "react";
 import { useFragment, useMutation } from "react-relay";
 import { useLocation, useNavigate, useSearchParams } from "react-router";
 import { graphql } from "relay-runtime";
@@ -26,8 +25,11 @@ const requestAccessMutation = graphql`
     $input: RequestDocumentAccessInput!
   ) {
     requestDocumentAccess(input: $input) {
-      trustCenterAccess {
+      document {
+        access {
           id
+          status
+        }
       }
     }
   }
@@ -46,7 +48,10 @@ const documentRowFragment = graphql`
     id
     title
     isUserAuthorized
-    hasUserRequestedAccess
+    access {
+      id
+      status
+    }
   }
 `;
 
@@ -58,9 +63,7 @@ export function DocumentRow(props: { document: DocumentRowFragment$key }) {
   const [searchParams] = useSearchParams();
 
   const document = useFragment(documentRowFragment, props.document);
-  const [hasRequested, setHasRequested] = useState(
+  const hasRequested = !!document.access;
-    document.hasUserRequestedAccess,
-  );
 
   const [requestAccess, isRequestingAccess]
     = useMutation<DocumentRow_requestAccessMutation>(requestAccessMutation);
@@ -83,7 +86,6 @@ export function DocumentRow(props: { document: DocumentRowFragment$key }) {
           });
           return;
         }
-        setHasRequested(true);
         toast({
           title: __("Success"),
           description: __("Access request submitted successfully."),

apps/trust/src/components/OrganizationSidebar.tsx

@@ -12,7 +12,7 @@ import {
 } from "@probo/ui";
 import { type PropsWithChildren } from "react";
 import { useMutation } from "react-relay";
-import { useNavigate, useSearchParams } from "react-router";
+import { useLocation, useNavigate, useSearchParams } from "react-router";
 import { graphql } from "relay-runtime";
 
 import type { TrustGraphCurrentQuery$data } from "#/queries/__generated__/TrustGraphCurrentQuery.graphql";
@@ -41,6 +41,7 @@ export function OrganizationSidebar({
   const theme = useSystemTheme();
   const [searchParams] = useSearchParams();
   const navigate = useNavigate();
+  const location = useLocation();
 
   const logoFileUrl = theme === "dark" ? (trustCenter?.darkLogoFileUrl ?? trustCenter?.logoFileUrl) : trustCenter?.logoFileUrl;
 
@@ -66,6 +67,8 @@ export function OrganizationSidebar({
           description: __("Access request submitted successfully."),
           variant: "success",
         });
+
+        window.location.href = location.pathname;
       },
       onError: (error) => {
         if (error instanceof UnAuthenticatedError) {

apps/trust/src/components/TrustCenterFileRow.tsx

@@ -9,7 +9,6 @@ import {
   Spinner,
   useToast,
 } from "@probo/ui";
-import { useState } from "react";
 import { useFragment, useMutation } from "react-relay";
 import { useLocation, useNavigate, useSearchParams } from "react-router";
 import { graphql } from "relay-runtime";
@@ -26,8 +25,11 @@ const requestAccessMutation = graphql`
     $input: RequestTrustCenterFileAccessInput!
   ) {
     requestTrustCenterFileAccess(input: $input) {
-      trustCenterAccess {
+      file {
+        access {
           id
+          status
+        }
       }
     }
   }
@@ -48,7 +50,10 @@ const trustCenterFileRowFragment = graphql`
     id
     name
     isUserAuthorized
-    hasUserRequestedAccess
+    access {
+      id
+      status
+    }
   }
 `;
 
@@ -62,7 +67,7 @@ export function TrustCenterFileRow(props: {
   const navigate = useNavigate();
 
   const file = useFragment(trustCenterFileRowFragment, props.file);
-  const [hasRequested, setHasRequested] = useState(file.hasUserRequestedAccess);
+  const hasRequested = !!file.access;
 
   const [requestAccess, isRequestingAccess]
     = useMutation<TrustCenterFileRow_requestAccessMutation>(
@@ -87,7 +92,6 @@ export function TrustCenterFileRow(props: {
           });
           return;
         }
-        setHasRequested(true);
         toast({
           title: __("Success"),
           description: __("Access request submitted successfully."),

apps/trust/src/components/__generated__/AuditRowFragment.graphql.ts

@@ -1,5 +1,5 @@
 /**
- * @generated SignedSource<<9540bd74ce3b0dd5366c237b56070d9f>>
+ * @generated SignedSource<<beb9130a1b213333ae647116467056a0>>
  * @lightSyntaxTransform
  * @nogrep
  */
@@ -9,6 +9,7 @@
 // @ts-nocheck
 
 import { ReaderFragment } from 'relay-runtime';
+export type DocumentAccessStatus = "GRANTED" | "REJECTED" | "REQUESTED" | "REVOKED";
 import { FragmentRefs } from "relay-runtime";
 export type AuditRowFragment$data = {
   readonly framework: {
@@ -19,8 +20,11 @@ export type AuditRowFragment$data = {
   };
   readonly name: string | null | undefined;
   readonly report: {
+    readonly access: {
+      readonly id: string;
+      readonly status: DocumentAccessStatus;
+    } | null | undefined;
     readonly filename: string;
-    readonly hasUserRequestedAccess: boolean;
     readonly id: string;
     readonly isUserAuthorized: boolean;
   } | null | undefined;
@@ -76,11 +80,23 @@ return {
           "name": "isUserAuthorized",
           "storageKey": null
         },
+        {
+          "alias": null,
+          "args": null,
+          "concreteType": "DocumentAccess",
+          "kind": "LinkedField",
+          "name": "access",
+          "plural": false,
+          "selections": [
+            (v1/*: any*/),
             {
               "alias": null,
               "args": null,
               "kind": "ScalarField",
-          "name": "hasUserRequestedAccess",
+              "name": "status",
+              "storageKey": null
+            }
+          ],
           "storageKey": null
         }
       ],
@@ -119,6 +135,6 @@ return {
 };
 })();
 
-(node as any).hash = "ebf47a97014ba4dad0da94f2bb01666f";
+(node as any).hash = "1e3e89368594b05e0926b5ee8bc7c0b5";
 
 export default node;

apps/trust/src/components/__generated__/AuditRow_requestAccessMutation.graphql.ts

@@ -1,5 +1,5 @@
 /**
- * @generated SignedSource<<0e5c234b565a3031a774995bff249b97>>
+ * @generated SignedSource<<5439a269fe5c79f6d90f2421fdacb090>>
  * @lightSyntaxTransform
  * @nogrep
  */
@@ -9,6 +9,7 @@
 // @ts-nocheck
 
 import { ConcreteRequest } from 'relay-runtime';
+export type DocumentAccessStatus = "GRANTED" | "REJECTED" | "REQUESTED" | "REVOKED";
 export type RequestReportAccessInput = {
   reportId: string;
 };
@@ -17,9 +18,14 @@ export type AuditRow_requestAccessMutation$variables = {
 };
 export type AuditRow_requestAccessMutation$data = {
   readonly requestReportAccess: {
-    readonly trustCenterAccess: {
+    readonly audit: {
+      readonly report: {
+        readonly access: {
           readonly id: string;
-    };
+          readonly status: DocumentAccessStatus;
+        } | null | undefined;
+      } | null | undefined;
+    } | null | undefined;
   };
 };
 export type AuditRow_requestAccessMutation = {
@@ -36,16 +42,49 @@ var v0 = [
   }
 ],
 v1 = [
-  {
-    "alias": null,
-    "args": [
   {
     "kind": "Variable",
     "name": "input",
     "variableName": "input"
   }
+],
+v2 = {
+  "alias": null,
+  "args": null,
+  "kind": "ScalarField",
+  "name": "id",
+  "storageKey": null
+},
+v3 = {
+  "alias": null,
+  "args": null,
+  "concreteType": "DocumentAccess",
+  "kind": "LinkedField",
+  "name": "access",
+  "plural": false,
+  "selections": [
+    (v2/*: any*/),
+    {
+      "alias": null,
+      "args": null,
+      "kind": "ScalarField",
+      "name": "status",
+      "storageKey": null
+    }
   ],
-    "concreteType": "RequestAccessesPayload",
+  "storageKey": null
+};
+return {
+  "fragment": {
+    "argumentDefinitions": (v0/*: any*/),
+    "kind": "Fragment",
+    "metadata": null,
+    "name": "AuditRow_requestAccessMutation",
+    "selections": [
+      {
+        "alias": null,
+        "args": (v1/*: any*/),
+        "concreteType": "RequestReportAccessPayload",
         "kind": "LinkedField",
         "name": "requestReportAccess",
         "plural": false,
@@ -53,32 +92,30 @@ v1 = [
           {
             "alias": null,
             "args": null,
-        "concreteType": "TrustCenterAccess",
+            "concreteType": "Audit",
             "kind": "LinkedField",
-        "name": "trustCenterAccess",
+            "name": "audit",
             "plural": false,
             "selections": [
               {
                 "alias": null,
                 "args": null,
-            "kind": "ScalarField",
+                "concreteType": "Report",
-            "name": "id",
+                "kind": "LinkedField",
-            "storageKey": null
+                "name": "report",
-          }
+                "plural": false,
+                "selections": [
+                  (v3/*: any*/)
                 ],
                 "storageKey": null
               }
             ],
             "storageKey": null
           }
-];
+        ],
-return {
+        "storageKey": null
-  "fragment": {
+      }
-    "argumentDefinitions": (v0/*: any*/),
+    ],
-    "kind": "Fragment",
-    "metadata": null,
-    "name": "AuditRow_requestAccessMutation",
-    "selections": (v1/*: any*/),
     "type": "Mutation",
     "abstractKey": null
   },
@@ -87,19 +124,56 @@ return {
     "argumentDefinitions": (v0/*: any*/),
     "kind": "Operation",
     "name": "AuditRow_requestAccessMutation",
-    "selections": (v1/*: any*/)
+    "selections": [
+      {
+        "alias": null,
+        "args": (v1/*: any*/),
+        "concreteType": "RequestReportAccessPayload",
+        "kind": "LinkedField",
+        "name": "requestReportAccess",
+        "plural": false,
+        "selections": [
+          {
+            "alias": null,
+            "args": null,
+            "concreteType": "Audit",
+            "kind": "LinkedField",
+            "name": "audit",
+            "plural": false,
+            "selections": [
+              {
+                "alias": null,
+                "args": null,
+                "concreteType": "Report",
+                "kind": "LinkedField",
+                "name": "report",
+                "plural": false,
+                "selections": [
+                  (v3/*: any*/),
+                  (v2/*: any*/)
+                ],
+                "storageKey": null
+              },
+              (v2/*: any*/)
+            ],
+            "storageKey": null
+          }
+        ],
+        "storageKey": null
+      }
+    ]
   },
   "params": {
-    "cacheID": "6760f1ec8a6990f62461c3fab2b2934a",
+    "cacheID": "8d33e98c3b907ff4ddf6d08a0d9e7ff8",
     "id": null,
     "metadata": {},
     "name": "AuditRow_requestAccessMutation",
     "operationKind": "mutation",
-    "text": "mutation AuditRow_requestAccessMutation(\n  $input: RequestReportAccessInput!\n) {\n  requestReportAccess(input: $input) {\n    trustCenterAccess {\n      id\n    }\n  }\n}\n"
+    "text": "mutation AuditRow_requestAccessMutation(\n  $input: RequestReportAccessInput!\n) {\n  requestReportAccess(input: $input) {\n    audit {\n      report {\n        access {\n          id\n          status\n        }\n        id\n      }\n      id\n    }\n  }\n}\n"
   }
 };
 })();
 
-(node as any).hash = "6ab5eb701126385e717a381e21e55ae0";
+(node as any).hash = "01e09978f688128c89698e9a0877fa37";
 
 export default node;

apps/trust/src/components/__generated__/DocumentRowFragment.graphql.ts

@@ -1,5 +1,5 @@
 /**
- * @generated SignedSource<<396f9d87342c909ca373f60a1e6f7ff3>>
+ * @generated SignedSource<<5698d403c8907dad78a4070f710f46b4>>
  * @lightSyntaxTransform
  * @nogrep
  */
@@ -9,9 +9,13 @@
 // @ts-nocheck
 
 import { ReaderFragment } from 'relay-runtime';
+export type DocumentAccessStatus = "GRANTED" | "REJECTED" | "REQUESTED" | "REVOKED";
 import { FragmentRefs } from "relay-runtime";
 export type DocumentRowFragment$data = {
-  readonly hasUserRequestedAccess: boolean;
+  readonly access: {
+    readonly id: string;
+    readonly status: DocumentAccessStatus;
+  } | null | undefined;
   readonly id: string;
   readonly isUserAuthorized: boolean;
   readonly title: string;
@@ -22,19 +26,21 @@ export type DocumentRowFragment$key = {
   readonly " $fragmentSpreads": FragmentRefs<"DocumentRowFragment">;
 };
 
-const node: ReaderFragment = {
+const node: ReaderFragment = (function(){
-  "argumentDefinitions": [],
+var v0 = {
-  "kind": "Fragment",
-  "metadata": null,
-  "name": "DocumentRowFragment",
-  "selections": [
-    {
   "alias": null,
   "args": null,
   "kind": "ScalarField",
   "name": "id",
   "storageKey": null
-    },
+};
+return {
+  "argumentDefinitions": [],
+  "kind": "Fragment",
+  "metadata": null,
+  "name": "DocumentRowFragment",
+  "selections": [
+    (v0/*: any*/),
     {
       "alias": null,
       "args": null,
@@ -49,18 +55,31 @@ const node: ReaderFragment = {
       "name": "isUserAuthorized",
       "storageKey": null
     },
+    {
+      "alias": null,
+      "args": null,
+      "concreteType": "DocumentAccess",
+      "kind": "LinkedField",
+      "name": "access",
+      "plural": false,
+      "selections": [
+        (v0/*: any*/),
         {
           "alias": null,
           "args": null,
           "kind": "ScalarField",
-      "name": "hasUserRequestedAccess",
+          "name": "status",
+          "storageKey": null
+        }
+      ],
       "storageKey": null
     }
   ],
   "type": "Document",
   "abstractKey": null
 };
+})();
 
-(node as any).hash = "1b0f0b9cae621268d72b0fd0646aa672";
+(node as any).hash = "6839ab4ad70d571dcce4e74583723244";
 
 export default node;

apps/trust/src/components/__generated__/DocumentRow_requestAccessMutation.graphql.ts

@@ -1,5 +1,5 @@
 /**
- * @generated SignedSource<<e62c28d53365ca5d5f3d53282aefd4e7>>
+ * @generated SignedSource<<b24d17465cf3d4aca2ade3fbd21326eb>>
  * @lightSyntaxTransform
  * @nogrep
  */
@@ -9,6 +9,7 @@
 // @ts-nocheck
 
 import { ConcreteRequest } from 'relay-runtime';
+export type DocumentAccessStatus = "GRANTED" | "REJECTED" | "REQUESTED" | "REVOKED";
 export type RequestDocumentAccessInput = {
   documentId: string;
 };
@@ -17,9 +18,12 @@ export type DocumentRow_requestAccessMutation$variables = {
 };
 export type DocumentRow_requestAccessMutation$data = {
   readonly requestDocumentAccess: {
-    readonly trustCenterAccess: {
+    readonly document: {
+      readonly access: {
         readonly id: string;
-    };
+        readonly status: DocumentAccessStatus;
+      } | null | undefined;
+    } | null | undefined;
   };
 };
 export type DocumentRow_requestAccessMutation = {
@@ -36,16 +40,49 @@ var v0 = [
   }
 ],
 v1 = [
-  {
-    "alias": null,
-    "args": [
   {
     "kind": "Variable",
     "name": "input",
     "variableName": "input"
   }
+],
+v2 = {
+  "alias": null,
+  "args": null,
+  "kind": "ScalarField",
+  "name": "id",
+  "storageKey": null
+},
+v3 = {
+  "alias": null,
+  "args": null,
+  "concreteType": "DocumentAccess",
+  "kind": "LinkedField",
+  "name": "access",
+  "plural": false,
+  "selections": [
+    (v2/*: any*/),
+    {
+      "alias": null,
+      "args": null,
+      "kind": "ScalarField",
+      "name": "status",
+      "storageKey": null
+    }
   ],
-    "concreteType": "RequestAccessesPayload",
+  "storageKey": null
+};
+return {
+  "fragment": {
+    "argumentDefinitions": (v0/*: any*/),
+    "kind": "Fragment",
+    "metadata": null,
+    "name": "DocumentRow_requestAccessMutation",
+    "selections": [
+      {
+        "alias": null,
+        "args": (v1/*: any*/),
+        "concreteType": "RequestDocumentAccessPayload",
         "kind": "LinkedField",
         "name": "requestDocumentAccess",
         "plural": false,
@@ -53,32 +90,19 @@ v1 = [
           {
             "alias": null,
             "args": null,
-        "concreteType": "TrustCenterAccess",
+            "concreteType": "Document",
             "kind": "LinkedField",
-        "name": "trustCenterAccess",
+            "name": "document",
             "plural": false,
             "selections": [
-          {
+              (v3/*: any*/)
-            "alias": null,
-            "args": null,
-            "kind": "ScalarField",
-            "name": "id",
-            "storageKey": null
-          }
             ],
             "storageKey": null
           }
         ],
         "storageKey": null
       }
-];
+    ],
-return {
-  "fragment": {
-    "argumentDefinitions": (v0/*: any*/),
-    "kind": "Fragment",
-    "metadata": null,
-    "name": "DocumentRow_requestAccessMutation",
-    "selections": (v1/*: any*/),
     "type": "Mutation",
     "abstractKey": null
   },
@@ -87,19 +111,44 @@ return {
     "argumentDefinitions": (v0/*: any*/),
     "kind": "Operation",
     "name": "DocumentRow_requestAccessMutation",
-    "selections": (v1/*: any*/)
+    "selections": [
+      {
+        "alias": null,
+        "args": (v1/*: any*/),
+        "concreteType": "RequestDocumentAccessPayload",
+        "kind": "LinkedField",
+        "name": "requestDocumentAccess",
+        "plural": false,
+        "selections": [
+          {
+            "alias": null,
+            "args": null,
+            "concreteType": "Document",
+            "kind": "LinkedField",
+            "name": "document",
+            "plural": false,
+            "selections": [
+              (v3/*: any*/),
+              (v2/*: any*/)
+            ],
+            "storageKey": null
+          }
+        ],
+        "storageKey": null
+      }
+    ]
   },
   "params": {
-    "cacheID": "13715b7cb8784d050b6d0381e460bbad",
+    "cacheID": "0bd652390e5413f5ba2c66af0796cbc9",
     "id": null,
     "metadata": {},
     "name": "DocumentRow_requestAccessMutation",
     "operationKind": "mutation",
-    "text": "mutation DocumentRow_requestAccessMutation(\n  $input: RequestDocumentAccessInput!\n) {\n  requestDocumentAccess(input: $input) {\n    trustCenterAccess {\n      id\n    }\n  }\n}\n"
+    "text": "mutation DocumentRow_requestAccessMutation(\n  $input: RequestDocumentAccessInput!\n) {\n  requestDocumentAccess(input: $input) {\n    document {\n      access {\n        id\n        status\n      }\n      id\n    }\n  }\n}\n"
   }
 };
 })();
 
-(node as any).hash = "ca9026b04c2de91067759e3a80e5c276";
+(node as any).hash = "bc8897aa5c4a7d7fb05604f8aa3b8491";
 
 export default node;

apps/trust/src/components/__generated__/TrustCenterFileRowFragment.graphql.ts

@@ -1,5 +1,5 @@
 /**
- * @generated SignedSource<<0261adc72d21035b906b6156ea9d0b40>>
+ * @generated SignedSource<<bd09e92db1b1b5bf9c45145f4058e88f>>
  * @lightSyntaxTransform
  * @nogrep
  */
@@ -9,9 +9,13 @@
 // @ts-nocheck
 
 import { ReaderFragment } from 'relay-runtime';
+export type DocumentAccessStatus = "GRANTED" | "REJECTED" | "REQUESTED" | "REVOKED";
 import { FragmentRefs } from "relay-runtime";
 export type TrustCenterFileRowFragment$data = {
-  readonly hasUserRequestedAccess: boolean;
+  readonly access: {
+    readonly id: string;
+    readonly status: DocumentAccessStatus;
+  } | null | undefined;
   readonly id: string;
   readonly isUserAuthorized: boolean;
   readonly name: string;
@@ -22,19 +26,21 @@ export type TrustCenterFileRowFragment$key = {
   readonly " $fragmentSpreads": FragmentRefs<"TrustCenterFileRowFragment">;
 };
 
-const node: ReaderFragment = {
+const node: ReaderFragment = (function(){
-  "argumentDefinitions": [],
+var v0 = {
-  "kind": "Fragment",
-  "metadata": null,
-  "name": "TrustCenterFileRowFragment",
-  "selections": [
-    {
   "alias": null,
   "args": null,
   "kind": "ScalarField",
   "name": "id",
   "storageKey": null
-    },
+};
+return {
+  "argumentDefinitions": [],
+  "kind": "Fragment",
+  "metadata": null,
+  "name": "TrustCenterFileRowFragment",
+  "selections": [
+    (v0/*: any*/),
     {
       "alias": null,
       "args": null,
@@ -49,18 +55,31 @@ const node: ReaderFragment = {
       "name": "isUserAuthorized",
       "storageKey": null
     },
+    {
+      "alias": null,
+      "args": null,
+      "concreteType": "DocumentAccess",
+      "kind": "LinkedField",
+      "name": "access",
+      "plural": false,
+      "selections": [
+        (v0/*: any*/),
         {
           "alias": null,
           "args": null,
           "kind": "ScalarField",
-      "name": "hasUserRequestedAccess",
+          "name": "status",
+          "storageKey": null
+        }
+      ],
       "storageKey": null
     }
   ],
   "type": "TrustCenterFile",
   "abstractKey": null
 };
+})();
 
-(node as any).hash = "4ff11c14e65566f0dfe3a77ea73903e8";
+(node as any).hash = "98e5e399ab6d45c22cd85d663cfb3748";
 
 export default node;

apps/trust/src/components/__generated__/TrustCenterFileRow_requestAccessMutation.graphql.ts

@@ -1,5 +1,5 @@
 /**
- * @generated SignedSource<<a8da5aa24d8696b55231f44d861f347c>>
+ * @generated SignedSource<<19d9adae53e45d4399358c9307928265>>
  * @lightSyntaxTransform
  * @nogrep
  */
@@ -9,6 +9,7 @@
 // @ts-nocheck
 
 import { ConcreteRequest } from 'relay-runtime';
+export type DocumentAccessStatus = "GRANTED" | "REJECTED" | "REQUESTED" | "REVOKED";
 export type RequestTrustCenterFileAccessInput = {
   trustCenterFileId: string;
 };
@@ -17,9 +18,12 @@ export type TrustCenterFileRow_requestAccessMutation$variables = {
 };
 export type TrustCenterFileRow_requestAccessMutation$data = {
   readonly requestTrustCenterFileAccess: {
-    readonly trustCenterAccess: {
+    readonly file: {
+      readonly access: {
         readonly id: string;
-    };
+        readonly status: DocumentAccessStatus;
+      } | null | undefined;
+    } | null | undefined;
   };
 };
 export type TrustCenterFileRow_requestAccessMutation = {
@@ -36,16 +40,49 @@ var v0 = [
   }
 ],
 v1 = [
-  {
-    "alias": null,
-    "args": [
   {
     "kind": "Variable",
     "name": "input",
     "variableName": "input"
   }
+],
+v2 = {
+  "alias": null,
+  "args": null,
+  "kind": "ScalarField",
+  "name": "id",
+  "storageKey": null
+},
+v3 = {
+  "alias": null,
+  "args": null,
+  "concreteType": "DocumentAccess",
+  "kind": "LinkedField",
+  "name": "access",
+  "plural": false,
+  "selections": [
+    (v2/*: any*/),
+    {
+      "alias": null,
+      "args": null,
+      "kind": "ScalarField",
+      "name": "status",
+      "storageKey": null
+    }
   ],
-    "concreteType": "RequestAccessesPayload",
+  "storageKey": null
+};
+return {
+  "fragment": {
+    "argumentDefinitions": (v0/*: any*/),
+    "kind": "Fragment",
+    "metadata": null,
+    "name": "TrustCenterFileRow_requestAccessMutation",
+    "selections": [
+      {
+        "alias": null,
+        "args": (v1/*: any*/),
+        "concreteType": "RequestFileAccessPayload",
         "kind": "LinkedField",
         "name": "requestTrustCenterFileAccess",
         "plural": false,
@@ -53,32 +90,19 @@ v1 = [
           {
             "alias": null,
             "args": null,
-        "concreteType": "TrustCenterAccess",
+            "concreteType": "TrustCenterFile",
             "kind": "LinkedField",
-        "name": "trustCenterAccess",
+            "name": "file",
             "plural": false,
             "selections": [
-          {
+              (v3/*: any*/)
-            "alias": null,
-            "args": null,
-            "kind": "ScalarField",
-            "name": "id",
-            "storageKey": null
-          }
             ],
             "storageKey": null
           }
         ],
         "storageKey": null
       }
-];
+    ],
-return {
-  "fragment": {
-    "argumentDefinitions": (v0/*: any*/),
-    "kind": "Fragment",
-    "metadata": null,
-    "name": "TrustCenterFileRow_requestAccessMutation",
-    "selections": (v1/*: any*/),
     "type": "Mutation",
     "abstractKey": null
   },
@@ -87,19 +111,44 @@ return {
     "argumentDefinitions": (v0/*: any*/),
     "kind": "Operation",
     "name": "TrustCenterFileRow_requestAccessMutation",
-    "selections": (v1/*: any*/)
+    "selections": [
+      {
+        "alias": null,
+        "args": (v1/*: any*/),
+        "concreteType": "RequestFileAccessPayload",
+        "kind": "LinkedField",
+        "name": "requestTrustCenterFileAccess",
+        "plural": false,
+        "selections": [
+          {
+            "alias": null,
+            "args": null,
+            "concreteType": "TrustCenterFile",
+            "kind": "LinkedField",
+            "name": "file",
+            "plural": false,
+            "selections": [
+              (v3/*: any*/),
+              (v2/*: any*/)
+            ],
+            "storageKey": null
+          }
+        ],
+        "storageKey": null
+      }
+    ]
   },
   "params": {
-    "cacheID": "77a09810aa9c3ddf3a3baddf709f9a42",
+    "cacheID": "f96fd0464a34ad565cc7b6bb2e13308f",
     "id": null,
     "metadata": {},
     "name": "TrustCenterFileRow_requestAccessMutation",
     "operationKind": "mutation",
-    "text": "mutation TrustCenterFileRow_requestAccessMutation(\n  $input: RequestTrustCenterFileAccessInput!\n) {\n  requestTrustCenterFileAccess(input: $input) {\n    trustCenterAccess {\n      id\n    }\n  }\n}\n"
+    "text": "mutation TrustCenterFileRow_requestAccessMutation(\n  $input: RequestTrustCenterFileAccessInput!\n) {\n  requestTrustCenterFileAccess(input: $input) {\n    file {\n      access {\n        id\n        status\n      }\n      id\n    }\n  }\n}\n"
   }
 };
 })();
 
-(node as any).hash = "eba04489de9ec18ab9816328a481ef33";
+(node as any).hash = "1a9f7ac6860d4bca88d04d73f9c6020d";
 
 export default node;

apps/trust/src/hooks/__generated__/useRequestAccessCallback_documentMutation.graphql.ts

@@ -1,5 +1,5 @@
 /**
- * @generated SignedSource<<6b6304c9a22de890f171632f8c9dabe1>>
+ * @generated SignedSource<<aae03fb419e3ef00b45151ceeb0988cd>>
  * @lightSyntaxTransform
  * @nogrep
  */
@@ -9,6 +9,7 @@
 // @ts-nocheck
 
 import { ConcreteRequest } from 'relay-runtime';
+export type DocumentAccessStatus = "GRANTED" | "REJECTED" | "REQUESTED" | "REVOKED";
 export type RequestDocumentAccessInput = {
   documentId: string;
 };
@@ -17,9 +18,12 @@ export type useRequestAccessCallback_documentMutation$variables = {
 };
 export type useRequestAccessCallback_documentMutation$data = {
   readonly requestDocumentAccess: {
-    readonly trustCenterAccess: {
+    readonly document: {
+      readonly access: {
         readonly id: string;
-    };
+        readonly status: DocumentAccessStatus;
+      } | null | undefined;
+    } | null | undefined;
   };
 };
 export type useRequestAccessCallback_documentMutation = {
@@ -36,16 +40,49 @@ var v0 = [
   }
 ],
 v1 = [
-  {
-    "alias": null,
-    "args": [
   {
     "kind": "Variable",
     "name": "input",
     "variableName": "input"
   }
+],
+v2 = {
+  "alias": null,
+  "args": null,
+  "kind": "ScalarField",
+  "name": "id",
+  "storageKey": null
+},
+v3 = {
+  "alias": null,
+  "args": null,
+  "concreteType": "DocumentAccess",
+  "kind": "LinkedField",
+  "name": "access",
+  "plural": false,
+  "selections": [
+    (v2/*: any*/),
+    {
+      "alias": null,
+      "args": null,
+      "kind": "ScalarField",
+      "name": "status",
+      "storageKey": null
+    }
   ],
-    "concreteType": "RequestAccessesPayload",
+  "storageKey": null
+};
+return {
+  "fragment": {
+    "argumentDefinitions": (v0/*: any*/),
+    "kind": "Fragment",
+    "metadata": null,
+    "name": "useRequestAccessCallback_documentMutation",
+    "selections": [
+      {
+        "alias": null,
+        "args": (v1/*: any*/),
+        "concreteType": "RequestDocumentAccessPayload",
         "kind": "LinkedField",
         "name": "requestDocumentAccess",
         "plural": false,
@@ -53,32 +90,19 @@ v1 = [
           {
             "alias": null,
             "args": null,
-        "concreteType": "TrustCenterAccess",
+            "concreteType": "Document",
             "kind": "LinkedField",
-        "name": "trustCenterAccess",
+            "name": "document",
             "plural": false,
             "selections": [
-          {
+              (v3/*: any*/)
-            "alias": null,
-            "args": null,
-            "kind": "ScalarField",
-            "name": "id",
-            "storageKey": null
-          }
             ],
             "storageKey": null
           }
         ],
         "storageKey": null
       }
-];
+    ],
-return {
-  "fragment": {
-    "argumentDefinitions": (v0/*: any*/),
-    "kind": "Fragment",
-    "metadata": null,
-    "name": "useRequestAccessCallback_documentMutation",
-    "selections": (v1/*: any*/),
     "type": "Mutation",
     "abstractKey": null
   },
@@ -87,19 +111,44 @@ return {
     "argumentDefinitions": (v0/*: any*/),
     "kind": "Operation",
     "name": "useRequestAccessCallback_documentMutation",
-    "selections": (v1/*: any*/)
+    "selections": [
+      {
+        "alias": null,
+        "args": (v1/*: any*/),
+        "concreteType": "RequestDocumentAccessPayload",
+        "kind": "LinkedField",
+        "name": "requestDocumentAccess",
+        "plural": false,
+        "selections": [
+          {
+            "alias": null,
+            "args": null,
+            "concreteType": "Document",
+            "kind": "LinkedField",
+            "name": "document",
+            "plural": false,
+            "selections": [
+              (v3/*: any*/),
+              (v2/*: any*/)
+            ],
+            "storageKey": null
+          }
+        ],
+        "storageKey": null
+      }
+    ]
   },
   "params": {
-    "cacheID": "849ea6a746660bdee8ebf805baef7a33",
+    "cacheID": "e3153093fd3da3f95ac5bc98a09163a7",
     "id": null,
     "metadata": {},
     "name": "useRequestAccessCallback_documentMutation",
     "operationKind": "mutation",
-    "text": "mutation useRequestAccessCallback_documentMutation(\n  $input: RequestDocumentAccessInput!\n) {\n  requestDocumentAccess(input: $input) {\n    trustCenterAccess {\n      id\n    }\n  }\n}\n"
+    "text": "mutation useRequestAccessCallback_documentMutation(\n  $input: RequestDocumentAccessInput!\n) {\n  requestDocumentAccess(input: $input) {\n    document {\n      access {\n        id\n        status\n      }\n      id\n    }\n  }\n}\n"
   }
 };
 })();
 
-(node as any).hash = "1ff8b5f560d8c3024e6d5c11bb2ed889";
+(node as any).hash = "afc533a5d5b764f81f6bc7632f1614ff";
 
 export default node;

apps/trust/src/hooks/__generated__/useRequestAccessCallback_fileMutation.graphql.ts

@@ -1,5 +1,5 @@
 /**
- * @generated SignedSource<<6db2a4322199d638b3f1ac498ecd066b>>
+ * @generated SignedSource<<688bb06b7534c867b9427a6fcbb52d57>>
  * @lightSyntaxTransform
  * @nogrep
  */
@@ -9,6 +9,7 @@
 // @ts-nocheck
 
 import { ConcreteRequest } from 'relay-runtime';
+export type DocumentAccessStatus = "GRANTED" | "REJECTED" | "REQUESTED" | "REVOKED";
 export type RequestTrustCenterFileAccessInput = {
   trustCenterFileId: string;
 };
@@ -17,9 +18,12 @@ export type useRequestAccessCallback_fileMutation$variables = {
 };
 export type useRequestAccessCallback_fileMutation$data = {
   readonly requestTrustCenterFileAccess: {
-    readonly trustCenterAccess: {
+    readonly file: {
+      readonly access: {
         readonly id: string;
-    };
+        readonly status: DocumentAccessStatus;
+      } | null | undefined;
+    } | null | undefined;
   };
 };
 export type useRequestAccessCallback_fileMutation = {
@@ -36,16 +40,49 @@ var v0 = [
   }
 ],
 v1 = [
-  {
-    "alias": null,
-    "args": [
   {
     "kind": "Variable",
     "name": "input",
     "variableName": "input"
   }
+],
+v2 = {
+  "alias": null,
+  "args": null,
+  "kind": "ScalarField",
+  "name": "id",
+  "storageKey": null
+},
+v3 = {
+  "alias": null,
+  "args": null,
+  "concreteType": "DocumentAccess",
+  "kind": "LinkedField",
+  "name": "access",
+  "plural": false,
+  "selections": [
+    (v2/*: any*/),
+    {
+      "alias": null,
+      "args": null,
+      "kind": "ScalarField",
+      "name": "status",
+      "storageKey": null
+    }
   ],
-    "concreteType": "RequestAccessesPayload",
+  "storageKey": null
+};
+return {
+  "fragment": {
+    "argumentDefinitions": (v0/*: any*/),
+    "kind": "Fragment",
+    "metadata": null,
+    "name": "useRequestAccessCallback_fileMutation",
+    "selections": [
+      {
+        "alias": null,
+        "args": (v1/*: any*/),
+        "concreteType": "RequestFileAccessPayload",
         "kind": "LinkedField",
         "name": "requestTrustCenterFileAccess",
         "plural": false,
@@ -53,32 +90,19 @@ v1 = [
           {
             "alias": null,
             "args": null,
-        "concreteType": "TrustCenterAccess",
+            "concreteType": "TrustCenterFile",
             "kind": "LinkedField",
-        "name": "trustCenterAccess",
+            "name": "file",
             "plural": false,
             "selections": [
-          {
+              (v3/*: any*/)
-            "alias": null,
-            "args": null,
-            "kind": "ScalarField",
-            "name": "id",
-            "storageKey": null
-          }
             ],
             "storageKey": null
           }
         ],
         "storageKey": null
       }
-];
+    ],
-return {
-  "fragment": {
-    "argumentDefinitions": (v0/*: any*/),
-    "kind": "Fragment",
-    "metadata": null,
-    "name": "useRequestAccessCallback_fileMutation",
-    "selections": (v1/*: any*/),
     "type": "Mutation",
     "abstractKey": null
   },
@@ -87,19 +111,44 @@ return {
     "argumentDefinitions": (v0/*: any*/),
     "kind": "Operation",
     "name": "useRequestAccessCallback_fileMutation",
-    "selections": (v1/*: any*/)
+    "selections": [
+      {
+        "alias": null,
+        "args": (v1/*: any*/),
+        "concreteType": "RequestFileAccessPayload",
+        "kind": "LinkedField",
+        "name": "requestTrustCenterFileAccess",
+        "plural": false,
+        "selections": [
+          {
+            "alias": null,
+            "args": null,
+            "concreteType": "TrustCenterFile",
+            "kind": "LinkedField",
+            "name": "file",
+            "plural": false,
+            "selections": [
+              (v3/*: any*/),
+              (v2/*: any*/)
+            ],
+            "storageKey": null
+          }
+        ],
+        "storageKey": null
+      }
+    ]
   },
   "params": {
-    "cacheID": "1ed0d9f8a3b3dc08c2af16101729d3a9",
+    "cacheID": "0c66e592bdb92aa92fbaef21c8133e17",
     "id": null,
     "metadata": {},
     "name": "useRequestAccessCallback_fileMutation",
     "operationKind": "mutation",
-    "text": "mutation useRequestAccessCallback_fileMutation(\n  $input: RequestTrustCenterFileAccessInput!\n) {\n  requestTrustCenterFileAccess(input: $input) {\n    trustCenterAccess {\n      id\n    }\n  }\n}\n"
+    "text": "mutation useRequestAccessCallback_fileMutation(\n  $input: RequestTrustCenterFileAccessInput!\n) {\n  requestTrustCenterFileAccess(input: $input) {\n    file {\n      access {\n        id\n        status\n      }\n      id\n    }\n  }\n}\n"
   }
 };
 })();
 
-(node as any).hash = "5105b60de987b135523ada9ee2777dea";
+(node as any).hash = "0dbe835b29f81d086b94cfecb8fc832f";
 
 export default node;

apps/trust/src/hooks/__generated__/useRequestAccessCallback_reportMutation.graphql.ts

@@ -1,5 +1,5 @@
 /**
- * @generated SignedSource<<d36c3f435afa928b80d415bd53786d81>>
+ * @generated SignedSource<<b995c7259ba7df94fbdc49770ec83a92>>
  * @lightSyntaxTransform
  * @nogrep
  */
@@ -9,6 +9,7 @@
 // @ts-nocheck
 
 import { ConcreteRequest } from 'relay-runtime';
+export type DocumentAccessStatus = "GRANTED" | "REJECTED" | "REQUESTED" | "REVOKED";
 export type RequestReportAccessInput = {
   reportId: string;
 };
@@ -17,9 +18,14 @@ export type useRequestAccessCallback_reportMutation$variables = {
 };
 export type useRequestAccessCallback_reportMutation$data = {
   readonly requestReportAccess: {
-    readonly trustCenterAccess: {
+    readonly audit: {
+      readonly report: {
+        readonly access: {
           readonly id: string;
-    };
+          readonly status: DocumentAccessStatus;
+        } | null | undefined;
+      } | null | undefined;
+    } | null | undefined;
   };
 };
 export type useRequestAccessCallback_reportMutation = {
@@ -36,16 +42,49 @@ var v0 = [
   }
 ],
 v1 = [
-  {
-    "alias": null,
-    "args": [
   {
     "kind": "Variable",
     "name": "input",
     "variableName": "input"
   }
+],
+v2 = {
+  "alias": null,
+  "args": null,
+  "kind": "ScalarField",
+  "name": "id",
+  "storageKey": null
+},
+v3 = {
+  "alias": null,
+  "args": null,
+  "concreteType": "DocumentAccess",
+  "kind": "LinkedField",
+  "name": "access",
+  "plural": false,
+  "selections": [
+    (v2/*: any*/),
+    {
+      "alias": null,
+      "args": null,
+      "kind": "ScalarField",
+      "name": "status",
+      "storageKey": null
+    }
   ],
-    "concreteType": "RequestAccessesPayload",
+  "storageKey": null
+};
+return {
+  "fragment": {
+    "argumentDefinitions": (v0/*: any*/),
+    "kind": "Fragment",
+    "metadata": null,
+    "name": "useRequestAccessCallback_reportMutation",
+    "selections": [
+      {
+        "alias": null,
+        "args": (v1/*: any*/),
+        "concreteType": "RequestReportAccessPayload",
         "kind": "LinkedField",
         "name": "requestReportAccess",
         "plural": false,
@@ -53,32 +92,30 @@ v1 = [
           {
             "alias": null,
             "args": null,
-        "concreteType": "TrustCenterAccess",
+            "concreteType": "Audit",
             "kind": "LinkedField",
-        "name": "trustCenterAccess",
+            "name": "audit",
             "plural": false,
             "selections": [
               {
                 "alias": null,
                 "args": null,
-            "kind": "ScalarField",
+                "concreteType": "Report",
-            "name": "id",
+                "kind": "LinkedField",
-            "storageKey": null
+                "name": "report",
-          }
+                "plural": false,
+                "selections": [
+                  (v3/*: any*/)
                 ],
                 "storageKey": null
               }
             ],
             "storageKey": null
           }
-];
+        ],
-return {
+        "storageKey": null
-  "fragment": {
+      }
-    "argumentDefinitions": (v0/*: any*/),
+    ],
-    "kind": "Fragment",
-    "metadata": null,
-    "name": "useRequestAccessCallback_reportMutation",
-    "selections": (v1/*: any*/),
     "type": "Mutation",
     "abstractKey": null
   },
@@ -87,19 +124,56 @@ return {
     "argumentDefinitions": (v0/*: any*/),
     "kind": "Operation",
     "name": "useRequestAccessCallback_reportMutation",
-    "selections": (v1/*: any*/)
+    "selections": [
+      {
+        "alias": null,
+        "args": (v1/*: any*/),
+        "concreteType": "RequestReportAccessPayload",
+        "kind": "LinkedField",
+        "name": "requestReportAccess",
+        "plural": false,
+        "selections": [
+          {
+            "alias": null,
+            "args": null,
+            "concreteType": "Audit",
+            "kind": "LinkedField",
+            "name": "audit",
+            "plural": false,
+            "selections": [
+              {
+                "alias": null,
+                "args": null,
+                "concreteType": "Report",
+                "kind": "LinkedField",
+                "name": "report",
+                "plural": false,
+                "selections": [
+                  (v3/*: any*/),
+                  (v2/*: any*/)
+                ],
+                "storageKey": null
+              },
+              (v2/*: any*/)
+            ],
+            "storageKey": null
+          }
+        ],
+        "storageKey": null
+      }
+    ]
   },
   "params": {
-    "cacheID": "c859384ca219b8302245e0bed292e698",
+    "cacheID": "82539e9ad64aa2bd9e5bd2cac4597f23",
     "id": null,
     "metadata": {},
     "name": "useRequestAccessCallback_reportMutation",
     "operationKind": "mutation",
-    "text": "mutation useRequestAccessCallback_reportMutation(\n  $input: RequestReportAccessInput!\n) {\n  requestReportAccess(input: $input) {\n    trustCenterAccess {\n      id\n    }\n  }\n}\n"
+    "text": "mutation useRequestAccessCallback_reportMutation(\n  $input: RequestReportAccessInput!\n) {\n  requestReportAccess(input: $input) {\n    audit {\n      report {\n        access {\n          id\n          status\n        }\n        id\n      }\n      id\n    }\n  }\n}\n"
   }
 };
 })();
 
-(node as any).hash = "6ad61c2f6638f5d31c9c25b0044f080a";
+(node as any).hash = "6b07d19642a0227f76f81bb64dac82ea";
 
 export default node;

apps/trust/src/hooks/useRequestAccessCallback.ts

@@ -3,7 +3,7 @@ import { useTranslate } from "@probo/i18n";
 import { useToast } from "@probo/ui";
 import { useEffect } from "react";
 import { useMutation } from "react-relay";
-import { useSearchParams } from "react-router";
+import { useLocation, useSearchParams } from "react-router";
 import { graphql } from "relay-runtime";
 
 import type { useRequestAccessCallback_allMutation } from "./__generated__/useRequestAccessCallback_allMutation.graphql";
@@ -16,8 +16,11 @@ const documentMutation = graphql`
     $input: RequestDocumentAccessInput!
   ) {
     requestDocumentAccess(input: $input) {
-      trustCenterAccess {
+      document {
+        access {
           id
+          status
+        }
       }
     }
   }
@@ -28,8 +31,13 @@ const reportMutation = graphql`
     $input: RequestReportAccessInput!
   ) {
     requestReportAccess(input: $input) {
-      trustCenterAccess {
+      audit {
+        report {
+          access {
             id
+            status
+          }
+        }
       }
     }
   }
@@ -40,8 +48,11 @@ const fileMutation = graphql`
     $input: RequestTrustCenterFileAccessInput!
   ) {
     requestTrustCenterFileAccess(input: $input) {
-      trustCenterAccess {
+      file {
+        access {
           id
+          status
+        }
       }
     }
   }
@@ -75,6 +86,7 @@ function successToastArgs(__: (s: string) => string) {
 
 export function useRequestAccessCallback() {
   const [searchParams, setSearchParams] = useSearchParams();
+  const location = useLocation();
 
   const documentId = searchParams.get("request-document-id");
   const reportId = searchParams.get("request-report-id");
@@ -173,6 +185,7 @@ export function useRequestAccessCallback() {
           toast(successToastArgs(__));
           searchParams.delete("request-all");
           setSearchParams(searchParams);
+          window.location.href = location.pathname;
         },
         onError: (error) => {
           toast(errorToastArgs(__, error));
@@ -194,5 +207,6 @@ export function useRequestAccessCallback() {
     searchParams,
     setSearchParams,
     toast,
+    location,
   ]);
 }

apps/trust/src/queries/__generated__/TrustGraphCurrentDocumentsQuery.graphql.ts

@@ -1,5 +1,5 @@
 /**
- * @generated SignedSource<<dabe16493c003a98ed8fd555efc85ddc>>
+ * @generated SignedSource<<49da700d766fbc346562bd5c8ec01ade>>
  * @lightSyntaxTransform
  * @nogrep
  */
@@ -87,10 +87,22 @@ v5 = {
   "storageKey": null
 },
 v6 = {
+  "alias": null,
+  "args": null,
+  "concreteType": "DocumentAccess",
+  "kind": "LinkedField",
+  "name": "access",
+  "plural": false,
+  "selections": [
+    (v0/*: any*/),
+    {
       "alias": null,
       "args": null,
       "kind": "ScalarField",
-  "name": "hasUserRequestedAccess",
+      "name": "status",
+      "storageKey": null
+    }
+  ],
   "storageKey": null
 };
 return {
@@ -324,12 +336,12 @@ return {
     ]
   },
   "params": {
-    "cacheID": "c9c4cb18da98c40646fbbe21c2c5b46f",
+    "cacheID": "479815df76932e5e2a6c57f97efdd029",
     "id": null,
     "metadata": {},
     "name": "TrustGraphCurrentDocumentsQuery",
     "operationKind": "query",
-    "text": "query TrustGraphCurrentDocumentsQuery {\n  currentTrustCenter {\n    id\n    organization {\n      name\n      id\n    }\n    documents(first: 50) {\n      edges {\n        node {\n          id\n          documentType\n          ...DocumentRowFragment\n        }\n      }\n    }\n    trustCenterFiles(first: 50) {\n      edges {\n        node {\n          id\n          category\n          ...TrustCenterFileRowFragment\n        }\n      }\n    }\n  }\n}\n\nfragment DocumentRowFragment on Document {\n  id\n  title\n  isUserAuthorized\n  hasUserRequestedAccess\n}\n\nfragment TrustCenterFileRowFragment on TrustCenterFile {\n  id\n  name\n  isUserAuthorized\n  hasUserRequestedAccess\n}\n"
+    "text": "query TrustGraphCurrentDocumentsQuery {\n  currentTrustCenter {\n    id\n    organization {\n      name\n      id\n    }\n    documents(first: 50) {\n      edges {\n        node {\n          id\n          documentType\n          ...DocumentRowFragment\n        }\n      }\n    }\n    trustCenterFiles(first: 50) {\n      edges {\n        node {\n          id\n          category\n          ...TrustCenterFileRowFragment\n        }\n      }\n    }\n  }\n}\n\nfragment DocumentRowFragment on Document {\n  id\n  title\n  isUserAuthorized\n  access {\n    id\n    status\n  }\n}\n\nfragment TrustCenterFileRowFragment on TrustCenterFile {\n  id\n  name\n  isUserAuthorized\n  access {\n    id\n    status\n  }\n}\n"
   }
 };
 })();

apps/trust/src/queries/__generated__/TrustGraphCurrentQuery.graphql.ts

@@ -1,5 +1,5 @@
 /**
- * @generated SignedSource<<e0f568dfda1fadf66ee2ec5f79129196>>
+ * @generated SignedSource<<47a6e80d3532b4c93d18495c2be7676d>>
  * @lightSyntaxTransform
  * @nogrep
  */
@@ -184,8 +184,14 @@ v15 = {
 v16 = {
   "alias": null,
   "args": null,
-  "kind": "ScalarField",
+  "concreteType": "DocumentAccess",
-  "name": "hasUserRequestedAccess",
+  "kind": "LinkedField",
+  "name": "access",
+  "plural": false,
+  "selections": [
+    (v0/*: any*/),
+    (v6/*: any*/)
+  ],
   "storageKey": null
 };
 return {
@@ -648,12 +654,12 @@ return {
     ]
   },
   "params": {
-    "cacheID": "442afcae5b414e0130cd702cf01f5c63",
+    "cacheID": "42b477429f092f97b0f444433a78c6d1",
     "id": null,
     "metadata": {},
     "name": "TrustGraphCurrentQuery",
     "operationKind": "query",
-    "text": "query TrustGraphCurrentQuery {\n  currentTrustCenter {\n    id\n    slug\n    logoFileUrl\n    darkLogoFileUrl\n    nonDisclosureAgreement {\n      fileName\n      fileUrl\n      viewerSignature {\n        status\n        id\n      }\n    }\n    organization {\n      name\n      description\n      websiteUrl\n      email\n      headquarterAddress\n      id\n    }\n    ...OverviewPageFragment\n    vendorInfo: vendors(first: 0) {\n      totalCount\n    }\n    audits(first: 50) {\n      edges {\n        node {\n          id\n          ...AuditRowFragment\n        }\n      }\n    }\n  }\n}\n\nfragment AuditRowFragment on Audit {\n  name\n  report {\n    id\n    filename\n    isUserAuthorized\n    hasUserRequestedAccess\n  }\n  framework {\n    id\n    name\n    lightLogoURL\n    darkLogoURL\n  }\n}\n\nfragment DocumentRowFragment on Document {\n  id\n  title\n  isUserAuthorized\n  hasUserRequestedAccess\n}\n\nfragment OverviewPageFragment on TrustCenter {\n  references(first: 14) {\n    edges {\n      node {\n        id\n        name\n        logoUrl\n        websiteUrl\n      }\n    }\n  }\n  vendors(first: 3) {\n    edges {\n      node {\n        id\n        countries\n        ...VendorRowFragment\n      }\n    }\n  }\n  documents(first: 5) {\n    edges {\n      node {\n        id\n        ...DocumentRowFragment\n        documentType\n      }\n    }\n  }\n  trustCenterFiles(first: 5) {\n    edges {\n      node {\n        id\n        category\n        ...TrustCenterFileRowFragment\n      }\n    }\n  }\n}\n\nfragment TrustCenterFileRowFragment on TrustCenterFile {\n  id\n  name\n  isUserAuthorized\n  hasUserRequestedAccess\n}\n\nfragment VendorRowFragment on Vendor {\n  name\n  description\n  websiteUrl\n  countries\n}\n"
+    "text": "query TrustGraphCurrentQuery {\n  currentTrustCenter {\n    id\n    slug\n    logoFileUrl\n    darkLogoFileUrl\n    nonDisclosureAgreement {\n      fileName\n      fileUrl\n      viewerSignature {\n        status\n        id\n      }\n    }\n    organization {\n      name\n      description\n      websiteUrl\n      email\n      headquarterAddress\n      id\n    }\n    ...OverviewPageFragment\n    vendorInfo: vendors(first: 0) {\n      totalCount\n    }\n    audits(first: 50) {\n      edges {\n        node {\n          id\n          ...AuditRowFragment\n        }\n      }\n    }\n  }\n}\n\nfragment AuditRowFragment on Audit {\n  name\n  report {\n    id\n    filename\n    isUserAuthorized\n    access {\n      id\n      status\n    }\n  }\n  framework {\n    id\n    name\n    lightLogoURL\n    darkLogoURL\n  }\n}\n\nfragment DocumentRowFragment on Document {\n  id\n  title\n  isUserAuthorized\n  access {\n    id\n    status\n  }\n}\n\nfragment OverviewPageFragment on TrustCenter {\n  references(first: 14) {\n    edges {\n      node {\n        id\n        name\n        logoUrl\n        websiteUrl\n      }\n    }\n  }\n  vendors(first: 3) {\n    edges {\n      node {\n        id\n        countries\n        ...VendorRowFragment\n      }\n    }\n  }\n  documents(first: 5) {\n    edges {\n      node {\n        id\n        ...DocumentRowFragment\n        documentType\n      }\n    }\n  }\n  trustCenterFiles(first: 5) {\n    edges {\n      node {\n        id\n        category\n        ...TrustCenterFileRowFragment\n      }\n    }\n  }\n}\n\nfragment TrustCenterFileRowFragment on TrustCenterFile {\n  id\n  name\n  isUserAuthorized\n  access {\n    id\n    status\n  }\n}\n\nfragment VendorRowFragment on Vendor {\n  name\n  description\n  websiteUrl\n  countries\n}\n"
   }
 };
 })();

pkg/server/api/trust/v1/schema.graphql

@@ -63,7 +63,7 @@ type Document implements Node @nda {
   title: String!
   documentType: DocumentType!
   isUserAuthorized: Boolean! @goField(forceResolver: true)
-  hasUserRequestedAccess: Boolean! @goField(forceResolver: true)
+  access: DocumentAccess @goField(forceResolver: true)
 }
 
 type DocumentConnection @nda {
@@ -87,7 +87,7 @@ type Report implements Node @nda {
   id: ID!
   filename: String!
   isUserAuthorized: Boolean! @goField(forceResolver: true)
-  hasUserRequestedAccess: Boolean! @goField(forceResolver: true)
+  access: DocumentAccess @goField(forceResolver: true)
 }
 
 type Audit implements Node @nda {
@@ -478,7 +478,7 @@ type TrustCenterFile implements Node @nda {
   name: String!
   category: String!
   isUserAuthorized: Boolean! @goField(forceResolver: true)
-  hasUserRequestedAccess: Boolean! @goField(forceResolver: true)
+  access: DocumentAccess @goField(forceResolver: true)
 }
 
 type TrustCenterFileConnection @nda {
@@ -552,6 +552,33 @@ type TrustCenterAccess implements Node {
   updatedAt: Datetime!
 }
 
+enum DocumentAccessStatus
+  @goModel(
+    model: "go.probo.inc/probo/pkg/coredata.TrustCenterDocumentAccessStatus"
+  ) {
+  REQUESTED
+    @goEnum(
+      value: "go.probo.inc/probo/pkg/coredata.TrustCenterDocumentAccessStatusRequested"
+    )
+  GRANTED
+    @goEnum(
+      value: "go.probo.inc/probo/pkg/coredata.TrustCenterDocumentAccessStatusGranted"
+    )
+  REJECTED
+    @goEnum(
+      value: "go.probo.inc/probo/pkg/coredata.TrustCenterDocumentAccessStatusRejected"
+    )
+  REVOKED
+    @goEnum(
+      value: "go.probo.inc/probo/pkg/coredata.TrustCenterDocumentAccessStatusRevoked"
+    )
+}
+
+type DocumentAccess implements Node {
+  id: ID!
+  status: DocumentAccessStatus!
+}
+
 input SendMagicLinkInput {
   email: EmailAddr!
   continue: String
@@ -569,6 +596,18 @@ type VerifyMagicLinkPayload {
   continue: String
 }
 
+type RequestDocumentAccessPayload {
+  document: Document
+}
+
+type RequestReportAccessPayload {
+  audit: Audit
+}
+
+type RequestFileAccessPayload {
+  file: TrustCenterFile
+}
+
 type RequestAccessesPayload {
   trustCenterAccess: TrustCenterAccess!
 }
@@ -772,15 +811,15 @@ type Mutation {
 
   requestDocumentAccess(
     input: RequestDocumentAccessInput!
-  ): RequestAccessesPayload! @session(required: PRESENT) @nda
+  ): RequestDocumentAccessPayload! @session(required: PRESENT) @nda
 
   requestReportAccess(
     input: RequestReportAccessInput!
-  ): RequestAccessesPayload! @session(required: PRESENT) @nda
+  ): RequestReportAccessPayload! @session(required: PRESENT) @nda
 
   requestTrustCenterFileAccess(
     input: RequestTrustCenterFileAccessInput!
-  ): RequestAccessesPayload! @session(required: PRESENT) @nda
+  ): RequestFileAccessPayload! @session(required: PRESENT) @nda
 
   acceptElectronicSignature(
     input: AcceptElectronicSignatureInput!

pkg/server/api/trust/v1/types/types.go

@@ -50,12 +50,20 @@ type Document struct {
 	Title            string                `json:"title"`
 	DocumentType     coredata.DocumentType `json:"documentType"`
 	IsUserAuthorized bool                  `json:"isUserAuthorized"`
-	HasUserRequestedAccess bool                  `json:"hasUserRequestedAccess"`
+	Access           *DocumentAccess       `json:"access,omitempty"`
 }
 
 func (Document) IsNode()             {}
 func (this Document) GetID() gid.GID { return this.ID }
 
+type DocumentAccess struct {
+	ID     gid.GID                                  `json:"id"`
+	Status coredata.TrustCenterDocumentAccessStatus `json:"status"`
+}
+
+func (DocumentAccess) IsNode()             {}
+func (this DocumentAccess) GetID() gid.GID { return this.ID }
+
 type DocumentConnection struct {
 	Edges    []*DocumentEdge `json:"edges"`
 	PageInfo *PageInfo       `json:"pageInfo"`
@@ -171,7 +179,7 @@ type Report struct {
 	ID               gid.GID         `json:"id"`
 	Filename         string          `json:"filename"`
 	IsUserAuthorized bool            `json:"isUserAuthorized"`
-	HasUserRequestedAccess bool    `json:"hasUserRequestedAccess"`
+	Access           *DocumentAccess `json:"access,omitempty"`
 }
 
 func (Report) IsNode()             {}
@@ -185,10 +193,22 @@ type RequestDocumentAccessInput struct {
 	DocumentID gid.GID `json:"documentId"`
 }
 
+type RequestDocumentAccessPayload struct {
+	Document *Document `json:"document,omitempty"`
+}
+
+type RequestFileAccessPayload struct {
+	File *TrustCenterFile `json:"file,omitempty"`
+}
+
 type RequestReportAccessInput struct {
 	ReportID gid.GID `json:"reportId"`
 }
 
+type RequestReportAccessPayload struct {
+	Audit *Audit `json:"audit,omitempty"`
+}
+
 type RequestTrustCenterFileAccessInput struct {
 	TrustCenterFileID gid.GID `json:"trustCenterFileId"`
 }
@@ -236,7 +256,7 @@ type TrustCenterFile struct {
 	Name             string          `json:"name"`
 	Category         string          `json:"category"`
 	IsUserAuthorized bool            `json:"isUserAuthorized"`
-	HasUserRequestedAccess bool    `json:"hasUserRequestedAccess"`
+	Access           *DocumentAccess `json:"access,omitempty"`
 }
 
 func (TrustCenterFile) IsNode()             {}

pkg/server/api/trust/v1/v1_resolver.go

@@ -115,30 +115,35 @@ func (r *documentResolver) IsUserAuthorized(ctx context.Context, obj *types.Docu
 	return documentAccess.Status == coredata.TrustCenterDocumentAccessStatusGranted, nil
 }
 
-// HasUserRequestedAccess is the resolver for the hasUserRequestedAccess field.
+// Access is the resolver for the access field.
-func (r *documentResolver) HasUserRequestedAccess(ctx context.Context, obj *types.Document) (bool, error) {
+func (r *documentResolver) Access(ctx context.Context, obj *types.Document) (*types.DocumentAccess, error) {
 	trustService := r.TrustService(ctx, obj.ID.TenantID())
 	trustCenter := compliancepage.CompliancePageFromContext(ctx)
 
 	identity := authn.IdentityFromContext(ctx)
 	if identity == nil {
-		return false, nil // User is not authenticated, so no access requested
+		return nil, nil // User is not authenticated, so no access requested
 	}
 
-	// Try to load document access - if it exists (regardless of active status), user has requested it
+	access, err := trustService.TrustCenterAccesses.GetDocumentAccess(
-	_, err := trustService.TrustCenterAccesses.GetDocumentAccess(
 		ctx,
 		trustCenter.ID,
 		identity.EmailAddress,
 		obj.ID,
 	)
 	if err != nil {
-		// FIXME check for not found and return without error in this case
+		if errors.Is(err, trust.ErrDocumentAccessNotFound) {
-		// r.logger.ErrorCtx(ctx, "cannot check trust center file access", log.Error(err))
+			return nil, nil
-		// return false, gqlutils.Internal(ctx)
-		return false, nil
 		}
-	return true, nil // Access exists (requested)
+
+		r.logger.ErrorCtx(ctx, "cannot get document access", log.Error(err))
+		return nil, gqlutils.Internal(ctx)
+	}
+
+	return &types.DocumentAccess{
+		ID:     access.ID,
+		Status: access.Status,
+	}, nil
 }
 
 // LightLogoURL is the resolver for the lightLogoURL field.
@@ -410,7 +415,7 @@ func (r *mutationResolver) ExportTrustCenterFile(ctx context.Context, input type
 }
 
 // RequestDocumentAccess is the resolver for the requestDocumentAccess field.
-func (r *mutationResolver) RequestDocumentAccess(ctx context.Context, input types.RequestDocumentAccessInput) (*types.RequestAccessesPayload, error) {
+func (r *mutationResolver) RequestDocumentAccess(ctx context.Context, input types.RequestDocumentAccessInput) (*types.RequestDocumentAccessPayload, error) {
 	trustCenter := compliancepage.CompliancePageFromContext(ctx)
 	trustService := r.TrustService(ctx, trustCenter.ID.TenantID())
 
@@ -431,7 +436,7 @@ func (r *mutationResolver) RequestDocumentAccess(ctx context.Context, input type
 		return nil, gqlutils.Unauthenticatedf(ctx, "authentication is required to request access")
 	}
 
-	access, err := trustService.TrustCenterAccesses.Request(
+	if _, err := trustService.TrustCenterAccesses.Request(
 		ctx,
 		&trust.TrustCenterAccessRequest{
 			TrustCenterID:      trustCenter.ID,
@@ -441,25 +446,18 @@ func (r *mutationResolver) RequestDocumentAccess(ctx context.Context, input type
 			ReportIDs:          []gid.GID{},
 			TrustCenterFileIDs: []gid.GID{},
 		},
-	)
+	); err != nil {
-	if err != nil {
 		r.logger.ErrorCtx(ctx, "cannot request document access", log.Error(err))
 		return nil, gqlutils.Internal(ctx)
 	}
 
-	return &types.RequestAccessesPayload{
+	return &types.RequestDocumentAccessPayload{
-		TrustCenterAccess: &types.TrustCenterAccess{
+		Document: types.NewDocument(document),
-			ID:        access.ID,
-			Email:     access.Email,
-			Name:      access.Name,
-			CreatedAt: access.CreatedAt,
-			UpdatedAt: access.UpdatedAt,
-		},
 	}, nil
 }
 
 // RequestReportAccess is the resolver for the requestReportAccess field.
-func (r *mutationResolver) RequestReportAccess(ctx context.Context, input types.RequestReportAccessInput) (*types.RequestAccessesPayload, error) {
+func (r *mutationResolver) RequestReportAccess(ctx context.Context, input types.RequestReportAccessInput) (*types.RequestReportAccessPayload, error) {
 	trustCenter := compliancepage.CompliancePageFromContext(ctx)
 	trustService := r.TrustService(ctx, trustCenter.ID.TenantID())
 
@@ -481,7 +479,7 @@ func (r *mutationResolver) RequestReportAccess(ctx context.Context, input types.
 		return nil, gqlutils.Unauthenticatedf(ctx, "authentication is required to request access")
 	}
 
-	access, err := trustService.TrustCenterAccesses.Request(
+	if _, err := trustService.TrustCenterAccesses.Request(
 		ctx,
 		&trust.TrustCenterAccessRequest{
 			TrustCenterID:      trustCenter.ID,
@@ -491,25 +489,18 @@ func (r *mutationResolver) RequestReportAccess(ctx context.Context, input types.
 			ReportIDs:          []gid.GID{input.ReportID},
 			TrustCenterFileIDs: []gid.GID{},
 		},
-	)
+	); err != nil {
-	if err != nil {
 		r.logger.ErrorCtx(ctx, "cannot request report access", log.Error(err))
 		return nil, gqlutils.Internal(ctx)
 	}
 
-	return &types.RequestAccessesPayload{
+	return &types.RequestReportAccessPayload{
-		TrustCenterAccess: &types.TrustCenterAccess{
+		Audit: types.NewAudit(audit),
-			ID:        access.ID,
-			Email:     access.Email,
-			Name:      access.Name,
-			CreatedAt: access.CreatedAt,
-			UpdatedAt: access.UpdatedAt,
-		},
 	}, nil
 }
 
 // RequestTrustCenterFileAccess is the resolver for the requestTrustCenterFileAccess field.
-func (r *mutationResolver) RequestTrustCenterFileAccess(ctx context.Context, input types.RequestTrustCenterFileAccessInput) (*types.RequestAccessesPayload, error) {
+func (r *mutationResolver) RequestTrustCenterFileAccess(ctx context.Context, input types.RequestTrustCenterFileAccessInput) (*types.RequestFileAccessPayload, error) {
 	trustCenter := compliancepage.CompliancePageFromContext(ctx)
 	trustService := r.TrustService(ctx, trustCenter.ID.TenantID())
 
@@ -531,7 +522,7 @@ func (r *mutationResolver) RequestTrustCenterFileAccess(ctx context.Context, inp
 		return nil, gqlutils.Unauthenticatedf(ctx, "authentication is required to request access")
 	}
 
-	access, err := trustService.TrustCenterAccesses.Request(
+	if _, err := trustService.TrustCenterAccesses.Request(
 		ctx,
 		&trust.TrustCenterAccessRequest{
 			TrustCenterID:      trustCenter.ID,
@@ -541,20 +532,13 @@ func (r *mutationResolver) RequestTrustCenterFileAccess(ctx context.Context, inp
 			ReportIDs:          []gid.GID{},
 			TrustCenterFileIDs: []gid.GID{input.TrustCenterFileID},
 		},
-	)
+	); err != nil {
-	if err != nil {
 		r.logger.ErrorCtx(ctx, "cannot request trust center file access", log.Error(err))
 		return nil, gqlutils.Internal(ctx)
 	}
 
-	return &types.RequestAccessesPayload{
+	return &types.RequestFileAccessPayload{
-		TrustCenterAccess: &types.TrustCenterAccess{
+		File: types.NewTrustCenterFile(trustCenterFile),
-			ID:        access.ID,
-			Email:     access.Email,
-			Name:      access.Name,
-			CreatedAt: access.CreatedAt,
-			UpdatedAt: access.UpdatedAt,
-		},
 	}, nil
 }
 
@@ -850,30 +834,35 @@ func (r *reportResolver) IsUserAuthorized(ctx context.Context, obj *types.Report
 	return reportAccess.Status == coredata.TrustCenterDocumentAccessStatusGranted, nil
 }
 
-// HasUserRequestedAccess is the resolver for the hasUserRequestedAccess field.
+// Access is the resolver for the access field.
-func (r *reportResolver) HasUserRequestedAccess(ctx context.Context, obj *types.Report) (bool, error) {
+func (r *reportResolver) Access(ctx context.Context, obj *types.Report) (*types.DocumentAccess, error) {
 	trustService := r.TrustService(ctx, obj.ID.TenantID())
-
 	trustCenter := compliancepage.CompliancePageFromContext(ctx)
 
 	identity := authn.IdentityFromContext(ctx)
 	if identity == nil {
-		return false, nil // User is not authenticated, so no access requested
+		return nil, nil // User is not authenticated, so no access requested
 	}
 
-	_, err := trustService.TrustCenterAccesses.GetReportAccess(ctx,
+	access, err := trustService.TrustCenterAccesses.GetReportAccess(
+		ctx,
 		trustCenter.ID,
 		identity.EmailAddress,
 		obj.ID,
 	)
 	if err != nil {
-		// FIXME check for not found and return without error in this case
+		if errors.Is(err, trust.ErrDocumentAccessNotFound) {
-		// r.logger.ErrorCtx(ctx, "cannot check report access", log.Error(err))
+			return nil, nil
-		// return false, gqlutils.Internal(ctx)
-		return false, nil
 		}
 
-	return true, nil
+		r.logger.ErrorCtx(ctx, "cannot get document access", log.Error(err))
+		return nil, gqlutils.Internal(ctx)
+	}
+
+	return &types.DocumentAccess{
+		ID:     access.ID,
+		Status: access.Status,
+	}, nil
 }
 
 // LogoFileURL is the resolver for the logoFileUrl field.
@@ -1061,30 +1050,35 @@ func (r *trustCenterFileResolver) IsUserAuthorized(ctx context.Context, obj *typ
 	return fileAccess.Status == coredata.TrustCenterDocumentAccessStatusGranted, nil
 }
 
-// HasUserRequestedAccess is the resolver for the hasUserRequestedAccess field.
+// Access is the resolver for the access field.
-func (r *trustCenterFileResolver) HasUserRequestedAccess(ctx context.Context, obj *types.TrustCenterFile) (bool, error) {
+func (r *trustCenterFileResolver) Access(ctx context.Context, obj *types.TrustCenterFile) (*types.DocumentAccess, error) {
 	trustService := r.TrustService(ctx, obj.ID.TenantID())
-
 	trustCenter := compliancepage.CompliancePageFromContext(ctx)
 
 	identity := authn.IdentityFromContext(ctx)
 	if identity == nil {
-		return false, nil // User is not authenticated, so no access requested
+		return nil, nil // User is not authenticated, so no access requested
 	}
 
-	_, err := trustService.TrustCenterAccesses.GetTrustCenterFileAccess(ctx,
+	access, err := trustService.TrustCenterAccesses.GetTrustCenterFileAccess(
+		ctx,
 		trustCenter.ID,
 		identity.EmailAddress,
 		obj.ID,
 	)
 	if err != nil {
-		// FIXME check for not found and return without error in this case
+		if errors.Is(err, trust.ErrDocumentAccessNotFound) {
-		// r.logger.ErrorCtx(ctx, "cannot check trust center file access", log.Error(err))
+			return nil, nil
-		// return false, gqlutils.Internal(ctx)
-		return false, nil
 		}
 
-	return true, nil
+		r.logger.ErrorCtx(ctx, "cannot get document access", log.Error(err))
+		return nil, gqlutils.Internal(ctx)
+	}
+
+	return &types.DocumentAccess{
+		ID:     access.ID,
+		Status: access.Status,
+	}, nil
 }
 
 // LogoURL is the resolver for the logoUrl field.