@luomus/laji-form 15.1.111 → 15.1.113

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

@@ -48,12 +48,11 @@ export default class MultiArrayField extends React.Component<any, any, any> {
     };
     constructor(props: any);
     constructor(props: any, context: any);
-    itemIds: {};
-    render(): any;
+    render(): JSX.Element[];
     cache: {}[] | undefined;
     arrayKeyFunctions: any[] | undefined;
     groupItemIds: {} | {}[] | undefined;
-    groupedItems: any;
+    groupedItems: never[][] | undefined;
     onChange: ((idx: any) => (formData: any) => void) & memoize.Memoized<(idx: any) => (formData: any) => void>;
 }
 import * as React from "react";

package/lib/components/fields/MultiArrayField.js

@@ -47,7 +47,6 @@ const memoizee_1 = __importDefault(require("memoizee"));
 class MultiArrayField extends React.Component {
     constructor() {
         super(...arguments);
-        this.itemIds = {};
         this.onChange = (0, memoizee_1.default)((idx) => (formData) => {
             let offset = 0;
             for (let i = 0; i < idx; i++) {
@@ -114,27 +113,24 @@ class MultiArrayField extends React.Component {
                 this.groupItemIds = getGroupItemIds();
             }
         }
-        const itemGroups = Array(groups.length + 1).fill(undefined).map(_ => []);
-        const addToGroup = (idx, item) => {
+        const groupedItems = Array(groups.length + 1).fill(undefined).map(_ => []);
+        const addToGroup = (groupIdx, item) => {
             const id = (0, utils_1.getUUID)(item);
-            itemGroups[idx].push(item);
-            this.groupItemIds[idx][id] = true;
-            this.itemIds[id] = true;
+            this.groupItemIds[groupIdx][id] = true;
+            groupedItems[groupIdx].push(item);
             return true;
         };
-        (props.formData || []).forEach(item => {
-            this.groupItemIds.forEach((_, groupIdx) => {
-                if (this.groupItemIds[groupIdx][(0, utils_1.getUUID)(item)]) {
-                    addToGroup(groupIdx, item);
-                }
-            });
-        });
         const nonGrouped = [];
-        const groupedItems = (props.formData || []).reduce((itemGroups, item, idx) => {
-            const addedToGroup = groups.some((group, groupIdx) => {
-                if (this.itemIds[(0, utils_1.getUUID)(item)]) {
-                    return true;
+        (props.formData || []).forEach((item, idx) => {
+            const id = (0, utils_1.getUUID)(item);
+            // Restore persisted group
+            for (let g = 0; g < this.groupItemIds.length; g++) {
+                if (this.groupItemIds[g][id]) {
+                    addToGroup(g, item);
+                    return;
                 }
+            }
+            const addedToGroup = groups.some((group, groupIdx) => {
                 const { rules = [] } = group;
                 let passes;
                 if (cache) {
@@ -153,8 +149,7 @@ class MultiArrayField extends React.Component {
             if (!addedToGroup) {
                 nonGrouped.push([item, idx]);
             }
-            return itemGroups;
-        }, itemGroups);
+        });
         nonGrouped.forEach(([item, idx]) => {
             const context = (0, Context_1.default)(`${persistenceKey}_MULTI`);
             const groupIdx = this.groupItemIds.length - 1;

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

@@ -48,5 +48,6 @@ export default class TaxonSetPopulatorField extends React.Component<FieldProps>
     };
     componentDidMount(): Promise<void>;
     onChange: (formData: any) => Promise<void>;
+    private sortByTaxonSet;
     private fetchTaxaFromSet;
 }

package/lib/components/fields/TaxonSetPopulatorField.js

@@ -54,6 +54,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const React = __importStar(require("react"));
 const PropTypes = __importStar(require("prop-types"));
 const VirtualSchemaField_1 = __importDefault(require("../VirtualSchemaField"));
+const utils_1 = require("../..//utils");
 const propsPropType = PropTypes.shape({
     from: PropTypes.string.isRequired,
     fromArrayKey: PropTypes.string,
@@ -99,16 +100,7 @@ let TaxonSetPopulatorField = class TaxonSetPopulatorField extends React.Componen
                         return this.unitTaxonSets[unit.identifications[0].taxonID]
                             && this.unitTaxonSets[unit.identifications[0].taxonID].includes(deletedTaxonSetId);
                     });
-                    observationsExist = deletedTaxonSetUnits.some((unit) => {
-                        var _a, _b, _c, _d;
-                        return unit.maleIndividualCount ||
-                            unit.femaleIndividualCount ||
-                            unit.nestCount ||
-                            ((_a = unit.unitFact) === null || _a === void 0 ? void 0 : _a.destroyedNestCount) ||
-                            ((_b = unit.unitFact) === null || _b === void 0 ? void 0 : _b.broodCount) ||
-                            ((_c = unit.unitFact) === null || _c === void 0 ? void 0 : _c.femalesWithBroodsCount) ||
-                            ((_d = unit.unitFact) === null || _d === void 0 ? void 0 : _d.juvenileCount);
-                    });
+                    observationsExist = deletedTaxonSetUnits.some((unit) => unit.observationStatus !== "MY.observationStatusIgnored");
                     if (observationsExist) {
                         window.alert(translations === null || translations === void 0 ? void 0 : translations.TaxonSetDeletionFailed);
                         const restoredFormData = Object.assign(Object.assign({}, formData), { taxonCensus: [
@@ -126,7 +118,8 @@ let TaxonSetPopulatorField = class TaxonSetPopulatorField extends React.Componen
                         return !this.unitTaxonSets[unit.identifications[0].taxonID]
                             || !this.unitTaxonSets[unit.identifications[0].taxonID].includes(deletedTaxonSetId);
                     });
-                    const updatedFormData = Object.assign(Object.assign({}, formData), { units: updatedUnits });
+                    const sortedUnits = this.sortByTaxonSet(updatedUnits, currentTaxonSets);
+                    const updatedFormData = Object.assign(Object.assign({}, formData), { units: sortedUnits });
                     this.props.onChange(updatedFormData);
                 });
                 return;
@@ -142,32 +135,20 @@ let TaxonSetPopulatorField = class TaxonSetPopulatorField extends React.Componen
                     return;
                 }
                 const results = yield this.fetchTaxaFromSet(this.props, addedTaxonSets);
-                // sort results by taxon set (lowest index of result's taxon sets in addedTaxonSets)
-                if (addedTaxonSets.length > 1) {
-                    results.sort((a, b) => {
-                        const aIndex = (a.taxonSets || []).reduce((min, taxonSet) => {
-                            const idx = addedTaxonSets.indexOf(taxonSet);
-                            return idx !== -1 && idx < min ? idx : min;
-                        }, addedTaxonSets.length);
-                        const bIndex = (b.taxonSets || []).reduce((min, taxonSet) => {
-                            const idx = addedTaxonSets.indexOf(taxonSet);
-                            return idx !== -1 && idx < min ? idx : min;
-                        }, addedTaxonSets.length);
-                        return aIndex - bIndex;
-                    });
-                }
+                const tmpIdTree = this.props.formContext.services.ids.getRelativeTmpIdTree(this.props.idSchema.units.$id);
                 const newUnits = results.map((result) => {
                     this.unitTaxonSets[result.id] = result.taxonSets || [];
-                    return {
+                    return (0, utils_1.addLajiFormIds)({
                         identifications: [{
                                 taxon: result.scientificName,
                                 taxonID: result.id,
                                 taxonVerbatim: result.vernacularName
                             }],
                         informalTaxonGroups: result.informalTaxonGroups || []
-                    };
+                    }, tmpIdTree, false)[0];
                 });
-                const updatedFormData = Object.assign(Object.assign({}, formData), { units: [...currentUnits, ...newUnits] });
+                const sortedUnits = this.sortByTaxonSet([...currentUnits, ...newUnits], currentTaxonSets);
+                const updatedFormData = Object.assign(Object.assign({}, formData), { units: sortedUnits });
                 this.props.onChange(updatedFormData);
                 return;
             }
@@ -204,6 +185,23 @@ let TaxonSetPopulatorField = class TaxonSetPopulatorField extends React.Componen
             });
         });
     }
+    // sort unit by taxon set (lowest index of unit's taxon sets in currentTaxonSets)
+    sortByTaxonSet(units, taxonSets) {
+        return units.sort((a, b) => {
+            var _a, _b, _c, _d;
+            const aTaxonSets = this.unitTaxonSets[(_b = (_a = a.identifications) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.taxonID] || [];
+            const bTaxonSets = this.unitTaxonSets[(_d = (_c = b.identifications) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.taxonID] || [];
+            const aIndex = aTaxonSets.reduce((min, taxonSet) => {
+                const idx = taxonSets.indexOf(taxonSet);
+                return idx !== -1 && idx < min ? idx : min;
+            }, taxonSets.length);
+            const bIndex = bTaxonSets.reduce((min, taxonSet) => {
+                const idx = taxonSets.indexOf(taxonSet);
+                return idx !== -1 && idx < min ? idx : min;
+            }, taxonSets.length);
+            return aIndex - bIndex;
+        });
+    }
     fetchTaxaFromSet(props, taxonSets) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;

package/lib/translations.json

@@ -894,6 +894,11 @@
         "en": "The same value may not be used more than once",
         "sv": "Samma värde får inte användas mer än en gång"
     },
+    "valueMustBe": {
+        "fi": "Arvon on oltava",
+        "en": "Value must be",
+        "sv": "Värdet måste vara"
+    },
     "taxonSetDeletionFailed": {
         "fi": "Tätä lajiryhmää ei voi poistaa, koska siihen on kirjattu havaintoja.",
         "en": "This taxon set cannot be removed because it contains observations.",

package/lib/validation.js

@@ -74,6 +74,9 @@ function transformErrors(translations, errors) {
         else if (error.name === "uniqueItems") {
             error.message = translations.UniqueItems + ".";
         }
+        else if (error.name === "minimum") {
+            error.message = translations.ValueMustBe + " " + error.params.comparison + " " + error.params.limit + ".";
+        }
         return error;
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luomus/laji-form",
-  "version": "15.1.111",
+  "version": "15.1.113",
   "description": "React module capable of building dynamic forms from Laji form json schemas",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -41,7 +41,7 @@
   "license": "MIT",
   "dependencies": {
     "@luomus/laji-map": "^5.1.19",
-    "@luomus/laji-validate": "^0.0.130",
+    "@luomus/laji-validate": "^0.0.132",
     "@rjsf/core": "~5.1.0",
     "@rjsf/utils": "~5.1.0",
     "@rjsf/validator-ajv6": "~5.1.0",