@jsonforms/core 3.3.0-alpha.0 → 3.3.0-beta.0

package/lib/jsonforms-core.esm.js

@@ -303,6 +303,7 @@ const isScopable = (obj) => !!obj && typeof obj === 'object';
 const isScoped = (obj) => isScopable(obj) && typeof obj.scope === 'string';
 const isLabelable = (obj) => !!obj && typeof obj === 'object';
 const isLabeled = (obj) => isLabelable(obj) && ['string', 'boolean'].includes(typeof obj.label);
+const isControlElement = (uiSchema) => uiSchema.type === 'Control';
 
 const move = (array, index, delta) => {
     const newIndex = index + delta;
@@ -970,7 +971,7 @@ const isObjectControl = and(uiTypeIs('Control'), schemaTypeIs('object'));
 const isAllOfControl = and(uiTypeIs('Control'), schemaMatches((schema) => Object.prototype.hasOwnProperty.call(schema, 'allOf')));
 const isAnyOfControl = and(uiTypeIs('Control'), schemaMatches((schema) => Object.prototype.hasOwnProperty.call(schema, 'anyOf')));
 const isOneOfControl = and(uiTypeIs('Control'), schemaMatches((schema) => Object.prototype.hasOwnProperty.call(schema, 'oneOf')));
-const isEnumControl = and(uiTypeIs('Control'), or(schemaMatches((schema) => Object.prototype.hasOwnProperty.call(schema, 'enum')), schemaMatches((schema) => Object.prototype.hasOwnProperty.call(schema, 'const'))));
+const isEnumControl = and(uiTypeIs('Control'), schemaMatches((schema) => isEnumSchema(schema)));
 const isOneOfEnumControl = and(uiTypeIs('Control'), schemaMatches((schema) => isOneOfEnumSchema(schema)));
 const isIntegerControl = and(uiTypeIs('Control'), schemaTypeIs('integer'));
 const isNumberControl = and(uiTypeIs('Control'), schemaTypeIs('number'));
@@ -1518,6 +1519,73 @@ const Runtime = {
     },
 };
 
+const getFirstPrimitiveProp = (schema) => {
+    if (schema.properties) {
+        return find(Object.keys(schema.properties), (propName) => {
+            const prop = schema.properties[propName];
+            return (prop.type === 'string' ||
+                prop.type === 'number' ||
+                prop.type === 'integer');
+        });
+    }
+    return undefined;
+};
+const isOneOfEnumSchema = (schema) => !!schema &&
+    Object.prototype.hasOwnProperty.call(schema, 'oneOf') &&
+    schema.oneOf &&
+    schema.oneOf.every((s) => s.const !== undefined);
+const isEnumSchema = (schema) => !!schema &&
+    typeof schema === 'object' &&
+    (Object.prototype.hasOwnProperty.call(schema, 'enum') ||
+        Object.prototype.hasOwnProperty.call(schema, 'const'));
+
+const setReadonlyPropertyValue = (value) => (child) => {
+    if (!child.options) {
+        child.options = {};
+    }
+    child.options.readonly = value;
+};
+const setReadonly = (uischema) => {
+    iterateSchema(uischema, setReadonlyPropertyValue(true));
+};
+const unsetReadonly = (uischema) => {
+    iterateSchema(uischema, setReadonlyPropertyValue(false));
+};
+const iterateSchema = (uischema, toApply) => {
+    if (isEmpty(uischema)) {
+        return;
+    }
+    if (isLayout(uischema)) {
+        uischema.elements.forEach((child) => iterateSchema(child, toApply));
+        return;
+    }
+    toApply(uischema);
+};
+const getPropPath = (path) => {
+    return `/properties/${path
+        .split('.')
+        .map((p) => encode(p))
+        .join('/properties/')}`;
+};
+const findUiControl = (uiSchema, path) => {
+    if (isControlElement(uiSchema)) {
+        if (isScoped(uiSchema) && uiSchema.scope.endsWith(getPropPath(path))) {
+            return uiSchema;
+        }
+        else if (uiSchema.options?.detail) {
+            return findUiControl(uiSchema.options.detail, path);
+        }
+    }
+    if (isLayout(uiSchema)) {
+        for (const elem of uiSchema.elements) {
+            const result = findUiControl(elem, path);
+            if (result !== undefined)
+                return result;
+        }
+    }
+    return undefined;
+};
+
 const deriveLabel = (controlElement, schemaElement) => {
     if (schemaElement && typeof schemaElement.title === 'string') {
         return schemaElement.title;
@@ -1553,6 +1621,32 @@ const labelDescription = (text, show) => ({
     text: text,
     show: show,
 });
+const computeChildLabel = (data, childPath, childLabelProp, schema, rootSchema, translateFct, uiSchema) => {
+    const childData = Resolve.data(data, childPath);
+    if (!childLabelProp) {
+        childLabelProp = getFirstPrimitiveProp(schema);
+    }
+    if (!childLabelProp) {
+        return '';
+    }
+    const currentValue = get(childData, childLabelProp);
+    if (currentValue === undefined) {
+        return '';
+    }
+    const childSchema = Resolve.schema(schema, '#' + getPropPath(childLabelProp), rootSchema);
+    let enumOption = undefined;
+    if (isEnumSchema(childSchema)) {
+        enumOption = enumToEnumOptionMapper(currentValue, translateFct, getI18nKeyPrefix(childSchema, findUiControl(uiSchema, childLabelProp), childPath + '.' + childLabelProp));
+    }
+    else if (isOneOfEnumSchema(childSchema)) {
+        const oneOfArray = childSchema.oneOf;
+        const oneOfSchema = oneOfArray.find((e) => isEqual(e.const, currentValue));
+        if (oneOfSchema) {
+            enumOption = oneOfToEnumOptionMapper(oneOfSchema, translateFct, getI18nKeyPrefix(oneOfSchema, undefined, childPath + '.' + childLabelProp));
+        }
+    }
+    return enumOption ? enumOption.label : currentValue;
+};
 
 const isRequired = (schema, schemaPath, rootSchema) => {
     const pathSegments = schemaPath.split('/');
@@ -1748,18 +1842,9 @@ const mapStateToMultiEnumControlProps = (state, ownProps) => {
     };
 };
 const mapStateToMasterListItemProps = (state, ownProps) => {
-    const { schema, path, index } = ownProps;
-    const firstPrimitiveProp = schema.properties
-        ? find(Object.keys(schema.properties), (propName) => {
-            const prop = schema.properties[propName];
-            return (prop.type === 'string' ||
-                prop.type === 'number' ||
-                prop.type === 'integer');
-        })
-        : undefined;
+    const { schema, path, uischema, childLabelProp, index } = ownProps;
     const childPath = compose(path, `${index}`);
-    const childData = Resolve.data(getData(state), childPath);
-    const childLabel = firstPrimitiveProp ? childData[firstPrimitiveProp] : '';
+    const childLabel = computeChildLabel(getData(state), childPath, childLabelProp, schema, getSchema(state), state.jsonforms.i18n.translate, uischema);
     return {
         ...ownProps,
         childLabel,
@@ -1797,7 +1882,7 @@ const mapDispatchToArrayControlProps = (dispatch) => ({
             }
             array.push(value);
             return array;
-        }));
+        }, { type: 'ADD', values: [value] }));
     },
     removeItems: (path, toDelete) => () => {
         dispatch(update(path, (array) => {
@@ -1806,18 +1891,24 @@ const mapDispatchToArrayControlProps = (dispatch) => ({
                 .reverse()
                 .forEach((s) => array.splice(s, 1));
             return array;
-        }));
+        }, { type: 'REMOVE', indices: toDelete }));
     },
     moveUp: (path, toMove) => () => {
         dispatch(update(path, (array) => {
             moveUp(array, toMove);
             return array;
+        }, {
+            type: 'MOVE',
+            moves: [{ from: toMove, to: toMove - 1 }],
         }));
     },
     moveDown: (path, toMove) => () => {
         dispatch(update(path, (array) => {
             moveDown(array, toMove);
             return array;
+        }, {
+            type: 'MOVE',
+            moves: [{ from: toMove, to: toMove + 1 }],
         }));
     },
 });
@@ -2102,45 +2193,6 @@ const createId = (proposedId) => {
 const removeId = (id) => usedIds.delete(id);
 const clearAllIds = () => usedIds.clear();
 
-const getFirstPrimitiveProp = (schema) => {
-    if (schema.properties) {
-        return find(Object.keys(schema.properties), (propName) => {
-            const prop = schema.properties[propName];
-            return (prop.type === 'string' ||
-                prop.type === 'number' ||
-                prop.type === 'integer');
-        });
-    }
-    return undefined;
-};
-const isOneOfEnumSchema = (schema) => !!schema &&
-    Object.prototype.hasOwnProperty.call(schema, 'oneOf') &&
-    schema.oneOf &&
-    schema.oneOf.every((s) => s.const !== undefined);
-
-const setReadonlyPropertyValue = (value) => (child) => {
-    if (!child.options) {
-        child.options = {};
-    }
-    child.options.readonly = value;
-};
-const setReadonly = (uischema) => {
-    iterateSchema(uischema, setReadonlyPropertyValue(true));
-};
-const unsetReadonly = (uischema) => {
-    iterateSchema(uischema, setReadonlyPropertyValue(false));
-};
-const iterateSchema = (uischema, toApply) => {
-    if (isEmpty(uischema)) {
-        return;
-    }
-    if (isLayout(uischema)) {
-        uischema.elements.forEach((child) => iterateSchema(child, toApply));
-        return;
-    }
-    toApply(uischema);
-};
-
 const createAjv = (options) => {
     const ajv = new Ajv({
         allErrors: true,
@@ -2276,6 +2328,40 @@ const SET_TRANSLATOR = 'jsonforms/SET_TRANSLATOR';
 const UPDATE_I18N = 'jsonforms/UPDATE_I18N';
 const ADD_DEFAULT_DATA = 'jsonforms/ADD_DEFAULT_DATA';
 const REMOVE_DEFAULT_DATA = 'jsonforms/REMOVE_DEFAULT_DATA';
+const isUpdateArrayContext = (context) => {
+    if (!('type' in context)) {
+        return false;
+    }
+    if (typeof context.type !== 'string') {
+        return false;
+    }
+    switch (context.type) {
+        case 'ADD': {
+            return ('values' in context &&
+                Array.isArray(context.values) &&
+                context.values.length > 0);
+        }
+        case 'REMOVE': {
+            return ('indices' in context &&
+                Array.isArray(context.indices) &&
+                context.indices.length > 0 &&
+                context.indices.every((i) => typeof i === 'number'));
+        }
+        case 'MOVE': {
+            return ('moves' in context &&
+                Array.isArray(context.moves) &&
+                context.moves.length > 0 &&
+                context.moves.every((m) => typeof m === 'object' &&
+                    m !== null &&
+                    'from' in m &&
+                    'to' in m &&
+                    typeof m.from === 'number' &&
+                    typeof m.to === 'number'));
+        }
+        default:
+            return false;
+    }
+};
 const init = (data, schema = generateJsonSchema(data), uischema, options) => ({
     type: INIT,
     data,
@@ -2303,10 +2389,11 @@ const setAjv = (ajv) => ({
     type: SET_AJV,
     ajv,
 });
-const update = (path, updater) => ({
+const update = (path, updater, context) => ({
     type: UPDATE_DATA,
     path,
     updater,
+    context,
 });
 const updateErrors = (errors) => ({
     type: UPDATE_ERRORS,
@@ -2400,6 +2487,7 @@ var index = /*#__PURE__*/Object.freeze({
   UPDATE_I18N: UPDATE_I18N,
   ADD_DEFAULT_DATA: ADD_DEFAULT_DATA,
   REMOVE_DEFAULT_DATA: REMOVE_DEFAULT_DATA,
+  isUpdateArrayContext: isUpdateArrayContext,
   init: init,
   updateCore: updateCore,
   registerDefaultData: registerDefaultData,
@@ -2427,5 +2515,5 @@ const Helpers = {
     convertToValidClassName,
 };
 
-export { ADD_CELL, ADD_DEFAULT_DATA, ADD_RENDERER, ADD_UI_SCHEMA, index as Actions, ArrayTranslationEnum, CombinatorTranslationEnum, Draft4, Generate, Helpers, INIT, NOT_APPLICABLE, Paths, REMOVE_CELL, REMOVE_DEFAULT_DATA, REMOVE_RENDERER, REMOVE_UI_SCHEMA, Resolve, RuleEffect, Runtime, SET_AJV, SET_CONFIG, SET_LOCALE, SET_SCHEMA, SET_TRANSLATOR, SET_UISCHEMA, SET_VALIDATION_MODE, index$1 as Test, UPDATE_CORE, UPDATE_DATA, UPDATE_ERRORS, UPDATE_I18N, VALIDATE, addI18nKeyToPrefix, and, arrayDefaultTranslations, categorizationHasCategory, cellReducer, clearAllIds, combinatorDefaultTranslations, compose, compose as composePaths, composeWithUi, computeLabel, configReducer, controlDefaultProps, convertDateToString, convertToValidClassName, coreReducer, createAjv, createCleanLabel, createCombinatorRenderInfos, createControlElement, createDefaultValue, createId, createLabelDescriptionFrom, decode, defaultDataReducer, defaultDateFormat, defaultDateTimeFormat, defaultErrorTranslator, defaultJsonFormsI18nState, defaultMapDispatchToControlProps, defaultMapStateToEnumCellProps, defaultMiddleware, defaultTimeFormat, defaultTranslator, deriveLabelForUISchemaElement, deriveTypes, encode, enumToEnumOptionMapper, errorAt, errorsAt, evalEnablement, evalVisibility, extractAjv, extractData, extractDefaultData, extractDefaults, extractSchema, extractUiSchema, fetchErrorTranslator, fetchLocale, fetchTranslator, findAllRefs, findMatchingUISchema, findUISchema, formatErrorMessage, formatIs, generateDefaultUISchema, generateJsonSchema, getAjv, getArrayTranslations, getCells, getCombinatorTranslations, getCombinedErrorMessage, getConfig, getControlPath, getData, getDefaultData, getErrorAt, getErrorTranslator, getFirstPrimitiveProp, getI18nKey, getI18nKeyPrefix, getI18nKeyPrefixBySchema, getLocale, getRenderers, getSchema, getSubErrorsAt, getTranslator, getUISchemas, getUiSchema, hasCategory, hasEnableRule, hasOption, hasShowRule, hasType, i18nReducer, init, isAllOfControl, isAnyOfControl, isArrayObjectControl, isBooleanControl, isCategorization, isCategory, isControl, isDateControl, isDateTimeControl, isDescriptionHidden, isEnabled, isEnumControl, isGroup, isInherentlyEnabled, isIntegerControl, isInternationalized, isLabelable, isLabeled, isLayout, isMultiLineControl, isNumberControl, isNumberFormatControl, isObjectArray, isObjectArrayControl, isObjectArrayWithNesting, isObjectControl, isOneOfControl, isOneOfEnumControl, isOneOfEnumSchema, isPrimitiveArrayControl, isRangeControl, isScopable, isScoped, isStringControl, isTimeControl, isVisible, iterateSchema, jsonFormsReducerConfig, layoutDefaultProps, mapDispatchToArrayControlProps, mapDispatchToCellProps, mapDispatchToControlProps, mapDispatchToMultiEnumProps, mapStateToAllOfProps, mapStateToAnyOfProps, mapStateToArrayControlProps, mapStateToArrayLayoutProps, mapStateToCellProps, mapStateToCombinatorRendererProps, mapStateToControlProps, mapStateToControlWithDetailProps, mapStateToDispatchCellProps, mapStateToEnumControlProps, mapStateToJsonFormsRendererProps, mapStateToLabelProps, mapStateToLayoutProps, mapStateToMasterListItemProps, mapStateToMultiEnumControlProps, mapStateToOneOfEnumCellProps, mapStateToOneOfEnumControlProps, mapStateToOneOfProps, moveDown, moveUp, not, oneOfToEnumOptionMapper, optionIs, or, rankWith, registerCell, registerDefaultData, registerRenderer, registerUISchema, removeId, rendererReducer, resolveData, resolveSchema, schemaMatches, schemaSubPathMatches, schemaTypeIs, scopeEndIs, scopeEndsWith, setAjv, setConfig, setLocale, setReadonly, setSchema, setTranslator, setUISchema, setValidationMode, showAsRequired, subErrorsAt, toDataPath, toDataPathSegments, transformPathToI18nPrefix, uiTypeIs, uischemaRegistryReducer, unregisterCell, unregisterDefaultData, unregisterRenderer, unregisterUISchema, unsetReadonly, update, updateCore, updateErrors, updateI18n, validate, withIncreasedRank };
+export { ADD_CELL, ADD_DEFAULT_DATA, ADD_RENDERER, ADD_UI_SCHEMA, index as Actions, ArrayTranslationEnum, CombinatorTranslationEnum, Draft4, Generate, Helpers, INIT, NOT_APPLICABLE, Paths, REMOVE_CELL, REMOVE_DEFAULT_DATA, REMOVE_RENDERER, REMOVE_UI_SCHEMA, Resolve, RuleEffect, Runtime, SET_AJV, SET_CONFIG, SET_LOCALE, SET_SCHEMA, SET_TRANSLATOR, SET_UISCHEMA, SET_VALIDATION_MODE, index$1 as Test, UPDATE_CORE, UPDATE_DATA, UPDATE_ERRORS, UPDATE_I18N, VALIDATE, addI18nKeyToPrefix, and, arrayDefaultTranslations, categorizationHasCategory, cellReducer, clearAllIds, combinatorDefaultTranslations, compose, compose as composePaths, composeWithUi, computeChildLabel, computeLabel, configReducer, controlDefaultProps, convertDateToString, convertToValidClassName, coreReducer, createAjv, createCleanLabel, createCombinatorRenderInfos, createControlElement, createDefaultValue, createId, createLabelDescriptionFrom, decode, defaultDataReducer, defaultDateFormat, defaultDateTimeFormat, defaultErrorTranslator, defaultJsonFormsI18nState, defaultMapDispatchToControlProps, defaultMapStateToEnumCellProps, defaultMiddleware, defaultTimeFormat, defaultTranslator, deriveLabelForUISchemaElement, deriveTypes, encode, enumToEnumOptionMapper, errorAt, errorsAt, evalEnablement, evalVisibility, extractAjv, extractData, extractDefaultData, extractDefaults, extractSchema, extractUiSchema, fetchErrorTranslator, fetchLocale, fetchTranslator, findAllRefs, findMatchingUISchema, findUISchema, findUiControl, formatErrorMessage, formatIs, generateDefaultUISchema, generateJsonSchema, getAjv, getArrayTranslations, getCells, getCombinatorTranslations, getCombinedErrorMessage, getConfig, getControlPath, getData, getDefaultData, getErrorAt, getErrorTranslator, getFirstPrimitiveProp, getI18nKey, getI18nKeyPrefix, getI18nKeyPrefixBySchema, getLocale, getPropPath, getRenderers, getSchema, getSubErrorsAt, getTranslator, getUISchemas, getUiSchema, hasCategory, hasEnableRule, hasOption, hasShowRule, hasType, i18nReducer, init, isAllOfControl, isAnyOfControl, isArrayObjectControl, isBooleanControl, isCategorization, isCategory, isControl, isControlElement, isDateControl, isDateTimeControl, isDescriptionHidden, isEnabled, isEnumControl, isEnumSchema, isGroup, isInherentlyEnabled, isIntegerControl, isInternationalized, isLabelable, isLabeled, isLayout, isMultiLineControl, isNumberControl, isNumberFormatControl, isObjectArray, isObjectArrayControl, isObjectArrayWithNesting, isObjectControl, isOneOfControl, isOneOfEnumControl, isOneOfEnumSchema, isPrimitiveArrayControl, isRangeControl, isScopable, isScoped, isStringControl, isTimeControl, isUpdateArrayContext, isVisible, iterateSchema, jsonFormsReducerConfig, layoutDefaultProps, mapDispatchToArrayControlProps, mapDispatchToCellProps, mapDispatchToControlProps, mapDispatchToMultiEnumProps, mapStateToAllOfProps, mapStateToAnyOfProps, mapStateToArrayControlProps, mapStateToArrayLayoutProps, mapStateToCellProps, mapStateToCombinatorRendererProps, mapStateToControlProps, mapStateToControlWithDetailProps, mapStateToDispatchCellProps, mapStateToEnumControlProps, mapStateToJsonFormsRendererProps, mapStateToLabelProps, mapStateToLayoutProps, mapStateToMasterListItemProps, mapStateToMultiEnumControlProps, mapStateToOneOfEnumCellProps, mapStateToOneOfEnumControlProps, mapStateToOneOfProps, moveDown, moveUp, not, oneOfToEnumOptionMapper, optionIs, or, rankWith, registerCell, registerDefaultData, registerRenderer, registerUISchema, removeId, rendererReducer, resolveData, resolveSchema, schemaMatches, schemaSubPathMatches, schemaTypeIs, scopeEndIs, scopeEndsWith, setAjv, setConfig, setLocale, setReadonly, setSchema, setTranslator, setUISchema, setValidationMode, showAsRequired, subErrorsAt, toDataPath, toDataPathSegments, transformPathToI18nPrefix, uiTypeIs, uischemaRegistryReducer, unregisterCell, unregisterDefaultData, unregisterRenderer, unregisterUISchema, unsetReadonly, update, updateCore, updateErrors, updateI18n, validate, withIncreasedRank };
 //# sourceMappingURL=jsonforms-core.esm.js.map