Merge pull request #124 from iExecBlockchainComputing/fix/too-many-request-and-code-refactor

feat: code refactor and request fetching optimisation

Author: Le-Caignec

package-lock.json

@@ -23,7 +23,7 @@
     "@fontsource/space-mono": "^5.2.5",
     "@graphql-codegen/introspection": "^4.0.3",
     "@iexec/dataprotector": "^2.0.0-beta.12",
-    "@iexec/web3mail": "^1.2.0",
+    "@iexec/web3mail": "^1.2.2",
     "@iexec/web3telegram": "^0.0.3-alpha",
     "@radix-ui/react-dialog": "^1.1.6",
     "@radix-ui/react-label": "^2.1.2",

package.json

@@ -93,6 +93,9 @@ export default function GrantAccessModal({
       queryClient.invalidateQueries({
         queryKey: ['granted access', protectedData.address, userAddress],
       });
+      queryClient.invalidateQueries({
+        queryKey: ['fetchContacts', userAddress],
+      });
       navigate(`/my-data/${protectedData.address}`);
       toast({
         title: 'You have successfully authorized a new user.',

src/modules/myData/protectedData/GrantAccessModal.tsx

@@ -0,0 +1,101 @@
+import {
+  WEB3MAIL_IDAPPS_WHITELIST_SC,
+  WEB3TELEGRAM_IDAPPS_WHITELIST_SC,
+} from '@/config/config';
+import { Contact as Web3mailContact } from '@iexec/web3mail';
+import { Contact as Web3telegramContact } from '@iexec/web3telegram';
+import { useQuery } from '@tanstack/react-query';
+import { Link } from 'react-router-dom';
+import { LoadingSpinner } from '@/components/LoadingSpinner';
+import { Button } from '@/components/ui/button';
+import { getDataProtectorCoreClient } from '@/externals/iexecSdkClient';
+import useUserStore from '@/stores/useUser.store';
+import { cn } from '@/utils/style.utils';
+
+interface ContactItemProps {
+  contact: (Web3telegramContact | Web3mailContact) & {
+    contactType: 'mail' | 'telegram';
+  };
+}
+
+const fetchContactDetails = async (
+  contact: (Web3telegramContact | Web3mailContact) & {
+    contactType: 'mail' | 'telegram';
+  },
+  userAddress: string
+) => {
+  const dataProtectorCore = await getDataProtectorCoreClient();
+
+  const contactProtectedData = await dataProtectorCore.getProtectedData({
+    protectedDataAddress: contact.address,
+  });
+
+  const grantedAccess = await dataProtectorCore.getGrantedAccess({
+    protectedData: contact.address,
+    authorizedUser: userAddress,
+    authorizedApp:
+      contact.contactType === 'mail'
+        ? WEB3MAIL_IDAPPS_WHITELIST_SC
+        : WEB3TELEGRAM_IDAPPS_WHITELIST_SC,
+  });
+
+  return {
+    ...contactProtectedData[0],
+    contactType: contact.contactType,
+    volume: grantedAccess.grantedAccess[0].volume,
+  };
+};
+
+export default function ContactItem({ contact }: ContactItemProps) {
+  const { address: userAddress } = useUserStore();
+
+  const {
+    data: contactDetails,
+    isLoading,
+    isError,
+  } = useQuery({
+    queryKey: ['contactDetails', contact.address, userAddress],
+    queryFn: () => fetchContactDetails(contact, userAddress as string),
+    enabled: !!userAddress,
+    refetchOnWindowFocus: false,
+    staleTime: 5 * 60 * 1000, // 5 minutes
+  });
+
+  if (isError) {
+    // TODO: Handle error more gracefully. Do not display error in the UI.
+    console.error('Error loading contact details:', contact.address);
+  }
+
+  return (
+    <div
+      className={cn(
+        'bg-grey-50 even:*:bg-grey-800 *:border-grey-600 contents text-sm *:flex *:h-full *:items-center *:border-t *:px-5 *:py-3'
+      )}
+    >
+      <div className="truncate">
+        {isLoading ? <LoadingSpinner /> : contactDetails?.name || '(No name)'}
+      </div>
+      <div className="truncate">
+        <span className="truncate whitespace-nowrap">{contact.address}</span>
+      </div>
+      <div className="truncate">
+        <span className="truncate whitespace-nowrap">
+          {contact.owner === userAddress
+            ? `(Mine) ${contact.owner}`
+            : contact.owner}
+        </span>
+      </div>
+      <div className="truncate">
+        {isLoading ? <LoadingSpinner /> : contactDetails?.volume || 'N/A'}
+      </div>
+      <div className="text-primary truncate uppercase">
+        {contact.contactType}
+      </div>
+      <div className="justify-end">
+        <Button asChild variant="discreet_outline">
+          <Link to={`/contacts/${contact.address}/send-message`}>Send</Link>
+        </Button>
+      </div>
+    </div>
+  );
+}