@luomus/laji-form 15.1.16 → 15.1.18

package/lib/components/fields/CombinedValueDisplayField.d.ts

@@ -5,6 +5,7 @@ export default class CombinedValueDisplayField extends React.Component<any, any,
                 combined: PropTypes.Requireable<PropTypes.InferProps<{
                     firstField: PropTypes.Validator<string>;
                     secondField: PropTypes.Validator<string>;
+                    additionalFields: PropTypes.Requireable<(string | null | undefined)[]>;
                     name: PropTypes.Requireable<string>;
                     title: PropTypes.Requireable<string>;
                     combineType: PropTypes.Requireable<string>;
@@ -12,6 +13,7 @@ export default class CombinedValueDisplayField extends React.Component<any, any,
                 }> | (PropTypes.InferProps<{
                     firstField: PropTypes.Validator<string>;
                     secondField: PropTypes.Validator<string>;
+                    additionalFields: PropTypes.Requireable<(string | null | undefined)[]>;
                     name: PropTypes.Requireable<string>;
                     title: PropTypes.Requireable<string>;
                     combineType: PropTypes.Requireable<string>;
@@ -34,7 +36,9 @@ export default class CombinedValueDisplayField extends React.Component<any, any,
         formData: any;
         onChange: (formData: any) => void;
     };
+    getFieldValue: (formData: any, field: any) => any;
     toMinutes: (time: any) => number;
+    getCount: (value: any) => number;
     onChange: (formData: any) => void;
 }
 import * as React from "react";

package/lib/components/fields/CombinedValueDisplayField.js

@@ -11,14 +11,16 @@ const PropTypes = require("prop-types");
 const utils_1 = require("../../utils");
 const VirtualSchemaField_1 = require("../VirtualSchemaField");
 /**
- * Combines values of two fields into one value which can be used for displaying (editing that value doesn't change formData)
+ * Combines values of two (or more) fields into one value which can be used for displaying (editing that value doesn't change formData)
  * Combine types:
  * timeDifference: combines the values by calculating their time difference
+ * totalCount: combines the values by summing their counts together. if the value is an array the count is its length and if it is a number the count is the value
  * stringJoin (default): combines the values by joining them. delimiter is added between if given
  */
 const combinedPropType = PropTypes.shape({
     firstField: PropTypes.string.isRequired,
     secondField: PropTypes.string.isRequired,
+    additionalFields: PropTypes.arrayOf(PropTypes.string),
     name: PropTypes.string,
     title: PropTypes.string,
     combineType: PropTypes.string,
@@ -27,10 +29,16 @@ const combinedPropType = PropTypes.shape({
 let CombinedValueDisplayField = class CombinedValueDisplayField extends React.Component {
     constructor() {
         super(...arguments);
+        this.getFieldValue = (formData, field) => {
+            return field[0] === "/" ? utils_1.parseJSONPointer(formData, field, !!"safely") : formData[field];
+        };
         this.toMinutes = (time) => {
             const parts = time.split(":");
             return Number(parts[0]) * 60 + Number(parts[1]);
         };
+        this.getCount = (value) => {
+            return Array.isArray(value) ? value.length : (typeof value === "number" ? value : 0);
+        };
         this.onChange = (formData) => {
             const uiOptions = this.getUiOptions();
             const combined = Array.isArray(uiOptions.combined) ? uiOptions.combined : [uiOptions.combined];
@@ -49,12 +57,14 @@ let CombinedValueDisplayField = class CombinedValueDisplayField extends React.Co
         let { schema, idSchema, formData } = props;
         const combined = Array.isArray(uiOptions.combined) ? uiOptions.combined : [uiOptions.combined];
         combined.forEach(options => {
-            const { name, title, combineType, firstField, secondField } = options;
+            const { name, title, combineType, firstField, secondField, additionalFields = [] } = options;
             schema = Object.assign(Object.assign({}, schema), { properties: Object.assign(Object.assign({}, schema.properties), { [name || ""]: { title: title || "", type: "string" } }) });
             idSchema = this.props.registry.schemaUtils.toIdSchema(schema, idSchema.$id);
             let value = undefined;
-            const firstValue = firstField[0] === "/" ? utils_1.parseJSONPointer(formData, firstField, !!"safely") : formData[firstField];
-            const secondValue = secondField[0] === "/" ? utils_1.parseJSONPointer(formData, secondField, !!"safely") : formData[secondField];
+            const firstValue = this.getFieldValue(formData, firstField);
+            const secondValue = this.getFieldValue(formData, secondField);
+            const additionalValues = additionalFields.map(field => this.getFieldValue(formData, field));
+            const allValues = [firstValue, secondValue].concat(additionalValues);
             if (combineType === "timeDifference") {
                 if (firstValue && secondValue) {
                     const difference = this.toMinutes(secondValue) - this.toMinutes(formData[firstField]);
@@ -65,13 +75,17 @@ let CombinedValueDisplayField = class CombinedValueDisplayField extends React.Co
                     }
                 }
             }
+            else if (combineType === "totalCount") {
+                value = allValues.reduce((result, current) => result + this.getCount(current), 0);
+            }
             else {
                 const delimiter = options.delimiter || "";
-                value = [];
-                if (firstValue)
-                    value.push(firstValue);
-                if (secondValue)
-                    value.push(secondValue);
+                value = allValues.reduce((result, current) => {
+                    if (current) {
+                        result.push(current);
+                    }
+                    return result;
+                }, []);
                 value = value.join(delimiter);
             }
             formData = Object.assign(Object.assign({}, formData), { [name]: value });

package/lib/components/fields/ScopeField.js

@@ -303,7 +303,7 @@ class ScopeField extends React.Component {
             }, this.state.additionalFields);
             if (this._globals) {
                 const additionalsPersistenceVal = this.getAdditionalPersistenceValue(this.props, !"don't include undefined");
-                let globalsEntry = this._globals || {};
+                let globalsEntry = this._globals ? Object.assign({}, this._globals) : {};
                 if (additionalsPersistenceField) {
                     let additionalsKeys = this.props.schema.properties[additionalsPersistenceField].type === "array"
                         ? additionalsPersistenceVal

package/package.json

@@ -1,9 +1,16 @@
 {
   "name": "@luomus/laji-form",
-  "version": "15.1.16",
+  "version": "15.1.18",
   "description": "React module capable of building dynamic forms from Laji form json schemas",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
+  "files": [
+    "lib",
+    "dist",
+    "test-export",
+    "README.md",
+    "CHANGELOG.md"
+  ],
   "scripts": {
     "start": "npx webpack serve",
     "staging": "webpack-dev-server --content-base playground playground/app.js --host 0.0.0.0 --port 4010",

package/protractor.conf.js

@@ -1,59 +0,0 @@
-// Firefox isn't run default since it has a bug with mousemove (See https://github.com/angular/protractor/issues/4715 )
-
-const [width, height] = [800, 1000];
-const common = {
-	shardTestFiles: parseInt(process.env.THREADS) !== 1,
-	maxInstances: process.env.THREADS ? parseInt(process.env.THREADS) :  4
-};
-const chrome = {
-	...common,
-	browserName: "chrome",
-	chromeOptions: {
-		args: ["--headless", "--disable-gpu", `window-size=${width}x${height}`, "--no-sandbox", "--disable-dev-shm-usage"]
-	},
-};
-
-const firefox = {
-	...common,
-	browserName: "firefox",
-	"firefoxOptions": {
-		args: ["--headless", `--width=${width}', '--height=${height}`]
-	},
-	"moz:firefoxOptions": {
-		args: ["--headless", `--width=${width}', '--height=${height}`]
-	}
-};
-
-let multiCapabilities = [chrome];
-if (process.env.TEST_BROWSER === "firefox") {
-	multiCapabilities = [firefox];
-} else if (process.env.TEST_BROWSER === "multi") {
-	multiCapabilities = [chrome, firefox];
-}
-if (process.env.HEADLESS && process.env.HEADLESS !== "true") multiCapabilities.forEach(capabilities => {
-	const options = [capabilities["chromeOptions"], capabilities["firefoxOptions"], capabilities["moz:firefoxOptions"]];
-	options.filter(o => o).forEach(_options => {
-		_options.args = _options.args.filter(a => a !== "--headless");
-	});
-});
-
-exports.config = {
-	specs: ["test/*-spec.ts"],
-	multiCapabilities,
-	maxSessions: 4,
-	SELENIUM_PROMISE_MANAGER: false,
-	onPrepare: async () => {
-		require("ts-node").register({
-			project: require("path").join(__dirname, "./tsconfig.json")
-		});
-
-		browser.waitForAngularEnabled(false);
-
-		// Set manually since Firefox cli size options don't work.
-		await browser.driver.manage().window().setSize(width, height);
-	},
-	plugins: multiCapabilities.length === 1 && multiCapabilities[0] === chrome && [{
-		package: "protractor-console-plugin",
-		exclude: [/Uncaught \(in promise\)/]
-	}]
-};

package/test.Dockerfile

@@ -1,11 +0,0 @@
-FROM mcr.microsoft.com/playwright:v1.40.1
-
-WORKDIR /app
-
-# Copy application files (see .dockerignore for what's excluded)
-COPY . .
-
-# Install dependencies
-RUN npm ci
-
-ENTRYPOINT ["npx", "playwright", "test"]