Merge branch 'main' into feature/move-searchbar

Author: ErwanDecoster

.release-please-manifest.json

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

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.21.0](https://github.com/iExecBlockchainComputing/explorer-v2/compare/iexec-explorer-v1.20.0...iexec-explorer-v1.21.0) (2025-09-16)
+
+
+### 🚀 Features
+
+* add type and structure on datasets ([#67](https://github.com/iExecBlockchainComputing/explorer-v2/issues/67)) ([7eea17f](https://github.com/iExecBlockchainComputing/explorer-v2/commit/7eea17fbd9c371767b303c5465cac479935153ad))
+
 ## [1.20.0](https://github.com/iExecBlockchainComputing/explorer-v2/compare/iexec-explorer-v1.19.0...iexec-explorer-v1.20.0) (2025-09-16)
 
 

package-lock.json

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

package.json

@@ -75,10 +75,6 @@ export const datasetSchemaTypeGroups = [
       { value: 'bool' },
     ],
   },
-  {
-    label: 'Legacy Common Types (deprecated)',
-    items: [{ value: 'number' }, { value: 'boolean' }],
-  },
   {
     label: 'Popular File Types',
     items: [
@@ -104,4 +100,8 @@ export const datasetSchemaTypeGroups = [
       { value: 'audio/x-wav' },
     ],
   },
+  {
+    label: 'Legacy Common Types (deprecated)',
+    items: [{ value: 'number' }, { value: 'boolean' }],
+  },
 ];

src/config.ts

@@ -279,4 +279,8 @@
   *::-webkit-scrollbar-track {
     @apply bg-grey-800 rounded-full;
   }
+
+  *::-webkit-scrollbar-corner {
+    @apply bg-transparent;
+  }
 }

src/index.css

@@ -87,7 +87,6 @@ export function AddressContributionTable({
     addressAddress,
     currentPage: currentPage - 1,
   });
-  console.log('AddressContributionTable', contribution);
 
   return (
     <div className="space-y-6">

src/modules/addresses/address/workers/beneficiaryDeals/addressContributionTable.tsx

@@ -50,7 +50,13 @@ export function SchemaSearch({
         onClick={() => setIsOpen(!isOpen)}
       >
         <SlidersHorizontal size={16} />
-        <div className="flex-1 text-left">Schema Search</div>
+        <p className="flex-1 text-left font-bold">
+          Schema Search{' '}
+          <span className="text-muted-foreground font-normal">
+            Add field types to filter datasets by their schema structure.
+            Filters are applied automatically.
+          </span>
+        </p>
         <ChevronDown
           className={cn(
             'ml-auto transition-transform',

src/modules/datasets/SchemaSearch.tsx

@@ -1,4 +1,5 @@
 import { cn } from '@/lib/utils';
+import { Search } from 'lucide-react';
 import React from 'react';
 import {
   Tooltip,
@@ -78,14 +79,14 @@ const renderTooltipContent = (
     ))}
     {onSchemaSearch && (
       <button
-        className="text-xs hover:underline"
+        className="flex justify-center gap-1 pt-2 text-xs hover:underline"
         onClick={(event) => {
           event.stopPropagation();
           event.preventDefault();
           onSchemaSearch(schemaPaths);
         }}
       >
-        Search schemas
+        Search schemas <Search size="16" />
       </button>
     )}
   </div>
@@ -103,7 +104,7 @@ const TypeBadge: React.FC<TypeBadgeProps> = ({
 }) => {
   if (isLoading && schemaPaths && schemaPaths.length === 0) {
     return (
-      <span className="border-muted-foreground text-muted-foreground rounded-full border px-4 py-2 text-xs">
+      <span className="border-muted-foreground text-muted-foreground inline-flex rounded-full border px-4 py-2 text-xs">
         Loading...
       </span>
     );
@@ -152,14 +153,14 @@ const TypeBadge: React.FC<TypeBadgeProps> = ({
       {badges}
       {!enableTooltip && onSchemaSearch && (
         <button
-          className="text-xs hover:underline"
+          className="flex items-center gap-1 text-xs hover:underline"
           onClick={(event) => {
             event.stopPropagation();
             event.preventDefault();
             onSchemaSearch(schemaPaths);
           }}
         >
-          Search schemas
+          Search schemas <Search size="16" />
         </button>
       )}
     </div>

src/modules/datasets/dataset/schema/TypeBadge.tsx

@@ -51,8 +51,6 @@ function formatDataset({
   schema?: SchemaFilter[];
   isSchemasLoading: boolean;
 }) {
-  console.log('log', dataset, schema, isSchemasLoading);
-
   return {
     address: dataset.address ?? '',
     name: dataset.name ?? '',
@@ -109,7 +107,6 @@ function useDatasetsData(currentPage: number) {
     datasetAddresses,
     chainId!
   );
-  console.log(schemasMap);
   const formattedDatasets = datasets.map((dataset) =>
     formatDataset({
       dataset,
@@ -265,25 +262,24 @@ function DatasetsRoute() {
 
   return (
     <div className="mt-8 grid gap-6">
-      <div className="mt-6 flex flex-col justify-between lg:flex-row">
-        <SearcherBar className="py-6 lg:order-last lg:mr-0 lg:max-w-md lg:py-0 xl:max-w-xl" />
-        <div className="space-y-2">
-          <h1 className="flex items-center gap-2 font-sans text-2xl font-extrabold">
-            <DatasetIcon size={24} />
-            Datasets
-            {data.length > 0 && isError && (
-              <span className="text-muted-foreground text-sm font-light">
-                (outdated)
-              </span>
-            )}
-            {(isLoading || isRefetching) && (
-              <LoaderCircle className="animate-spin" />
-            )}
-          </h1>
-          <div className="flex items-center gap-2">
-            <BackButton />
-            <DatasetBreadcrumbsList />
-          </div>
+      <SearcherBar className="py-6" />
+
+      <div className="space-y-2">
+        <h1 className="flex items-center gap-2 font-sans text-2xl font-extrabold">
+          <DatasetIcon size={24} />
+          Datasets
+          {data.length > 0 && isError && (
+            <span className="text-muted-foreground text-sm font-light">
+              (outdated)
+            </span>
+          )}
+          {(isLoading || isRefetching) && (
+            <LoaderCircle className="animate-spin" />
+          )}
+        </h1>
+        <div className="flex items-center gap-2">
+          <BackButton />
+          <DatasetBreadcrumbsList />
         </div>
       </div>