@k-int/stripes-kint-components 5.4.0 → 5.5.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +20 -0
- package/es/index.js +1 -1
- package/es/lib/ActionList/ActionList.js +1 -1
- package/es/lib/ActionList/ActionListFieldArray.js +1 -1
- package/es/lib/CustomProperties/Edit/CustomPropertyField.js +1 -1
- package/es/lib/CustomProperties/Edit/CustomPropertyFormCard.test.js +1 -1
- package/es/lib/CustomProperties/Filter/useOperators.js +1 -1
- package/es/lib/CustomProperties/Filter/useValueProps.js +1 -1
- package/es/lib/CustomProperties/View/CustomPropertyCard.js +1 -1
- package/es/lib/EditableRefdataList/EditableRefdataList.js +1 -1
- package/es/lib/EditableSettingsList/SettingField/SettingField.js +1 -1
- package/es/lib/FormModal/FormModal.js +17 -14
- package/es/lib/IconSelect/IconSelect.js +1 -1
- package/es/lib/QueryTypedown/QueryTypedown.js +1 -1
- package/es/lib/SASQLookupComponent/SASQLookupComponent.js +4 -0
- package/es/lib/SASQLookupComponent/TableBody/TableBody.js +48 -12
- package/es/lib/SettingPage/SettingPage.js +1 -1
- package/es/lib/Typedown/Typedown.js +1 -1
- package/es/lib/hooks/useHelperApp.js +1 -1
- package/es/lib/hooks/useLocalStorageState.js +1 -1
- package/es/lib/hooks/useQIndex.js +1 -1
- package/es/lib/utils/filterParsers/index.js +1 -1
- package/package.json +9 -10
- package/renovate.json +6 -0
- package/src/lib/FormModal/FormModal.js +16 -15
- package/src/lib/SASQLookupComponent/SASQLookupComponent.js +3 -0
- package/src/lib/SASQLookupComponent/TableBody/TableBody.js +42 -5
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,23 @@
|
|
|
1
|
+
## [5.5.1](https://gitlab.com/knowledge-integration/folio/stripes-kint-components/compare/v5.5.0...v5.5.1) (2024-03-19)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* FormModal validating ([65806e1](https://gitlab.com/knowledge-integration/folio/stripes-kint-components/commit/65806e1f6bbcb2aab00b17b419048beb47fd5ab9))
|
|
7
|
+
* FormModal validating ([e4b99c7](https://gitlab.com/knowledge-integration/folio/stripes-kint-components/commit/e4b99c7526fdc292fe069100fd3ab2ea2c52dcce))
|
|
8
|
+
|
|
9
|
+
# [5.5.0](https://gitlab.com/knowledge-integration/folio/stripes-kint-components/compare/v5.4.0...v5.5.0) (2024-03-15)
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
### Bug Fixes
|
|
13
|
+
|
|
14
|
+
* FormModal handleSUbmit clears form ([2abf0dd](https://gitlab.com/knowledge-integration/folio/stripes-kint-components/commit/2abf0dddd042a0ea79970aa09b01ecca073d5705))
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
### Features
|
|
18
|
+
|
|
19
|
+
* SASQLookupComponent rowNavigation ([57aa5d2](https://gitlab.com/knowledge-integration/folio/stripes-kint-components/commit/57aa5d231f2700e2930ff26726d8445d03bd9001))
|
|
20
|
+
|
|
1
21
|
# [5.4.0](https://gitlab.com/knowledge-integration/folio/stripes-kint-components/compare/v5.3.1...v5.4.0) (2024-02-29)
|
|
2
22
|
|
|
3
23
|
|
package/es/index.js
CHANGED
|
@@ -393,5 +393,5 @@ var _ResponsiveButtonGroup = _interopRequireDefault(require("./lib/ResponsiveBut
|
|
|
393
393
|
var _SettingsFormContainer = _interopRequireDefault(require("./lib/SettingsFormContainer"));
|
|
394
394
|
var _ComboButton = _interopRequireDefault(require("./lib/ComboButton"));
|
|
395
395
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
396
|
-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u &&
|
|
396
|
+
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
397
397
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
@@ -13,7 +13,7 @@ var _ActionListFieldArray = _interopRequireDefault(require("./ActionListFieldArr
|
|
|
13
13
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
14
14
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
15
15
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
16
|
-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u &&
|
|
16
|
+
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
17
17
|
const propTypes = {
|
|
18
18
|
actionAssigner: _propTypes.default.func,
|
|
19
19
|
columnMapping: _propTypes.default.object,
|
|
@@ -15,7 +15,7 @@ var _ActionListFieldArray = _interopRequireDefault(require("../../../styles/Acti
|
|
|
15
15
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
16
16
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
17
17
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
18
|
-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u &&
|
|
18
|
+
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
19
19
|
const EDITING_ACTIONS_WIDTH = 25;
|
|
20
20
|
const NON_EDITING_ACTIONS_WIDTH = 20;
|
|
21
21
|
const TOTAL_WIDTH = 100;
|
|
@@ -12,7 +12,7 @@ var CUSTOM_PROPERTY_TYPES = _interopRequireWildcard(require("../../constants/cus
|
|
|
12
12
|
var _hooks = require("../../hooks");
|
|
13
13
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
14
14
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
15
|
-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u &&
|
|
15
|
+
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
16
16
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
17
17
|
const CustomPropertyField = _ref => {
|
|
18
18
|
let {
|
|
@@ -6,7 +6,7 @@ var _customProperties = _interopRequireWildcard(require("../../../../test/jest/c
|
|
|
6
6
|
var _jest = require("../../../../test/jest");
|
|
7
7
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
8
8
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
9
|
-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u &&
|
|
9
|
+
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
10
10
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
11
11
|
jest.mock('../../hooks');
|
|
12
12
|
jest.mock('./CustomPropertyField', () => () => /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
@@ -7,7 +7,7 @@ exports.default = void 0;
|
|
|
7
7
|
var CUSTPROP_TYPES = _interopRequireWildcard(require("../../constants/customProperties"));
|
|
8
8
|
var _hooks = require("../../hooks");
|
|
9
9
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
10
|
-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u &&
|
|
10
|
+
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
11
11
|
const {
|
|
12
12
|
REFDATA_CLASS_NAME: REFDATA,
|
|
13
13
|
MULTI_REFDATA_CLASS_NAME: MULTIREFDATA,
|
|
@@ -8,7 +8,7 @@ var _components = require("@folio/stripes/components");
|
|
|
8
8
|
var CUSTPROP_TYPES = _interopRequireWildcard(require("../../constants/customProperties"));
|
|
9
9
|
var _validators = require("../../validators");
|
|
10
10
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
11
|
-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u &&
|
|
11
|
+
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
12
12
|
const {
|
|
13
13
|
REFDATA_CLASS_NAME: REFDATA,
|
|
14
14
|
MULTI_REFDATA_CLASS_NAME: MULTIREFDATA,
|
|
@@ -11,7 +11,7 @@ var CUSTPROP_TYPES = _interopRequireWildcard(require("../../constants/customProp
|
|
|
11
11
|
var _hooks = require("../../hooks");
|
|
12
12
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
13
13
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
14
|
-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u &&
|
|
14
|
+
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
15
15
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
16
16
|
const CustomPropertyCard = _ref => {
|
|
17
17
|
let {
|
|
@@ -15,7 +15,7 @@ var _utils = require("../utils");
|
|
|
15
15
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
16
16
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
17
17
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
18
|
-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u &&
|
|
18
|
+
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
19
19
|
const propTypes = {
|
|
20
20
|
afterQueryCalls: _propTypes.default.object,
|
|
21
21
|
allowSpecial: _propTypes.default.bool,
|
|
@@ -16,7 +16,7 @@ var _renderHelpText = _interopRequireDefault(require("../../../../styles/renderH
|
|
|
16
16
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
17
17
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
18
18
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
19
|
-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u &&
|
|
19
|
+
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
20
20
|
const SettingField = settingFieldProps => {
|
|
21
21
|
const {
|
|
22
22
|
allowEdit = true,
|
|
@@ -41,25 +41,31 @@ const FormModal = _ref => {
|
|
|
41
41
|
onClose(e);
|
|
42
42
|
restart();
|
|
43
43
|
};
|
|
44
|
+
const handleSaveAndClear = function () {
|
|
45
|
+
handleSubmit(...arguments);
|
|
46
|
+
restart();
|
|
47
|
+
};
|
|
44
48
|
const renderFooter = () => {
|
|
45
49
|
if (footer) {
|
|
46
50
|
return footer({
|
|
47
51
|
formState,
|
|
48
|
-
handleSubmit,
|
|
49
|
-
handleClose
|
|
52
|
+
handleSubmit: handleSaveAndClear,
|
|
53
|
+
handleClose,
|
|
54
|
+
handleSubmitNoRestart: handleSubmit
|
|
50
55
|
});
|
|
51
56
|
}
|
|
52
57
|
const {
|
|
53
58
|
invalid,
|
|
54
59
|
pristine,
|
|
55
|
-
submitting
|
|
60
|
+
submitting,
|
|
61
|
+
validating
|
|
56
62
|
} = formState;
|
|
57
63
|
return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_components.ModalFooter, {
|
|
58
64
|
children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, {
|
|
59
65
|
buttonStyle: "primary",
|
|
60
|
-
disabled: submitting || invalid || pristine,
|
|
66
|
+
disabled: submitting || invalid || pristine || validating,
|
|
61
67
|
marginBottom0: true,
|
|
62
|
-
onClick:
|
|
68
|
+
onClick: handleSaveAndClear,
|
|
63
69
|
type: "submit",
|
|
64
70
|
children: kintIntl.formatKintMessage({
|
|
65
71
|
id: 'saveAndClose',
|
|
@@ -75,15 +81,12 @@ const FormModal = _ref => {
|
|
|
75
81
|
})]
|
|
76
82
|
});
|
|
77
83
|
};
|
|
78
|
-
return /*#__PURE__*/(0, _jsxRuntime.jsx)(
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
...modalProps,
|
|
85
|
-
children: children
|
|
86
|
-
})
|
|
84
|
+
return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Modal, {
|
|
85
|
+
enforceFocus: false,
|
|
86
|
+
footer: renderFooter(),
|
|
87
|
+
onClose: handleClose,
|
|
88
|
+
...modalProps,
|
|
89
|
+
children: children
|
|
87
90
|
});
|
|
88
91
|
}
|
|
89
92
|
});
|
|
@@ -13,7 +13,7 @@ var _RichSelect = _interopRequireWildcard(require("../RichSelect"));
|
|
|
13
13
|
var _FormattedKintMessage = _interopRequireDefault(require("../FormattedKintMessage"));
|
|
14
14
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
15
15
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
16
|
-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u &&
|
|
16
|
+
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
17
17
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
18
18
|
// A form component which acts as a "Select for states with corresponding icons"
|
|
19
19
|
const IconSelect = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
|
|
@@ -11,7 +11,7 @@ var _typedownHooks = require("../hooks/typedownHooks");
|
|
|
11
11
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
12
12
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
13
13
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
14
|
-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u &&
|
|
14
|
+
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
15
15
|
const QueryTypedown = _ref => {
|
|
16
16
|
let {
|
|
17
17
|
dataFormatter = d => d,
|
|
@@ -32,6 +32,8 @@ const SASQLookupComponent = /*#__PURE__*/(0, _react.forwardRef)((props, ref) =>
|
|
|
32
32
|
noSearchField,
|
|
33
33
|
persistedPanesetProps = {},
|
|
34
34
|
RenderBody,
|
|
35
|
+
rowNavigation = true,
|
|
36
|
+
// Default navigation onRowClick
|
|
35
37
|
sasqProps,
|
|
36
38
|
searchFieldAriaLabel,
|
|
37
39
|
searchFieldProps
|
|
@@ -221,6 +223,7 @@ const SASQLookupComponent = /*#__PURE__*/(0, _react.forwardRef)((props, ref) =>
|
|
|
221
223
|
intlNS: passedIntlNS,
|
|
222
224
|
labelOverrides: labelOverrides,
|
|
223
225
|
query: query,
|
|
226
|
+
rowNavigation: rowNavigation,
|
|
224
227
|
toggleFilterPane: toggleFilterPane,
|
|
225
228
|
...restOfInfiniteQueryProps,
|
|
226
229
|
...sasqRenderProps,
|
|
@@ -253,6 +256,7 @@ SASQLookupComponent.propTypes = {
|
|
|
253
256
|
RenderBody: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.node]),
|
|
254
257
|
resource: _propTypes.default.object,
|
|
255
258
|
resultColumns: _propTypes.default.arrayOf(_propTypes.default.object),
|
|
259
|
+
rowNavigation: _propTypes.default.bool,
|
|
256
260
|
sasqProps: _propTypes.default.object,
|
|
257
261
|
searchFieldAriaLabel: _propTypes.default.string,
|
|
258
262
|
searchFieldProps: _propTypes.default.object
|
|
@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.default = void 0;
|
|
7
|
+
var _react = require("react");
|
|
7
8
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
8
9
|
var _reactRouterDom = require("react-router-dom");
|
|
9
10
|
var _components = require("@folio/stripes/components");
|
|
@@ -11,7 +12,7 @@ var _NoResultsMessage = _interopRequireDefault(require("../../NoResultsMessage")
|
|
|
11
12
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
12
13
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
13
14
|
const TableBody = _ref => {
|
|
14
|
-
var _query$sort;
|
|
15
|
+
var _query$sort, _match$params2;
|
|
15
16
|
let {
|
|
16
17
|
data,
|
|
17
18
|
error,
|
|
@@ -23,10 +24,15 @@ const TableBody = _ref => {
|
|
|
23
24
|
isLoading,
|
|
24
25
|
labelOverrides = {},
|
|
25
26
|
match,
|
|
26
|
-
mclProps
|
|
27
|
+
mclProps: {
|
|
28
|
+
formatter = {},
|
|
29
|
+
...mclProps
|
|
30
|
+
},
|
|
27
31
|
onSort,
|
|
28
32
|
path,
|
|
29
33
|
resultColumns,
|
|
34
|
+
rowNavigation = true,
|
|
35
|
+
// Default navigation onRowClick
|
|
30
36
|
toggleFilterPane,
|
|
31
37
|
query
|
|
32
38
|
} = _ref;
|
|
@@ -44,11 +50,48 @@ const TableBody = _ref => {
|
|
|
44
50
|
|
|
45
51
|
// Build the list of visible columns
|
|
46
52
|
const visibleColumns = resultColumns.map(e => e.propertyPath);
|
|
53
|
+
const getRowUrl = (0, _react.useCallback)(rowData => {
|
|
54
|
+
const baseUrl = "".concat(path, "/").concat(rowData === null || rowData === void 0 ? void 0 : rowData.id);
|
|
55
|
+
return {
|
|
56
|
+
url: "".concat(baseUrl).concat(location === null || location === void 0 ? void 0 : location.search),
|
|
57
|
+
path,
|
|
58
|
+
baseUrl,
|
|
59
|
+
location
|
|
60
|
+
};
|
|
61
|
+
}, [location, path]);
|
|
62
|
+
const getEnhancedFormatter = (0, _react.useCallback)(() => {
|
|
63
|
+
const enhancedFormatter = {};
|
|
64
|
+
for (const [key, value] of Object.entries(formatter)) {
|
|
65
|
+
enhancedFormatter[key] = item => value({
|
|
66
|
+
...item,
|
|
67
|
+
defaultRowUrl: getRowUrl(item)
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
return enhancedFormatter;
|
|
71
|
+
}, [formatter, getRowUrl]);
|
|
72
|
+
const getOnRowClick = (0, _react.useCallback)(() => {
|
|
73
|
+
if (rowNavigation) {
|
|
74
|
+
return (_e, rowData) => {
|
|
75
|
+
history.push(getRowUrl(rowData).url);
|
|
76
|
+
};
|
|
77
|
+
}
|
|
78
|
+
return null;
|
|
79
|
+
}, [getRowUrl, history, rowNavigation]);
|
|
80
|
+
const isSelected = (0, _react.useCallback)(_ref2 => {
|
|
81
|
+
var _match$params;
|
|
82
|
+
let {
|
|
83
|
+
item
|
|
84
|
+
} = _ref2;
|
|
85
|
+
return item.id === (match === null || match === void 0 || (_match$params = match.params) === null || _match$params === void 0 ? void 0 : _match$params.id);
|
|
86
|
+
}, [match === null || match === void 0 || (_match$params2 = match.params) === null || _match$params2 === void 0 ? void 0 : _match$params2.id]);
|
|
47
87
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.MultiColumnList, {
|
|
48
88
|
autosize: true,
|
|
49
89
|
columnMapping: columnMapping,
|
|
50
90
|
contentData: data === null || data === void 0 ? void 0 : data.results,
|
|
91
|
+
formatter: getEnhancedFormatter() // Pass enhanced formatter
|
|
92
|
+
,
|
|
51
93
|
hasMargin: true,
|
|
94
|
+
interactive: rowNavigation,
|
|
52
95
|
isEmptyMessage: /*#__PURE__*/(0, _jsxRuntime.jsx)(_NoResultsMessage.default, {
|
|
53
96
|
error,
|
|
54
97
|
filterPaneIsVisible: filterPaneVisible,
|
|
@@ -60,18 +103,10 @@ const TableBody = _ref => {
|
|
|
60
103
|
searchTerm: query.query,
|
|
61
104
|
toggleFilterPane
|
|
62
105
|
}),
|
|
63
|
-
isSelected:
|
|
64
|
-
var _match$params;
|
|
65
|
-
let {
|
|
66
|
-
item
|
|
67
|
-
} = _ref2;
|
|
68
|
-
return item.id === (match === null || match === void 0 || (_match$params = match.params) === null || _match$params === void 0 ? void 0 : _match$params.id);
|
|
69
|
-
},
|
|
106
|
+
isSelected: isSelected,
|
|
70
107
|
onHeaderClick: onSort,
|
|
71
108
|
onNeedMoreData: onNeedMoreData,
|
|
72
|
-
onRowClick: (
|
|
73
|
-
history.push("".concat(path, "/").concat(rowData === null || rowData === void 0 ? void 0 : rowData.id).concat(location === null || location === void 0 ? void 0 : location.search));
|
|
74
|
-
},
|
|
109
|
+
onRowClick: getOnRowClick(),
|
|
75
110
|
pagingType: "click",
|
|
76
111
|
sortDirection: sortOrder.startsWith('-') ? 'descending' : 'ascending',
|
|
77
112
|
sortOrder: sortOrder.replace(/^-/, '').replace(/,.*/, ''),
|
|
@@ -101,6 +136,7 @@ TableBody.propTypes = {
|
|
|
101
136
|
path: _propTypes.default.string.isRequired,
|
|
102
137
|
query: _propTypes.default.object,
|
|
103
138
|
resultColumns: _propTypes.default.arrayOf(_propTypes.default.object),
|
|
139
|
+
rowNavigation: _propTypes.default.bool,
|
|
104
140
|
toggleFilterPane: _propTypes.default.func
|
|
105
141
|
};
|
|
106
142
|
var _default = exports.default = TableBody;
|
|
@@ -12,7 +12,7 @@ var _useSettingSection = _interopRequireDefault(require("../settingsHooks/useSet
|
|
|
12
12
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
13
13
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
14
14
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
15
|
-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u &&
|
|
15
|
+
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
16
16
|
// Importing directly here to avoid cyclic dependency
|
|
17
17
|
|
|
18
18
|
const SettingPage = _ref => {
|
|
@@ -16,7 +16,7 @@ var _selectorSafe = _interopRequireDefault(require("../utils/selectorSafe"));
|
|
|
16
16
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
17
17
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
18
18
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
19
|
-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u &&
|
|
19
|
+
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
20
20
|
const Typedown = _ref => {
|
|
21
21
|
let {
|
|
22
22
|
className,
|
|
@@ -11,7 +11,7 @@ var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
|
|
|
11
11
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
12
12
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
13
13
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
14
|
-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u &&
|
|
14
|
+
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
15
15
|
let helperObject = {};
|
|
16
16
|
const useHelperApp = helpers => {
|
|
17
17
|
const history = (0, _reactRouterDom.useHistory)();
|
|
@@ -7,7 +7,7 @@ exports.default = void 0;
|
|
|
7
7
|
var _react = _interopRequireWildcard(require("react"));
|
|
8
8
|
var _localStorage = require("@rehooks/local-storage");
|
|
9
9
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
10
|
-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u &&
|
|
10
|
+
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
11
11
|
const useLocalStorageState = (key, defaultValue) => {
|
|
12
12
|
const [local] = (0, _localStorage.useLocalStorage)(key, defaultValue);
|
|
13
13
|
const [localState, setLocalState] = (0, _react.useState)(local);
|
|
@@ -9,7 +9,7 @@ var _reactRouterDom = require("react-router-dom");
|
|
|
9
9
|
var _queryString = _interopRequireDefault(require("query-string"));
|
|
10
10
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
11
11
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
12
|
-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u &&
|
|
12
|
+
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
13
13
|
const useQIndex = () => {
|
|
14
14
|
const history = (0, _reactRouterDom.useHistory)();
|
|
15
15
|
const location = (0, _reactRouterDom.useLocation)();
|
|
@@ -44,5 +44,5 @@ var _parseKiwtQueryString = _interopRequireDefault(require("./parseKiwtQueryStri
|
|
|
44
44
|
var _parseKiwtQueryFilters = _interopRequireWildcard(require("./parseKiwtQueryFilters"));
|
|
45
45
|
var _deparseKiwtQueryFilters = _interopRequireWildcard(require("./deparseKiwtQueryFilters"));
|
|
46
46
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
47
|
-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u &&
|
|
47
|
+
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
48
48
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@k-int/stripes-kint-components",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.5.1",
|
|
4
4
|
"description": "Stripes Component library for K-Int specific applications",
|
|
5
5
|
"sideEffects": [
|
|
6
6
|
"*.css"
|
|
@@ -50,15 +50,14 @@
|
|
|
50
50
|
"@semantic-release/git": "^10.0.1",
|
|
51
51
|
"@semantic-release/gitlab": "^12.0.6",
|
|
52
52
|
"@semantic-release/npm": "^11.0.0",
|
|
53
|
-
"babel-eslint": "^10.1.0",
|
|
54
53
|
"babel-plugin-const-enum": "^1.0.1",
|
|
55
|
-
"babel-plugin-module-resolver": "^
|
|
54
|
+
"babel-plugin-module-resolver": "^5.0.0",
|
|
56
55
|
"babel-plugin-require-context-hook": "^1.0.0",
|
|
57
56
|
"babel-plugin-transform-async-to-promises": "^0.8.15",
|
|
58
57
|
"babel-polyfill": "^6.26.0",
|
|
59
58
|
"classnames": ">=2.2.6",
|
|
60
59
|
"core-js": "^3.6.1",
|
|
61
|
-
"eslint": "^
|
|
60
|
+
"eslint": "^8.0.0",
|
|
62
61
|
"eslint-plugin-import": "^2.26.0",
|
|
63
62
|
"eslint-plugin-jest": "^27.4.2",
|
|
64
63
|
"graphql": "^16.0.0",
|
|
@@ -69,15 +68,15 @@
|
|
|
69
68
|
"react-dom": "^18.2.0",
|
|
70
69
|
"react-intl": "^6.4.4",
|
|
71
70
|
"react-query": "^3.6.0",
|
|
72
|
-
"react-redux": "^
|
|
71
|
+
"react-redux": "^9.0.0",
|
|
73
72
|
"react-router": "^5.2.0",
|
|
74
73
|
"react-router-dom": "^5.2.0",
|
|
75
|
-
"redux": "^
|
|
76
|
-
"redux-observable": "^
|
|
77
|
-
"regenerator-runtime": "^0.
|
|
78
|
-
"rxjs": "^
|
|
74
|
+
"redux": "^5.0.0",
|
|
75
|
+
"redux-observable": "^2.0.0",
|
|
76
|
+
"regenerator-runtime": "^0.14.0",
|
|
77
|
+
"rxjs": "^7.0.0",
|
|
79
78
|
"semantic-release": "^22.0.6",
|
|
80
|
-
"sinon": "^
|
|
79
|
+
"sinon": "^17.0.0",
|
|
81
80
|
"typescript": "^2.8.0"
|
|
82
81
|
},
|
|
83
82
|
"peerDependencies": {
|
package/renovate.json
ADDED
|
@@ -27,19 +27,24 @@ const FormModal = ({
|
|
|
27
27
|
restart();
|
|
28
28
|
};
|
|
29
29
|
|
|
30
|
+
const handleSaveAndClear = (...onSaveProps) => {
|
|
31
|
+
handleSubmit(...onSaveProps);
|
|
32
|
+
restart();
|
|
33
|
+
};
|
|
34
|
+
|
|
30
35
|
const renderFooter = () => {
|
|
31
36
|
if (footer) {
|
|
32
|
-
return footer({ formState, handleSubmit, handleClose });
|
|
37
|
+
return footer({ formState, handleSubmit: handleSaveAndClear, handleClose, handleSubmitNoRestart: handleSubmit });
|
|
33
38
|
}
|
|
34
39
|
|
|
35
|
-
const { invalid, pristine, submitting } = formState;
|
|
40
|
+
const { invalid, pristine, submitting, validating } = formState;
|
|
36
41
|
return (
|
|
37
42
|
<ModalFooter>
|
|
38
43
|
<Button
|
|
39
44
|
buttonStyle="primary"
|
|
40
|
-
disabled={submitting || invalid || pristine}
|
|
45
|
+
disabled={submitting || invalid || pristine || validating}
|
|
41
46
|
marginBottom0
|
|
42
|
-
onClick={
|
|
47
|
+
onClick={handleSaveAndClear}
|
|
43
48
|
type="submit"
|
|
44
49
|
>
|
|
45
50
|
{kintIntl.formatKintMessage({
|
|
@@ -61,18 +66,14 @@ const FormModal = ({
|
|
|
61
66
|
};
|
|
62
67
|
|
|
63
68
|
return (
|
|
64
|
-
<
|
|
65
|
-
|
|
69
|
+
<Modal
|
|
70
|
+
enforceFocus={false}
|
|
71
|
+
footer={renderFooter()}
|
|
72
|
+
onClose={handleClose}
|
|
73
|
+
{...modalProps}
|
|
66
74
|
>
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
footer={renderFooter()}
|
|
70
|
-
onClose={handleClose}
|
|
71
|
-
{...modalProps}
|
|
72
|
-
>
|
|
73
|
-
{children}
|
|
74
|
-
</Modal>
|
|
75
|
-
</form>
|
|
75
|
+
{children}
|
|
76
|
+
</Modal>
|
|
76
77
|
);
|
|
77
78
|
}}
|
|
78
79
|
</Form>
|
|
@@ -44,6 +44,7 @@ const SASQLookupComponent = forwardRef((props, ref) => {
|
|
|
44
44
|
noSearchField,
|
|
45
45
|
persistedPanesetProps = {},
|
|
46
46
|
RenderBody,
|
|
47
|
+
rowNavigation = true, // Default navigation onRowClick
|
|
47
48
|
sasqProps,
|
|
48
49
|
searchFieldAriaLabel,
|
|
49
50
|
searchFieldProps
|
|
@@ -266,6 +267,7 @@ const SASQLookupComponent = forwardRef((props, ref) => {
|
|
|
266
267
|
intlNS={passedIntlNS}
|
|
267
268
|
labelOverrides={labelOverrides}
|
|
268
269
|
query={query}
|
|
270
|
+
rowNavigation={rowNavigation}
|
|
269
271
|
toggleFilterPane={toggleFilterPane}
|
|
270
272
|
{...restOfInfiniteQueryProps}
|
|
271
273
|
{...sasqRenderProps}
|
|
@@ -320,6 +322,7 @@ SASQLookupComponent.propTypes = {
|
|
|
320
322
|
]),
|
|
321
323
|
resource: PropTypes.object,
|
|
322
324
|
resultColumns: PropTypes.arrayOf(PropTypes.object),
|
|
325
|
+
rowNavigation: PropTypes.bool,
|
|
323
326
|
sasqProps: PropTypes.object,
|
|
324
327
|
searchFieldAriaLabel: PropTypes.string,
|
|
325
328
|
searchFieldProps: PropTypes.object
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { useCallback } from 'react';
|
|
1
2
|
import PropTypes from 'prop-types';
|
|
2
3
|
|
|
3
4
|
import { useHistory, useLocation } from 'react-router-dom';
|
|
@@ -18,10 +19,14 @@ const TableBody = ({
|
|
|
18
19
|
isLoading,
|
|
19
20
|
labelOverrides = {},
|
|
20
21
|
match,
|
|
21
|
-
mclProps
|
|
22
|
+
mclProps: {
|
|
23
|
+
formatter = {},
|
|
24
|
+
...mclProps
|
|
25
|
+
},
|
|
22
26
|
onSort,
|
|
23
27
|
path,
|
|
24
28
|
resultColumns,
|
|
29
|
+
rowNavigation = true, // Default navigation onRowClick
|
|
25
30
|
toggleFilterPane,
|
|
26
31
|
query,
|
|
27
32
|
}) => {
|
|
@@ -41,12 +46,45 @@ const TableBody = ({
|
|
|
41
46
|
// Build the list of visible columns
|
|
42
47
|
const visibleColumns = resultColumns.map(e => e.propertyPath);
|
|
43
48
|
|
|
49
|
+
const getRowUrl = useCallback((rowData) => {
|
|
50
|
+
const baseUrl = `${path}/${rowData?.id}`;
|
|
51
|
+
return {
|
|
52
|
+
url: `${baseUrl}${location?.search}`,
|
|
53
|
+
path,
|
|
54
|
+
baseUrl,
|
|
55
|
+
location
|
|
56
|
+
};
|
|
57
|
+
}, [location, path]);
|
|
58
|
+
|
|
59
|
+
const getEnhancedFormatter = useCallback(() => {
|
|
60
|
+
const enhancedFormatter = {};
|
|
61
|
+
for (const [key, value] of Object.entries(formatter)) {
|
|
62
|
+
enhancedFormatter[key] = (item) => value({ ...item, defaultRowUrl: getRowUrl(item) });
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
return enhancedFormatter;
|
|
66
|
+
}, [formatter, getRowUrl]);
|
|
67
|
+
|
|
68
|
+
const getOnRowClick = useCallback(() => {
|
|
69
|
+
if (rowNavigation) {
|
|
70
|
+
return (_e, rowData) => {
|
|
71
|
+
history.push(getRowUrl(rowData).url);
|
|
72
|
+
};
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
return null;
|
|
76
|
+
}, [getRowUrl, history, rowNavigation]);
|
|
77
|
+
|
|
78
|
+
const isSelected = useCallback(({ item }) => item.id === match?.params?.id, [match?.params?.id]);
|
|
79
|
+
|
|
44
80
|
return (
|
|
45
81
|
<MultiColumnList
|
|
46
82
|
autosize
|
|
47
83
|
columnMapping={columnMapping}
|
|
48
84
|
contentData={data?.results}
|
|
85
|
+
formatter={getEnhancedFormatter()} // Pass enhanced formatter
|
|
49
86
|
hasMargin
|
|
87
|
+
interactive={rowNavigation}
|
|
50
88
|
isEmptyMessage={
|
|
51
89
|
<NoResultsMessage
|
|
52
90
|
{...{
|
|
@@ -62,12 +100,10 @@ const TableBody = ({
|
|
|
62
100
|
}}
|
|
63
101
|
/>
|
|
64
102
|
}
|
|
65
|
-
isSelected={
|
|
103
|
+
isSelected={isSelected}
|
|
66
104
|
onHeaderClick={onSort}
|
|
67
105
|
onNeedMoreData={onNeedMoreData}
|
|
68
|
-
onRowClick={(
|
|
69
|
-
history.push(`${path}/${rowData?.id}${location?.search}`);
|
|
70
|
-
}}
|
|
106
|
+
onRowClick={getOnRowClick()}
|
|
71
107
|
pagingType="click"
|
|
72
108
|
sortDirection={sortOrder.startsWith('-') ? 'descending' : 'ascending'}
|
|
73
109
|
sortOrder={sortOrder.replace(/^-/, '').replace(/,.*/, '')}
|
|
@@ -99,6 +135,7 @@ TableBody.propTypes = {
|
|
|
99
135
|
path: PropTypes.string.isRequired,
|
|
100
136
|
query: PropTypes.object,
|
|
101
137
|
resultColumns: PropTypes.arrayOf(PropTypes.object),
|
|
138
|
+
rowNavigation: PropTypes.bool,
|
|
102
139
|
toggleFilterPane: PropTypes.func
|
|
103
140
|
};
|
|
104
141
|
|