@luomus/laji-form 15.1.120 → 15.1.122

package/lib/components/LajiForm.d.ts

@@ -316,6 +316,7 @@ export default class LajiForm extends React.Component<LajiFormProps, LajiFormSta
         TaxaByYearPopulatorField: typeof fields.TaxaByYearPopulatorField;
         TaxonSetPopulatorField: typeof fields.TaxonSetPopulatorField;
         ScientificNameTaxonAutosuggestField: typeof fields.ScientificNameTaxonAutosuggestField;
+        ArchipelagoURLField: typeof fields.ArchipelagoURLField;
         ArraySchemaField: typeof fields.SchemaField;
         InputTransformerField: typeof fields.ConditionalOnChangeField;
         ConditionalField: typeof fields.ConditionalUiSchemaField;
@@ -488,7 +489,7 @@ export default class LajiForm extends React.Component<LajiFormProps, LajiFormSta
     addEventListener: (target: typeof document | typeof window, name: string, fn: (e: Event) => void) => void;
     setTimeout: (fn: () => void, time?: number) => number;
     destroy: () => void;
-    getSchemaValidationErrors: (formData: any) => any;
+    getSchemaValidationErrors: (formData: any) => ErrorSchema;
     getFormDataReadyForSubmit: (formData: any, schema: JSONSchema) => {
         formData: any;
         removedArrayItemsAndObjects: string[];

package/lib/components/LajiForm.js

@@ -377,7 +377,7 @@ class LajiForm extends React.Component {
             ignoreErrorPaths.forEach(path => {
                 schemaErrors = (0, utils_1.immutableDelete)(schemaErrors, path);
             });
-            return schemaErrors;
+            return removeEmptyErrorObjects(schemaErrors);
         };
         this.getFormDataReadyForSubmit = (formData, schema) => {
             formData = this.memoizedFormContext.services.ids.removeLajiFormIds(formData);
@@ -597,6 +597,21 @@ const removeEmptyValuesAndTrim = (formData, schema) => {
         return formData;
     }
 };
+const removeEmptyErrorObjects = (errors) => {
+    const result = {};
+    for (const key of Object.keys(errors)) {
+        if (key === "__errors") {
+            result[key] = errors[key];
+        }
+        else if (errors[key]) {
+            const cleanedValue = removeEmptyErrorObjects(errors[key]);
+            if (Object.keys(cleanedValue).length > 0) {
+                result[key] = cleanedValue;
+            }
+        }
+    }
+    return Object.keys(result).length === 0 ? {} : result;
+};
 const getShortcuts = (uiSchema) => {
     var _a, _b;
     if ((_b = (_a = window.navigator) === null || _a === void 0 ? void 0 : _a.platform) === null || _b === void 0 ? void 0 : _b.includes("Mac")) {

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

@@ -0,0 +1,20 @@
+import * as React from "react";
+import * as PropTypes from "prop-types";
+import { FieldProps } from "../../types";
+export default class ArchipelagoURLField extends React.Component<FieldProps> {
+    static propTypes: {
+        uiSchema: PropTypes.Validator<NonNullable<PropTypes.InferProps<{
+            "ui:options": PropTypes.Requireable<PropTypes.InferProps<{
+                baseURL: PropTypes.Requireable<string>;
+            }>>;
+            uiSchema: PropTypes.Requireable<object>;
+        }>>>;
+        schema: PropTypes.Requireable<PropTypes.InferProps<{
+            type: PropTypes.Requireable<string>;
+        }>>;
+        formData: PropTypes.Validator<object>;
+    };
+    constructor(props: FieldProps);
+    static getName(): string;
+    render(): JSX.Element;
+}

package/lib/components/fields/ArchipelagoURLField.js

@@ -0,0 +1,87 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+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");
+let ArchipelagoURLField = class ArchipelagoURLField extends React.Component {
+    constructor(props) {
+        super(props);
+    }
+    static getName() { return "ArchipelagoURLField"; }
+    render() {
+        var _a, _b, _c;
+        const { baseURL } = (0, utils_1.getUiOptions)(this.props.uiSchema);
+        const { translations } = this.props.formContext;
+        const SchemaField = this.props.registry.fields.SchemaField;
+        const dateBegin = (_b = (_a = this.props.formData) === null || _a === void 0 ? void 0 : _a.gatheringEvent) === null || _b === void 0 ? void 0 : _b.dateBegin;
+        const year = Number(dateBegin === null || dateBegin === void 0 ? void 0 : dateBegin.split("-")[0]) || undefined;
+        const namedPlace = (_c = this.props.formData) === null || _c === void 0 ? void 0 : _c.namedPlaceID;
+        const url = baseURL + `/project/MHL.1166/stats?tab=statistics&year=${year}&namedPlace=${namedPlace}`;
+        return (React.createElement(React.Fragment, null,
+            React.createElement("div", { style: { margin: 10 } },
+                React.createElement("b", null, translations.ResultsLink),
+                React.createElement("br", null),
+                React.createElement("a", { href: url, target: "_blank" }, url)),
+            React.createElement(SchemaField, Object.assign({}, this.props, { uiSchema: (0, utils_1.getInnerUiSchema)(this.props.uiSchema) }))));
+    }
+};
+ArchipelagoURLField.propTypes = {
+    uiSchema: PropTypes.shape({
+        "ui:options": PropTypes.shape({
+            baseURL: PropTypes.string
+        }),
+        uiSchema: PropTypes.object
+    }).isRequired,
+    schema: PropTypes.shape({
+        type: PropTypes.oneOf(["string"])
+    }),
+    formData: PropTypes.oneOfType([PropTypes.array, PropTypes.object]).isRequired
+};
+ArchipelagoURLField = __decorate([
+    VirtualSchemaField_1.default
+], ArchipelagoURLField);
+exports.default = ArchipelagoURLField;
+;

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

@@ -70,6 +70,7 @@ export { default as FillDateRangeField } from "./FillDateRangeField";
 export { default as TaxaByYearPopulatorField } from "./TaxaByYearPopulatorField";
 export { default as TaxonSetPopulatorField } from "./TaxonSetPopulatorField";
 export { default as ScientificNameTaxonAutosuggestField } from "./ScientificNameTaxonAutosuggestField";
+export { default as ArchipelagoURLField } from "./ArchipelagoURLField";
 export { default as ArraySchemaField } from "./SchemaField";
 export { default as InputTransformerField } from "./ConditionalOnChangeField";
 export { default as ConditionalField } from "./ConditionalUiSchemaField";

package/lib/components/fields/index.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FakePropertyField = exports.ImageDisplayField = exports.LocalityField = exports.DataLeakerField = exports.LocationChooserField = exports.UnitListShorthandArrayField = exports.EnumRangeArrayField = exports.AnyToBooleanField = exports.PrefillingArrayField = exports.AnnotationField = exports.ConditionalUiSchemaField = exports.ConditionalOnChangeField = exports.StringToArrayField = exports.TagArrayField = exports.GeocoderField = exports.MapField = exports.NamedPlaceSaverField = exports.NamedPlaceChooserField = exports.SumField = exports.ExtraLabelRowField = exports.UiFieldMapperArrayField = exports.CombinedValueDisplayField = exports.UnitShorthandField = exports.SingleItemArrayField = exports.SingleActiveArrayField = exports.FlatField = exports.SplitField = exports.ImageArrayField = exports.ContextInjectionField = exports.InitiallyHiddenField = exports.HiddenWithTextField = exports.HiddenField = exports.AutosuggestField = exports.AutoArrayField = exports.MapArrayField = exports.DependentDisableField = exports.DependentBooleanField = exports.ArrayCombinerField = exports.InjectDefaultValueField = exports.InjectField = exports.TableField = exports.GridLayoutField = exports.SelectTreeField = exports.ScopeField = exports.ArrayPropertyCountField = exports.ArrayPropertySumField = exports.NestField = exports.ObjectField = exports.ArrayField = exports.SchemaField = void 0;
-exports.AccordionArrayField = exports.UnitRapidField = exports.ConditionalField = exports.InputTransformerField = exports.ArraySchemaField = exports.ScientificNameTaxonAutosuggestField = exports.TaxonSetPopulatorField = exports.TaxaByYearPopulatorField = exports.FillDateRangeField = exports.PrefixArrayField = exports.MultiActiveArrayField = exports.CondensedObjectField = exports.AsArrayField = exports.PdfArrayField = exports.MultiTagArrayField = exports.InputWithDefaultValueButtonField = exports.SortArrayField = exports.MultiLanguageField = exports.UiFieldApplierField = exports.DefaultValueArrayField = exports.ToggleAdditionalArrayFieldsField = exports.UnitCountShorthandField = exports.MultiAnyToBooleanField = exports.FilterArrayField = exports.AudioArrayField = exports.MultiArrayField = exports.SectionArrayField = void 0;
+exports.AccordionArrayField = exports.UnitRapidField = exports.ConditionalField = exports.InputTransformerField = exports.ArraySchemaField = exports.ArchipelagoURLField = exports.ScientificNameTaxonAutosuggestField = exports.TaxonSetPopulatorField = exports.TaxaByYearPopulatorField = exports.FillDateRangeField = exports.PrefixArrayField = exports.MultiActiveArrayField = exports.CondensedObjectField = exports.AsArrayField = exports.PdfArrayField = exports.MultiTagArrayField = exports.InputWithDefaultValueButtonField = exports.SortArrayField = exports.MultiLanguageField = exports.UiFieldApplierField = exports.DefaultValueArrayField = exports.ToggleAdditionalArrayFieldsField = exports.UnitCountShorthandField = exports.MultiAnyToBooleanField = exports.FilterArrayField = exports.AudioArrayField = exports.MultiArrayField = exports.SectionArrayField = void 0;
 var SchemaField_1 = require("./SchemaField");
 Object.defineProperty(exports, "SchemaField", { enumerable: true, get: function () { return __importDefault(SchemaField_1).default; } });
 var ArrayField_1 = require("./ArrayField");
@@ -149,6 +149,8 @@ var TaxonSetPopulatorField_1 = require("./TaxonSetPopulatorField");
 Object.defineProperty(exports, "TaxonSetPopulatorField", { enumerable: true, get: function () { return __importDefault(TaxonSetPopulatorField_1).default; } });
 var ScientificNameTaxonAutosuggestField_1 = require("./ScientificNameTaxonAutosuggestField");
 Object.defineProperty(exports, "ScientificNameTaxonAutosuggestField", { enumerable: true, get: function () { return __importDefault(ScientificNameTaxonAutosuggestField_1).default; } });
+var ArchipelagoURLField_1 = require("./ArchipelagoURLField");
+Object.defineProperty(exports, "ArchipelagoURLField", { enumerable: true, get: function () { return __importDefault(ArchipelagoURLField_1).default; } });
 // ---- Aliases for backward compatibility ----
 var SchemaField_2 = require("./SchemaField");
 Object.defineProperty(exports, "ArraySchemaField", { enumerable: true, get: function () { return __importDefault(SchemaField_2).default; } });

package/lib/translations.json

@@ -918,5 +918,10 @@
         "fi": "Kiinnitä ylös",
         "en": "Pin to top",
         "sv": "Fäst överst"
+    },
+    "resultsLink": {
+        "fi": "Linkki tulospalveluun",
+        "en": "Link to result service",
+        "sv": "Länk till resultat"
     }
 }

package/package.json

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

package/test-export/test-utils.d.ts

@@ -268,4 +268,5 @@ export declare const maybeJSONPointerToLocator: (pointer: string) => string;
 /** Fills value into given input and presses tab to unfocus it. Useful for inputs with debounce */
 export declare const updateValue: ($input: Locator, value: string) => Promise<void>;
 export declare const getRemoveUnit: (page: Page) => (gatheringIdx: number, unitIdx: number) => Promise<void>;
+export declare const getRemoveIdentification: (page: Page) => (gatheringIdx: number, unitIdx: number, identificationIdx: number) => Promise<void>;
 export {};

package/test-export/test-utils.js

@@ -53,7 +53,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRemoveUnit = exports.updateValue = exports.maybeJSONPointerToLocator = exports.filterUUIDs = exports.mockImageMetadata = exports.DemoPageForm = exports.Form = exports.getFocusedId = exports.getFocusedElement = exports.lajiFormLocate = exports.lajiFormLocator = exports.navigateToForm = exports.emptyForm = void 0;
+exports.getRemoveIdentification = exports.getRemoveUnit = exports.updateValue = exports.maybeJSONPointerToLocator = exports.filterUUIDs = exports.mockImageMetadata = exports.DemoPageForm = exports.Form = exports.getFocusedId = exports.getFocusedElement = exports.lajiFormLocate = exports.lajiFormLocator = exports.navigateToForm = exports.emptyForm = void 0;
 exports.createForm = createForm;
 const path = __importStar(require("path"));
 const test_utils_1 = require("@luomus/laji-map/test-export/test-utils");
@@ -415,3 +415,8 @@ const getRemoveUnit = (page) => (gatheringIdx, unitIdx) => __awaiter(void 0, voi
     return page.locator(`#root_gatherings_${gatheringIdx}_units_${unitIdx}-delete-confirm-yes`).click();
 });
 exports.getRemoveUnit = getRemoveUnit;
+const getRemoveIdentification = (page) => (gatheringIdx, unitIdx, identificationIdx) => __awaiter(void 0, void 0, void 0, function* () {
+    yield page.locator(`#root_gatherings_${gatheringIdx}_units_${unitIdx}_identifications_${identificationIdx}-delete`).click();
+    return page.locator(`#root_gatherings_${gatheringIdx}_units_${unitIdx}_identifications_${identificationIdx}-delete-confirm-yes`).click();
+});
+exports.getRemoveIdentification = getRemoveIdentification;