@k-int/stripes-kint-components 2.4.1 → 2.6.0

package/es/lib/CustomProperties/Config/CustomPropertiesLookup.js

@@ -11,23 +11,20 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _reactIntl = require("react-intl");
 
-var _debounce = _interopRequireDefault(require("lodash/debounce"));
-
 var _components = require("@folio/stripes/components");
 
+var _reactFinalForm = require("react-final-form");
+
 var _SearchField = _interopRequireDefault(require("../../SearchField"));
 
 var _hooks = require("../../hooks");
 
+var _CustomProperties = _interopRequireDefault(require("../../../../styles/CustomProperties.css"));
+
 var _jsxRuntime = require("react/jsx-runtime");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-(function () {
-  var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
-  enterModule && enterModule(module);
-})();
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -46,12 +43,6 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
-  return a;
-};
-
-var DEBOUNCE_TIME = 500;
-
 var CustomPropertiesLookup = function CustomPropertiesLookup(_ref) {
   var _labelOverrides$label, _labelOverrides$prima, _labelOverrides$ctx, _labelOverrides$weigh, _labelOverrides$type, _labelOverrides$categ;
 
@@ -79,27 +70,70 @@ var CustomPropertiesLookup = function CustomPropertiesLookup(_ref) {
     nsValues: nsValues,
     queryParams: queryParams,
     returnQueryObject: true,
-    ctx: selectedContext
+    ctx: selectedContext,
+    options: {
+      sort: [{
+        path: 'ctx'
+      }, {
+        path: 'weight'
+      }]
+    }
   }),
       custprops = _useCustomProperties.data,
       isLoading = _useCustomProperties.isLoading;
 
-  var handleSearch = (0, _debounce.default)(function (query) {
+  var handleSearch = function handleSearch(query) {
     setNsValues(_objectSpread(_objectSpread({}, nsValues), {}, {
       query: query
     }));
-  }, DEBOUNCE_TIME);
+  };
+
+  var _useState5 = (0, _react.useState)(''),
+      _useState6 = _slicedToArray(_useState5, 2),
+      searchTerm = _useState6[0],
+      setSearchTerm = _useState6[1];
+
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_SearchField.default, {
-      fullWidth: true,
-      onChange: function onChange(e) {
-        return handleSearch(e.target.value);
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFinalForm.Form, {
+      enableReinitialize: true,
+      keepDirtyOnReinitialize: true,
+      onSubmit: function onSubmit() {
+        return handleSearch(searchTerm);
+      },
+      children: function children(_ref2) {
+        var _labelOverrides$searc;
+
+        var handleSubmit = _ref2.handleSubmit;
+        return /*#__PURE__*/(0, _jsxRuntime.jsxs)("form", {
+          className: _CustomProperties.default.lookupSearchContainer,
+          onSubmit: handleSubmit,
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_SearchField.default, {
+            ariaLabel: (_labelOverrides$searc = labelOverrides.searchAriaLabel) !== null && _labelOverrides$searc !== void 0 ? _labelOverrides$searc : 'custom-property-search-field',
+            className: _CustomProperties.default.lookupSearch,
+            marginBottom0: true,
+            onChange: function onChange(e) {
+              return setSearchTerm(e.target.value);
+            },
+            value: searchTerm
+          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, {
+            buttonClass: _CustomProperties.default.lookupSearchButton,
+            buttonStyle: "primary",
+            marginBottom0: true,
+            type: "submit",
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
+              id: "stripes-kint-components.search"
+            })
+          })]
+        });
       }
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Row, {
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Col, {
         xs: 6,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Select, {
           dataOptions: contextFilterOptions,
+          label: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
+            id: "stripes-kint-components.customProperties.ctx"
+          }),
           onChange: function onChange(e) {
             setSelectedContext(e.target.value);
           },
@@ -157,10 +191,6 @@ var CustomPropertiesLookup = function CustomPropertiesLookup(_ref) {
   });
 };
 
-__signature__(CustomPropertiesLookup, "useState{[nsValues, setNsValues]({\n    sort: 'label'\n  })}\nuseState{[selectedContext, setSelectedContext]}\nuseCustomProperties{{ data: custprops, isLoading }}", function () {
-  return [_hooks.useCustomProperties];
-});
-
 CustomPropertiesLookup.propTypes = {
   contextFilterOptions: _propTypes.default.arrayOf(_propTypes.default.shape({
     value: _propTypes.default.string,
@@ -174,25 +204,4 @@ CustomPropertiesLookup.propTypes = {
   refdataEndpoint: _propTypes.default.string
 };
 var _default = CustomPropertiesLookup;
-var _default2 = _default;
-exports.default = _default2;
-;
-
-(function () {
-  var reactHotLoader = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default : undefined;
-
-  if (!reactHotLoader) {
-    return;
-  }
-
-  reactHotLoader.register(DEBOUNCE_TIME, "DEBOUNCE_TIME", "/home/ethan/FolioModules/stripes-kint-components/src/lib/CustomProperties/Config/CustomPropertiesLookup.js");
-  reactHotLoader.register(CustomPropertiesLookup, "CustomPropertiesLookup", "/home/ethan/FolioModules/stripes-kint-components/src/lib/CustomProperties/Config/CustomPropertiesLookup.js");
-  reactHotLoader.register(_default, "default", "/home/ethan/FolioModules/stripes-kint-components/src/lib/CustomProperties/Config/CustomPropertiesLookup.js");
-})();
-
-;
-
-(function () {
-  var leaveModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.leaveModule : undefined;
-  leaveModule && leaveModule(module);
-})();
+exports.default = _default;

package/es/lib/CustomProperties/Config/CustomPropertiesLookup.test.js

@@ -0,0 +1,53 @@
+"use strict";
+
+var _react = _interopRequireDefault(require("react"));
+
+require("@folio/stripes-erm-components/test/jest/__mock__");
+
+var _reactRouterDom = require("react-router-dom");
+
+var _helpers = require("../../../../test/jest/helpers");
+
+var _testResources = require("./testResources");
+
+var _CustomPropertiesLookup = _interopRequireDefault(require("./CustomPropertiesLookup"));
+
+var _jsxRuntime = require("react/jsx-runtime");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+jest.mock('../../SearchField', function () {
+  return function () {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      children: "SearchField"
+    });
+  };
+});
+describe('CustomPropertiesLookup', function () {
+  var renderComponent;
+  beforeEach(function () {
+    renderComponent = (0, _helpers.renderWithKintHarness)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRouterDom.MemoryRouter, {
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertiesLookup.default, _objectSpread(_objectSpread({}, _testResources.custPropLookup), {}, {
+        visibleColumns: ['label', 'primary', 'ctx', 'weight', 'type', 'category']
+      }))
+    }));
+  });
+  it('renders expected options', function () {
+    var _renderComponent = renderComponent,
+        getByText = _renderComponent.getByText;
+    expect(getByText('All')).toBeInTheDocument();
+    expect(getByText('OpenAccess')).toBeInTheDocument();
+    expect(getByText('None')).toBeInTheDocument();
+  });
+  it('renders SearchField component ', function () {
+    var _renderComponent2 = renderComponent,
+        getByText = _renderComponent2.getByText;
+    expect(getByText('SearchField')).toBeInTheDocument();
+  });
+});

package/es/lib/CustomProperties/Config/CustomPropertiesSettings.js

@@ -1,5 +1,7 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -15,10 +17,10 @@ var _reactIntl = require("react-intl");
 
 var _reactQuery = require("react-query");
 
-var _reactIntlSafeHtml = _interopRequireDefault(require("@folio/react-intl-safe-html"));
-
 var _components = require("@folio/stripes/components");
 
+var _core = require("@folio/stripes/core");
+
 var _FormModal = _interopRequireDefault(require("../../FormModal/FormModal"));
 
 var _CustomPropertiesLookup = _interopRequireDefault(require("./CustomPropertiesLookup"));
@@ -33,10 +35,11 @@ var _jsxRuntime = require("react/jsx-runtime");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-(function () {
-  var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
-  enterModule && enterModule(module);
-})();
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return generator._invoke = function (innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; }(innerFn, self, context), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (object) { var keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -56,23 +59,21 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
-  return a;
-};
-
 var EDITING = 'edit';
 var CREATING = 'create';
 var VIEWING = 'view'; // A default option for setting up panes manually
 
 var CustomPropertiesSettings = function CustomPropertiesSettings(_ref) {
-  var _labelOverrides$paneT, _ref3, _renderViewPaneTitle, _labelOverrides$confi, _labelOverrides$confi2, _labelOverrides$confi3;
+  var _labelOverrides$paneT, _ref3, _renderViewPaneTitle, _customProperty$categ, _labelOverrides$modal, _labelOverrides$modal2, _labelOverrides$confi, _labelOverrides$confi2, _labelOverrides$confi3;
 
   var afterQueryCalls = _ref.afterQueryCalls,
+      catchQueryCalls = _ref.catchQueryCalls,
       contextFilterOptions = _ref.contextFilterOptions,
       customPropertiesEndpoint = _ref.customPropertiesEndpoint,
       helpPopovers = _ref.helpPopovers,
       labelOverrides = _ref.labelOverrides,
       refdataEndpoint = _ref.refdataEndpoint;
+  var callout = (0, _react.useContext)(_core.CalloutContext);
   var queryClient = (0, _reactQuery.useQueryClient)();
   var intl = (0, _reactIntl.useIntl)();
 
@@ -117,20 +118,7 @@ var CustomPropertiesSettings = function CustomPropertiesSettings(_ref) {
 
   if (renderViewPaneTitle instanceof Function) {
     renderViewPaneTitle = renderViewPaneTitle(customProperty);
-  } // Defaulting is hard
-
-
-  var afterQueryCallsSafe = _objectSpread({
-    put: function put() {
-      return null;
-    },
-    post: function post() {
-      return null;
-    },
-    delete: function _delete() {
-      return null;
-    }
-  }, afterQueryCalls);
+  }
 
   var _useMutateCustomPrope = (0, _hooks.useMutateCustomProperties)({
     afterQueryCalls: {
@@ -138,21 +126,71 @@ var CustomPropertiesSettings = function CustomPropertiesSettings(_ref) {
         setMode(VIEWING);
         queryClient.invalidateQueries(['stripes-kint-components', 'useCustomProperties', 'custprops']);
         setCustomProperty(res);
-        afterQueryCallsSafe.put(res);
+
+        if (afterQueryCalls !== null && afterQueryCalls !== void 0 && afterQueryCalls.put) {
+          afterQueryCalls.put(res);
+        }
       },
       post: function post(res) {
         setMode(VIEWING);
         queryClient.invalidateQueries(['stripes-kint-components', 'useCustomProperties', 'custprops']);
         setCustomProperty(res);
-        afterQueryCallsSafe.post(res);
+
+        if (afterQueryCalls !== null && afterQueryCalls !== void 0 && afterQueryCalls.post) {
+          afterQueryCalls.post(res);
+        }
       },
       delete: function _delete(res) {
         setMode(VIEWING);
         queryClient.invalidateQueries(['stripes-kint-components', 'useCustomProperties', 'custprops']);
         setCustomProperty();
-        afterQueryCallsSafe.delete(res);
+
+        if (afterQueryCalls !== null && afterQueryCalls !== void 0 && afterQueryCalls.delete) {
+          afterQueryCalls.delete(res);
+        }
       }
     },
+    catchQueryCalls: _objectSpread({
+      // Default delete behaviour is to fire a callout, either with kint-components default message
+      // or one provided in labelOverrides, which is passed the error message and customProperty in question
+      delete: function () {
+        var _delete2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(err) {
+          var errorResp;
+          return _regeneratorRuntime().wrap(function _callee$(_context) {
+            while (1) {
+              switch (_context.prev = _context.next) {
+                case 0:
+                  _context.next = 2;
+                  return err.response.json();
+
+                case 2:
+                  errorResp = _context.sent;
+                  callout.sendCallout({
+                    message: labelOverrides !== null && labelOverrides !== void 0 && labelOverrides.deleteError ? labelOverrides.deleteError(errorResp === null || errorResp === void 0 ? void 0 : errorResp.message, customProperty) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
+                      id: "stripes-kint-components.customPropertiesSettings.deleteCustomProperty.errorMessage",
+                      values: {
+                        error: errorResp === null || errorResp === void 0 ? void 0 : errorResp.message,
+                        label: customProperty === null || customProperty === void 0 ? void 0 : customProperty.label
+                      }
+                    }),
+                    type: 'error'
+                  });
+
+                case 4:
+                case "end":
+                  return _context.stop();
+              }
+            }
+          }, _callee);
+        }));
+
+        function _delete(_x) {
+          return _delete2.apply(this, arguments);
+        }
+
+        return _delete;
+      }()
+    }, catchQueryCalls),
     endpoint: customPropertiesEndpoint,
     id: customProperty === null || customProperty === void 0 ? void 0 : customProperty.id
   }),
@@ -166,6 +204,18 @@ var CustomPropertiesSettings = function CustomPropertiesSettings(_ref) {
     return _objectSpread(_objectSpread({}, submitData), {}, {
       ctx: submitData === null || submitData === void 0 ? void 0 : (_submitData$ctx = submitData.ctx) === null || _submitData$ctx === void 0 ? void 0 : (_submitData$ctx$ = _submitData$ctx[0]) === null || _submitData$ctx$ === void 0 ? void 0 : _submitData$ctx$.value
     });
+  }; // When POSTing a custom property, the backend expects a shorthand "Integer" or "LocalDate"
+  // When PUTing a custom property, the backend needs the full class name
+
+
+  var handleType = function handleType(submitData) {
+    var _typeRegex$exec;
+
+    var typeRegex = /(com\.k_int\.web\.toolkit\.custprops\.types\.CustomProperty)(.*)/g;
+    var typeMatch = (_typeRegex$exec = typeRegex.exec(submitData === null || submitData === void 0 ? void 0 : submitData.type)) !== null && _typeRegex$exec !== void 0 ? _typeRegex$exec : [];
+    return _objectSpread(_objectSpread({}, submitData), {}, {
+      type: typeMatch[2]
+    });
   };
 
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
@@ -173,13 +223,14 @@ var CustomPropertiesSettings = function CustomPropertiesSettings(_ref) {
       defaultWidth: "fill",
       id: "settings-customProperties.lookupPane",
       lastMenu: /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, {
+        buttonStyle: "primary",
         marginBottom0: true,
         onClick: function onClick() {
           return setMode(CREATING);
         } // TODO do we need to clear form here too?
         ,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
-          id: "stripes-kint-components.create"
+          id: "stripes-kint-components.new"
         })
       }),
       paneTitle: (_labelOverrides$paneT = labelOverrides.paneTitle) !== null && _labelOverrides$paneT !== void 0 ? _labelOverrides$paneT : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
@@ -203,8 +254,11 @@ var CustomPropertiesSettings = function CustomPropertiesSettings(_ref) {
           onClick: function onClick() {
             return setMode(EDITING);
           },
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
-            id: "stripes-kint-components.edit"
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Icon, {
+            icon: "edit",
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
+              id: "stripes-kint-components.edit"
+            })
           })
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, {
           buttonStyle: "dropdownItem",
@@ -213,8 +267,11 @@ var CustomPropertiesSettings = function CustomPropertiesSettings(_ref) {
             setDeleteModal(true);
             onToggle();
           },
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
-            id: "stripes-kint-components.delete"
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Icon, {
+            icon: "trash",
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
+              id: "stripes-kint-components.delete"
+            })
           })
         })];
       },
@@ -227,6 +284,7 @@ var CustomPropertiesSettings = function CustomPropertiesSettings(_ref) {
       paneTitle: (_ref3 = (_renderViewPaneTitle = renderViewPaneTitle) !== null && _renderViewPaneTitle !== void 0 ? _renderViewPaneTitle : customProperty === null || customProperty === void 0 ? void 0 : customProperty.label) !== null && _ref3 !== void 0 ? _ref3 : customProperty === null || customProperty === void 0 ? void 0 : customProperty.name,
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertyView.default, {
         customProperty: customProperty,
+        helpPopovers: helpPopovers,
         labelOverrides: labelOverrides
       })
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_FormModal.default, {
@@ -239,16 +297,22 @@ var CustomPropertiesSettings = function CustomPropertiesSettings(_ref) {
         ctx: customProperty !== null && customProperty !== void 0 && customProperty.ctx ? [{
           value: customProperty.ctx,
           label: customProperty.ctx
-        }] : null
+        }] : null,
+        category: customProperty !== null && customProperty !== void 0 && customProperty.category ? customProperty === null || customProperty === void 0 ? void 0 : (_customProperty$categ = customProperty.category) === null || _customProperty$categ === void 0 ? void 0 : _customProperty$categ.id : null
       }),
       modalProps: {
         dismissible: true,
+        label: mode === CREATING ? (_labelOverrides$modal = labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.modalTitleNew) !== null && _labelOverrides$modal !== void 0 ? _labelOverrides$modal : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
+          id: "stripes-kint-components.customProperty.newModal"
+        }) : (_labelOverrides$modal2 = labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.modalTitleEdit) !== null && _labelOverrides$modal2 !== void 0 ? _labelOverrides$modal2 : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
+          id: "stripes-kint-components.customProperty.editModal"
+        }),
         onClose: function onClose() {
           return setMode(VIEWING);
         },
         open: mode === CREATING || mode === EDITING
       },
-      onSubmit: mode === CREATING ? (0, _composeFunction.default)(createCustprop, handeContextSubmit) : (0, _composeFunction.default)(editCustProp, handeContextSubmit),
+      onSubmit: mode === CREATING ? (0, _composeFunction.default)(createCustprop, handeContextSubmit, handleType) : (0, _composeFunction.default)(editCustProp, handeContextSubmit),
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertyForm.default, {
         contextFilterOptions: renderContextFilterOptions,
         helpPopovers: helpPopovers,
@@ -269,7 +333,7 @@ var CustomPropertiesSettings = function CustomPropertiesSettings(_ref) {
         id: "stripes-kint-components.customProperties.delete.confirmHeading"
       }),
       id: "delete-job-confirmation",
-      message: (_labelOverrides$confi3 = labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.confirmMessage) !== null && _labelOverrides$confi3 !== void 0 ? _labelOverrides$confi3 : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntlSafeHtml.default, {
+      message: (_labelOverrides$confi3 = labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.confirmMessage) !== null && _labelOverrides$confi3 !== void 0 ? _labelOverrides$confi3 : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
         id: "stripes-kint-components.customProperties.delete.confirmMessage",
         values: {
           name: customProperty === null || customProperty === void 0 ? void 0 : customProperty.name
@@ -279,7 +343,7 @@ var CustomPropertiesSettings = function CustomPropertiesSettings(_ref) {
         return setDeleteModal(false);
       },
       onConfirm: function onConfirm() {
-        deleteCustProp();
+        deleteCustProp(customProperty === null || customProperty === void 0 ? void 0 : customProperty.id);
         setCustomProperty();
         setDeleteModal(false);
       },
@@ -288,12 +352,9 @@ var CustomPropertiesSettings = function CustomPropertiesSettings(_ref) {
   });
 };
 
-__signature__(CustomPropertiesSettings, "useQueryClient{queryClient}\nuseIntl{intl}\nuseState{[customProperty, setCustomProperty]}\nuseState{[deleteModal, setDeleteModal](false)}\nuseRefdata{refdata}\nuseState{[mode, setMode](VIEWING)}\nuseMutateCustomProperties{{\n    post: createCustprop,\n    put: editCustProp,\n    delete: deleteCustProp\n  }}", function () {
-  return [_reactQuery.useQueryClient, _reactIntl.useIntl, _hooks.useRefdata, _hooks.useMutateCustomProperties];
-});
-
 CustomPropertiesSettings.propTypes = {
   afterQueryCalls: _propTypes.default.object,
+  catchQueryCalls: _propTypes.default.object,
   contextFilterOptions: _propTypes.default.arrayOf(_propTypes.default.shape({
     value: _propTypes.default.string,
     label: _propTypes.default.oneOfType([_propTypes.default.element, _propTypes.default.string])
@@ -304,27 +365,4 @@ CustomPropertiesSettings.propTypes = {
   refdataEndpoint: _propTypes.default.string
 };
 var _default = CustomPropertiesSettings;
-var _default2 = _default;
-exports.default = _default2;
-;
-
-(function () {
-  var reactHotLoader = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default : undefined;
-
-  if (!reactHotLoader) {
-    return;
-  }
-
-  reactHotLoader.register(EDITING, "EDITING", "/home/ethan/FolioModules/stripes-kint-components/src/lib/CustomProperties/Config/CustomPropertiesSettings.js");
-  reactHotLoader.register(CREATING, "CREATING", "/home/ethan/FolioModules/stripes-kint-components/src/lib/CustomProperties/Config/CustomPropertiesSettings.js");
-  reactHotLoader.register(VIEWING, "VIEWING", "/home/ethan/FolioModules/stripes-kint-components/src/lib/CustomProperties/Config/CustomPropertiesSettings.js");
-  reactHotLoader.register(CustomPropertiesSettings, "CustomPropertiesSettings", "/home/ethan/FolioModules/stripes-kint-components/src/lib/CustomProperties/Config/CustomPropertiesSettings.js");
-  reactHotLoader.register(_default, "default", "/home/ethan/FolioModules/stripes-kint-components/src/lib/CustomProperties/Config/CustomPropertiesSettings.js");
-})();
-
-;
-
-(function () {
-  var leaveModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.leaveModule : undefined;
-  leaveModule && leaveModule(module);
-})();
+exports.default = _default;