paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 39 Packages Projects Releases Wiki Activity

Fix the scaffolder validator for arrays when the item is a field in the object

Browse Source 
Signed-off-by: Bogdan Nechyporenko <bnechyporenko@bol.com>
This commit is contained in:
Bogdan Nechyporenko
2023-03-02 15:53:37 +01:00
parent 6ca13414f2
commit 3ce12b6f0c
1 changed files with 27 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/scaffolder-react/src/next/components/Stepper/createAsyncValidators.ts
+27 -39
View File
@@ -77,51 +77,39 @@ export const createAsyncValidators = (
const definitionInSchema = parsedSchema.getSchema(path, formData);
const { schema, uiSchema } = extractSchemaFromStep(definitionInSchema);
if (definitionInSchema && 'ui:field' in definitionInSchema) {
if ('ui:field' in definitionInSchema) {
await validateForm(
definitionInSchema['ui:field'],
key,
value,
schema,
uiSchema,
);
}
} else if (
definitionInSchema &&
definitionInSchema.items &&
'ui:field' in definitionInSchema.items
) {
if ('ui:field' in definitionInSchema.items) {
const hasItems = definitionInSchema && definitionInSchema.items;
const doValidateItem = async (
propValue: JsonObject,
itemSchema: JsonObject,
itemUiSchema: NextFieldExtensionUiSchema<unknown, unknown>,
) => {
await validateForm(
propValue['ui:field'] as string,
key,
value,
itemSchema,
itemUiSchema,
);
};
const doValidate = async (propValue: JsonObject) => {
if ('ui:field' in propValue) {
const { schema: itemsSchema, uiSchema: itemsUiSchema } =
extractSchemaFromStep(definitionInSchema.items);
await validateForm(
definitionInSchema.items['ui:field'],
key,
value,
itemsSchema,
itemsUiSchema,
);
await doValidateItem(propValue, itemsSchema, itemsUiSchema);
}
} else if (
definitionInSchema &&
definitionInSchema.items &&
definitionInSchema.items.type === 'object'
) {
};
if (definitionInSchema && 'ui:field' in definitionInSchema) {
await doValidateItem(definitionInSchema, schema, uiSchema);
} else if (hasItems && 'ui:field' in definitionInSchema.items) {
await doValidate(definitionInSchema.items);
} else if (hasItems && definitionInSchema.items.type === 'object') {
const properties = (definitionInSchema.items?.properties ??
[]) as JsonObject[];
for (const [, propValue] of Object.entries(properties)) {
if ('ui:field' in propValue) {
const { schema: itemsSchema, uiSchema: itemsUiSchema } =
extractSchemaFromStep(definitionInSchema.items);
await validateForm(
propValue['ui:field'] as string,
key,
value,
itemsSchema,
itemsUiSchema,
);
}
await doValidate(propValue);
}
} else if (isObject(value)) {
formValidation[key] = await validate(formData, path, value);