@luomus/laji-form 15.1.17 → 15.1.19

package/lib/components/fields/AudioArrayField.js

@@ -12,13 +12,13 @@ const ImageArrayField_1 = require("./ImageArrayField");
 const Spinner = require("react-spinner");
 const components_1 = require("../components");
 const ReactContext_1 = require("../../ReactContext");
-const FILE_TYPES = ["audio/mp3", "audio/mpeg", "audio/x-wav", "audio/wav", "audio/wave", "audio/vnd.wave"];
+const FILE_TYPES = ["audio/mp3", "audio/mpeg", "audio/x-wav", "audio/wav", "audio/wave", "audio/vnd.wave", "audio/flac"];
 let AudioArrayField = class AudioArrayField extends React.Component {
     constructor() {
         super(...arguments);
         this.ALLOWED_FILE_TYPES = FILE_TYPES;
         this.ACCEPT_FILE_TYPES = ["audio/*"];
-        this.MAX_FILE_SIZE = 20000000;
+        this.MAX_FILE_SIZE = 100000000;
         this.KEY = "AUDIO";
         this.ENDPOINT = "audio";
         this.GLYPH = "headphones";
@@ -81,10 +81,12 @@ const AudioButton = React.forwardRef((props, ref) => {
 const LajiAudio = React.forwardRef((props, ref) => {
     const [mp3Url, setMp3Url] = useState(null);
     const [wavUrl, setWavUrl] = useState(null);
+    const [flacUrl, setFlacUrl] = useState(null);
     useEffect(() => {
         props.apiClient.fetchCached(`/audio/${props.id}`, undefined, { failSilently: true }).then(response => {
             setMp3Url(response.mp3URL);
             setWavUrl(response.wavURL);
+            setFlacUrl(response.flacURL);
             props.onLoaded && props.onLoaded(true);
         });
     });
@@ -96,5 +98,9 @@ const LajiAudio = React.forwardRef((props, ref) => {
             wavUrl &&
                 React.createElement(React.Fragment, null,
                     " | ",
-                    React.createElement("a", { href: wavUrl, download: true }, `${props.translations.Download} wav`))))));
+                    React.createElement("a", { href: wavUrl, download: true }, `${props.translations.Download} wav`)),
+            flacUrl &&
+                React.createElement(React.Fragment, null,
+                    " | ",
+                    React.createElement("a", { href: flacUrl, download: true }, `${props.translations.Download} flac`))))));
 });

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luomus/laji-form",
-  "version": "15.1.17",
+  "version": "15.1.19",
   "description": "React module capable of building dynamic forms from Laji form json schemas",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",