Merge pull request #1763 from Shoaibdev7/Render-schema-attributes-if-…

…attributes-object

Render schema attributes if attributes object is passed in `GET /schema/all`

src/components/AddItemModal/SetAttributesStep/index.tsx

@@ -35,7 +35,8 @@ export const SetAttributesStep: FC<Props> = ({ handleSelectType, skipToStep, nod
 
       const data = await getNodeType(nodeType)
 
-      const parsedData = parseJson(data)
+      const parsedData =
+        data.attributes && typeof data.attributes === 'object' ? parseJson(data.attributes) : parseJson(data)
 
       const filteredAttributes = parsedData.filter((attr) => attr.key !== 'node_key')
 

src/components/ModalsContainer/BlueprintModal/Body/Editor/CustomAttributesStep/FormInput/index.tsx

@@ -48,7 +48,11 @@ export const FormInput = ({
 
           const data = await getNodeType(parentParam as string)
 
-          parsedDataDefault = parseJson(data)
+          if (data.attributes && typeof data.attributes === 'object') {
+            parsedDataDefault = parseJson(data.attributes)
+          } else {
+            parsedDataDefault = parseJson(data)
+          }
         }
 
         parsedDataDefault = parsedDataDefault.filter((x) => x.key !== 'node_key')

src/components/ModalsContainer/BlueprintModal/Body/index.tsx

@@ -1,6 +1,7 @@
 import { useEffect, useState } from 'react'
 import { ClipLoader } from 'react-spinners'
 import styled from 'styled-components'
+import { AddEdgeNode } from '~/components/ModalsContainer/BlueprintModal/Body/AddEdgeNode'
 import { Flex } from '~/components/common/Flex'
 import { Schema, getSchemaAll } from '~/network/fetchSourcesData'
 import { useSchemaStore } from '~/stores/useSchemaStore'
@@ -9,7 +10,6 @@ import { SchemaWithChildren } from '../types'
 import { Editor } from './Editor'
 import { Graph } from './Graph'
 import { Toolbar } from './Toolbar'
-import { AddEdgeNode } from '~/components/ModalsContainer/BlueprintModal/Body/AddEdgeNode'
 
 export type FormData = {
   type: string