Merge branch 'main' into feature/add-type-and-structure-on-datasets

Author: ErwanDecoster

.release-please-manifest.json

@@ -1 +1 @@
-{".":"1.17.0"}
+{".":"1.20.0"}

CHANGELOG.md

@@ -1,5 +1,38 @@
 # Changelog
 
+## [1.20.0](https://github.com/iExecBlockchainComputing/explorer-v2/compare/iexec-explorer-v1.19.0...iexec-explorer-v1.20.0) (2025-09-16)
+
+
+### 🚀 Features
+
+* add dataprotector subgraph integration and update poco queries ([#65](https://github.com/iExecBlockchainComputing/explorer-v2/issues/65)) ([4edb4bf](https://github.com/iExecBlockchainComputing/explorer-v2/commit/4edb4bfd9bf764558bee34185b372a0a926ccba3))
+
+## [1.19.0](https://github.com/iExecBlockchainComputing/explorer-v2/compare/iexec-explorer-v1.18.0...iexec-explorer-v1.19.0) (2025-09-10)
+
+
+### 🚀 Features
+
+* **StatusCell:** display timeout indication for 'STARTED' status ([c2f8d4d](https://github.com/iExecBlockchainComputing/explorer-v2/commit/c2f8d4d9b2316b51b3a9d52988b87ba60476dd43))
+* update navigation to include 'from=my_activity' query parameter ([9d24279](https://github.com/iExecBlockchainComputing/explorer-v2/commit/9d2427936b5c652f8a49284b01b793fd0618c2c9))
+
+
+### 🐞 Bug Fixes
+
+* update error message for not found addresses ([3215e4d](https://github.com/iExecBlockchainComputing/explorer-v2/commit/3215e4da2c036679e7f9ae51108adf2e93dc8070))
+* update type for search parameter in navigation ([f8ed8ec](https://github.com/iExecBlockchainComputing/explorer-v2/commit/f8ed8ecd831eb9296c5df8a4b01b3ca908061532))
+
+## [1.18.0](https://github.com/iExecBlockchainComputing/explorer-v2/compare/iexec-explorer-v1.17.0...iexec-explorer-v1.18.0) (2025-09-05)
+
+
+### 🚀 Features
+
+* update navigation links in Footer component ([#62](https://github.com/iExecBlockchainComputing/explorer-v2/issues/62)) ([281c752](https://github.com/iExecBlockchainComputing/explorer-v2/commit/281c752b48fef3b92c9471aeb5c659ceaacc244d))
+
+
+### 🐞 Bug Fixes
+
+* update navigation links in Footer component ([281c752](https://github.com/iExecBlockchainComputing/explorer-v2/commit/281c752b48fef3b92c9471aeb5c659ceaacc244d))
+
 ## [1.17.0](https://github.com/iExecBlockchainComputing/explorer-v2/compare/iexec-explorer-v1.16.0...iexec-explorer-v1.17.0) (2025-08-26)
 
 

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "iexec-explorer",
   "private": true,
-  "version": "1.17.0",
+  "version": "1.20.0",
   "type": "module",
   "scripts": {
     "dev": "vite",

package.json

@@ -51,8 +51,7 @@ export function Footer({ className }: { className?: string }) {
 
   const navLinks = [
     { href: 'https://www.iex.ec/', label: 'iExec Website' },
-    { href: 'https://tools.docs.iex.ec/', label: 'Doc tools' },
-    { href: 'https://protocol.docs.iex.ec/', label: 'Doc protocol' },
+    { href: 'https://docs.iex.ec/', label: 'Documentation' },
     ...(chainId !== undefined
       ? [{ href: getBlockExplorerUrl(chainId), label: 'Block explorer' }]
       : []),

src/components/Footer.tsx

@@ -179,7 +179,9 @@ export function SearcherBar({
             className="bg-muted hover:bg-secondary absolute top-1/2 right-4 hidden -translate-y-1/2 sm:flex"
             asChild
           >
-            <ChainLink to={`/address/${userAddress}`}>My activity</ChainLink>
+            <ChainLink to={`/address/${userAddress}?from=my_activity`}>
+              My activity
+            </ChainLink>
           </Button>
         )}
       </div>
@@ -193,7 +195,9 @@ export function SearcherBar({
 
         {isConnected && (
           <Button variant="outline" className="sm:hidden" asChild>
-            <ChainLink to={`/address/${userAddress}`}>My activity</ChainLink>
+            <ChainLink to={`/address/${userAddress}?from=my_activity`}>
+              My activity
+            </ChainLink>
           </Button>
         )}
       </div>

src/modules/search/SearcherBar.tsx

@@ -100,7 +100,9 @@ const StatusCell = ({
 
   return (
     <span className="flex flex-wrap items-center gap-2">
-      <span className={classes}>{label}</span>
+      <span className={classes}>
+        {label} {label === 'STARTED' && timeout ? '(timeout)' : ''}
+      </span>
     </span>
   );
 };

src/modules/tasks/StatusCell.tsx

@@ -2,7 +2,9 @@ import { TABLE_LENGTH, TABLE_REFETCH_INTERVAL } from '@/config';
 import { execute } from '@/graphql/poco/execute';
 import { useQuery } from '@tanstack/react-query';
 import { createFileRoute } from '@tanstack/react-router';
+import { useSearch, useNavigate } from '@tanstack/react-router';
 import { LoaderCircle } from 'lucide-react';
+import { useEffect } from 'react';
 import AddressIcon from '@/components/icons/AddressIcon';
 import { BackButton } from '@/components/ui/BackButton';
 import { useTabParam } from '@/hooks/usePageParam';
@@ -74,7 +76,7 @@ function AddressRoute() {
     'WORKERPOOLS',
   ];
   const [currentTab, setCurrentTab] = useTabParam('addressTab', tabLabels, 0);
-  const { chainId } = useUserStore();
+  const { chainId, address: userAddress } = useUserStore();
   const { addressAddress } = Route.useParams();
   const {
     data: address,
@@ -86,6 +88,29 @@ function AddressRoute() {
     error,
   } = useAddressData((addressAddress as string).toLowerCase(), chainId!);
 
+  const navigate = useNavigate();
+  const search = useSearch({ strict: false });
+  const { chainSlug } = Route.useParams();
+  const fromMyActivity = search?.['from'] === 'my_activity';
+
+  useEffect(() => {
+    if (
+      fromMyActivity &&
+      userAddress &&
+      addressAddress?.toLowerCase() !== userAddress?.toLowerCase()
+    ) {
+      navigate({
+        to: `/${chainSlug}/address/${userAddress}`,
+        search: (prev: Record<string, unknown>) => ({
+          ...prev,
+          from: 'my_activity',
+        }),
+        replace: true,
+        resetScroll: false,
+      });
+    }
+  }, [userAddress, addressAddress, fromMyActivity, navigate, chainSlug]);
+
   const addressDetails = address ? buildAddressDetails({ address }) : undefined;
   const addressOverview = address
     ? buildAddressOverview({ address })
@@ -121,14 +146,19 @@ function AddressRoute() {
   }
 
   if (isError && error instanceof NotFoundError) {
-    return <ErrorAlert className="my-16" message="Address not found." />;
+    return (
+      <ErrorAlert className="my-16" message="No data found for this address." />
+    );
   }
 
   return (
     <div className="mt-8 flex flex-col gap-6">
       <SearcherBar className="py-6" />
 
       <div className="space-y-2">
+        {isError && error instanceof NotFoundError ? (
+          <ErrorAlert message="Address not found." />
+        ) : null}
         <h1 className="flex items-center gap-2 font-sans text-2xl font-extrabold">
           <AddressIcon size={24} />
           Address details