@luomus/laji-form 15.1.74 → 15.1.75

package/lib/components/fields/ImageArrayField.js

@@ -74,17 +74,11 @@ const LajiForm_1 = __importDefault(require("../LajiForm"));
 const utils_1 = require("../../utils");
 const BaseComponent_1 = __importDefault(require("../BaseComponent"));
 const react_spinner_1 = __importDefault(require("react-spinner"));
-const exif_js_1 = __importDefault(require("exif-js"));
+const exifreader_1 = __importDefault(require("exifreader"));
 const utils_2 = require("@luomus/laji-map/lib/utils");
 const moment_1 = __importDefault(require("moment"));
 const ReactContext_1 = __importDefault(require("../../ReactContext"));
 const utils_3 = require("@rjsf/utils");
-function toDecimal(number) {
-    if (!number)
-        return undefined;
-    return number[0].numerator + number[1].numerator /
-        (60 * number[1].denominator) + number[2].numerator / (3600 * number[2].denominator);
-}
 let mediaUuid = 0;
 let ImageArrayField = class ImageArrayField extends React.Component {
     constructor() {
@@ -270,11 +264,16 @@ function MediaArrayField(ComposedComponent) {
                         return promise;
                     }
                     return promise.then(found => new Promise(resolve => {
-                        exif_js_1.default.getData(file, function () {
+                        exifreader_1.default.load(file).then(tags => {
+                            var _a, _b;
                             if ("geometry" in found)
                                 try {
-                                    const coordinates = ["GPSLongitude", "GPSLatitude"].map(tag => toDecimal(exif_js_1.default.getTag(this, tag)));
-                                    const rawDatum = exif_js_1.default.getTag(this, "GPSMapDatum");
+                                    const coordinates = ["GPSLongitude", "GPSLatitude"].map(tag => {
+                                        var _a;
+                                        const coord = (_a = tags[tag]) === null || _a === void 0 ? void 0 : _a.description;
+                                        return coord;
+                                    });
+                                    const rawDatum = (_a = tags["GPSMapDatum"]) === null || _a === void 0 ? void 0 : _a.description;
                                     const datum = typeof rawDatum === "string"
                                         ? rawDatum.trim().toUpperCase()
                                         : undefined;
@@ -301,7 +300,7 @@ function MediaArrayField(ComposedComponent) {
                             };
                             if ("date" in found) {
                                 try {
-                                    const rawDate = exif_js_1.default.getTag(this, "DateTimeOriginal");
+                                    const rawDate = (_b = tags["DateTimeOriginal"]) === null || _b === void 0 ? void 0 : _b.description;
                                     const momentDate = (0, moment_1.default)(rawDate, "YYYY:MM:DD HH:mm:ss");
                                     if (momentDate.isValid()) {
                                         found.date = momentDate.format("YYYY-MM-DDTHH:mm");

package/lib/components/widgets/AutosuggestWidget.js

@@ -87,8 +87,10 @@ class _AutosuggestWidget extends React.Component {
                     return React.createElement(TaxonAutosuggestWidget, Object.assign({}, this.props, { options: Object.assign(Object.assign({}, this.props.options), { autosuggestField: "taxa" }) }));
                 case "unit":
                     return React.createElement(UnitAutosuggestWidget, Object.assign({}, this.props, { basePath: "/shorthand/unit/trip-report" }));
-                case "friends":
                 case "person":
+                    return React.createElement(FriendsAutosuggestWidget, Object.assign({}, this.props, { options: Object.assign(Object.assign({}, this.props.options), { autosuggestField: "persons" }) }));
+                case "friends":
+                case "persons":
                     return React.createElement(FriendsAutosuggestWidget, Object.assign({}, this.props));
                 case "organization":
                     return React.createElement(OrganizationAutosuggestWidget, Object.assign({}, this.props));
@@ -115,6 +117,7 @@ class _AutosuggestWidget extends React.Component {
                     break;
                 case "friends":
                 case "person":
+                case "persons":
                     component = FriendsAutosuggestWidget;
                     break;
                 case "organization":
@@ -330,7 +333,7 @@ class FriendsAutosuggestWidget extends React.Component {
             const { showID } = (0, utils_1.getUiOptions)(this.props);
             const { isAdmin } = this.props.formContext.uiSchemaContext;
             if (this.isValueSuggested(value)) {
-                const { fullName, group, id } = yield this.props.formContext.apiClient.get(`/person/by-id/${value}`);
+                const { fullName, group, id } = yield this.props.formContext.apiClient.get(`/person/${value}`);
                 if (fullName) {
                     const addGroup = str => group ? `${str} (${group})` : str;
                     const addID = str => isAdmin && showID ? `${str} (${id})` : str;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luomus/laji-form",
-  "version": "15.1.74",
+  "version": "15.1.75",
   "description": "React module capable of building dynamic forms from Laji form json schemas",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -52,7 +52,7 @@
     "@types/react-spinner": "^0.2.0",
     "deep-equal": "^2.0.5",
     "deepmerge": "^4.2.2",
-    "exif-js": "^2.3.0",
+    "exifreader": "^4.32.0",
     "immutability-helper": "^3.1.1",
     "isomorphic-fetch": "^3.0.0",
     "memoizee": "^0.4.15",