@jsonforms/core 3.1.0 → 3.2.0-alpha.0

package/lib/jsonforms-core.esm.js

@@ -4,6 +4,7 @@ import keys from 'lodash/keys';
 import merge from 'lodash/merge';
 import cloneDeep from 'lodash/cloneDeep';
 import setFp from 'lodash/fp/set';
+import unsetFp from 'lodash/fp/unset';
 import get from 'lodash/get';
 import filter from 'lodash/filter';
 import isEqual from 'lodash/isEqual';
@@ -529,7 +530,13 @@ const coreReducer = (state = initState, action) => {
             else {
                 const oldData = get(state.data, action.path);
                 const newData = action.updater(cloneDeep(oldData));
-                const newState = setFp(action.path, newData, state.data === undefined ? {} : state.data);
+                let newState;
+                if (newData !== undefined) {
+                    newState = setFp(action.path, newData, state.data === undefined ? {} : state.data);
+                }
+                else {
+                    newState = unsetFp(action.path, state.data === undefined ? {} : state.data);
+                }
                 const errors = validate(state.validator, newState);
                 return {
                     ...state,
@@ -740,6 +747,14 @@ const getArrayTranslations = (t, defaultTranslations, i18nKeyPrefix, label) => {
     });
     return translations;
 };
+const getCombinatorTranslations = (t, defaultTranslations, i18nKeyPrefix, label) => {
+    const translations = {};
+    defaultTranslations.forEach((controlElement) => {
+        const key = addI18nKeyToPrefix(i18nKeyPrefix, controlElement.key);
+        translations[controlElement.key] = t(key, controlElement.default(label));
+    });
+    return translations;
+};
 
 var ArrayTranslationEnum;
 (function (ArrayTranslationEnum) {
@@ -787,6 +802,26 @@ const arrayDefaultTranslations = [
     { key: ArrayTranslationEnum.deleteDialogDecline, default: () => 'No' },
 ];
 
+var CombinatorTranslationEnum;
+(function (CombinatorTranslationEnum) {
+    CombinatorTranslationEnum["clearDialogTitle"] = "clearDialogTitle";
+    CombinatorTranslationEnum["clearDialogMessage"] = "clearDialogMessage";
+    CombinatorTranslationEnum["clearDialogAccept"] = "clearDialogAccept";
+    CombinatorTranslationEnum["clearDialogDecline"] = "clearDialogDecline";
+})(CombinatorTranslationEnum || (CombinatorTranslationEnum = {}));
+const combinatorDefaultTranslations = [
+    {
+        key: CombinatorTranslationEnum.clearDialogTitle,
+        default: () => 'Clear form?',
+    },
+    {
+        key: CombinatorTranslationEnum.clearDialogMessage,
+        default: () => 'Your data will be cleared. Do you want to proceed?',
+    },
+    { key: CombinatorTranslationEnum.clearDialogAccept, default: () => 'Yes' },
+    { key: CombinatorTranslationEnum.clearDialogDecline, default: () => 'No' },
+];
+
 const defaultJsonFormsI18nState = {
     locale: 'en',
     translate: defaultTranslator,
@@ -1315,6 +1350,9 @@ const evaluateCondition = (data, condition, path, ajv) => {
     }
     else if (isSchemaCondition(condition)) {
         const value = resolveData(data, getConditionScope(condition, path));
+        if (condition.failWhenUndefined && value === undefined) {
+            return false;
+        }
         return ajv.validate(condition.schema, value);
     }
     else {
@@ -1709,7 +1747,7 @@ const mapDispatchToArrayControlProps = (dispatch) => ({
     removeItems: (path, toDelete) => () => {
         dispatch(update(path, (array) => {
             toDelete
-                .sort()
+                .sort((a, b) => a - b)
                 .reverse()
                 .forEach((s) => array.splice(s, 1));
             return array;
@@ -1807,8 +1845,10 @@ const controlDefaultProps = {
     errors: [],
 };
 const mapStateToCombinatorRendererProps = (state, ownProps, keyword) => {
-    const { data, schema, rootSchema, ...props } = mapStateToControlProps(state, ownProps);
+    const { data, schema, rootSchema, i18nKeyPrefix, label, ...props } = mapStateToControlProps(state, ownProps);
     const ajv = state.jsonforms.core.ajv;
+    const t = getTranslator()(state);
+    const translations = getCombinatorTranslations(t, combinatorDefaultTranslations, i18nKeyPrefix, label);
     const structuralKeywords = [
         'required',
         'additionalProperties',
@@ -1844,8 +1884,11 @@ const mapStateToCombinatorRendererProps = (state, ownProps, keyword) => {
         schema,
         rootSchema,
         ...props,
+        i18nKeyPrefix,
+        label,
         indexOfFittingSchema,
         uischemas: getUISchemas(state),
+        translations,
     };
 };
 const mapStateToAllOfProps = (state, ownProps) => mapStateToCombinatorRendererProps(state, ownProps, 'allOf');
@@ -1971,22 +2014,15 @@ const defaultMapDispatchToControlProps =
     };
 };
 
-const createLabel = (subSchema, subSchemaIndex, keyword) => {
-    if (subSchema.title) {
-        return subSchema.title;
-    }
-    else {
-        return keyword + '-' + subSchemaIndex;
-    }
-};
 const createCombinatorRenderInfos = (combinatorSubSchemas, rootSchema, keyword, control, path, uischemas) => combinatorSubSchemas.map((subSchema, subSchemaIndex) => {
-    const schema = subSchema.$ref
-        ? Resolve.schema(rootSchema, subSchema.$ref, rootSchema)
-        : subSchema;
+    const resolvedSubSchema = subSchema.$ref && Resolve.schema(rootSchema, subSchema.$ref, rootSchema);
+    const schema = resolvedSubSchema ?? subSchema;
     return {
         schema,
         uischema: findUISchema(uischemas, schema, control.scope, path, undefined, control, rootSchema),
-        label: createLabel(subSchema, subSchemaIndex, keyword),
+        label: subSchema.title ??
+            resolvedSubSchema?.title ??
+            `${keyword}-${subSchemaIndex}`,
     };
 });
 
@@ -2330,5 +2366,5 @@ const Helpers = {
     convertToValidClassName,
 };
 
-export { ADD_CELL, ADD_DEFAULT_DATA, ADD_RENDERER, ADD_UI_SCHEMA, index as Actions, ArrayTranslationEnum, 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, compose, compose as composePaths, composeWithUi, computeLabel, configReducer, controlDefaultProps, convertToValidClassName, coreReducer, createAjv, createCleanLabel, createCombinatorRenderInfos, createControlElement, createDefaultValue, createId, createLabelDescriptionFrom, decode, defaultDataReducer, defaultErrorTranslator, defaultJsonFormsI18nState, defaultMapDispatchToControlProps, defaultMapStateToEnumCellProps, defaultTranslator, deriveLabelForUISchemaElement, deriveTypes, encode, enumToEnumOptionMapper, errorAt, errorsAt, evalEnablement, evalVisibility, extractAjv, extractData, extractDefaultData, extractSchema, extractUiSchema, fetchErrorTranslator, fetchLocale, fetchTranslator, findAllRefs, findMatchingUISchema, findUISchema, formatErrorMessage, formatIs, generateDefaultUISchema, generateJsonSchema, getAjv, getArrayTranslations, getCells, getCombinedErrorMessage, getConfig, getControlPath, getData, getDefaultData, getErrorAt, getErrorTranslator, getFirstPrimitiveProp, getI18nKey, getI18nKeyPrefix, getI18nKeyPrefixBySchema, getLocale, getRenderers, getSchema, getSubErrorsAt, getTranslator, getUISchemas, getUiSchema, hasCategory, hasEnableRule, 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, computeLabel, configReducer, controlDefaultProps, convertToValidClassName, coreReducer, createAjv, createCleanLabel, createCombinatorRenderInfos, createControlElement, createDefaultValue, createId, createLabelDescriptionFrom, decode, defaultDataReducer, defaultErrorTranslator, defaultJsonFormsI18nState, defaultMapDispatchToControlProps, defaultMapStateToEnumCellProps, defaultTranslator, deriveLabelForUISchemaElement, deriveTypes, encode, enumToEnumOptionMapper, errorAt, errorsAt, evalEnablement, evalVisibility, extractAjv, extractData, extractDefaultData, 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, 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 };
 //# sourceMappingURL=jsonforms-core.esm.js.map