@longline/aqua-ui 1.0.322 → 1.0.324

package/modules/CountryDropdown/CountryDropdown.js

@@ -16,6 +16,8 @@ import { getCountries } from '../../formatters/CountryFormatter/CountryLocales';
 import { CountryFormatter } from '../../formatters/CountryFormatter';
 // Get country keys ("NL", "PT", "ZW"..) only once. They never change.
 var countryKeys = Object.keys(Countries);
+// Strip diacritics for search matching (e.g. "pai" matches "Países").
+var stripDiacritics = function (s) { return s.normalize('NFD').replace(/[\u0300-\u036F]/g, ''); };
 /**
  * A dropdown preconfigured for country selection. Shows country flags.
  * By default, this will show all countries. A pre-filtered list of country
@@ -29,7 +31,7 @@ var CountryDropdown = function (props) {
     }, [localizedNames]);
     var data = sortedKeys
         .filter(function (c) { return !props.countries || props.countries.includes(c.toUpperCase()); })
-        .filter(function (c) { return localizedNames[c].toLocaleLowerCase().includes((q || "").toLocaleLowerCase()); });
+        .filter(function (c) { return stripDiacritics(localizedNames[c]).toLocaleLowerCase().includes(stripDiacritics(q || "").toLocaleLowerCase()); });
     return (React.createElement(Dropdown, __assign({ data: data, onSearch: setQ, placeholder: props.placeholder || "Country", label: function (item) { return React.createElement(CountryFormatter, { type: 'both', value: item, locale: props.locale }); } }, props),
         React.createElement(Dropdown.Column, null, function (item) { return React.createElement(CountryFormatter, { type: 'both', value: item, locale: props.locale }); })));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@longline/aqua-ui",
-  "version": "1.0.322",
+  "version": "1.0.324",
   "description": "AquaUI",
   "author": "Alexander van Oostenrijk / Longline Environment",
   "license": "Commercial",

package/services/Dialog/XhrDialog.d.ts

@@ -40,7 +40,7 @@ interface IXhrDialogProps {
  * A `Dialog.Xhr` is a preset dialog that takes an `error` object from an
  * Axios request. It then displays a human-readable version of this error.
  * An "OK" button is present that calls `onClose`, and, if `onRetry` is set,
- * a "Retry" button.
+ * a "RETRY" button.
  */
 declare const XhrDialog: {
     ({ open, title, ...props }: IXhrDialogProps): React.JSX.Element;

package/services/Dialog/XhrDialog.js

@@ -18,10 +18,11 @@ import { HttpStatusFormatter } from '../../formatters/HttpStatusFormatter/HttpSt
  * A `Dialog.Xhr` is a preset dialog that takes an `error` object from an
  * Axios request. It then displays a human-readable version of this error.
  * An "OK" button is present that calls `onClose`, and, if `onRetry` is set,
- * a "Retry" button.
+ * a "RETRY" button.
  */
 var XhrDialog = function (_a) {
-    var _b = _a.open, open = _b === void 0 ? false : _b, _c = _a.title, title = _c === void 0 ? "Network error" : _c, props = __rest(_a, ["open", "title"]);
+    var _b, _c, _d, _e, _f, _g, _h;
+    var _j = _a.open, open = _j === void 0 ? false : _j, _k = _a.title, title = _k === void 0 ? "Server error" : _k, props = __rest(_a, ["open", "title"]);
     var getStatusHeader = function () {
         if (props.error.response) {
             var status_1 = React.createElement(HttpStatusFormatter, { type: "title", status: props.error.response.status });
@@ -49,14 +50,24 @@ var XhrDialog = function (_a) {
     return (React.createElement(Dialog, { inverted: props.inverted, open: open, width: props.width, onClose: props.onClose },
         React.createElement(Dialog.Header, null, title),
         React.createElement(Dialog.Content, null,
-            props.error && React.createElement("p", { style: { fontWeight: 700 } }, getStatusHeader()),
+            props.error && React.createElement("p", { style: { fontWeight: 700 } },
+                getStatusHeader(),
+                ((_b = props.error.response) === null || _b === void 0 ? void 0 : _b.status) && " (".concat(props.error.response.status, ")")),
             props.error && React.createElement("p", null, getStatusText()),
-            props.error && props.error.response && props.error.response.status === 422 && props.error.response.data &&
+            (((_e = (_d = (_c = props.error) === null || _c === void 0 ? void 0 : _c.response) === null || _d === void 0 ? void 0 : _d.data) === null || _e === void 0 ? void 0 : _e.message) || ((_h = (_g = (_f = props.error) === null || _f === void 0 ? void 0 : _f.response) === null || _g === void 0 ? void 0 : _g.data) === null || _h === void 0 ? void 0 : _h.errors)) &&
                 React.createElement(React.Fragment, null,
-                    React.createElement("div", null, "Details"),
-                    React.createElement("div", null, props.error.response.data.message))),
+                    React.createElement("p", null,
+                        React.createElement("strong", null, "Details")),
+                    props.error.response.data.errors
+                        ? Object.entries(props.error.response.data.errors).map(function (_a) {
+                            var field = _a[0], messages = _a[1];
+                            return React.createElement("ul", { key: field, style: { margin: '0 0', paddingLeft: '20px' } }, messages.map(function (msg, i) {
+                                return React.createElement("li", { key: i }, msg);
+                            }));
+                        })
+                        : React.createElement("div", null, props.error.response.data.message))),
         React.createElement(Dialog.Footer, null,
-            props.onRetry && React.createElement(PrimaryButton, { onClick: props.onRetry }, "Retry"),
+            props.onRetry && React.createElement(PrimaryButton, { onClick: props.onRetry }, "RETRY"),
             React.createElement(PrimaryButton, { onClick: props.onClose }, "OK"))));
 };
 XhrDialog.displayName = "Dialog.Xhr";