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

package/lib/actions/actions.d.ts

@@ -25,11 +25,26 @@ export declare const SET_TRANSLATOR: "jsonforms/SET_TRANSLATOR";
 export declare const UPDATE_I18N: "jsonforms/UPDATE_I18N";
 export declare const ADD_DEFAULT_DATA: "jsonforms/ADD_DEFAULT_DATA";
 export declare const REMOVE_DEFAULT_DATA: "jsonforms/REMOVE_DEFAULT_DATA";
+export type UpdateArrayContext = {
+    type: 'ADD';
+    values: any[];
+} | {
+    type: 'REMOVE';
+    indices: number[];
+} | {
+    type: 'MOVE';
+    moves: {
+        from: number;
+        to: number;
+    }[];
+};
+export declare const isUpdateArrayContext: (context: object) => context is UpdateArrayContext;
 export type CoreActions = InitAction | UpdateCoreAction | UpdateAction | UpdateErrorsAction | SetAjvAction | SetSchemaAction | SetUISchemaAction | SetValidationModeAction;
 export interface UpdateAction {
     type: 'jsonforms/UPDATE';
     path: string;
     updater(existingData?: any): any;
+    context?: object;
 }
 export interface UpdateErrorsAction {
     type: 'jsonforms/UPDATE_ERRORS';
@@ -92,7 +107,7 @@ export declare const setAjv: (ajv: AJV) => {
     type: "jsonforms/SET_AJV";
     ajv: AJV;
 };
-export declare const update: (path: string, updater: (existingData: any) => any) => UpdateAction;
+export declare const update: (path: string, updater: (existingData: any) => any, context?: object) => UpdateAction;
 export declare const updateErrors: (errors: ErrorObject[]) => UpdateErrorsAction;
 export interface AddRendererAction {
     type: 'jsonforms/ADD_RENDERER';

package/lib/jsonforms-core.cjs.js

@@ -356,6 +356,7 @@ var isLabelable = function (obj) {
 var isLabeled = function (obj) {
     return isLabelable(obj) && ['string', 'boolean'].includes(typeof obj.label);
 };
+var isControlElement = function (uiSchema) { return uiSchema.type === 'Control'; };
 
 var move = function (array, index, delta) {
     var newIndex = index + delta;
@@ -1079,11 +1080,7 @@ var isAnyOfControl = and(uiTypeIs('Control'), schemaMatches(function (schema) {
 var isOneOfControl = and(uiTypeIs('Control'), schemaMatches(function (schema) {
     return Object.prototype.hasOwnProperty.call(schema, 'oneOf');
 }));
-var isEnumControl = and(uiTypeIs('Control'), or(schemaMatches(function (schema) {
-    return Object.prototype.hasOwnProperty.call(schema, 'enum');
-}), schemaMatches(function (schema) {
-    return Object.prototype.hasOwnProperty.call(schema, 'const');
-})));
+var isEnumControl = and(uiTypeIs('Control'), schemaMatches(function (schema) { return isEnumSchema(schema); }));
 var isOneOfEnumControl = and(uiTypeIs('Control'), schemaMatches(function (schema) { return isOneOfEnumSchema(schema); }));
 var isIntegerControl = and(uiTypeIs('Control'), schemaTypeIs('integer'));
 var isNumberControl = and(uiTypeIs('Control'), schemaTypeIs('number'));
@@ -1708,6 +1705,81 @@ var Runtime = {
     },
 };
 
+var getFirstPrimitiveProp = function (schema) {
+    if (schema.properties) {
+        return find__default["default"](Object.keys(schema.properties), function (propName) {
+            var prop = schema.properties[propName];
+            return (prop.type === 'string' ||
+                prop.type === 'number' ||
+                prop.type === 'integer');
+        });
+    }
+    return undefined;
+};
+var isOneOfEnumSchema = function (schema) {
+    return !!schema &&
+        Object.prototype.hasOwnProperty.call(schema, 'oneOf') &&
+        schema.oneOf &&
+        schema.oneOf.every(function (s) { return s.const !== undefined; });
+};
+var isEnumSchema = function (schema) {
+    return !!schema &&
+        typeof schema === 'object' &&
+        (Object.prototype.hasOwnProperty.call(schema, 'enum') ||
+            Object.prototype.hasOwnProperty.call(schema, 'const'));
+};
+
+var setReadonlyPropertyValue = function (value) {
+    return function (child) {
+        if (!child.options) {
+            child.options = {};
+        }
+        child.options.readonly = value;
+    };
+};
+var setReadonly = function (uischema) {
+    iterateSchema(uischema, setReadonlyPropertyValue(true));
+};
+var unsetReadonly = function (uischema) {
+    iterateSchema(uischema, setReadonlyPropertyValue(false));
+};
+var iterateSchema = function (uischema, toApply) {
+    if (isEmpty__default["default"](uischema)) {
+        return;
+    }
+    if (isLayout(uischema)) {
+        uischema.elements.forEach(function (child) { return iterateSchema(child, toApply); });
+        return;
+    }
+    toApply(uischema);
+};
+var getPropPath = function (path) {
+    return "/properties/".concat(path
+        .split('.')
+        .map(function (p) { return encode(p); })
+        .join('/properties/'));
+};
+var findUiControl = function (uiSchema, path) {
+    var _a;
+    if (isControlElement(uiSchema)) {
+        if (isScoped(uiSchema) && uiSchema.scope.endsWith(getPropPath(path))) {
+            return uiSchema;
+        }
+        else if ((_a = uiSchema.options) === null || _a === void 0 ? void 0 : _a.detail) {
+            return findUiControl(uiSchema.options.detail, path);
+        }
+    }
+    if (isLayout(uiSchema)) {
+        for (var _i = 0, _b = uiSchema.elements; _i < _b.length; _i++) {
+            var elem = _b[_i];
+            var result = findUiControl(elem, path);
+            if (result !== undefined)
+                return result;
+        }
+    }
+    return undefined;
+};
+
 var deriveLabel = function (controlElement, schemaElement) {
     if (schemaElement && typeof schemaElement.title === 'string') {
         return schemaElement.title;
@@ -1743,6 +1815,34 @@ var labelDescription = function (text, show) { return ({
     text: text,
     show: show,
 }); };
+var computeChildLabel = function (data, childPath, childLabelProp, schema, rootSchema, translateFct, uiSchema) {
+    var childData = Resolve.data(data, childPath);
+    if (!childLabelProp) {
+        childLabelProp = getFirstPrimitiveProp(schema);
+    }
+    if (!childLabelProp) {
+        return '';
+    }
+    var currentValue = get__default["default"](childData, childLabelProp);
+    if (currentValue === undefined) {
+        return '';
+    }
+    var childSchema = Resolve.schema(schema, '#' + getPropPath(childLabelProp), rootSchema);
+    var enumOption = undefined;
+    if (isEnumSchema(childSchema)) {
+        enumOption = enumToEnumOptionMapper(currentValue, translateFct, getI18nKeyPrefix(childSchema, findUiControl(uiSchema, childLabelProp), childPath + '.' + childLabelProp));
+    }
+    else if (isOneOfEnumSchema(childSchema)) {
+        var oneOfArray = childSchema.oneOf;
+        var oneOfSchema = oneOfArray.find(function (e) {
+            return isEqual__default["default"](e.const, currentValue);
+        });
+        if (oneOfSchema) {
+            enumOption = oneOfToEnumOptionMapper(oneOfSchema, translateFct, getI18nKeyPrefix(oneOfSchema, undefined, childPath + '.' + childLabelProp));
+        }
+    }
+    return enumOption ? enumOption.label : currentValue;
+};
 
 var isRequired = function (schema, schemaPath, rootSchema) {
     var pathSegments = schemaPath.split('/');
@@ -1942,18 +2042,9 @@ var mapStateToMultiEnumControlProps = function (state, ownProps) {
     return __assign(__assign({}, props), { options: options });
 };
 var mapStateToMasterListItemProps = function (state, ownProps) {
-    var schema = ownProps.schema, path = ownProps.path, index = ownProps.index;
-    var firstPrimitiveProp = schema.properties
-        ? find__default["default"](Object.keys(schema.properties), function (propName) {
-            var prop = schema.properties[propName];
-            return (prop.type === 'string' ||
-                prop.type === 'number' ||
-                prop.type === 'integer');
-        })
-        : undefined;
+    var schema = ownProps.schema, path = ownProps.path, uischema = ownProps.uischema, childLabelProp = ownProps.childLabelProp, index = ownProps.index;
     var childPath = compose(path, "".concat(index));
-    var childData = Resolve.data(getData(state), childPath);
-    var childLabel = firstPrimitiveProp ? childData[firstPrimitiveProp] : '';
+    var childLabel = computeChildLabel(getData(state), childPath, childLabelProp, schema, getSchema(state), state.jsonforms.i18n.translate, uischema);
     return __assign(__assign({}, ownProps), { childLabel: childLabel });
 };
 var mapStateToControlWithDetailProps = function (state, ownProps) {
@@ -1975,7 +2066,7 @@ var mapDispatchToArrayControlProps = function (dispatch) { return ({
             }
             array.push(value);
             return array;
-        }));
+        }, { type: 'ADD', values: [value] }));
     }; },
     removeItems: function (path, toDelete) { return function () {
         dispatch(update(path, function (array) {
@@ -1984,18 +2075,24 @@ var mapDispatchToArrayControlProps = function (dispatch) { return ({
                 .reverse()
                 .forEach(function (s) { return array.splice(s, 1); });
             return array;
-        }));
+        }, { type: 'REMOVE', indices: toDelete }));
     }; },
     moveUp: function (path, toMove) { return function () {
         dispatch(update(path, function (array) {
             moveUp(array, toMove);
             return array;
+        }, {
+            type: 'MOVE',
+            moves: [{ from: toMove, to: toMove - 1 }],
         }));
     }; },
     moveDown: function (path, toMove) { return function () {
         dispatch(update(path, function (array) {
             moveDown(array, toMove);
             return array;
+        }, {
+            type: 'MOVE',
+            moves: [{ from: toMove, to: toMove + 1 }],
         }));
     }; },
 }); };
@@ -2247,49 +2344,6 @@ var createId = function (proposedId) {
 var removeId = function (id) { return usedIds.delete(id); };
 var clearAllIds = function () { return usedIds.clear(); };
 
-var getFirstPrimitiveProp = function (schema) {
-    if (schema.properties) {
-        return find__default["default"](Object.keys(schema.properties), function (propName) {
-            var prop = schema.properties[propName];
-            return (prop.type === 'string' ||
-                prop.type === 'number' ||
-                prop.type === 'integer');
-        });
-    }
-    return undefined;
-};
-var isOneOfEnumSchema = function (schema) {
-    return !!schema &&
-        Object.prototype.hasOwnProperty.call(schema, 'oneOf') &&
-        schema.oneOf &&
-        schema.oneOf.every(function (s) { return s.const !== undefined; });
-};
-
-var setReadonlyPropertyValue = function (value) {
-    return function (child) {
-        if (!child.options) {
-            child.options = {};
-        }
-        child.options.readonly = value;
-    };
-};
-var setReadonly = function (uischema) {
-    iterateSchema(uischema, setReadonlyPropertyValue(true));
-};
-var unsetReadonly = function (uischema) {
-    iterateSchema(uischema, setReadonlyPropertyValue(false));
-};
-var iterateSchema = function (uischema, toApply) {
-    if (isEmpty__default["default"](uischema)) {
-        return;
-    }
-    if (isLayout(uischema)) {
-        uischema.elements.forEach(function (child) { return iterateSchema(child, toApply); });
-        return;
-    }
-    toApply(uischema);
-};
-
 var createAjv = function (options) {
     var ajv = new Ajv__default["default"](__assign({ allErrors: true, verbose: true, strict: false, addUsedSchema: false }, options));
     addFormats__default["default"](ajv);
@@ -2424,6 +2478,42 @@ var SET_TRANSLATOR = 'jsonforms/SET_TRANSLATOR';
 var UPDATE_I18N = 'jsonforms/UPDATE_I18N';
 var ADD_DEFAULT_DATA = 'jsonforms/ADD_DEFAULT_DATA';
 var REMOVE_DEFAULT_DATA = 'jsonforms/REMOVE_DEFAULT_DATA';
+var isUpdateArrayContext = function (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(function (i) { return typeof i === 'number'; }));
+        }
+        case 'MOVE': {
+            return ('moves' in context &&
+                Array.isArray(context.moves) &&
+                context.moves.length > 0 &&
+                context.moves.every(function (m) {
+                    return typeof m === 'object' &&
+                        m !== null &&
+                        'from' in m &&
+                        'to' in m &&
+                        typeof m.from === 'number' &&
+                        typeof m.to === 'number';
+                }));
+        }
+        default:
+            return false;
+    }
+};
 var init = function (data, schema, uischema, options) {
     if (schema === void 0) { schema = generateJsonSchema(data); }
     return ({
@@ -2454,10 +2544,11 @@ var setAjv = function (ajv) { return ({
     type: SET_AJV,
     ajv: ajv,
 }); };
-var update = function (path, updater) { return ({
+var update = function (path, updater, context) { return ({
     type: UPDATE_DATA,
     path: path,
     updater: updater,
+    context: context,
 }); };
 var updateErrors = function (errors) { return ({
     type: UPDATE_ERRORS,
@@ -2551,6 +2642,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,
@@ -2618,6 +2710,7 @@ exports.combinatorDefaultTranslations = combinatorDefaultTranslations;
 exports.compose = compose;
 exports.composePaths = compose;
 exports.composeWithUi = composeWithUi;
+exports.computeChildLabel = computeChildLabel;
 exports.computeLabel = computeLabel;
 exports.configReducer = configReducer;
 exports.controlDefaultProps = controlDefaultProps;
@@ -2662,6 +2755,7 @@ exports.fetchTranslator = fetchTranslator;
 exports.findAllRefs = findAllRefs;
 exports.findMatchingUISchema = findMatchingUISchema;
 exports.findUISchema = findUISchema;
+exports.findUiControl = findUiControl;
 exports.formatErrorMessage = formatErrorMessage;
 exports.formatIs = formatIs;
 exports.generateDefaultUISchema = generateDefaultUISchema;
@@ -2682,6 +2776,7 @@ exports.getI18nKey = getI18nKey;
 exports.getI18nKeyPrefix = getI18nKeyPrefix;
 exports.getI18nKeyPrefixBySchema = getI18nKeyPrefixBySchema;
 exports.getLocale = getLocale;
+exports.getPropPath = getPropPath;
 exports.getRenderers = getRenderers;
 exports.getSchema = getSchema;
 exports.getSubErrorsAt = getSubErrorsAt;
@@ -2702,11 +2797,13 @@ exports.isBooleanControl = isBooleanControl;
 exports.isCategorization = isCategorization;
 exports.isCategory = isCategory;
 exports.isControl = isControl;
+exports.isControlElement = isControlElement;
 exports.isDateControl = isDateControl;
 exports.isDateTimeControl = isDateTimeControl;
 exports.isDescriptionHidden = isDescriptionHidden;
 exports.isEnabled = isEnabled;
 exports.isEnumControl = isEnumControl;
+exports.isEnumSchema = isEnumSchema;
 exports.isGroup = isGroup;
 exports.isInherentlyEnabled = isInherentlyEnabled;
 exports.isIntegerControl = isIntegerControl;
@@ -2730,6 +2827,7 @@ exports.isScopable = isScopable;
 exports.isScoped = isScoped;
 exports.isStringControl = isStringControl;
 exports.isTimeControl = isTimeControl;
+exports.isUpdateArrayContext = isUpdateArrayContext;
 exports.isVisible = isVisible;
 exports.iterateSchema = iterateSchema;
 exports.jsonFormsReducerConfig = jsonFormsReducerConfig;