Skip to content

Commit 686400b

Browse files
author
Domagoj Kriskovic
authored
fix: removed NameValidations to properly show default values (#178)
1 parent 2bab691 commit 686400b

File tree

2 files changed

+5
-23
lines changed

2 files changed

+5
-23
lines changed

src/__tests__/__snapshots__/index.spec.tsx.snap

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3583,7 +3583,10 @@ exports[`HTML Output should match tickets.schema.json 1`] = `
35833583
</div>
35843584
</div>
35853585
</div>
3586-
<div><span>examples</span></div>
3586+
<div>
3587+
<span>Example value:</span>
3588+
<span>true</span>
3589+
</div>
35873590
</div>
35883591
<div></div>
35893592
</div>

src/components/shared/Validations.tsx

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import capitalize from 'lodash/capitalize.js';
55
import keys from 'lodash/keys.js';
66
import omit from 'lodash/omit.js';
77
import pick from 'lodash/pick.js';
8-
import pickBy from 'lodash/pickBy.js';
98
import uniq from 'lodash/uniq.js';
109
import * as React from 'react';
1110

@@ -108,13 +107,8 @@ function filterOutOasFormatValidations(format: string, values: Dictionary<unknow
108107

109108
export const Validations: React.FunctionComponent<IValidations> = ({ validations, hideExamples }) => {
110109
const numberValidations = pick(validations, numberValidationNames);
111-
const booleanValidations = omit(
112-
pickBy(validations, v => ['true', 'false'].includes(String(v))),
113-
excludedValidations,
114-
);
115110
const keyValueValidations = omit(validations, [
116111
...keys(numberValidations),
117-
...keys(booleanValidations),
118112
...excludedValidations,
119113
...(hideExamples ? exampleValidationNames : []),
120114
]);
@@ -123,7 +117,6 @@ export const Validations: React.FunctionComponent<IValidations> = ({ validations
123117
<>
124118
<NumberValidations validations={numberValidations} />
125119
<KeyValueValidations validations={keyValueValidations} />
126-
<NameValidations validations={booleanValidations} />
127120
</>
128121
);
129122
};
@@ -176,20 +169,6 @@ const KeyValueValidation = ({ name, values }: { name: string; values: string[] }
176169
);
177170
};
178171

179-
const NameValidations = ({ validations }: { validations: Dictionary<unknown> }) => (
180-
<>
181-
{keys(validations).length ? (
182-
<Flex flexWrap maxW="full">
183-
{keys(validations)
184-
.filter(key => validations[key])
185-
.map(key => (
186-
<Value key={key} name={key} className="sl-text-muted sl-capitalize" />
187-
))}
188-
</Flex>
189-
) : null}
190-
</>
191-
);
192-
193172
const Value = ({ name, className }: { name: string; className?: string }) => (
194173
<Text
195174
px={1}
@@ -226,7 +205,7 @@ export function getValidationsFromSchema(schemaNode: RegularNode) {
226205
: null),
227206
...('annotations' in schemaNode
228207
? {
229-
...(schemaNode.annotations.default ? { default: schemaNode.annotations.default } : null),
208+
...(schemaNode.annotations.default !== void 0 ? { default: schemaNode.annotations.default } : null),
230209
...(schemaNode.annotations.examples ? { examples: schemaNode.annotations.examples } : null),
231210
}
232211
: null),

0 commit comments

Comments
 (0)