@jsonforms/core 3.1.0 → 3.2.0-alpha.0

package/lib/i18n/combinatorTranslations.d.ts

@@ -0,0 +1,14 @@
+export interface CombinatorDefaultTranslation {
+    key: CombinatorTranslationEnum;
+    default: (variable?: string) => string;
+}
+export declare enum CombinatorTranslationEnum {
+    clearDialogTitle = "clearDialogTitle",
+    clearDialogMessage = "clearDialogMessage",
+    clearDialogAccept = "clearDialogAccept",
+    clearDialogDecline = "clearDialogDecline"
+}
+export declare type CombinatorTranslations = {
+    [key in CombinatorTranslationEnum]?: string;
+};
+export declare const combinatorDefaultTranslations: CombinatorDefaultTranslation[];

package/lib/i18n/i18nUtil.d.ts

@@ -2,6 +2,7 @@ import type { ErrorObject } from 'ajv';
 import { Labelable, UISchemaElement } from '../models';
 import type { i18nJsonSchema, ErrorTranslator, Translator } from './i18nTypes';
 import { ArrayDefaultTranslation, ArrayTranslations } from './arrayTranslations';
+import { CombinatorDefaultTranslation, CombinatorTranslations } from './combinatorTranslations';
 export declare const getI18nKeyPrefixBySchema: (schema: i18nJsonSchema | undefined, uischema: unknown | undefined) => string | undefined;
 /**
  * Transforms a given path to a prefix which can be used for i18n keys.
@@ -24,3 +25,4 @@ export declare const getCombinedErrorMessage: (errors: ErrorObject[], et: ErrorT
  */
 export declare const deriveLabelForUISchemaElement: (uischema: Labelable<boolean>, t: Translator) => string | undefined;
 export declare const getArrayTranslations: (t: Translator, defaultTranslations: ArrayDefaultTranslation[], i18nKeyPrefix: string, label: string) => ArrayTranslations;
+export declare const getCombinatorTranslations: (t: Translator, defaultTranslations: CombinatorDefaultTranslation[], i18nKeyPrefix: string, label: string) => CombinatorTranslations;

package/lib/i18n/index.d.ts

@@ -1,3 +1,4 @@
 export * from './i18nTypes';
 export * from './i18nUtil';
 export * from './arrayTranslations';
+export * from './combinatorTranslations';

package/lib/jsonforms-core.cjs.js

@@ -8,6 +8,7 @@ var keys = require('lodash/keys');
 var merge = require('lodash/merge');
 var cloneDeep = require('lodash/cloneDeep');
 var setFp = require('lodash/fp/set');
+var unsetFp = require('lodash/fp/unset');
 var get = require('lodash/get');
 var filter = require('lodash/filter');
 var isEqual = require('lodash/isEqual');
@@ -34,6 +35,7 @@ var keys__default = /*#__PURE__*/_interopDefaultLegacy(keys);
 var merge__default = /*#__PURE__*/_interopDefaultLegacy(merge);
 var cloneDeep__default = /*#__PURE__*/_interopDefaultLegacy(cloneDeep);
 var setFp__default = /*#__PURE__*/_interopDefaultLegacy(setFp);
+var unsetFp__default = /*#__PURE__*/_interopDefaultLegacy(unsetFp);
 var get__default = /*#__PURE__*/_interopDefaultLegacy(get);
 var filter__default = /*#__PURE__*/_interopDefaultLegacy(filter);
 var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
@@ -414,7 +416,12 @@ function __spreadArray(to, from, pack) {
         }
     }
     return to.concat(ar || Array.prototype.slice.call(from));
-}
+}
+
+typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+};
 
 var cellReducer = function (state, _a) {
     if (state === void 0) { state = []; }
@@ -599,7 +606,13 @@ var coreReducer = function (state, action) {
             else {
                 var oldData = get__default["default"](state.data, action.path);
                 var newData = action.updater(cloneDeep__default["default"](oldData));
-                var newState = setFp__default["default"](action.path, newData, state.data === undefined ? {} : state.data);
+                var newState = void 0;
+                if (newData !== undefined) {
+                    newState = setFp__default["default"](action.path, newData, state.data === undefined ? {} : state.data);
+                }
+                else {
+                    newState = unsetFp__default["default"](action.path, state.data === undefined ? {} : state.data);
+                }
                 var errors = validate(state.validator, newState);
                 return __assign(__assign({}, state), { data: newState, errors: errors });
             }
@@ -803,6 +816,14 @@ var getArrayTranslations = function (t, defaultTranslations, i18nKeyPrefix, labe
     });
     return translations;
 };
+var getCombinatorTranslations = function (t, defaultTranslations, i18nKeyPrefix, label) {
+    var translations = {};
+    defaultTranslations.forEach(function (controlElement) {
+        var key = addI18nKeyToPrefix(i18nKeyPrefix, controlElement.key);
+        translations[controlElement.key] = t(key, controlElement.default(label));
+    });
+    return translations;
+};
 
 exports.ArrayTranslationEnum = void 0;
 (function (ArrayTranslationEnum) {
@@ -850,6 +871,26 @@ var arrayDefaultTranslations = [
     { key: exports.ArrayTranslationEnum.deleteDialogDecline, default: function () { return 'No'; } },
 ];
 
+exports.CombinatorTranslationEnum = void 0;
+(function (CombinatorTranslationEnum) {
+    CombinatorTranslationEnum["clearDialogTitle"] = "clearDialogTitle";
+    CombinatorTranslationEnum["clearDialogMessage"] = "clearDialogMessage";
+    CombinatorTranslationEnum["clearDialogAccept"] = "clearDialogAccept";
+    CombinatorTranslationEnum["clearDialogDecline"] = "clearDialogDecline";
+})(exports.CombinatorTranslationEnum || (exports.CombinatorTranslationEnum = {}));
+var combinatorDefaultTranslations = [
+    {
+        key: exports.CombinatorTranslationEnum.clearDialogTitle,
+        default: function () { return 'Clear form?'; },
+    },
+    {
+        key: exports.CombinatorTranslationEnum.clearDialogMessage,
+        default: function () { return 'Your data will be cleared. Do you want to proceed?'; },
+    },
+    { key: exports.CombinatorTranslationEnum.clearDialogAccept, default: function () { return 'Yes'; } },
+    { key: exports.CombinatorTranslationEnum.clearDialogDecline, default: function () { return 'No'; } },
+];
+
 var defaultJsonFormsI18nState = {
     locale: 'en',
     translate: defaultTranslator,
@@ -1489,6 +1530,9 @@ var evaluateCondition = function (data, condition, path, ajv) {
     }
     else if (isSchemaCondition(condition)) {
         var value = resolveData(data, getConditionScope(condition, path));
+        if (condition.failWhenUndefined && value === undefined) {
+            return false;
+        }
         return ajv.validate(condition.schema, value);
     }
     else {
@@ -1882,7 +1926,7 @@ var mapDispatchToArrayControlProps = function (dispatch) { return ({
     removeItems: function (path, toDelete) { return function () {
         dispatch(update(path, function (array) {
             toDelete
-                .sort()
+                .sort(function (a, b) { return a - b; })
                 .reverse()
                 .forEach(function (s) { return array.splice(s, 1); });
             return array;
@@ -1968,8 +2012,10 @@ var mapStateToJsonFormsRendererProps = function (state, ownProps) {
 var controlDefaultProps = __assign(__assign({}, layoutDefaultProps), { errors: [] });
 var mapStateToCombinatorRendererProps = function (state, ownProps, keyword) {
     var _a;
-    var _b = mapStateToControlProps(state, ownProps), data = _b.data, schema = _b.schema, rootSchema = _b.rootSchema, props = __rest(_b, ["data", "schema", "rootSchema"]);
+    var _b = mapStateToControlProps(state, ownProps), data = _b.data, schema = _b.schema, rootSchema = _b.rootSchema, i18nKeyPrefix = _b.i18nKeyPrefix, label = _b.label, props = __rest(_b, ["data", "schema", "rootSchema", "i18nKeyPrefix", "label"]);
     var ajv = state.jsonforms.core.ajv;
+    var t = getTranslator()(state);
+    var translations = getCombinatorTranslations(t, combinatorDefaultTranslations, i18nKeyPrefix, label);
     var structuralKeywords = [
         'required',
         'additionalProperties',
@@ -2002,7 +2048,9 @@ var mapStateToCombinatorRendererProps = function (state, ownProps, keyword) {
     }
     return __assign(__assign({ data: data,
         schema: schema,
-        rootSchema: rootSchema }, props), { indexOfFittingSchema: indexOfFittingSchema, uischemas: getUISchemas(state) });
+        rootSchema: rootSchema }, props), { i18nKeyPrefix: i18nKeyPrefix,
+        label: label,
+        indexOfFittingSchema: indexOfFittingSchema, uischemas: getUISchemas(state), translations: translations });
 };
 var mapStateToAllOfProps = function (state, ownProps) {
     return mapStateToCombinatorRendererProps(state, ownProps, 'allOf');
@@ -2117,23 +2165,15 @@ function (dispatch, ownProps) {
     };
 };
 
-var createLabel = function (subSchema, subSchemaIndex, keyword) {
-    if (subSchema.title) {
-        return subSchema.title;
-    }
-    else {
-        return keyword + '-' + subSchemaIndex;
-    }
-};
 var createCombinatorRenderInfos = function (combinatorSubSchemas, rootSchema, keyword, control, path, uischemas) {
     return combinatorSubSchemas.map(function (subSchema, subSchemaIndex) {
-        var schema = subSchema.$ref
-            ? Resolve.schema(rootSchema, subSchema.$ref, rootSchema)
-            : subSchema;
+        var _a, _b;
+        var resolvedSubSchema = subSchema.$ref && Resolve.schema(rootSchema, subSchema.$ref, rootSchema);
+        var schema = resolvedSubSchema !== null && resolvedSubSchema !== void 0 ? resolvedSubSchema : subSchema;
         return {
             schema: schema,
             uischema: findUISchema(uischemas, schema, control.scope, path, undefined, control, rootSchema),
-            label: createLabel(subSchema, subSchemaIndex, keyword),
+            label: (_b = (_a = subSchema.title) !== null && _a !== void 0 ? _a : resolvedSubSchema === null || resolvedSubSchema === void 0 ? void 0 : resolvedSubSchema.title) !== null && _b !== void 0 ? _b : keyword + "-" + subSchemaIndex,
         };
     });
 };
@@ -2523,6 +2563,7 @@ exports.arrayDefaultTranslations = arrayDefaultTranslations;
 exports.categorizationHasCategory = categorizationHasCategory;
 exports.cellReducer = cellReducer;
 exports.clearAllIds = clearAllIds;
+exports.combinatorDefaultTranslations = combinatorDefaultTranslations;
 exports.compose = compose;
 exports.composePaths = compose;
 exports.composeWithUi = composeWithUi;
@@ -2571,6 +2612,7 @@ exports.generateJsonSchema = generateJsonSchema;
 exports.getAjv = getAjv;
 exports.getArrayTranslations = getArrayTranslations;
 exports.getCells = getCells;
+exports.getCombinatorTranslations = getCombinatorTranslations;
 exports.getCombinedErrorMessage = getCombinedErrorMessage;
 exports.getConfig = getConfig;
 exports.getControlPath = getControlPath;