@luomus/laji-form 15.1.79 → 15.1.81

package/lib/ApiClient.d.ts

@@ -18,7 +18,7 @@ type RelaxQuery<P, K extends string> = P extends {
 } : {
     query: Omit<Q, Extract<keyof Q, K>> & Partial<Pick<Q, Extract<keyof Q, K>>>;
 }) : P;
-type MiddlewareInjectedKeys = "collectionID" | "formID" | "personToken";
+type MiddlewareInjectedKeys = "collectionID" | "formID";
 type Parameters<T> = "parameters" extends keyof T ? T["parameters"] : never;
 type ExtractContentIfExists<R> = R extends {
     content: infer C;

package/lib/ApiClient.js

@@ -169,7 +169,7 @@ class ApiClient {
                 options = Object.assign(Object.assign({}, options), { headers: Object.assign(Object.assign({}, (options.headers || {})), { "Content-Type": "application/json", "Accept": "application/json" }) });
                 body = JSON.stringify(body);
             }
-            const response = yield this.apiClient.fetch(pathSegments.join(""), _query, Object.assign({ method, body }, options));
+            const response = yield this.apiClient.fetch(pathSegments.join(""), ((params === null || params === void 0 ? void 0 : params.query) || {}), Object.assign({ method, body }, options));
             if (response.status >= 400) {
                 const error = yield response.json();
                 throw new LajiApiError(error === null || error === void 0 ? void 0 : error.message, response.status);

package/lib/components/fields/ImageArrayField.js

@@ -464,7 +464,7 @@ function MediaArrayField(ComposedComponent) {
                 const metadataPromise = ("capturerVerbatim" in mediaMetadata)
                     ? Promise.resolve(Object.assign(Object.assign({}, mediaMetadata), { capturerVerbatim: Array.isArray(mediaMetadata.capturerVerbatim) ? mediaMetadata.capturerVerbatim : [mediaMetadata.capturerVerbatim] }))
                     : MACode
-                        ? this.apiClient.get("/person/by-id/{personId}", { path: { personId: MACode } }).then(({ fullName = MACode }) => (Object.assign(Object.assign({ capturerVerbatim: Array.isArray(fullName) ? fullName : [fullName] }, mediaMetadata), { intellectualOwner: fullName }))).catch(() => Promise.resolve(mediaMetadata))
+                        ? this.apiClient.get("/person/{id}", { path: { id: MACode } }).then(({ fullName = MACode }) => (Object.assign(Object.assign({ capturerVerbatim: Array.isArray(fullName) ? fullName : [fullName] }, mediaMetadata), { intellectualOwner: fullName }))).catch(() => Promise.resolve(mediaMetadata))
                         : Promise.resolve(mediaMetadata);
                 return Promise.all([exifDataPromise, metadataPromise]).then(([exifData, metadata]) => {
                     return Object.assign(Object.assign({}, exifData.defaultMediaMetadata), metadata);

package/lib/components/widgets/InputWithDefaultValueButtonWidget.d.ts

@@ -12,6 +12,7 @@ export default class InputWithDefaultValueButtonWidget extends React.Component<a
                     resultKey: PropTypes.Validator<string>;
                     cache: PropTypes.Requireable<boolean>;
                 }>>;
+                disableButtonAfterUse: PropTypes.Requireable<boolean>;
                 onClick: PropTypes.Requireable<(...args: any[]) => any>;
             }>>>;
         }>>>;
@@ -21,11 +22,15 @@ export default class InputWithDefaultValueButtonWidget extends React.Component<a
         value: PropTypes.Requireable<string>;
     };
     constructor(props: any);
+    fetching: boolean;
+    disabled: boolean;
     state: {
         fetching: boolean;
+        disabled: boolean;
     };
     render(): JSX.Element;
     onClick: () => any;
+    changeValue: (value: any) => void;
 }
 import * as React from "react";
 import * as PropTypes from "prop-types";

package/lib/components/widgets/InputWithDefaultValueButtonWidget.js

@@ -41,26 +41,31 @@ const PropTypes = __importStar(require("prop-types"));
 const BaseInputTemplate_1 = __importDefault(require("../templates/BaseInputTemplate"));
 const ReactContext_1 = __importDefault(require("../../ReactContext"));
 const utils_1 = require("../../utils");
+const react_spinner_1 = __importDefault(require("react-spinner"));
 class InputWithDefaultValueButtonWidget extends React.Component {
     constructor(props) {
         super(props);
         this.onClick = () => {
+            if (this.fetching || this.disabled) {
+                return;
+            }
             const { contextFieldForDefaultValue, apiQueryForDefaultValue, onClick } = (0, utils_1.getUiOptions)(this.props);
             if (contextFieldForDefaultValue) {
                 const uiSchemaContext = this.props.formContext.uiSchemaContext || {};
                 const defaultValue = uiSchemaContext[contextFieldForDefaultValue];
-                this.props.onChange(defaultValue);
+                this.changeValue(defaultValue);
             }
             else if (apiQueryForDefaultValue) {
                 const { path, query = {}, resultKey, cache = false } = apiQueryForDefaultValue;
                 const apiClient = this.props.formContext.apiClient;
+                this.fetching = true;
                 this.setState({ fetching: true });
-                return apiClient.get(path, { query }, cache).then(result => {
-                    if (result[resultKey]) {
-                        this.props.onChange(result[resultKey]);
-                    }
-                    this.setState({ fetching: false });
+                return apiClient.get(path, { query: Object.assign({ value: this.props.value }, query) }, cache).then(result => {
+                    result = resultKey ? result === null || result === void 0 ? void 0 : result[resultKey] : result;
+                    this.changeValue(result);
                 }).catch(() => {
+                }).finally(() => {
+                    this.fetching = false;
                     this.setState({ fetching: false });
                 });
             }
@@ -68,7 +73,17 @@ class InputWithDefaultValueButtonWidget extends React.Component {
                 onClick();
             }
         };
-        this.state = { fetching: false };
+        this.changeValue = (value) => {
+            const { disableButtonAfterUse = false } = (0, utils_1.getUiOptions)(this.props);
+            this.props.onChange(value);
+            if (disableButtonAfterUse) {
+                this.disabled = true;
+                this.setState({ disabled: true });
+            }
+        };
+        this.fetching = false;
+        this.disabled = false;
+        this.state = { fetching: false, disabled: false };
     }
     render() {
         const { InputGroup, Button } = this.context.theme;
@@ -77,7 +92,9 @@ class InputWithDefaultValueButtonWidget extends React.Component {
         return (React.createElement(InputGroup, null,
             React.createElement(BaseInputTemplate_1.default, Object.assign({}, this.props)),
             React.createElement(InputGroup.Button, { className: "input-group-button" },
-                React.createElement(Button, { onClick: this.onClick, disabled: disabled || readonly || this.state.fetching, variant: buttonVariant }, buttonLabel))));
+                React.createElement(Button, { onClick: this.onClick, disabled: disabled || readonly || this.state.fetching || this.state.disabled, variant: buttonVariant },
+                    buttonLabel,
+                    this.state.fetching && React.createElement(react_spinner_1.default, null)))));
     }
 }
 InputWithDefaultValueButtonWidget.contextType = ReactContext_1.default;
@@ -93,6 +110,7 @@ InputWithDefaultValueButtonWidget.propTypes = {
                 resultKey: PropTypes.string.isRequired,
                 cache: PropTypes.bool
             }),
+            disableButtonAfterUse: PropTypes.bool,
             onClick: PropTypes.func
         }).isRequired
     }).isRequired,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luomus/laji-form",
-  "version": "15.1.79",
+  "version": "15.1.81",
   "description": "React module capable of building dynamic forms from Laji form json schemas",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -29,7 +29,7 @@
     "test:lightweight": "npx playwright test --project chromium",
     "test:docker:build": "docker build -t laji-form-test -f test.Dockerfile .",
     "test:docker:run": "docker run laji-form-test",
-    "generate:api-client": "openapi-typescript https://apitest.laji.fi/explorer-json -o ./generated/api.d.ts --properties-required-by-default"
+    "generate:api-client": "openapi-typescript https://apitest.laji.fi/openapi-json -o ./generated/api.d.ts --properties-required-by-default"
   },
   "keywords": [
     "react-jsonschema-form",
@@ -41,7 +41,7 @@
   "license": "MIT",
   "dependencies": {
     "@luomus/laji-map": "^5.1.19",
-    "@luomus/laji-validate": "^0.0.123",
+    "@luomus/laji-validate": "^0.0.124",
     "@rjsf/core": "~5.1.0",
     "@rjsf/utils": "~5.1.0",
     "@rjsf/validator-ajv6": "~5.1.0",