Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Render schema attributes if attributes object is passed in GET /schema/all #1763

Merged
merged 9 commits into from
Jul 24, 2024
Merged

Render schema attributes if attributes object is passed in GET /schema/all #1763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f1c106a
fix(blue-print): render schema attributes if attributes object
Shoaibdev7 Jul 3, 2024
d83c110
Merge remote-tracking branch 'origin' into Render-schema-attributes-i…
Shoaibdev7 Jul 6, 2024
0c640af
fix(blue-print): render schema attributes if attributes object
Shoaibdev7 Jul 7, 2024
452c640
fix(blue-print): remove unrelated changes
Shoaibdev7 Jul 7, 2024
857c9e2
Merge branch 'master' into Render-schema-attributes-if-attributes-object
Shoaibdev7 Jul 18, 2024
a5953c0
Merge branch 'master' into Render-schema-attributes-if-attributes-object
Shoaibdev7 Jul 18, 2024
83c6340
Merge branch 'master' into Render-schema-attributes-if-attributes-object
Shoaibdev7 Jul 19, 2024
6bf36f0
Merge branch 'master' into Render-schema-attributes-if-attributes-object
Shoaibdev7 Jul 19, 2024
593ed01
Merge branch 'master' into Render-schema-attributes-if-attributes-object
Shoaibdev7 Jul 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/components/AddItemModal/SetAttributesStep/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
6 changes: 5 additions & 1 deletion ...nents/ModalsContainer/BlueprintModal/Body/Editor/CustomAttributesStep/FormInput/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion src/components/ModalsContainer/BlueprintModal/Body/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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
Expand Down
Loading