@luomus/laji-form 15.1.23 → 15.1.24

package/lib/components/fields/NamedPlaceChooserField.js

@@ -89,7 +89,7 @@ let NamedPlaceChooserField = class NamedPlaceChooserField extends React.Componen
         };
         this.onPlaceDeleted = (place, success) => {
             this.apiClient.fetchRaw(`/named-places/${place.id}`, undefined, { method: "DELETE" }).then(response => {
-                if (response.status === 204) {
+                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.apiClient.invalidateCachePath("/named-places");

package/lib/components/fields/NamedPlaceSaverField.js

@@ -27,6 +27,7 @@ const ReactContext_1 = require("../../ReactContext");
 const BaseComponent_1 = require("../BaseComponent");
 const Spinner = require("react-spinner");
 const MapArrayField_1 = require("./MapArrayField");
+const memoize = require("memoizee");
 const SAVE = "SAVE", FETCH = "FETCH";
 /**
  * Compatible only with gathering field.
@@ -110,18 +111,17 @@ class PlaceSaverDialog extends React.Component {
                 prepopulatedDocument: { gatherings: [gathering] }
             });
         };
-        this.onOverwriteCurrent = () => {
-            const { namedPlaceID } = this.props.gathering;
+        this.onOverwriteCurrentFor = memoize((namedPlaceID) => () => {
             const gathering = this.getGathering(); //eslint-disable-line no-unused-vars
             this.onSave(Object.assign(Object.assign({}, this.state.placeIdsToPlaces[namedPlaceID]), { name: this.state.value, prepopulatedDocument: { gatherings: [gathering] } }));
-        };
-        this.onOverwriteSelected = (place) => () => {
+        });
+        this.onOverwriteSelected = memoize((place) => () => {
             const gathering = this.getGathering(); //eslint-disable-line no-unused-vars
             this.onSave(Object.assign(Object.assign({}, place), { name: this.state.value, prepopulatedDocument: { gatherings: [gathering] } }));
-        };
-        this.onOverwriteExisting = () => {
-            this.onOverwriteSelected(this.state.placeNamesToPlaces[this.state.value])();
-        };
+        });
+        this.onOverwriteExistingFor = memoize((place) => () => {
+            this.onOverwriteSelected(place)();
+        });
         // Hack that fixed autofocus cursor position
         this.onFocus = (e) => {
             var val = e.target.value;
@@ -219,9 +219,9 @@ class PlaceSaverDialog extends React.Component {
                         getButton(this.onSaveNew, `${translations.Save} ${translations.new}`) : null,
                     " ",
                     this.props.gathering.namedPlaceID ?
-                        getButton(this.onOverwriteCurrent, translations.SaveCurrentOverwrite) : null,
+                        getButton(this.onOverwriteCurrentFor(this.props.gathering.namedPlaceID), translations.SaveCurrentOverwrite) : null,
                     existingPlaces.length === 1 && !this.props.gathering.namedPlaceID ?
-                        getButton(this.onOverwriteExisting, translations.SaveExistingOverwrite) : null),
+                        getButton(this.onOverwriteExistingFor(existingPlaces[0]), translations.SaveExistingOverwrite) : null),
                 loading ? React.createElement("div", { className: "pull-right" },
                     React.createElement(Spinner, null)) : null),
             !this.props.gathering.namedPlaceID && existingPlaces.length ?

package/package.json

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