Merge branch 'dev' into 94-add-file-resource-schema

Author: aashimgarg

app/[locale]/(user)/datasets/components/DatasetCards/index.tsx

@@ -15,7 +15,8 @@ import {
 
 import { cn } from '@/lib/utils';
 import BreadCrumbs from '@/components/BreadCrumbs';
-import DatasetCards from './components/DatasetCards';
+import GraphqlPagination from '../../dashboard/components/GraphqlPagination/graphqlPagination';
+import Card from './components/Card';
 import Filter from './components/FIlter/Filter';
 import Styles from './dataset.module.scss';
 
@@ -313,14 +314,17 @@ const DatasetsListing = () => {
 
               <div className="flex flex-col gap-6">
                 {facets && datasetDetails?.length > 0 && (
-                  <DatasetCards
-                    data={datasetDetails}
-                    totalCount={count}
+                  <GraphqlPagination
+                    totalRows={count}
                     pageSize={queryParams.pageSize}
                     currentPage={queryParams.currentPage}
                     onPageChange={handlePageChange}
                     onPageSizeChange={handlePageSizeChange}
-                  />
+                  >
+                    {datasetDetails.map((item: any, index: any) => (
+                      <Card key={index} data={item} />
+                    ))}
+                  </GraphqlPagination>
                 )}
               </div>
             </div>

app/[locale]/(user)/datasets/page.tsx

@@ -1,37 +1,27 @@
 import React from 'react';
-import { DataTable, Text } from 'opub-ui';
 
 import Footer from './footer';
 
 interface GraphqlTableProps {
-  table: {
-    columns: any[];
-    rows: any[];
-  };
   totalRows: number;
   pageSize: number;
   currentPage: number;
   onPageChange: (newPage: number) => void;
   onPageSizeChange: (newSize: number) => void;
+  children: React.ReactNode;
 }
 
-const GraphqlTable: React.FC<GraphqlTableProps> = ({
-  table,
+const GraphqlPagination: React.FC<GraphqlTableProps> = ({
   totalRows,
   pageSize,
   currentPage,
   onPageChange,
   onPageSizeChange,
+  children,
 }) => {
   return (
     <div>
-      <DataTable
-        columns={table.columns}
-        rows={table.rows}
-        hideFooter={true}
-        hideSelection={true}
-        defaultRowCount={100}
-      />
+      {children}
       <Footer
         totalRows={totalRows}
         pageSize={pageSize}
@@ -43,4 +33,4 @@ const GraphqlTable: React.FC<GraphqlTableProps> = ({
   );
 };
 
-export default GraphqlTable;
+export default GraphqlPagination;

…board/components/GraphqlTable/footer.tsx …/components/GraphqlPagination/footer.tsxapp/[locale]/dashboard/components/GraphqlTable/footer.tsx renamed to app/[locale]/dashboard/components/GraphqlPagination/footer.tsx app/[locale]/dashboard/components/GraphqlTable/footer.tsx renamed to app/[locale]/dashboard/components/GraphqlPagination/footer.tsx

@@ -17,6 +17,7 @@ import {
   TabList,
   Tabs,
   Text,
+  toast,
 } from 'opub-ui';
 
 import { GraphQL } from '@/lib/api';
@@ -56,7 +57,7 @@ interface LayoutProps {
   params: { id: string };
 }
 
-const layoutList = ['metadata', 'access', 'distribution', 'publish'];
+const layoutList = ['metadata', 'access', 'resources', 'publish'];
 
 export function EditLayout({ children, params }: LayoutProps) {
   // const { data } = useQuery([`dataset_layout_${params.id}`], () =>
@@ -93,7 +94,7 @@ export function EditLayout({ children, params }: LayoutProps) {
         getDatasetTitleRes.refetch();
       },
       onError: (err: any) => {
-        console.log('Error ::: ', err);
+        toast(err.message.split(':')[0]);
       },
     }
   );
@@ -229,11 +230,11 @@ const Navigation = ({
   pathItem: string;
   organization: string;
 }) => {
-  const links = [
+  let links = [
     {
-      label: 'Distributions',
-      url: `/dashboard/organization/${organization}/dataset/${id}/edit/distribution`,
-      selected: pathItem === 'distribution',
+      label: 'Resources',
+      url: `/dashboard/organization/${organization}/dataset/${id}/edit/resources`,
+      selected: pathItem === 'resources',
     },
     {
       label: 'Access Models',
@@ -248,7 +249,6 @@ const Navigation = ({
     {
       label: 'Publish',
       url: `/dashboard/organization/${organization}/dataset/${id}/edit/publish`,
-      disabled: true,
       selected: pathItem === 'publish',
     },
   ];