@luomus/laji-form 15.1.22 → 15.1.24

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

@@ -2,7 +2,7 @@ export default class AutoArrayField extends React.Component<any, any, any> {
     static propTypes: {
         uiSchema: PropTypes.Requireable<PropTypes.InferProps<{
             "ui:options": PropTypes.Requireable<PropTypes.InferProps<{
-                autofocus: any;
+                autofocus: PropTypes.Requireable<boolean>;
             }>>;
         }>>;
         schema: PropTypes.Validator<PropTypes.InferProps<{

package/lib/components/fields/AutoArrayField.js

@@ -42,7 +42,7 @@ let AutoArrayField = class AutoArrayField extends React.Component {
 AutoArrayField.propTypes = {
     uiSchema: PropTypes.shape({
         "ui:options": PropTypes.shape({
-            autofocus: PropTypes.boolean
+            autofocus: PropTypes.bool
         })
     }),
     schema: PropTypes.shape({

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

@@ -20,7 +20,7 @@ export default class AutosuggestField extends React.Component<any, any, any> {
             "ui:options": PropTypes.Validator<PropTypes.InferProps<{
                 autosuggestField: PropTypes.Validator<string>;
                 suggestionInputField: PropTypes.Validator<string>;
-                allowNonsuggestedValue: any;
+                allowNonsuggestedValue: PropTypes.Requireable<boolean>;
                 suggestionReceivers: PropTypes.Validator<object>;
                 inputTransformer: PropTypes.Requireable<PropTypes.InferProps<{
                     regexp: PropTypes.Validator<string>;

package/lib/components/fields/AutosuggestField.js

@@ -281,7 +281,7 @@ AutosuggestField.propTypes = {
         "ui:options": PropTypes.shape({
             autosuggestField: PropTypes.string.isRequired,
             suggestionInputField: PropTypes.string.isRequired,
-            allowNonsuggestedValue: PropTypes.boolean,
+            allowNonsuggestedValue: PropTypes.bool,
             suggestionReceivers: PropTypes.object.isRequired,
             inputTransformer: PropTypes.shape({
                 regexp: PropTypes.string.isRequired,

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

@@ -103,7 +103,7 @@ export default class ConditionalUiSchemaField extends React.Component<any, any,
                         uiSchema: PropTypes.Validator<object>;
                     }> | null | undefined)[]>;
                 }> | null | undefined)[]>;
-                cache: any;
+                cache: PropTypes.Requireable<boolean>;
             }>>;
         }>>;
         schema: PropTypes.Validator<PropTypes.InferProps<{

package/lib/components/fields/ConditionalUiSchemaField.js

@@ -106,7 +106,7 @@ ConditionalUiSchemaField.propTypes = {
                 casePropType,
                 PropTypes.arrayOf(casePropType)
             ]),
-            cache: PropTypes.boolean
+            cache: PropTypes.bool
         })
     }),
     schema: PropTypes.shape({

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

@@ -8,7 +8,7 @@ export default class ExtraLabelRowField extends React.Component<any, any, any> {
                 md: PropTypes.Requireable<number | object>;
                 sm: PropTypes.Requireable<number | object>;
                 xs: PropTypes.Requireable<number | object>;
-                hiddenXs: any;
+                hiddenXs: PropTypes.Requireable<boolean>;
             }>>;
         }>>;
         schema: PropTypes.Validator<PropTypes.InferProps<{

package/lib/components/fields/ExtraLabelRowField.js

@@ -86,7 +86,7 @@ ExtraLabelRowField.propTypes = {
             md: PropTypes.oneOfType([PropTypes.number, PropTypes.object]),
             sm: PropTypes.oneOfType([PropTypes.number, PropTypes.object]),
             xs: PropTypes.oneOfType([PropTypes.number, PropTypes.object]),
-            hiddenXs: PropTypes.boolean
+            hiddenXs: PropTypes.bool
         })
     }).isRequired,
     schema: PropTypes.shape({

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

@@ -48,7 +48,7 @@ export default class FilterArrayField extends React.Component<any, any, any> {
                     isLast: PropTypes.Requireable<number>;
                     complement: PropTypes.Requireable<boolean>;
                 }> | null | undefined)[]>;
-                cache: any;
+                cache: PropTypes.Requireable<boolean>;
             }>>;
         }>>;
         schema: PropTypes.Validator<PropTypes.InferProps<{

package/lib/components/fields/FilterArrayField.js

@@ -107,7 +107,7 @@ FilterArrayField.propTypes = {
     uiSchema: PropTypes.shape({
         "ui:options": PropTypes.shape({
             rules: exports.arrayRulesPropType,
-            cache: PropTypes.boolean
+            cache: PropTypes.bool
         })
     }),
     schema: PropTypes.shape({

package/lib/components/fields/LocationChooserField.js

@@ -246,7 +246,7 @@ class LocationButton extends React.Component {
                         if (!geometryRef || !geometryRef.type) {
                             break;
                         }
-                        that.props.onChange(utils_1.updateFormDataWithJSONPointer(that.props, utils_1.getDefaultFormState(utils_1.parseSchemaFromFormDataPointer(that.props.schema, geometryField)), geometryField));
+                        that.props.onChange(utils_1.updateFormDataWithJSONPointer(that.props, undefined, geometryField));
                         break;
                     }
                     case "edit": {

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

@@ -13,7 +13,7 @@ export default class MapField extends React.Component<any, any, any> {
                 mapOptions: PropTypes.Requireable<object>;
                 height: PropTypes.Requireable<number>;
                 emptyHelp: PropTypes.Requireable<string>;
-                geometryCollection: any;
+                geometryCollection: PropTypes.Requireable<boolean>;
             }>>;
         }>>;
         schema: PropTypes.Validator<PropTypes.InferProps<{

package/lib/components/fields/MapField.js

@@ -300,7 +300,7 @@ MapField.propTypes = {
             mapOptions: PropTypes.object,
             height: PropTypes.number,
             emptyHelp: PropTypes.string,
-            geometryCollection: PropTypes.boolean,
+            geometryCollection: PropTypes.bool,
         })
     }),
     schema: PropTypes.shape({

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

@@ -32,7 +32,7 @@ export default class MultiArrayField extends React.Component<any, any, any> {
                     type: PropTypes.Requireable<string>;
                     uiSchema: PropTypes.Validator<object>;
                 }> | null | undefined)[]>;
-                cache: any;
+                cache: PropTypes.Requireable<boolean>;
             }>>;
         }>>;
         schema: PropTypes.Validator<PropTypes.InferProps<{

package/lib/components/fields/MultiArrayField.js

@@ -187,7 +187,7 @@ MultiArrayField.propTypes = {
                 ConditionalUiSchemaField_1.operationPropType,
                 PropTypes.arrayOf(ConditionalUiSchemaField_1.operationPropType)
             ]),
-            cache: PropTypes.boolean
+            cache: PropTypes.bool
         })
     }),
     schema: PropTypes.shape({

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/lib/components/fields/ScopeField.d.ts

@@ -35,7 +35,7 @@ export default class ScopeField extends React.Component<any, any, any> {
     static propTypes: {
         uiSchema: PropTypes.Validator<PropTypes.InferProps<{
             "ui:options": PropTypes.Validator<PropTypes.InferProps<{
-                includeAdditionalFieldsChooserButton: any;
+                includeAdditionalFieldsChooserButton: PropTypes.Requireable<boolean>;
                 additionalsGroupingPath: PropTypes.Requireable<string>;
                 additionalsGroupsTranslator: PropTypes.Requireable<string>;
                 additionalsPersistenceKey: PropTypes.Requireable<string>;

package/lib/components/fields/ScopeField.js

@@ -453,7 +453,7 @@ ScopeField.contextType = ReactContext_1.default;
 ScopeField.propTypes = {
     uiSchema: PropTypes.shape({
         "ui:options": PropTypes.shape({
-            includeAdditionalFieldsChooserButton: PropTypes.boolean,
+            includeAdditionalFieldsChooserButton: PropTypes.bool,
             additionalsGroupingPath: PropTypes.string,
             additionalsGroupsTranslator: PropTypes.oneOf(Object.keys(scopeFieldSettings)),
             additionalsPersistenceKey: PropTypes.string,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luomus/laji-form",
-  "version": "15.1.22",
+  "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",