From 011af9fa76e8ce9eb84585d47e01bf177c6bdde2 Mon Sep 17 00:00:00 2001
From: aashimgarg <aashim1garg@gmail.com>
Date: Tue, 28 May 2024 14:45:16 +0530
Subject: [PATCH 1/7] add editable fields with mutations

---
 .../[id]/edit/components/EditResource.tsx     |  48 +++++--
 .../[id]/edit/components/ResourceSchema.tsx   | 125 +++++++++++++++++-
 2 files changed, 159 insertions(+), 14 deletions(-)

diff --git a/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/EditResource.tsx b/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/EditResource.tsx
index 9de92497..0795a4af 100644
--- a/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/EditResource.tsx
+++ b/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/EditResource.tsx
@@ -1,29 +1,39 @@
 import { graphql } from '@/gql';
 import {
   CreateFileResourceInput,
+  SchemaUpdateInput,
   UpdateFileResourceInput,
 } from '@/gql/generated/graphql';
-import { useMutation, useQuery } from '@tanstack/react-query';
-import { parseAsString, useQueryState } from 'next-usequerystate';
-import { useParams, useRouter } from 'next/navigation';
+import { IconTrash } from '@tabler/icons-react';
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import {
+  parseAsBoolean,
+  parseAsString,
+  useQueryState,
+} from 'next-usequerystate';
 import {
   Button,
+  ButtonGroup,
+  Checkbox,
   Combobox,
+  DataTable,
   Dialog,
   Divider,
   DropZone,
   Icon,
+  IconButton,
   Select,
   Text,
   TextField,
-  toast
+  toast,
 } from 'opub-ui';
-import React from 'react';
 
-import { Icons } from '@/components/icons';
 import { GraphQL } from '@/lib/api';
+import { Icons } from '@/components/icons';
 import { createResourceFilesDoc } from './ResourceDropzone';
-import { ResourceSchema } from './ResourceSchema';
+import { ResourceSchema, updateSchema } from './ResourceSchema';
+import { useParams } from 'next/navigation';
+import React from 'react';
 
 interface TListItem {
   label: string;
@@ -50,6 +60,7 @@ export const EditResource = ({ reload, data }: any) => {
   `);
 
   const [resourceId, setResourceId] = useQueryState<any>('id', parseAsString);
+  const [schema, setSchema] = React.useState([]);
 
   const { mutate, isLoading } = useMutation(
     (data: { fileResourceInput: UpdateFileResourceInput }) =>
@@ -92,6 +103,18 @@ export const EditResource = ({ reload, data }: any) => {
     }
   `);
 
+  const { mutate: modify } = useMutation(
+    (data: { input: SchemaUpdateInput }) => GraphQL(updateSchema, data),
+    {
+      onSuccess: (data) => {
+        console.log(data);
+      },
+      onError: (err: any) => {
+        console.log('Error ::: ', err);
+      },
+    }
+  );
+  
   const { mutate: transform } = useMutation(
     (data: { fileResourceInput: CreateFileResourceInput }) =>
       GraphQL(createResourceFilesDoc, data),
@@ -112,8 +135,6 @@ export const EditResource = ({ reload, data }: any) => {
     }
   );
 
-  const router = useRouter();
-
   const ResourceList: TListItem[] =
     data.map((item: any) => ({
       label: item.name,
@@ -215,6 +236,14 @@ export const EditResource = ({ reload, data }: any) => {
         file: resourceFile,
       },
     });
+    if (schema.length > 0) {
+      modify({
+        input: {
+          resource: resourceId,
+          updates: schema,
+        },
+      });
+    }
   };
 
   return (
@@ -384,6 +413,7 @@ export const EditResource = ({ reload, data }: any) => {
       </div>*/}
       {resourceId && payload && Object.keys(payload).length > 0 ? (
         <ResourceSchema
+          setSchema={setSchema}
           resourceId={resourceId}
           isPending={isPending}
           refetch={refetch}
diff --git a/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/ResourceSchema.tsx b/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/ResourceSchema.tsx
index 0bdcd4e3..e799e58f 100644
--- a/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/ResourceSchema.tsx
+++ b/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/ResourceSchema.tsx
@@ -1,19 +1,98 @@
 import React from 'react';
 import { useParams } from 'next/navigation';
 import { graphql } from '@/gql';
+import { SchemaUpdateInput } from '@/gql/generated/graphql';
 import { useMutation, useQuery } from '@tanstack/react-query';
-import { Button, DataTable, Icon, IconButton, Spinner, Text } from 'opub-ui';
+import {
+  Button,
+  DataTable,
+  Icon,
+  Select,
+  Spinner,
+  Text,
+  TextField,
+} from 'opub-ui';
 
 import { GraphQL } from '@/lib/api';
 import { Icons } from '@/components/icons';
 
+export const updateSchema: any = graphql(`
+  mutation updateSchema($input: SchemaUpdateInput!) {
+    updateSchema(input: $input) {
+      __typename
+      ... on TypeResource {
+        id
+      }
+    }
+  }
+`);
+
+const DescriptionCell = ({
+  value,
+  rowIndex,
+  handleFieldChange,
+}: {
+  value: string;
+  rowIndex: any;
+  handleFieldChange: any;
+}) => {
+  const [description, setDescription] = React.useState(value || '');
+
+  const handleChange = (text: string) => {
+    setDescription(text);
+    handleFieldChange('description', text, rowIndex);
+  };
+
+  return (
+    <TextField
+      label="Description"
+      labelHidden
+      name="description"
+      type="text"
+      value={description}
+      onChange={(e: any) => handleChange(e)}
+    />
+  );
+};
+
 export const ResourceSchema = ({
+  setSchema,
   resourceId,
   isPending,
   data,
   refetch,
 }: any) => {
-  
+
+  const transformedData = data.map((item: any) => ({
+    schemaId: parseInt(item.id, 10),
+    format: item.format,
+    description: item.description,
+  }));
+  const [updatedData, setUpdatedData] = React.useState<any>(transformedData);
+
+  React.useEffect(() => {
+    if (data && data.length > 0) {
+      setUpdatedData(transformedData);
+    }
+  }, [data]);
+
+  const handleFieldChange = (
+    field: string,
+    newValue: string,
+    rowIndex: any
+  ) => {
+    setUpdatedData((prev: any) => {
+      const newData = [...prev];
+      newData[rowIndex] = {
+        ...newData[rowIndex],
+        [field]: newValue,
+      };
+      return newData;
+    });
+  };
+
+  setSchema(updatedData);
+
   const resetSchema: any = graphql(`
     mutation resetFileResourceSchema($resourceId: UUID!) {
       resetFileResourceSchema(resourceId: $resourceId) {
@@ -42,6 +121,17 @@ export const ResourceSchema = ({
     }
   );
 
+  const options = [
+    {
+      label: 'Integer',
+      value: 'INTEGER',
+    },
+    {
+      label: 'String',
+      value: 'STRING',
+    },
+  ];
+
   const generateColumnData = () => {
     return [
       {
@@ -51,16 +141,41 @@ export const ResourceSchema = ({
       {
         accessorKey: 'description',
         header: 'DESCRIPTION',
+        cell: (info: any) => {
+          const rowIndex = info.row.index;
+          const description = updatedData[rowIndex]?.description || '';
+          return (
+            <DescriptionCell
+              value={description}
+              rowIndex={rowIndex}
+              handleFieldChange={handleFieldChange}
+            />
+          );
+        },
       },
       {
         accessorKey: 'format',
         header: 'FORMAT',
+        cell: (info: any) => {
+          const rowIndex = info.row.index;
+          const format = updatedData[rowIndex]?.format || '';
+          return (
+            <Select
+              label="Resource List"
+              labelHidden
+              options={options}
+              value={format}
+              onChange={(e) => handleFieldChange('format', e, rowIndex)}
+              name="Select format"
+            />
+          );
+        },
       },
     ];
   };
 
-  const generateTableData = (data: any[]) => {
-    return data.map((item: any) => ({
+  const generateTableData = (updatedData: any[]) => {
+    return updatedData.map((item: any) => ({
       fieldName: item.fieldName,
       description: item.description,
       format: item.format,
@@ -108,7 +223,7 @@ export const ResourceSchema = ({
             hideSelection
           />
         ) : (
-          <div className="flex justify-center mt-8">Click on Reset Fields</div>
+          <div className="mt-8 flex justify-center">Click on Reset Fields</div>
         )}
       </div>
     </>

From da1823ad9a353ece41031395447bdc4913657d36 Mon Sep 17 00:00:00 2001
From: aashimgarg <aashim1garg@gmail.com>
Date: Wed, 29 May 2024 19:25:59 +0530
Subject: [PATCH 2/7] fix schema mutation

---
 .../[id]/edit/components/EditResource.tsx     | 20 ++++++++++++-------
 .../[id]/edit/components/ResourceSchema.tsx   |  4 ++--
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/EditResource.tsx b/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/EditResource.tsx
index 0795a4af..24081e89 100644
--- a/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/EditResource.tsx
+++ b/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/EditResource.tsx
@@ -1,3 +1,5 @@
+import React from 'react';
+import { useParams } from 'next/navigation';
 import { graphql } from '@/gql';
 import {
   CreateFileResourceInput,
@@ -32,8 +34,6 @@ import { GraphQL } from '@/lib/api';
 import { Icons } from '@/components/icons';
 import { createResourceFilesDoc } from './ResourceDropzone';
 import { ResourceSchema, updateSchema } from './ResourceSchema';
-import { useParams } from 'next/navigation';
-import React from 'react';
 
 interface TListItem {
   label: string;
@@ -106,15 +106,21 @@ export const EditResource = ({ reload, data }: any) => {
   const { mutate: modify } = useMutation(
     (data: { input: SchemaUpdateInput }) => GraphQL(updateSchema, data),
     {
-      onSuccess: (data) => {
-        console.log(data);
+      onSuccess: () => {
+        refetch();
+        toast('Schema Updated Successfully', {
+          action: {
+            label: 'Dismiss',
+            onClick: () => {},
+          },
+        });
       },
       onError: (err: any) => {
         console.log('Error ::: ', err);
       },
     }
   );
-  
+
   const { mutate: transform } = useMutation(
     (data: { fileResourceInput: CreateFileResourceInput }) =>
       GraphQL(createResourceFilesDoc, data),
@@ -277,7 +283,7 @@ export const EditResource = ({ reload, data }: any) => {
           className=" w-1/5 justify-end"
           size="medium"
           kind="tertiary"
-          variant="basic"
+          variant="interactive"
           onClick={listViewFunction}
         >
           <div className="flex items-center gap-2">
@@ -385,7 +391,7 @@ export const EditResource = ({ reload, data }: any) => {
           />
           <Combobox
             name="to_row_number"
-            label="To Row Number"
+            label="To Row Number"  
             placeholder="Search Locations"
             list={[
               {
diff --git a/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/ResourceSchema.tsx b/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/ResourceSchema.tsx
index e799e58f..081cfd8b 100644
--- a/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/ResourceSchema.tsx
+++ b/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/ResourceSchema.tsx
@@ -64,7 +64,7 @@ export const ResourceSchema = ({
 }: any) => {
 
   const transformedData = data.map((item: any) => ({
-    schemaId: parseInt(item.id, 10),
+    schemaId: item.id,
     format: item.format,
     description: item.description,
   }));
@@ -156,7 +156,7 @@ export const ResourceSchema = ({
       {
         accessorKey: 'format',
         header: 'FORMAT',
-        cell: (info: any) => {
+        cell: (info: any) => {     
           const rowIndex = info.row.index;
           const format = updatedData[rowIndex]?.format || '';
           return (

From 4855b6faf23ef083c355968992d56d2db624e653 Mon Sep 17 00:00:00 2001
From: aashimgarg <aashim1garg@gmail.com>
Date: Thu, 30 May 2024 12:29:11 +0530
Subject: [PATCH 3/7] fix schema key

---
 .../dataset/[id]/edit/components/EditResource.tsx        | 5 ++++-
 .../dataset/[id]/edit/components/ResourceSchema.tsx      | 9 ++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/EditResource.tsx b/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/EditResource.tsx
index 24081e89..a718e822 100644
--- a/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/EditResource.tsx
+++ b/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/EditResource.tsx
@@ -417,7 +417,10 @@ export const EditResource = ({ reload, data }: any) => {
           <Text>See Preview</Text>
         </div>
       </div>*/}
-      {resourceId && payload && Object.keys(payload).length > 0 ? (
+      {resourceId &&
+      payload?.datasetResources?.filter(
+        (item: any) => item.id === resourceId
+      ) ? (
         <ResourceSchema
           setSchema={setSchema}
           resourceId={resourceId}
diff --git a/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/ResourceSchema.tsx b/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/ResourceSchema.tsx
index 081cfd8b..97706374 100644
--- a/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/ResourceSchema.tsx
+++ b/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/ResourceSchema.tsx
@@ -63,16 +63,11 @@ export const ResourceSchema = ({
   refetch,
 }: any) => {
 
-  const transformedData = data.map((item: any) => ({
-    schemaId: item.id,
-    format: item.format,
-    description: item.description,
-  }));
-  const [updatedData, setUpdatedData] = React.useState<any>(transformedData);
+  const [updatedData, setUpdatedData] = React.useState<any>(data);
 
   React.useEffect(() => {
     if (data && data.length > 0) {
-      setUpdatedData(transformedData);
+      setUpdatedData(data);
     }
   }, [data]);
 

From 41af17ab926c39be2471a1c1acc5aa4e7e1b3933 Mon Sep 17 00:00:00 2001
From: aashimgarg <aashim1garg@gmail.com>
Date: Thu, 30 May 2024 23:37:01 +0530
Subject: [PATCH 4/7] make mutation on change of file

---
 .../[id]/edit/components/EditResource.tsx     | 70 +++++++++++++++----
 .../[id]/edit/components/ResourceSchema.tsx   | 38 ++--------
 2 files changed, 62 insertions(+), 46 deletions(-)

diff --git a/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/EditResource.tsx b/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/EditResource.tsx
index a718e822..7dc8a66a 100644
--- a/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/EditResource.tsx
+++ b/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/EditResource.tsx
@@ -63,16 +63,23 @@ export const EditResource = ({ reload, data }: any) => {
   const [schema, setSchema] = React.useState([]);
 
   const { mutate, isLoading } = useMutation(
-    (data: { fileResourceInput: UpdateFileResourceInput }) =>
-      GraphQL(updateResourceDoc, data),
+    (data: {
+      fileResourceInput: UpdateFileResourceInput;
+      isResetSchema: boolean;
+    }) => GraphQL(updateResourceDoc, data),
     {
-      onSuccess: () => {
+      onSuccess: (data, variables) => {
         toast('File changes saved', {
           action: {
             label: 'Dismiss',
             onClick: () => {},
           },
         });
+        if (variables.isResetSchema) {
+          schemaMutate({
+            resourceId: resourceId,
+          });
+        }
         reload();
       },
       onError: (err: any) => {
@@ -81,6 +88,34 @@ export const EditResource = ({ reload, data }: any) => {
     }
   );
 
+  const resetSchema: any = graphql(`
+    mutation resetFileResourceSchema($resourceId: UUID!) {
+      resetFileResourceSchema(resourceId: $resourceId) {
+        ... on TypeResource {
+          id
+          schema {
+            format
+            description
+            id
+            fieldName
+          }
+        }
+      }
+    }
+  `);
+
+  const { mutate: schemaMutate, isLoading: isSchemaLoading } = useMutation(
+    (data: { resourceId: string }) => GraphQL(resetSchema, data),
+    {
+      onSuccess: () => {
+        refetch();
+      },
+      onError: (err: any) => {
+        console.log('Error ::: ', err);
+      },
+    }
+  );
+
   const {
     data: payload,
     refetch,
@@ -133,6 +168,7 @@ export const EditResource = ({ reload, data }: any) => {
             onClick: () => {},
           },
         });
+        refetch();
         reload();
       },
       onError: (err: any) => {
@@ -204,17 +240,20 @@ export const EditResource = ({ reload, data }: any) => {
     </div>
   );
 
-  const [resourceFile, setResourceFile] = React.useState<File>();
 
   const onDrop = React.useCallback(
-    (_dropFiles: File[], acceptedFiles: File[]) =>
-      setResourceFile(acceptedFiles[0]),
+    (_dropFiles: File[], acceptedFiles: File[]) => {
+      mutate({
+        fileResourceInput: {
+          id: resourceId,
+          file: acceptedFiles[0],
+        },
+        isResetSchema: true,
+      });
+    },
     []
   );
-
-  const fileInput = resourceFile ? (
-    <div className="flex ">{resourceFile.name} </div>
-  ) : (
+  const fileInput = (
     <div className="flex">
       <Text className="break-all">
         {getResourceObject(resourceId)?.fileDetails.file.name.replace(
@@ -239,14 +278,18 @@ export const EditResource = ({ reload, data }: any) => {
         name: resourceName
           ? resourceName
           : getResourceObject(resourceId)?.label,
-        file: resourceFile,
       },
+      isResetSchema: false,
     });
     if (schema.length > 0) {
+      const updatedScheme = schema.map((item) => {
+        const { fieldName, ...rest } = item as any;
+        return rest;
+      });
       modify({
         input: {
           resource: resourceId,
-          updates: schema,
+          updates: updatedScheme,
         },
       });
     }
@@ -425,7 +468,8 @@ export const EditResource = ({ reload, data }: any) => {
           setSchema={setSchema}
           resourceId={resourceId}
           isPending={isPending}
-          refetch={refetch}
+          schemaMutate={schemaMutate}
+          isSchemaLoading={isSchemaLoading}
           data={
             payload?.datasetResources?.filter(
               (item: any) => item.id === resourceId
diff --git a/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/ResourceSchema.tsx b/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/ResourceSchema.tsx
index 97706374..920949bf 100644
--- a/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/ResourceSchema.tsx
+++ b/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/ResourceSchema.tsx
@@ -60,13 +60,14 @@ export const ResourceSchema = ({
   resourceId,
   isPending,
   data,
-  refetch,
+  schemaMutate,
+  isSchemaLoading
 }: any) => {
 
   const [updatedData, setUpdatedData] = React.useState<any>(data);
 
   React.useEffect(() => {
-    if (data && data.length > 0) {
+    if (data) {
       setUpdatedData(data);
     }
   }, [data]);
@@ -87,35 +88,6 @@ export const ResourceSchema = ({
   };
 
   setSchema(updatedData);
-
-  const resetSchema: any = graphql(`
-    mutation resetFileResourceSchema($resourceId: UUID!) {
-      resetFileResourceSchema(resourceId: $resourceId) {
-        ... on TypeResource {
-          id
-          schema {
-            format
-            description
-            id
-            fieldName
-          }
-        }
-      }
-    }
-  `);
-
-  const { mutate, isLoading } = useMutation(
-    (data: { resourceId: string }) => GraphQL(resetSchema, data),
-    {
-      onSuccess: () => {
-        refetch();
-      },
-      onError: (err: any) => {
-        console.log('Error ::: ', err);
-      },
-    }
-  );
-
   const options = [
     {
       label: 'Integer',
@@ -178,7 +150,7 @@ export const ResourceSchema = ({
   };
 
   const setFields = () => {
-    mutate({
+    schemaMutate({
       resourceId: resourceId,
     });
   };
@@ -206,7 +178,7 @@ export const ResourceSchema = ({
         be changed in Access Models.
       </Text>
       <div className="mt-3">
-        {isPending || isLoading ? (
+        {isPending || isSchemaLoading ? (
           <div className=" mt-8 flex justify-center">
             <Spinner size={30} />
           </div>

From 4ab24e151f5f63d4bfd274e89008ff1e293520db Mon Sep 17 00:00:00 2001
From: aashimgarg <aashim1garg@gmail.com>
Date: Fri, 31 May 2024 11:38:21 +0530
Subject: [PATCH 5/7] lift schema data to limit rerender

---
 .../[id]/edit/components/EditResource.tsx     | 55 +++++++++++++------
 .../[id]/edit/components/ResourceSchema.tsx   | 47 ++--------------
 2 files changed, 42 insertions(+), 60 deletions(-)

diff --git a/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/EditResource.tsx b/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/EditResource.tsx
index 7dc8a66a..4aa74233 100644
--- a/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/EditResource.tsx
+++ b/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/EditResource.tsx
@@ -25,6 +25,7 @@ import {
   Icon,
   IconButton,
   Select,
+  Spinner,
   Text,
   TextField,
   toast,
@@ -460,23 +461,43 @@ export const EditResource = ({ reload, data }: any) => {
           <Text>See Preview</Text>
         </div>
       </div>*/}
-      {resourceId &&
-      payload?.datasetResources?.filter(
-        (item: any) => item.id === resourceId
-      ) ? (
-        <ResourceSchema
-          setSchema={setSchema}
-          resourceId={resourceId}
-          isPending={isPending}
-          schemaMutate={schemaMutate}
-          isSchemaLoading={isSchemaLoading}
-          data={
-            payload?.datasetResources?.filter(
-              (item: any) => item.id === resourceId
-            )[0]?.schema
-          }
-        />
-      ) : null}
+      <div className="my-8">
+        <div className="flex flex-wrap justify-between">
+          <Text>Fields in the Resource</Text>
+          <Button
+            size="medium"
+            kind="tertiary"
+            variant="basic"
+            onClick={() =>
+              schemaMutate({
+                resourceId: resourceId,
+              })
+            }
+          >
+            <div className="flex items-center gap-1">
+              <Text>Reset Fields</Text>{' '}
+              <Icon source={Icons.info} color="interactive" />
+            </div>
+          </Button>
+        </div>
+        <Text variant="headingXs" as="span" fontWeight="regular">
+           The Field settings apply to the Resource on a master level and can not
+           be changed in Access Models.
+        </Text>
+        {isPending || isSchemaLoading ? (
+          <div className=" mt-8 flex justify-center">
+            <Spinner size={30} />
+          </div>
+        ) : resourceId && payload?.datasetResources?.filter(
+            (item: any) => item.id === resourceId ).length > 0 ? (
+               <ResourceSchema
+                  setSchema={setSchema}
+                  data={payload?.datasetResources?.filter((item: any) => item.id === resourceId)[0]?.schema}
+                />
+          ) : (
+             <div className="my-8 flex justify-center"> Click on Reset Fields </div>
+        )}
+      </div>
     </div>
   );
 };
diff --git a/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/ResourceSchema.tsx b/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/ResourceSchema.tsx
index 920949bf..132f7479 100644
--- a/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/ResourceSchema.tsx
+++ b/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/ResourceSchema.tsx
@@ -55,14 +55,7 @@ const DescriptionCell = ({
   );
 };
 
-export const ResourceSchema = ({
-  setSchema,
-  resourceId,
-  isPending,
-  data,
-  schemaMutate,
-  isSchemaLoading
-}: any) => {
+export const ResourceSchema = ({ setSchema, data }: any) => {
 
   const [updatedData, setUpdatedData] = React.useState<any>(data);
 
@@ -123,7 +116,7 @@ export const ResourceSchema = ({
       {
         accessorKey: 'format',
         header: 'FORMAT',
-        cell: (info: any) => {     
+        cell: (info: any) => {
           const rowIndex = info.row.index;
           const format = updatedData[rowIndex]?.format || '';
           return (
@@ -149,49 +142,17 @@ export const ResourceSchema = ({
     }));
   };
 
-  const setFields = () => {
-    schemaMutate({
-      resourceId: resourceId,
-    });
-  };
-
   return (
     <>
-      <div className="mt-8 flex justify-between">
-        <Text>Fields in the Resource</Text>
-        <div className="flex gap-4">
-          <Button
-            size="medium"
-            kind="tertiary"
-            variant="basic"
-            onClick={setFields}
-          >
-            <div className="flex items-center gap-1">
-              <Text>Reset Fields</Text>{' '}
-              <Icon source={Icons.info} color="interactive" />
-            </div>
-          </Button>
-        </div>
-      </div>
-      <Text variant="headingXs" as="span" fontWeight="regular">
-        The Field settings apply to the Resource on a master level and can not
-        be changed in Access Models.
-      </Text>
       <div className="mt-3">
-        {isPending || isSchemaLoading ? (
-          <div className=" mt-8 flex justify-center">
-            <Spinner size={30} />
-          </div>
-        ) : data && data.length > 0 ? (
+        {data && data.length > 0 ? (
           <DataTable
             columns={generateColumnData()}
             rows={generateTableData(data)}
             hideFooter={true}
             hideSelection
           />
-        ) : (
-          <div className="mt-8 flex justify-center">Click on Reset Fields</div>
-        )}
+        ):<div className="mt-8 flex justify-center">Click on Reset Fields</div>}
       </div>
     </>
   );

From d30ef3542025ad81576bc6d860ac8a84059446e9 Mon Sep 17 00:00:00 2001
From: aashimgarg <aashim1garg@gmail.com>
Date: Fri, 31 May 2024 11:59:22 +0530
Subject: [PATCH 6/7] remove schema destructuring

---
 .../[id]/edit/components/EditResource.tsx     | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/EditResource.tsx b/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/EditResource.tsx
index 4aa74233..fe988138 100644
--- a/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/EditResource.tsx
+++ b/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/EditResource.tsx
@@ -77,7 +77,7 @@ export const EditResource = ({ reload, data }: any) => {
           },
         });
         if (variables.isResetSchema) {
-          schemaMutate({
+          schemaMutation.mutate({
             resourceId: resourceId,
           });
         }
@@ -105,11 +105,11 @@ export const EditResource = ({ reload, data }: any) => {
     }
   `);
 
-  const { mutate: schemaMutate, isLoading: isSchemaLoading } = useMutation(
+  const schemaMutation = useMutation(
     (data: { resourceId: string }) => GraphQL(resetSchema, data),
     {
       onSuccess: () => {
-        refetch();
+        schemaQuery.refetch();
       },
       onError: (err: any) => {
         console.log('Error ::: ', err);
@@ -117,11 +117,7 @@ export const EditResource = ({ reload, data }: any) => {
     }
   );
 
-  const {
-    data: payload,
-    refetch,
-    isLoading: isPending,
-  } = useQuery<any>([`fetch_schema_${params.id}`], () =>
+  const schemaQuery = useQuery<any>([`fetch_schema_${params.id}`], () =>
     GraphQL(fetchSchema, { datasetId: params.id })
   );
 
@@ -143,7 +139,7 @@ export const EditResource = ({ reload, data }: any) => {
     (data: { input: SchemaUpdateInput }) => GraphQL(updateSchema, data),
     {
       onSuccess: () => {
-        refetch();
+        schemaQuery.refetch();
         toast('Schema Updated Successfully', {
           action: {
             label: 'Dismiss',
@@ -169,7 +165,7 @@ export const EditResource = ({ reload, data }: any) => {
             onClick: () => {},
           },
         });
-        refetch();
+        schemaQuery.refetch();
         reload();
       },
       onError: (err: any) => {
@@ -469,7 +465,7 @@ export const EditResource = ({ reload, data }: any) => {
             kind="tertiary"
             variant="basic"
             onClick={() =>
-              schemaMutate({
+              schemaMutation.mutate({
                 resourceId: resourceId,
               })
             }
@@ -484,15 +480,16 @@ export const EditResource = ({ reload, data }: any) => {
            The Field settings apply to the Resource on a master level and can not
            be changed in Access Models.
         </Text>
-        {isPending || isSchemaLoading ? (
+        {schemaQuery.isLoading || schemaMutation.isLoading ? (
           <div className=" mt-8 flex justify-center">
             <Spinner size={30} />
           </div>
-        ) : resourceId && payload?.datasetResources?.filter(
+        ) : resourceId && schemaQuery.data?.datasetResources?.filter(
             (item: any) => item.id === resourceId ).length > 0 ? (
                <ResourceSchema
                   setSchema={setSchema}
-                  data={payload?.datasetResources?.filter((item: any) => item.id === resourceId)[0]?.schema}
+                  data={schemaQuery.data?.datasetResources?.filter(
+                    (item: any) => item.id === resourceId)[0]?.schema}
                 />
           ) : (
              <div className="my-8 flex justify-center"> Click on Reset Fields </div>

From fd205240e74117d669d1c04450687227123abe1e Mon Sep 17 00:00:00 2001
From: aashimgarg <aashim1garg@gmail.com>
Date: Fri, 31 May 2024 12:22:13 +0530
Subject: [PATCH 7/7] fix resource name and desc for <empty string> values

---
 .../dataset/[id]/edit/components/EditResource.tsx         | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/EditResource.tsx b/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/EditResource.tsx
index fe988138..61023018 100644
--- a/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/EditResource.tsx
+++ b/app/[locale]/dashboard/organization/[organizationId]/dataset/[id]/edit/components/EditResource.tsx
@@ -269,12 +269,8 @@ export const EditResource = ({ reload, data }: any) => {
     mutate({
       fileResourceInput: {
         id: resourceId,
-        description: resourceDesc
-          ? resourceDesc
-          : getResourceObject(resourceId)?.description,
-        name: resourceName
-          ? resourceName
-          : getResourceObject(resourceId)?.label,
+        description: resourceDesc || '',
+        name: resourceName || '',
       },
       isResetSchema: false,
     });