@luomus/laji-form 15.1.67 → 15.1.68

package/lib/ApiClient.d.ts

@@ -68,7 +68,9 @@ export default class ApiClient {
     private flush;
     private getCacheNode;
     /** The response is cached until the resource receives a POST/PUT/DELETE request. */
-    get<P extends PathWithMethod<"get">, R extends Responses<P, "get" extends Method<P> ? "get" : never>>(path: P, params?: RelaxQuery<Parameters<paths[P]["get"]>, MiddlewareInjectedKeys>, useCache?: boolean): Promise<ExtractContentIfExists<R[IntersectUnionTypes<keyof R, HttpSuccessCodes>]>>;
+    get<P extends PathWithMethod<"get">, R extends Responses<P, "get" extends Method<P> ? "get" : never>>(path: P, params?: RelaxQuery<Parameters<paths[P]["get"]>, MiddlewareInjectedKeys>, 
+    /** Defaults to true */
+    useCache?: boolean): Promise<ExtractContentIfExists<R[IntersectUnionTypes<keyof R, HttpSuccessCodes>]>>;
     /** Subscribe to a GET request. It re-emits when the resource receives a POST/PUT/DELETE request. */
     subscribe<P extends PathWithMethod<"get">, R extends Responses<P, "get" extends Method<P> ? "get" : never>>(path: P, params: RelaxQuery<Parameters<paths[P]["get"]>, MiddlewareInjectedKeys> | undefined, onFulfilled: (response: ExtractContentIfExists<R[IntersectUnionTypes<keyof R, HttpSuccessCodes>]>) => void, onError?: () => void, 
     /**

package/lib/ApiClient.js

@@ -93,7 +93,9 @@ class ApiClient {
     ;
     /** The response is cached until the resource receives a POST/PUT/DELETE request. */
     get(path_1, params_1) {
-        return __awaiter(this, arguments, void 0, function* (path, params, useCache = true) {
+        return __awaiter(this, arguments, void 0, function* (path, params, 
+        /** Defaults to true */
+        useCache = true) {
             let cacheNode;
             let serializedQuery;
             if (useCache) {

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

@@ -48,7 +48,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const React = __importStar(require("react"));
 const ReactContext_1 = __importDefault(require("../../../ReactContext"));
 const utils_1 = require("../../../utils");
-// import { NamedPlace } from "@luomus/laji-schema";
 const Context_1 = __importDefault(require("../../../Context"));
 const NamedPlaceChooser_1 = require("./NamedPlaceChooser");
 const PLACE_WHITELIST = [

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.1", "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 })));
     }
 };
@@ -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,

package/package.json

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