@luomus/laji-form 15.1.69 → 15.1.70

package/lib/components/fields/NamedPlaceChooserField/NamedPlaceChooserField.js

@@ -32,6 +32,15 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -59,7 +68,6 @@ const PLACE_DELETE_FAIL = "PLACE_DELETE_FAIL";
 class NamedPlaceChooserField extends React.Component {
     constructor() {
         super(...arguments);
-        this.removeIds = {};
         this.mounted = false;
         this.state = {};
         this.getUiSchema = (props, buttonDefinition) => {
@@ -122,69 +130,61 @@ class NamedPlaceChooserField extends React.Component {
                 this.setState({ failed: PLACE_USE_FAIL });
             }
         };
-        this.onPlaceDeleted = (place, success) => {
-            this.props.formContext.apiClient.fetchRaw(`/named-places/${place.id}`, undefined, { method: "DELETE" }).then(response => {
-                if (response.status < 400) {
-                    // It takes a while for API to remove the place, so we remove it locally and then invalidate again after some time.
-                    this.removeIds[place.id] = true;
-                    this.props.formContext.apiClient.invalidateCachePath("/named-places");
-                    setTimeout(() => this.props.formContext.apiClient.invalidateCachePath("/named-places"), 2000);
-                    success();
-                }
-            }).catch(() => {
+        this.onPlaceDeleted = (place, end) => __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield this.props.formContext.apiClient.delete("/named-places/{id}", { path: { id: place.id } });
+                end();
+            }
+            catch (e) {
                 this.setState({ failed: PLACE_DELETE_FAIL });
                 this.props.formContext.notifier.error(this.props.formContext.translations.PlaceRemovalFailed);
-            });
-        };
+                end();
+            }
+        });
         this.onButtonClick = () => () => {
             this.setState({ show: true });
         };
-        this.updatePlaces = () => {
-            this.props.formContext.apiClient.fetchCached("/named-places", { includePublic: false, pageSize: 100000 }).then(response => {
-                var _a;
-                if (!this.mounted)
-                    return;
-                const state = { places: response.results.filter(p => !this.removeIds[p.id]).sort((a, b) => {
-                        if (a.name < b.name)
-                            return -1;
-                        if (a.name > b.name)
-                            return 1;
-                        return 0;
-                    }) };
-                if (!((_a = response.results) === null || _a === void 0 ? void 0 : _a.length)) {
-                    return;
-                }
-                const buttonDefinition = {
-                    fn: this.onButtonClick,
-                    fnName: "addNamedPlace",
-                    glyph: "map-marker",
-                    label: this.props.formContext.translations.ChooseFromNamedPlace,
-                    id: this.props.idSchema.$id,
-                    changesFormData: true,
-                    variant: "primary"
-                };
-                if (this.isGatheringsArray(this.props.schema)) {
-                    buttonDefinition.rules = { canAdd: true };
-                }
-                else {
-                    buttonDefinition.position = "top";
-                }
-                state.buttonDefinition = buttonDefinition;
-                this.setState(state);
-            }).catch(() => {
-                this.setState({ failed: PLACES_FETCH_FAIL });
-            });
+        this.updatePlaces = (response) => {
+            var _a;
+            if (!this.mounted)
+                return;
+            const state = { places: response.results.sort((a, b) => {
+                    if (a.name < b.name)
+                        return -1;
+                    if (a.name > b.name)
+                        return 1;
+                    return 0;
+                }) };
+            if (!((_a = response.results) === null || _a === void 0 ? void 0 : _a.length)) {
+                return;
+            }
+            const buttonDefinition = {
+                fn: this.onButtonClick,
+                fnName: "addNamedPlace",
+                glyph: "map-marker",
+                label: this.props.formContext.translations.ChooseFromNamedPlace,
+                id: this.props.idSchema.$id,
+                changesFormData: true,
+                variant: "primary"
+            };
+            if (this.isGatheringsArray(this.props.schema)) {
+                buttonDefinition.rules = { canAdd: true };
+            }
+            else {
+                buttonDefinition.position = "top";
+            }
+            state.buttonDefinition = buttonDefinition;
+            this.setState(state);
         };
         this.onHide = () => this.setState({ show: false });
     }
     componentDidMount() {
         this.mounted = true;
-        this.updatePlaces();
-        this.props.formContext.apiClient.onCachePathInvalidation("/named-places", this.updatePlaces);
+        this.getNamedPlacesUnsubscribe = this.props.formContext.apiClient.subscribe("/named-places", { query: { includePublic: false, pageSize: 100000 } }, this.updatePlaces, () => this.setState({ failed: PLACES_FETCH_FAIL }), 1000);
     }
     componentWillUnmount() {
         this.mounted = false;
-        this.props.formContext.apiClient.removeOnCachePathInvalidation("/named-places", this.updatePlaces);
+        this.getNamedPlacesUnsubscribe();
     }
     render() {
         const { registry: { fields: { SchemaField } }, formContext } = this.props;

package/lib/components/fields/NamedPlaceChooserField/Popup.d.ts

@@ -1,6 +1,7 @@
 import * as React from "react";
-import { NamedPlace } from "@luomus/laji-schema";
 import { FormContext } from "src/components/LajiForm";
+import type { components } from "generated/api.d";
+type NamedPlace = components["schemas"]["namedPlace"];
 type Props = {
     onPlaceSelected: (place: NamedPlace) => void;
     onPlaceDeleted: (place: NamedPlace) => void;

package/lib/components/fields/NamedPlaceSaverField.js

@@ -38,6 +38,15 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
@@ -182,7 +191,7 @@ class PlaceSaverDialog extends React.Component {
     }
     componentDidMount() {
         this.mounted = true;
-        this.apiClient.fetchCached("/named-places", { includePublic: false, pageSize: 1000 }).then(response => {
+        this.apiClient.get("/named-places", { query: { includePublic: false, pageSize: 100000 } }).then(response => {
             if (!this.mounted)
                 return;
             const state = {
@@ -213,23 +222,18 @@ class PlaceSaverDialog extends React.Component {
         });
     }
     onSave(place) {
-        place = Object.assign(Object.assign({}, place), { geometry: place.prepopulatedDocument.gatherings[0].geometry });
-        this.props.formContext.services.blocker.push();
-        this.apiClient.fetchRaw(`/named-places${place.id ? `/${place.id}` : ""}`, undefined, {
-            method: place.id ? "PUT" : "POST",
-            headers: {
-                "accept": "application/json",
-                "content-type": "application/json"
-            },
-            body: JSON.stringify(place)
-        }).then(response => {
-            this.props.formContext.services.blocker.pop();
-            this.apiClient.invalidateCachePath("/named-places");
-            return response.json();
-        }).then(this.props.onSave)
-            .catch(() => {
-            this.props.formContext.services.blocker.pop();
-            this.setState({ failed: SAVE });
+        return __awaiter(this, void 0, void 0, function* () {
+            place = Object.assign(Object.assign({}, place), { geometry: place.prepopulatedDocument.gatherings[0].geometry });
+            this.props.formContext.services.blocker.push();
+            try {
+                const savedPlace = yield this.apiClient[place.id ? "put" : "post"](`/named-places${place.id ? "/{id}" : ""}`, place.id ? { path: { id: place.id } } : undefined, place);
+                this.props.formContext.services.blocker.pop();
+                yield this.props.onSave(savedPlace);
+            }
+            catch (e) {
+                this.props.formContext.services.blocker.pop();
+                this.setState({ failed: SAVE });
+            }
         });
     }
     render() {

package/lib/components/fields/ScopeField.js

@@ -50,7 +50,7 @@ const utils_2 = require("@rjsf/utils");
 const scopeFieldSettings = {
     taxonGroups: {
         translate: (props, taxonGroup) => {
-            return props.formContext.apiClient.fetchCached("/informal-taxon-groups/" + taxonGroup).then((response) => {
+            return props.formContext.apiClient.get("/informal-taxon-groups/" + taxonGroup).then((response) => {
                 return response.name;
             }).catch(() => {
                 return "";

package/lib/components/fields/SingleActiveArrayField.js

@@ -911,13 +911,13 @@ const headerFormatters = {
                 this.fetch = (props) => {
                     const { namedPlaceID } = (props.that.props.formData || {})[props.idx] || {};
                     if (namedPlaceID)
-                        props.that.props.formContext.apiClient.fetchCached(`/named-places/${namedPlaceID}`, undefined, { failSilently: true }).then(response => {
+                        props.that.props.formContext.apiClient.get("/named-places/{id}", { path: { id: namedPlaceID } }).then(response => {
                             if (this.mounted && response.name !== this.state.name)
                                 this.setState({
                                     namedPlaceID,
                                     name: response.name
                                 });
-                        });
+                        }).catch(() => { });
                 };
                 this.state = {};
             }

package/lib/components/fields/SortArrayField.js

@@ -69,7 +69,7 @@ class TaxonomicComparer extends Comparer {
     }
     initialize() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.idToIdx = (yield this.formContext.apiClient.fetchCached("/taxa", Object.assign(Object.assign({}, this.options.query), { pageSize: 10000, selectedFields: "id" })))
+            this.idToIdx = (yield this.formContext.apiClient.get("/taxa", { query: Object.assign(Object.assign({}, this.options.query), { pageSize: 10000, selectedFields: "id" }) }))
                 .results.reduce((idToIdx, { id }, idx) => {
                 idToIdx[id] = idx;
                 return idToIdx;

package/lib/components/fields/UnitCountShorthandField.js

@@ -82,7 +82,7 @@ let UnitCountShorthandField = class UnitCountShorthandField extends React.Compon
                 resolve({ success: undefined });
                 return;
             }
-            apiClient.fetchCached("/autocomplete/pairCount", { q: value, taxonID: taxonId }).then(suggestion => {
+            apiClient.get("/shorthand/unit/water-bird-pair-count", { query: { query: value, taxonID: taxonId } }).then(suggestion => {
                 if (timestamp !== this.promiseTimestamp) {
                     reject();
                     return;

package/lib/components/fields/UnitListShorthandArrayField.js

@@ -69,8 +69,8 @@ let UnitListShorthandArrayField = class UnitListShorthandArrayField extends Reac
             this.onHide();
             const { translations, notifier, apiClient } = this.props.formContext;
             this.props.formContext.services.blocker.push();
-            apiClient.fetch("/autocomplete/unit", { q: value, list: true, includePayload: true }).then(({ payload: { units, nonMatchingCount } }) => {
-                units = units.map(unit => {
+            apiClient.get("/shorthand/unit/list", { query: { query: value } }).then(({ results, nonMatchingCount }) => {
+                const units = results.map(unit => {
                     unit = (0, utils_1.getDefaultFormState)(this.props.schema.items, unit);
                     unit = (0, utils_1.bringRemoteFormData)(unit, this.props.formContext);
                     unit = (0, utils_1.assignUUID)(unit);

package/lib/components/fields/UnitShorthandField.js

@@ -51,7 +51,6 @@ const ReactContext_1 = __importDefault(require("../../ReactContext"));
 const components_1 = require("../components");
 const AutosuggestWidget_1 = require("../widgets/AutosuggestWidget");
 const ArrayFieldTemplate_1 = require("../templates/ArrayFieldTemplate");
-const LINE_TRANSECT_IDS = ["MHL.1162", "MHL.27", "MHL.28"];
 let UnitShorthandField = class UnitShorthandField extends React.Component {
     constructor(props) {
         super(props);
@@ -125,13 +124,13 @@ let UnitShorthandField = class UnitShorthandField extends React.Component {
     render() {
         const { uiSchema, formContext, disabled, readonly } = this.props;
         const { SchemaField } = this.props.registry.fields;
-        const shorthandFieldName = (0, utils_1.getUiOptions)(this.props.uiSchema).shorthandField;
+        const { shorthandField, lineTransect } = (0, utils_1.getUiOptions)(this.props.uiSchema);
         const toggleButton = this.getToggleButton();
         const tailUiSchema = (0, utils_1.getNestedTailUiSchema)(uiSchema);
-        let help = tailUiSchema && tailUiSchema[shorthandFieldName] && tailUiSchema[shorthandFieldName]["ui:belowHelp"];
-        const uiSchemaWithoutHelp = (0, utils_1.isEmptyString)(help) ? uiSchema : (0, utils_1.updateTailUiSchema)(uiSchema, { [shorthandFieldName]: { "ui:belowHelp": { $set: undefined } } });
-        const id = (shorthandFieldName && this.props.idSchema[shorthandFieldName]) ?
-            this.props.idSchema[shorthandFieldName].$id :
+        let help = tailUiSchema && tailUiSchema[shorthandField] && tailUiSchema[shorthandField]["ui:belowHelp"];
+        const uiSchemaWithoutHelp = (0, utils_1.isEmptyString)(help) ? uiSchema : (0, utils_1.updateTailUiSchema)(uiSchema, { [shorthandField]: { "ui:belowHelp": { $set: undefined } } });
+        const id = (shorthandField && this.props.idSchema[shorthandField]) ?
+            this.props.idSchema[shorthandField].$id :
             `${this.props.idSchema.$id}_shortHandField`;
         let innerUiSchema = undefined;
         if (this.state.showSchema) {
@@ -140,7 +139,7 @@ let UnitShorthandField = class UnitShorthandField extends React.Component {
             innerUiSchema = Object.assign(Object.assign({}, innerUiSchema), { "ui:options": Object.assign(Object.assign({}, innerOptions), { buttons: [...(innerOptions.buttons || []), toggleButton] }) });
         }
         return !this.state.showSchema ? (React.createElement("div", { className: "laji-form-field-template-item", id: `_laji-form_${id}` },
-            React.createElement(CodeReader, { translations: this.props.formContext.translations, onChange: this.onCodeChange, value: this.props.formData[shorthandFieldName], formID: (0, utils_1.getUiOptions)(this.props.uiSchema).formID || formContext.formID || formContext.uiSchemaContext.formID, help: help, id: id, formContext: formContext, disabled: disabled, readonly: readonly, className: "laji-form-field-template-schema" }),
+            React.createElement(CodeReader, { translations: this.props.formContext.translations, onChange: this.onCodeChange, value: this.props.formData[shorthandField], formID: (0, utils_1.getUiOptions)(this.props.uiSchema).formID || formContext.formID || formContext.uiSchemaContext.formID, help: help, id: id, formContext: formContext, disabled: disabled, readonly: readonly, lineTransect: lineTransect, className: "laji-form-field-template-schema" }),
             React.createElement("div", { className: "laji-form-field-template-buttons" }, (0, ArrayFieldTemplate_1.getButton)(toggleButton)))) : (React.createElement(SchemaField, Object.assign({}, this.props, { uiSchema: innerUiSchema })));
     }
 };
@@ -185,14 +184,14 @@ let CodeReader = class CodeReader extends React.Component {
         this.onAutosuggestChange = (formData) => {
             this.props.onChange(formData);
         };
-        this.onSuggestionSelected = ({ payload: { unit } }) => {
+        this.onSuggestionSelected = ({ unit }) => {
             const { formContext } = this.props;
             unit = (0, utils_1.bringRemoteFormData)(unit, formContext);
             this.props.onChange(unit);
         };
         this.renderSuggestion = (suggestion) => {
             const { translations } = this.props;
-            return suggestion.payload.isNonMatching
+            return suggestion.isNonMatching
                 ? React.createElement("span", { className: "text-muted" },
                     suggestion.value,
                     " ",
@@ -212,8 +211,8 @@ let CodeReader = class CodeReader extends React.Component {
             }
             else if (value.length >= 3) {
                 this.mounted && this.setState({ loading: true });
-                this.apiClient.fetchCached("/autocomplete/unit", { q: value, formID: this.props.formID, includePayload: true }).then(response => {
-                    this.props.onChange(response.payload.unit);
+                this.apiClient.get("/shorthand/unit/line-transect", { query: { query: value } }).then(response => {
+                    this.props.onChange(response.unit);
                 }).catch(() => {
                     this.mounted && this.setState({ failed: true, loading: false });
                 });
@@ -230,18 +229,15 @@ let CodeReader = class CodeReader extends React.Component {
         this.mounted = false;
     }
     render() {
-        const { translations, readonly, disabled } = this.props;
+        const { translations, readonly, disabled, lineTransect } = this.props;
         let validationState = null;
         if (this.state.failed === true)
             validationState = "warning";
         else if (!(0, utils_1.isEmptyString)(this.props.value) && this.props.value === this.state.value)
             validationState = "success";
-        const { formID, formContext } = this.props;
-        const inputElem = LINE_TRANSECT_IDS.includes(formID) ? (React.createElement(components_1.FetcherInput, { id: this.props.id, loading: this.state.loading, value: this.state.value, validationState: validationState, onChange: this.onFetcherInputChange, onBlur: this.getCode, onKeyDown: this.onKeyDown, readonly: readonly, disabled: disabled })) : (React.createElement("div", { className: "unit-shorthand" },
-            React.createElement(AutosuggestWidget_1.Autosuggest, { autosuggestField: "unit", query: {
-                    formID,
-                    includeNonMatching: true
-                }, onSuggestionSelected: this.onSuggestionSelected, renderSuggestion: this.renderSuggestion, onChange: this.onAutosuggestChange, formContext: formContext, allowNonsuggestedValue: false })));
+        const { formContext } = this.props;
+        const inputElem = lineTransect ? (React.createElement(components_1.FetcherInput, { id: this.props.id, loading: this.state.loading, value: this.state.value, validationState: validationState, onChange: this.onFetcherInputChange, onBlur: this.getCode, onKeyDown: this.onKeyDown, readonly: readonly, disabled: disabled })) : (React.createElement("div", { className: "unit-shorthand" },
+            React.createElement(AutosuggestWidget_1.Autosuggest, { autosuggestField: "unit", onSuggestionSelected: this.onSuggestionSelected, renderSuggestion: this.renderSuggestion, onChange: this.onAutosuggestChange, formContext: formContext, allowNonsuggestedValue: false })));
         const { FormGroup, HelpBlock } = this.context.theme;
         return (React.createElement(FormGroup, { validationState: this.state.failed ? "error" : undefined },
             inputElem,