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

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

@@ -0,0 +1,125 @@
+"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); }
+
+var _react = _interopRequireDefault(require("react"));
+
+require("@folio/stripes-erm-components/test/jest/__mock__");
+
+var _stripesTesting = require("@folio/stripes-testing");
+
+var _reactRouterDom = require("react-router-dom");
+
+var _helpers = require("../../../../test/jest/helpers");
+
+var _testResources = require("./testResources");
+
+var _CustomPropertiesSettings = _interopRequireDefault(require("./CustomPropertiesSettings"));
+
+var _jsxRuntime = require("react/jsx-runtime");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+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; }
+
+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('../../hooks', function () {
+  return {
+    useRefdata: function useRefdata() {
+      return [];
+    },
+    useMutateCustomProperties: function useMutateCustomProperties() {
+      return [];
+    }
+  };
+});
+jest.mock('../../FormModal/FormModal', function () {
+  return function () {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      children: "FormModal"
+    });
+  };
+});
+jest.mock('./CustomPropertiesLookup', function () {
+  return function () {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      children: "CustomPropertiesLookup"
+    });
+  };
+});
+describe('CustomPropertiesSettings', function () {
+  var renderComponent;
+  beforeEach(function () {
+    renderComponent = (0, _helpers.renderWithKintHarness)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRouterDom.MemoryRouter, {
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertiesSettings.default, _objectSpread({}, _testResources.custPropsSettings))
+    }));
+  });
+  it('renders FormModal component ', function () {
+    var _renderComponent = renderComponent,
+        getByText = _renderComponent.getByText;
+    expect(getByText('FormModal')).toBeInTheDocument();
+  });
+  it('renders CustomPropertiesLookup component ', function () {
+    var _renderComponent2 = renderComponent,
+        getByText = _renderComponent2.getByText;
+    expect(getByText('CustomPropertiesLookup')).toBeInTheDocument();
+  });
+  it('renders the expected New button', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return (0, _stripesTesting.Button)('New').exists();
+
+          case 2:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  })));
+  it('renders the expected Pane ', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return (0, _stripesTesting.Pane)('Supplementary properties').is({
+              visible: true
+            });
+
+          case 2:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  })));
+  it('renders the expected Pane header', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) {
+        switch (_context3.prev = _context3.next) {
+          case 0:
+            _context3.next = 2;
+            return (0, _stripesTesting.PaneHeader)('Supplementary properties').is({
+              visible: true
+            });
+
+          case 2:
+          case "end":
+            return _context3.stop();
+        }
+      }
+    }, _callee3);
+  })));
+});

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

@@ -17,15 +17,12 @@ var _components = require("@folio/stripes/components");
 
 var _validators = require("../../utils/validators");
 
+var _customProperties = require("../../constants/customProperties");
+
 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -46,12 +43,8 @@ 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 CustomPropertyForm = function CustomPropertyForm(_ref) {
-  var _labelOverrides$label, _labelOverrides$name, _labelOverrides$descr, _labelOverrides$ctx, _labelOverrides$weigh, _labelOverrides$prima2, _labelOverrides$retir, _labelOverrides$defau, _labelOverrides$type, _labelOverrides$categ;
+  var _labelOverrides$type, _labelOverrides$categ, _labelOverrides$label, _labelOverrides$name, _labelOverrides$descr, _labelOverrides$ctx, _labelOverrides$weigh, _labelOverrides$prima2, _labelOverrides$retir, _labelOverrides$defau;
 
   var contextFilterOptions = _ref.contextFilterOptions,
       helpPopovers = _ref.helpPopovers,
@@ -123,32 +116,108 @@ var CustomPropertyForm = function CustomPropertyForm(_ref) {
 
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_components.Row, {
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Col, {
+        xs: 6,
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFinalForm.Field, {
+          component: _components.Select,
+          dataOptions: [{
+            label: '',
+            value: ''
+          }, {
+            label: intl.formatMessage({
+              id: "stripes-kint-components.customProperties.type.".concat(_customProperties.DECIMAL_CLASS_NAME)
+            }),
+            value: _customProperties.DECIMAL_CLASS_NAME
+          }, {
+            label: intl.formatMessage({
+              id: "stripes-kint-components.customProperties.type.".concat(_customProperties.INTEGER_CLASS_NAME)
+            }),
+            value: _customProperties.INTEGER_CLASS_NAME
+          }, {
+            label: intl.formatMessage({
+              id: "stripes-kint-components.customProperties.type.".concat(_customProperties.TEXT_CLASS_NAME)
+            }),
+            value: _customProperties.TEXT_CLASS_NAME
+          }, {
+            label: intl.formatMessage({
+              id: "stripes-kint-components.customProperties.type.".concat(_customProperties.REFDATA_CLASS_NAME)
+            }),
+            value: _customProperties.REFDATA_CLASS_NAME
+          }, {
+            label: intl.formatMessage({
+              id: "stripes-kint-components.customProperties.type.".concat(_customProperties.MULTI_REFDATA_CLASS_NAME)
+            }),
+            value: _customProperties.MULTI_REFDATA_CLASS_NAME
+          }, {
+            label: intl.formatMessage({
+              id: "stripes-kint-components.customProperties.type.".concat(_customProperties.DATE_CLASS_NAME)
+            }),
+            value: _customProperties.DATE_CLASS_NAME
+          }],
+          disabled: values === null || values === void 0 ? void 0 : values.id,
+          label: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+            children: [(_labelOverrides$type = labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.type) !== null && _labelOverrides$type !== void 0 ? _labelOverrides$type : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
+              id: "stripes-kint-components.customProperties.type"
+            }), helpPopovers !== null && helpPopovers !== void 0 && helpPopovers.type ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
+              content: helpPopovers === null || helpPopovers === void 0 ? void 0 : helpPopovers.type
+            }) : null]
+          }),
+          name: "type",
+          required: true,
+          validate: _validators.required
+        })
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Col, {
+        xs: 6,
+        children: ((values === null || values === void 0 ? void 0 : values.type) === _customProperties.REFDATA_CLASS_NAME || (values === null || values === void 0 ? void 0 : values.type) === _customProperties.MULTI_REFDATA_CLASS_NAME) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFinalForm.Field, {
+          component: _components.Select,
+          dataOptions: [{
+            label: '',
+            value: ''
+          }].concat(_toConsumableArray(refdata)),
+          disabled: values === null || values === void 0 ? void 0 : values.id,
+          label: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+            children: [(_labelOverrides$categ = labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.category) !== null && _labelOverrides$categ !== void 0 ? _labelOverrides$categ : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
+              id: "stripes-kint-components.customProperties.category"
+            }), helpPopovers !== null && helpPopovers !== void 0 && helpPopovers.category ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
+              content: helpPopovers === null || helpPopovers === void 0 ? void 0 : helpPopovers.category
+            }) : null]
+          }),
+          name: "category",
+          required: true,
+          validate: _validators.required
+        })
+      })]
+    }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_components.Row, {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Col, {
         xs: 6,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFinalForm.Field, {
           component: _components.TextField,
-          label: (_labelOverrides$label = labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.label) !== null && _labelOverrides$label !== void 0 ? _labelOverrides$label : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
-            id: "stripes-kint-components.customProperties.label"
+          id: "custom-prop-label",
+          label: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+            children: [(_labelOverrides$label = labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.label) !== null && _labelOverrides$label !== void 0 ? _labelOverrides$label : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
+              id: "stripes-kint-components.customProperties.label"
+            }), helpPopovers !== null && helpPopovers !== void 0 && helpPopovers.label ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
+              content: helpPopovers === null || helpPopovers === void 0 ? void 0 : helpPopovers.label
+            }) : null]
           }),
           name: "label",
           required: true,
-          startControl: helpPopovers !== null && helpPopovers !== void 0 && helpPopovers.label ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
-            content: helpPopovers === null || helpPopovers === void 0 ? void 0 : helpPopovers.label
-          }) : null,
           validate: _validators.required
         })
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Col, {
         xs: 6,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFinalForm.Field, {
           component: _components.TextField,
-          label: (_labelOverrides$name = labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.name) !== null && _labelOverrides$name !== void 0 ? _labelOverrides$name : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
-            id: "stripes-kint-components.customProperties.name"
+          id: "custom-prop-name",
+          label: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+            children: [(_labelOverrides$name = labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.name) !== null && _labelOverrides$name !== void 0 ? _labelOverrides$name : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
+              id: "stripes-kint-components.customProperties.name"
+            }), helpPopovers !== null && helpPopovers !== void 0 && helpPopovers.name ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
+              content: helpPopovers === null || helpPopovers === void 0 ? void 0 : helpPopovers.name
+            }) : null]
           }),
           name: "name",
           required: true,
-          startControl: helpPopovers !== null && helpPopovers !== void 0 && helpPopovers.name ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
-            content: helpPopovers === null || helpPopovers === void 0 ? void 0 : helpPopovers.name
-          }) : null,
           validate: function validate(v) {
             if (v && v.length) {
               return /^[a-z][a-z0-9]*$/i.test(v) ? undefined : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
@@ -162,21 +231,23 @@ var CustomPropertyForm = function CustomPropertyForm(_ref) {
       })]
     }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_components.Row, {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Col, {
-        xs: 9,
+        xs: 6,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFinalForm.Field, {
           component: _components.TextArea,
-          label: (_labelOverrides$descr = labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.description) !== null && _labelOverrides$descr !== void 0 ? _labelOverrides$descr : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
-            id: "stripes-kint-components.customProperties.description"
+          id: "custom-prop-description",
+          label: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+            children: [(_labelOverrides$descr = labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.description) !== null && _labelOverrides$descr !== void 0 ? _labelOverrides$descr : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
+              id: "stripes-kint-components.customProperties.description"
+            }), helpPopovers !== null && helpPopovers !== void 0 && helpPopovers.description ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
+              content: helpPopovers === null || helpPopovers === void 0 ? void 0 : helpPopovers.description
+            }) : null]
           }),
           name: "description",
           required: true,
-          startControl: helpPopovers !== null && helpPopovers !== void 0 && helpPopovers.description ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
-            content: helpPopovers === null || helpPopovers === void 0 ? void 0 : helpPopovers.description
-          }) : null,
           validate: _validators.required
         })
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Col, {
-        xs: 3,
+        xs: 6,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFinalForm.Field, {
           actions: [{
             onSelect: addCtx,
@@ -187,8 +258,12 @@ var CustomPropertyForm = function CustomPropertyForm(_ref) {
           emptyMessage: intl.formatMessage({
             id: 'stripes-kint-components.customProperties.noCtxFound'
           }),
-          label: (_labelOverrides$ctx = labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.ctx) !== null && _labelOverrides$ctx !== void 0 ? _labelOverrides$ctx : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
-            id: "stripes-kint-components.customProperties.ctx"
+          label: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+            children: [(_labelOverrides$ctx = labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.ctx) !== null && _labelOverrides$ctx !== void 0 ? _labelOverrides$ctx : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
+              id: "stripes-kint-components.customProperties.ctx"
+            }), helpPopovers !== null && helpPopovers !== void 0 && helpPopovers.ctx ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
+              content: helpPopovers === null || helpPopovers === void 0 ? void 0 : helpPopovers.ctx
+            }) : null]
           }),
           name: "ctx",
           onChange: function onChange(selectedItems) {
@@ -210,14 +285,16 @@ var CustomPropertyForm = function CustomPropertyForm(_ref) {
         xs: 3,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFinalForm.Field, {
           component: _components.TextField,
-          label: (_labelOverrides$weigh = labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.weight) !== null && _labelOverrides$weigh !== void 0 ? _labelOverrides$weigh : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
-            id: "stripes-kint-components.customProperties.weight"
+          id: "custom-prop-weight",
+          label: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+            children: [(_labelOverrides$weigh = labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.weight) !== null && _labelOverrides$weigh !== void 0 ? _labelOverrides$weigh : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
+              id: "stripes-kint-components.customProperties.weight"
+            }), helpPopovers !== null && helpPopovers !== void 0 && helpPopovers.weight ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
+              content: helpPopovers === null || helpPopovers === void 0 ? void 0 : helpPopovers.weight
+            }) : null]
           }),
           name: "weight",
           required: true,
-          startControl: helpPopovers !== null && helpPopovers !== void 0 && helpPopovers.weight ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
-            content: helpPopovers === null || helpPopovers === void 0 ? void 0 : helpPopovers.weight
-          }) : null,
           type: "number",
           validate: _validators.required
         })
@@ -237,15 +314,16 @@ var CustomPropertyForm = function CustomPropertyForm(_ref) {
             value: 'false'
           }],
           format: booleanToString,
-          label: (_labelOverrides$prima2 = labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.primary) !== null && _labelOverrides$prima2 !== void 0 ? _labelOverrides$prima2 : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
-            id: "stripes-kint-components.customProperties.primary"
+          label: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+            children: [(_labelOverrides$prima2 = labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.primary) !== null && _labelOverrides$prima2 !== void 0 ? _labelOverrides$prima2 : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
+              id: "stripes-kint-components.customProperties.primary"
+            }), helpPopovers !== null && helpPopovers !== void 0 && helpPopovers.primary ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
+              content: helpPopovers === null || helpPopovers === void 0 ? void 0 : helpPopovers.primary
+            }) : null]
           }),
           name: "primary",
           parse: stringToBoolean,
           required: true,
-          startControl: helpPopovers !== null && helpPopovers !== void 0 && helpPopovers.primary ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
-            content: helpPopovers === null || helpPopovers === void 0 ? void 0 : helpPopovers.primary
-          }) : null,
           validate: (0, _validators.composeValidators)(_validators.required, primaryRetiredValidator)
         })
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Col, {
@@ -264,15 +342,16 @@ var CustomPropertyForm = function CustomPropertyForm(_ref) {
             value: 'false'
           }],
           format: booleanToString,
-          label: (_labelOverrides$retir = labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.retired) !== null && _labelOverrides$retir !== void 0 ? _labelOverrides$retir : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
-            id: "stripes-kint-components.customProperties.retired"
+          label: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+            children: [(_labelOverrides$retir = labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.retired) !== null && _labelOverrides$retir !== void 0 ? _labelOverrides$retir : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
+              id: "stripes-kint-components.customProperties.retired"
+            }), helpPopovers !== null && helpPopovers !== void 0 && helpPopovers.retired ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
+              content: helpPopovers === null || helpPopovers === void 0 ? void 0 : helpPopovers.retired
+            }) : null]
           }),
           name: "retired",
           parse: stringToBoolean,
           required: true,
-          startControl: helpPopovers !== null && helpPopovers !== void 0 && helpPopovers.primary ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
-            content: helpPopovers === null || helpPopovers === void 0 ? void 0 : helpPopovers.primary
-          }) : null,
           validate: (0, _validators.composeValidators)(_validators.required, primaryRetiredValidator)
         })
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Col, {
@@ -291,78 +370,16 @@ var CustomPropertyForm = function CustomPropertyForm(_ref) {
             value: 'false'
           }],
           format: booleanToString,
-          label: (_labelOverrides$defau = labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.defaultVisibility) !== null && _labelOverrides$defau !== void 0 ? _labelOverrides$defau : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
-            id: "stripes-kint-components.customProperties.defaultVisibility"
+          label: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+            children: [(_labelOverrides$defau = labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.defaultVisibility) !== null && _labelOverrides$defau !== void 0 ? _labelOverrides$defau : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
+              id: "stripes-kint-components.customProperties.defaultVisibility"
+            }), helpPopovers !== null && helpPopovers !== void 0 && helpPopovers.defaultVisibility ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
+              content: helpPopovers === null || helpPopovers === void 0 ? void 0 : helpPopovers.defaultVisibility
+            }) : null]
           }),
           name: "defaultInternal",
           parse: stringToBoolean,
           required: true,
-          startControl: helpPopovers !== null && helpPopovers !== void 0 && helpPopovers.defaultVisibility ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
-            content: helpPopovers === null || helpPopovers === void 0 ? void 0 : helpPopovers.defaultVisibility
-          }) : null,
-          validate: _validators.required
-        })
-      })]
-    }), !(values !== null && values !== void 0 && values.id) && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_components.Row, {
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Col, {
-        xs: 6,
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFinalForm.Field, {
-          component: _components.Select,
-          dataOptions: [{
-            label: '',
-            value: ''
-          }, {
-            label: intl.formatMessage({
-              id: 'stripes-kint-components.customProperties.type.com.k_int.web.toolkit.custprops.types.CustomPropertyDecimal'
-            }),
-            value: 'Decimal'
-          }, {
-            label: intl.formatMessage({
-              id: 'stripes-kint-components.customProperties.type.com.k_int.web.toolkit.custprops.types.CustomPropertyInteger'
-            }),
-            value: 'Integer'
-          }, {
-            label: intl.formatMessage({
-              id: 'stripes-kint-components.customProperties.type.com.k_int.web.toolkit.custprops.types.CustomPropertyText'
-            }),
-            value: 'Text'
-          }, {
-            label: intl.formatMessage({
-              id: 'stripes-kint-components.customProperties.type.com.k_int.web.toolkit.custprops.types.CustomPropertyRefdata'
-            }),
-            value: 'Refdata'
-          }, {
-            label: intl.formatMessage({
-              id: 'stripes-kint-components.customProperties.type.com.k_int.web.toolkit.custprops.types.CustomPropertyLocalDate'
-            }),
-            value: 'LocalDate'
-          }],
-          label: (_labelOverrides$type = labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.type) !== null && _labelOverrides$type !== void 0 ? _labelOverrides$type : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
-            id: "stripes-kint-components.customProperties.type"
-          }),
-          name: "type",
-          required: true,
-          startControl: helpPopovers !== null && helpPopovers !== void 0 && helpPopovers.type ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
-            content: helpPopovers === null || helpPopovers === void 0 ? void 0 : helpPopovers.type
-          }) : null,
-          validate: _validators.required
-        })
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Col, {
-        xs: 6,
-        children: (values === null || values === void 0 ? void 0 : values.type) === 'Refdata' && /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFinalForm.Field, {
-          component: _components.Select,
-          dataOptions: [{
-            label: '',
-            value: ''
-          }].concat(_toConsumableArray(refdata)),
-          label: (_labelOverrides$categ = labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.category) !== null && _labelOverrides$categ !== void 0 ? _labelOverrides$categ : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
-            id: "stripes-kint-components.customProperties.category"
-          }),
-          name: "category",
-          required: true,
-          startControl: helpPopovers !== null && helpPopovers !== void 0 && helpPopovers.category ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
-            content: helpPopovers === null || helpPopovers === void 0 ? void 0 : helpPopovers.category
-          }) : null,
           validate: _validators.required
         })
       })]
@@ -370,35 +387,11 @@ var CustomPropertyForm = function CustomPropertyForm(_ref) {
   });
 };
 
-__signature__(CustomPropertyForm, "useFormState{{ values }}\nuseForm{{ change }}\nuseIntl{intl}\nuseState{[contextOptions, setContextOptions](contextFilterOptions?.filter(ctx => ctx.value !== '' && ctx?.value !== 'isNull'))}", function () {
-  return [_reactFinalForm.useFormState, _reactFinalForm.useForm, _reactIntl.useIntl];
-});
-
 CustomPropertyForm.propTypes = {
-  contextFilterOptions: _propTypes.default.arrayOf(_propTypes.default.string),
+  contextFilterOptions: _propTypes.default.arrayOf(_propTypes.default.object),
   helpPopovers: _propTypes.default.object,
   labelOverrides: _propTypes.default.object,
   refdata: _propTypes.default.arrayOf(_propTypes.default.object)
 };
 var _default = CustomPropertyForm;
-var _default2 = _default;
-exports.default = _default2;
-;
-
-(function () {
-  var reactHotLoader = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default : undefined;
-
-  if (!reactHotLoader) {
-    return;
-  }
-
-  reactHotLoader.register(CustomPropertyForm, "CustomPropertyForm", "/home/ethan/FolioModules/stripes-kint-components/src/lib/CustomProperties/Config/CustomPropertyForm.js");
-  reactHotLoader.register(_default, "default", "/home/ethan/FolioModules/stripes-kint-components/src/lib/CustomProperties/Config/CustomPropertyForm.js");
-})();
-
-;
-
-(function () {
-  var leaveModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.leaveModule : undefined;
-  leaveModule && leaveModule(module);
-})();
+exports.default = _default;