Fixes for object no properties, array no items

Author: jamesej

src/components/schema-form-array.tsx

@@ -18,7 +18,7 @@ export function SchemaFormArray({
 }: ISchemaContainerProps): React.ReactElement {
     const dispatch = useContext(ValueDispatch);
     const [ collapsed, setCollapsed ] = useState(false);
-    const itemSchema = schema['items'];
+    const itemSchema = schema['items'] || {};
     const valueArray = Array.isArray(value) ? value as any[] : [];
     const pathEl = path.length ? _.last(path) : '';
     const arrayClass = path.length === 0 ? "" : "sf-array sf-" + pathEl;

src/components/schema-form-object.tsx

@@ -60,8 +60,8 @@ export function SchemaFormObject({
         return <></>;
     }
 
-    let topOrder: NestedListArray = schema['order'] || Object.keys(schema['properties']);
-    let properties = Object.entries(schema['properties']);
+    let topOrder: NestedListArray = schema['order'] || Object.keys(schema['properties'] || {});
+    let properties = Object.entries(schema['properties'] || {});
     let requireds = schema['required'];
     if (schema['order'] && _.flatten(schema['order']).length < properties.length) {
         console.log('fewer items in order than properties at ' + path.join('.'));

src/editors/multi-select-buttons-editor.tsx

@@ -39,7 +39,7 @@ export function MultiSelectButtonsEditor(props: ISchemaContainerProps): React.Re
         const classes = `sf-control sf-check-buttons ${isError && 'sf-has-error'}`;
         const readOnly = schema['readOnly'] || false;
         const baseProps = { name, readOnly, onFocus: handleFocus, onBlur: handleBlur };
-        const enums = schema['items']['enum'] as string[];
+        const enums = schema?.['items']['enum'] as string[];
         if (!enums || schema['type'] !== 'array') {
             throw(`In schema ${JSON.stringify(schema)}, editor: checkButtons must be an array type with items an enum property`);
         }

src/schema/schema.ts

@@ -70,14 +70,15 @@ function nullOptionalsAllowedApply(schema: object) {
     if (schema['$ref']) return;
     switch (schema['type']) {
         case 'object':
-            for (let prop in schema['properties']) {
+            const properties = schema['properties'] || {};
+            for (let prop in properties) {
                 if (req.indexOf(prop) < 0) {
                     nullOptionalsAllowedApply(schema['properties'][prop]);
                 }
             }
             break;
         case 'array':
-            const items = schema['items'];
+            const items = schema['items'] || {};
             nullOptionalsAllowedApply(items);
             if (items['oneOf'] && !(items['oneOf'] as any[]).some(subschema => subschema["type"] == "null")) {
                 items['oneOf'].push({ type: 'null' });
@@ -226,7 +227,7 @@ export function disjoin(schema0: object | null, schema1: object | null ): object
             case 'properties':
                 let deleteProps = [];
                 for (let p in schema['properties']) {
-                    let otherProp = schema1['properties'][p] || null;
+                    let otherProp = schema1?.['properties']?.[p] || null;
                     if (otherProp === null) {
                         deleteProps.push(p);
                     } else {
@@ -321,7 +322,7 @@ export function fieldUnion(baseSchema: object, schema: object | null): object |
     };
     switch (schema['type']) {
         case "object":
-            let props = schema['properties'];
+            let props = schema['properties'] || {};
             for (let field in props) {
                 union[field] = fieldUnion(baseSchema, props[field]);
             }
@@ -489,7 +490,7 @@ export const deleteSubschemaProperties = (value: any, schema: object): any => {
         }
         return value === {} ? null : value;
     } else if (schemaType === 'array' && Array.isArray(value)) {
-        return (value as any[]).map(item => deleteSubschemaProperties(item, schema['items'])).filter((item: any) => item !== null);
+        return (value as any[]).map(item => deleteSubschemaProperties(item, schema['items'] || {})).filter((item: any) => item !== null);
     } else {
         return null;
     }