@formio/js 5.0.0-rc.37 → 5.0.0-rc.38

package/lib/mjs/utils/conditionOperators/IsEqualTo.js

@@ -1,5 +1,6 @@
 import ConditionOperator from './ConditionOperator';
 import _ from 'lodash';
+import { getItemTemplateKeys, isSelectResourceWithObjectValue } from '../utils';
 export default class IsEqualTo extends ConditionOperator {
     static get operatorKey() {
         return 'isEqual';
@@ -7,7 +8,7 @@ export default class IsEqualTo extends ConditionOperator {
     static get displayedName() {
         return 'Is Equal To';
     }
-    execute({ value, comparedValue }) {
+    execute({ value, comparedValue, instance, conditionComponentPath }) {
         if (value && comparedValue && typeof value !== typeof comparedValue && _.isString(comparedValue)) {
             try {
                 comparedValue = JSON.parse(comparedValue);
@@ -15,6 +16,22 @@ export default class IsEqualTo extends ConditionOperator {
             // eslint-disable-next-line no-empty
             catch (e) { }
         }
+        if (instance && instance.root) {
+            const conditionTriggerComponent = instance.root.getComponent(conditionComponentPath);
+            if (conditionTriggerComponent
+                && isSelectResourceWithObjectValue(conditionTriggerComponent.component)
+                && conditionTriggerComponent.component?.template) {
+                if (!value || !_.isPlainObject(value)) {
+                    return false;
+                }
+                const { template, valueProperty } = conditionTriggerComponent.component;
+                if (valueProperty === 'data') {
+                    value = { data: value };
+                    comparedValue = { data: comparedValue };
+                }
+                return _.every(getItemTemplateKeys(template) || [], k => _.isEqual(_.get(value, k), _.get(comparedValue, k)));
+            }
+        }
         //special check for select boxes
         if (_.isObject(value) && comparedValue && _.isString(comparedValue)) {
             return value[comparedValue];

package/lib/mjs/utils/conditionOperators/IsNotEqualTo.js

@@ -1,13 +1,12 @@
-import ConditionOperator from './ConditionOperator';
-import _ from 'lodash';
-export default class IsNotEqualTo extends ConditionOperator {
+import IsEqualTo from './IsEqualTo';
+export default class IsNotEqualTo extends IsEqualTo {
     static get operatorKey() {
         return 'isNotEqual';
     }
     static get displayedName() {
         return 'Is Not Equal To';
     }
-    execute({ value, comparedValue }) {
-        return !_.isEqual(value, comparedValue);
+    execute(options) {
+        return !super.execute(options);
     }
 }

package/lib/mjs/utils/utils.js

@@ -394,6 +394,21 @@ export function unescapeHTML(str) {
     const doc = new window.DOMParser().parseFromString(str, 'text/html');
     return doc.documentElement.textContent;
 }
+/**
+ * Escape HTML characters like <, >, & and etc.
+ * @param str
+ * @returns {string}
+ */
+export function escapeHTML(html) {
+    if (html) {
+        return html.replace(/&/g, '&amp;')
+            .replace(/</g, '&lt;')
+            .replace(/>/g, '&gt;')
+            .replace(/"/g, '&quot;')
+            .replace(/'/g, '&#39;');
+    }
+    return '';
+}
 /**
  * Make HTML element from string
  * @param str
@@ -1407,3 +1422,23 @@ export const interpolateErrors = (component, errors, interpolateFn) => {
         return { ...error, message: unescapeHTML(interpolateFn(toInterpolate, context)), context: { ...context } };
     });
 };
+export function getItemTemplateKeys(template) {
+    const templateKeys = [];
+    if (!template) {
+        return templateKeys;
+    }
+    const keys = template.match(/({{\s*(.*?)\s*}})/g);
+    if (keys) {
+        keys.forEach((key) => {
+            const propKey = key.match(/{{\s*item\.(.*?)\s*}}/);
+            if (propKey && propKey.length > 1) {
+                templateKeys.push(propKey[1]);
+            }
+        });
+    }
+    return templateKeys;
+}
+export function isSelectResourceWithObjectValue(comp = {}) {
+    const { reference, dataSrc, valueProperty } = comp;
+    return reference || (dataSrc === 'resource' && (!valueProperty || valueProperty === 'data'));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-rc.37",
+  "version": "5.0.0-rc.38",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {
@@ -86,7 +86,7 @@
   "dependencies": {
     "@formio/bootstrap": "^3.0.0-rc.20",
     "@formio/choices.js": "^10.2.0",
-    "@formio/core": "^2.0.0-rc.2",
+    "@formio/core": "^2.0.0-rc.6",
     "@formio/text-mask-addons": "^3.8.0-formio.2",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",

package/types/formio.d.ts

@@ -159,6 +159,10 @@ export declare class Formio {
      * Stores all of the libraries lazy loaded with ```Formio.requireLibrary``` method.
      */
     static libraries: any;
+    /**
+     * The Library license for this application.
+     */
+    static license: string;
     /**
      * A direct interface to the Form.io fetch polyfill.
      */