Skip to content

Commit a4da408

Browse files
author
Alban Bailly
committed
DLC-178 fixing erros with smaplybody output and add missing allOf
1 parent 7e9de0e commit a4da408

File tree

4 files changed

+87
-63
lines changed

4 files changed

+87
-63
lines changed

‎gatsby-browser.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ exports.shouldUpdateScroll = ({ routerProps: { location } }) => {
1515
() =>
1616
document.getElementById(location.hash.substr(1)).scrollIntoView({
1717
block: "start",
18-
behavior: transitionDelay <= 480 ? "auto" : "smooth"
18+
behavior: windowWidth <= 480 ? "auto" : "smooth"
1919
}),
2020
transitionDelay
2121
);

‎index.json

+1-1
Large diffs are not rendered by default.

‎src/components/2_molecules/ResponseItemElements.js

+79-55
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ export const ResponseItemElements = props => {
2323
)
2424
.map((p, i) => {
2525
const l = context.content.application_json.schema.properties[p];
26+
// console.log(l);
2627
return (
2728
l && (
2829
<div key={i} className="response-wrapper">
@@ -64,69 +65,92 @@ export const ResponseItemElements = props => {
6465
</div>
6566
)}
6667
{l.items && (
67-
<div className="px-4 mt-4 mb-4 ml-4 subResponse">
68-
{l.items.properties &&
69-
Object.keys(l.items.properties).map((value, index) => {
70-
const data = l.items.properties[value];
71-
return (
72-
data && (
73-
<div key={index} className="response-wrapper">
74-
<div className="lg:flex mb-4">
75-
<div className="w-full lg:w-1/4">
76-
<b
77-
className={
78-
data.deprecated && "line-through"
79-
}
80-
>
81-
{value}
82-
</b>
83-
{data.x_linode_filterable && <Filterable />}
84-
{data.nullable && <Nullable />}
85-
</div>
86-
<div className="w-full lg:w-3/4">
87-
<div>
88-
<div className="text-sm text-grey-darkest leading-text-sm">
89-
{data.type && data.type}
90-
{data.pattern && (
91-
<span className="tag">
92-
{data.pattern}
93-
</span>
68+
<>
69+
<div className="px-4 mt-4 mb-4 ml-4 subResponse">
70+
{l.items.properties &&
71+
Object.keys(l.items.properties).map(
72+
(value, index) => {
73+
const data = l.items.properties[value];
74+
// console.log(data);
75+
return (
76+
data && (
77+
<div key={index} className="response-wrapper">
78+
<div className="lg:flex mb-4">
79+
<div className="w-full lg:w-1/4">
80+
<b
81+
className={
82+
data.deprecated && "line-through"
83+
}
84+
>
85+
{value}
86+
</b>
87+
{data.x_linode_filterable && (
88+
<Filterable />
9489
)}
90+
{data.nullable && <Nullable />}
9591
</div>
96-
{data.enum && <Enum dataSource={data} />}
97-
{data.deprecated && <Deprecated />}
98-
<div>
99-
<Markdown
100-
source={data.description}
101-
escapeHtml={false}
102-
className="api-desc"
103-
/>
92+
<div className="w-full lg:w-3/4">
93+
<div>
94+
<div className="text-sm text-grey-darkest leading-text-sm">
95+
{data.type && data.type}
96+
{data.pattern && (
97+
<span className="tag">
98+
{data.pattern}
99+
</span>
100+
)}
101+
</div>
102+
{data.enum && (
103+
<Enum dataSource={data} />
104+
)}
105+
{data.deprecated && <Deprecated />}
106+
<div>
107+
<Markdown
108+
source={data.description}
109+
escapeHtml={false}
110+
className="api-desc"
111+
/>
112+
</div>
113+
</div>
104114
</div>
105115
</div>
106-
</div>
107-
</div>
108-
{data.oneOf && (
109-
<div className="px-4 mt-4 mb-4 ml-4 subResponse">
110-
{data.oneOf.map((data, i) => {
111-
return (
116+
{data.oneOf && (
117+
<div className="px-4 mt-4 mb-4 ml-4 subResponse">
118+
{data.oneOf.map((data, i) => {
119+
return (
120+
<SubResponse
121+
dataSource={data.properties}
122+
key={i}
123+
/>
124+
);
125+
})}
126+
</div>
127+
)}
128+
{data.properties && (
129+
<div className="px-4 mt-4 mb-4 ml-4 subResponse">
112130
<SubResponse
113131
dataSource={data.properties}
114-
key={i}
115132
/>
116-
);
117-
})}
118-
</div>
119-
)}
120-
{data.properties && (
121-
<div className="px-4 mt-4 mb-4 ml-4 subResponse">
122-
<SubResponse dataSource={data.properties} />
133+
</div>
134+
)}
123135
</div>
124-
)}
125-
</div>
126-
)
127-
);
128-
})}
129-
</div>
136+
)
137+
);
138+
}
139+
)}
140+
</div>
141+
{l.items.allOf && (
142+
<div className="px-4 mt-4 mb-4 ml-4 subResponse">
143+
{l.items.allOf.map((data, i) => {
144+
return (
145+
<SubResponse
146+
dataSource={data.properties}
147+
key={i}
148+
/>
149+
);
150+
})}
151+
</div>
152+
)}
153+
</>
130154
)}
131155
</div>
132156
)

‎src/components/2_molecules/ResponseSampleBody.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export const ResponseSampleBody = props => {
4747
const data = l.properties[e];
4848
return `
4949
"${e}": ${
50-
data.example
50+
data.example !== undefined
5151
? JSON.stringify(data.example)
5252
: data.type === "object" && data.properties
5353
? `{
@@ -72,15 +72,15 @@ export const ResponseSampleBody = props => {
7272
? `"${s2}": ${JSON.stringify(
7373
dps2.example
7474
? dps2.example
75-
: ""
75+
: '""'
7676
)}`
77-
: "";
77+
: '""';
7878
})}}`
79-
: ""
79+
: '""'
8080
}`
81-
: "";
81+
: '""';
8282
})}}`
83-
: ""
83+
: '""'
8484
}
8585
`;
8686
}) +

0 commit comments

Comments
 (0)