@k-int/stripes-kint-components 2.3.0 → 2.3.3

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 2.3.3 2022-04-04
+  * Fixed inconsistent `retiredName` labelOverride function behaviour, where in `filters` the function accepted the name, and in `view` the function accepted the entire object. The behaviour has been standardised to be the name alone in both scenarios.
+  * Fixed improper custom property count behaviour in view mode, now only _set_ primary properties are included in the count.
+
+## 2.3.2 2022-04-01
+  * Fix to actionAssigner callback pattern
+  * Tweak to remove marginBottom0 warning
+  * FormModal buttons have marginBottom0 prop on them now
+  * Fixed issue where cusotm property updates would not be reflected on the open view pane in settings
+
+## 2.3.1 2022-03-28
+  * Custom Property component fixes
+
 ## 2.3.0 2022-03-25
   * FormModal
     * Ability to override labels for "save" and "cancel"

package/es/lib/ActionList/ActionListFieldArray.js

@@ -137,14 +137,14 @@ var ActionListFieldArray = function ActionListFieldArray(_ref) {
   };
 
   var handleSave = function handleSave(index) {
-    var _actionAssigner$find;
+    var _actionAssigner, _actionAssigner$find;
 
     var _fields$value$index = fields.value[index],
         _a = _fields$value$index.actionListActions,
         rowData = _objectWithoutProperties(_fields$value$index, _excluded2); // Find "edit" entry in actionAssigner
 
 
-    var editCallback = (_actionAssigner$find = actionAssigner.find(function (act) {
+    var editCallback = (_actionAssigner = actionAssigner(rowData)) === null || _actionAssigner === void 0 ? void 0 : (_actionAssigner$find = _actionAssigner.find(function (act) {
       return act.name === 'edit';
     })) === null || _actionAssigner$find === void 0 ? void 0 : _actionAssigner$find.callback;
 
@@ -255,7 +255,6 @@ var ActionListFieldArray = function ActionListFieldArray(_ref) {
           return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.IconButton, {
             disabled: editing,
             icon: action.icon,
-            marginBottom0: true,
             onClick: function onClick() {
               return actionFunction ? actionFunction() : function () {
                 return null;

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

@@ -134,20 +134,23 @@ var CustomPropertiesSettings = function CustomPropertiesSettings(_ref) {
 
   var _useMutateCustomPrope = (0, _hooks.useMutateCustomProperties)({
     afterQueryCalls: {
-      put: function put() {
+      put: function put(res) {
         setMode(VIEWING);
         queryClient.invalidateQueries(['stripes-kint-components', 'useCustomProperties', 'custprops']);
-        afterQueryCallsSafe.put();
+        setCustomProperty(res);
+        afterQueryCallsSafe.put(res);
       },
-      post: function post() {
+      post: function post(res) {
         setMode(VIEWING);
         queryClient.invalidateQueries(['stripes-kint-components', 'useCustomProperties', 'custprops']);
-        afterQueryCallsSafe.post();
+        setCustomProperty(res);
+        afterQueryCallsSafe.post(res);
       },
-      delete: function _delete() {
+      delete: function _delete(res) {
         setMode(VIEWING);
         queryClient.invalidateQueries(['stripes-kint-components', 'useCustomProperties', 'custprops']);
-        afterQueryCallsSafe.delete();
+        setCustomProperty();
+        afterQueryCallsSafe.delete(res);
       }
     },
     endpoint: customPropertiesEndpoint,

package/es/lib/CustomProperties/Filter/CustomPropertiesFilterField.js

@@ -55,7 +55,8 @@ var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoader
 var CustomPropertiesFilterField = function CustomPropertiesFilterField(_ref) {
   var _labelOverrides$custo, _customProperties$fin, _customProperties$fin2, _fields$value$index2;
 
-  var customProperties = _ref.customProperties,
+  var _ref$customProperties = _ref.customProperties,
+      customProperties = _ref$customProperties === void 0 ? [] : _ref$customProperties,
       fields = _ref.fields,
       index = _ref.index,
       _ref$labelOverrides = _ref.labelOverrides,

package/es/lib/CustomProperties/View/CustomPropertiesViewCtx.js

@@ -41,10 +41,11 @@ var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoader
 };
 
 var CustomPropertiesViewCtx = function CustomPropertiesViewCtx(_ref) {
-  var _custprops$filter$len, _custprops$filter, _Object$entries$filte, _Object$entries, _Object$entries$filte2;
+  var _custprops$filter$len, _custprops$filter;
 
   var ctx = _ref.ctx,
-      customProperties = _ref.customProperties,
+      _ref$customProperties = _ref.customProperties,
+      customProperties = _ref$customProperties === void 0 ? [] : _ref$customProperties,
       customPropertiesEndpoint = _ref.customPropertiesEndpoint,
       id = _ref.id,
       labelOverrides = _ref.labelOverrides;
@@ -111,30 +112,37 @@ var CustomPropertiesViewCtx = function CustomPropertiesViewCtx(_ref) {
       label: getAccordionLabel(),
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Spinner, {})
     });
-  } // We need to display any set properties, along with any non-set primary properties
+  }
+
+  var countSetProperties = function countSetProperties(primary) {
+    var _Object$entries$filte, _Object$entries, _Object$entries$filte2;
+
+    return (_Object$entries$filte = (_Object$entries = Object.entries(customProperties)) === null || _Object$entries === void 0 ? void 0 : (_Object$entries$filte2 = _Object$entries.filter(function (_ref2) {
+      var _cp$, _cp$$type, _cp$2, _cp$2$type, _cp$3, _cp$3$type;
+
+      var _ref3 = _slicedToArray(_ref2, 2),
+          _key = _ref3[0],
+          cp = _ref3[1];
+
+      return (((_cp$ = cp[0]) === null || _cp$ === void 0 ? void 0 : (_cp$$type = _cp$.type) === null || _cp$$type === void 0 ? void 0 : _cp$$type.ctx) === ctx || ctx === 'isNull' && !((_cp$2 = cp[0]) !== null && _cp$2 !== void 0 && (_cp$2$type = _cp$2.type) !== null && _cp$2$type !== void 0 && _cp$2$type.ctx)) && // Either the ctx string matches, or isNull matches blank
+      ((_cp$3 = cp[0]) === null || _cp$3 === void 0 ? void 0 : (_cp$3$type = _cp$3.type) === null || _cp$3$type === void 0 ? void 0 : _cp$3$type.primary) === primary // Only count non-primary set custprops
+      ;
+    })) === null || _Object$entries$filte2 === void 0 ? void 0 : _Object$entries$filte2.length) !== null && _Object$entries$filte !== void 0 ? _Object$entries$filte : 0;
+  }; // We need to display any set properties, along with any non-set primary properties
 
 
   var primaryCount = (_custprops$filter$len = custprops === null || custprops === void 0 ? void 0 : (_custprops$filter = custprops.filter(function (cp) {
     return cp.primary === true;
   })) === null || _custprops$filter === void 0 ? void 0 : _custprops$filter.length) !== null && _custprops$filter$len !== void 0 ? _custprops$filter$len : 0;
-  var optionalCount = (_Object$entries$filte = (_Object$entries = Object.entries(customProperties)) === null || _Object$entries === void 0 ? void 0 : (_Object$entries$filte2 = _Object$entries.filter(function (_ref2) {
-    var _cp$, _cp$$type, _cp$2, _cp$2$type, _cp$3, _cp$3$type;
-
-    var _ref3 = _slicedToArray(_ref2, 2),
-        _key = _ref3[0],
-        cp = _ref3[1];
-
-    return (((_cp$ = cp[0]) === null || _cp$ === void 0 ? void 0 : (_cp$$type = _cp$.type) === null || _cp$$type === void 0 ? void 0 : _cp$$type.ctx) === ctx || ctx === 'isNull' && !((_cp$2 = cp[0]) !== null && _cp$2 !== void 0 && (_cp$2$type = _cp$2.type) !== null && _cp$2$type !== void 0 && _cp$2$type.ctx)) && // Either the ctx string matches, or isNull matches blank
-    ((_cp$3 = cp[0]) === null || _cp$3 === void 0 ? void 0 : (_cp$3$type = _cp$3.type) === null || _cp$3$type === void 0 ? void 0 : _cp$3$type.primary) === false // Only count non-primary set custprops
-    ;
-  })) === null || _Object$entries$filte2 === void 0 ? void 0 : _Object$entries$filte2.length) !== null && _Object$entries$filte !== void 0 ? _Object$entries$filte : 0;
+  var optionalCount = countSetProperties(false);
+  var setPrimaryCount = countSetProperties(true);
   return primaryCount + optionalCount > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Accordion, {
     closedByDefault: true,
     displayWhenClosed: /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Badge, {
-      children: primaryCount + optionalCount
+      children: setPrimaryCount + optionalCount
     }),
     displayWhenOpen: /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Badge, {
-      children: primaryCount + optionalCount
+      children: setPrimaryCount + optionalCount
     }),
     id: "".concat(id, "-accordion-").concat(ctx),
     label: getAccordionLabel(),

package/es/lib/CustomProperties/View/CustomPropertyCard.js

@@ -37,7 +37,8 @@ var CustomPropertyCard = function CustomPropertyCard(_ref) {
 
   var ctx = _ref.ctx,
       customProperty = _ref.customProperty,
-      customPropertyDefinition = _ref.customPropertyDefinition,
+      _ref$customPropertyDe = _ref.customPropertyDefinition,
+      customPropertyDefinition = _ref$customPropertyDe === void 0 ? {} : _ref$customPropertyDe,
       index = _ref.index,
       labelOverrides = _ref.labelOverrides;
   // We only need to display primary and set properties
@@ -54,7 +55,7 @@ var CustomPropertyCard = function CustomPropertyCard(_ref) {
 
     // Label override for default card title,
     if (labelOverrides.retiredName && typeof labelOverrides.retiredName === 'function') {
-      return labelOverrides.retiredName(customPropertyDefinition);
+      return labelOverrides.retiredName(customPropertyDefinition.name);
     } // Label override for default title or finally built in default
 
 

package/es/lib/FormModal/FormModal.js

@@ -75,11 +75,13 @@ var FormModal = function FormModal(_ref) {
         return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_components.ModalFooter, {
           children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, {
             buttonStyle: "primary",
+            marginBottom0: true,
             onClick: handleSubmit,
             children: (_labelOverrides$save = labelOverrides.save) !== null && _labelOverrides$save !== void 0 ? _labelOverrides$save : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
               id: "stripes-kint-components.save"
             })
           }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, {
+            marginBottom0: true,
             onClick: handleClose,
             children: (_labelOverrides$cance = labelOverrides.cancel) !== null && _labelOverrides$cance !== void 0 ? _labelOverrides$cance : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
               id: "stripes-kint-components.cancel"

package/es/lib/utils/groupCustomPropertiesByCtx.js

@@ -32,7 +32,8 @@ var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoader
   return a;
 };
 
-var groupCustomPropertiesByCtx = function groupCustomPropertiesByCtx(customProperties) {
+var groupCustomPropertiesByCtx = function groupCustomPropertiesByCtx() {
+  var customProperties = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   return customProperties.reduce(function (acc, curr) {
     var _curr$ctx, _acc$ctx;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k-int/stripes-kint-components",
-  "version": "2.3.0",
+  "version": "2.3.3",
   "description": "Stripes Component library for K-Int specific applications",
   "sideEffects": [
     "*.css"

package/src/lib/ActionList/ActionListFieldArray.js

@@ -61,7 +61,7 @@ const ActionListFieldArray = ({
     const { actionListActions: _a, ...rowData } = fields.value[index];
 
     // Find "edit" entry in actionAssigner
-    const editCallback = actionAssigner.find(act => act.name === 'edit')?.callback;
+    const editCallback = actionAssigner(rowData)?.find(act => act.name === 'edit')?.callback;
     if (editCallback) {
       editCallback(rowData);
     } else {
@@ -167,7 +167,6 @@ const ActionListFieldArray = ({
                 key={`action-${action.name}[${data.rowIndex}]`}
                 disabled={editing}
                 icon={action.icon}
-                marginBottom0
                 onClick={() => (actionFunction ? actionFunction() : () => null)}
                 to={action.to}
               />

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

@@ -78,20 +78,23 @@ const CustomPropertiesSettings = ({
     delete: deleteCustProp
   } = useMutateCustomProperties({
     afterQueryCalls: {
-      put: () => {
+      put: res => {
         setMode(VIEWING);
         queryClient.invalidateQueries(['stripes-kint-components', 'useCustomProperties', 'custprops']);
-        afterQueryCallsSafe.put();
+        setCustomProperty(res);
+        afterQueryCallsSafe.put(res);
       },
-      post: () => {
+      post: res => {
         setMode(VIEWING);
         queryClient.invalidateQueries(['stripes-kint-components', 'useCustomProperties', 'custprops']);
-        afterQueryCallsSafe.post();
+        setCustomProperty(res);
+        afterQueryCallsSafe.post(res);
       },
-      delete: () => {
+      delete: res => {
         setMode(VIEWING);
         queryClient.invalidateQueries(['stripes-kint-components', 'useCustomProperties', 'custprops']);
-        afterQueryCallsSafe.delete();
+        setCustomProperty();
+        afterQueryCallsSafe.delete(res);
       }
     },
     endpoint: customPropertiesEndpoint,

package/src/lib/CustomProperties/Filter/CustomPropertiesFilterField.js

@@ -19,7 +19,7 @@ import { required as requiredValidator } from '../../utils/validators';
 import CustomPropertiesRule from './CustomPropertiesRule';
 
 const CustomPropertiesFilterField = ({
-  customProperties,
+  customProperties = [],
   fields,
   index,
   labelOverrides = {},

package/src/lib/CustomProperties/View/CustomPropertiesViewCtx.js

@@ -8,7 +8,7 @@ import CustomPropertyCard from './CustomPropertyCard';
 
 const CustomPropertiesViewCtx = ({
   ctx,
-  customProperties,
+  customProperties = [],
   customPropertiesEndpoint,
   id,
   labelOverrides
@@ -69,21 +69,26 @@ const CustomPropertiesViewCtx = ({
     );
   }
 
+  const countSetProperties = (primary) => (
+    Object.entries(customProperties)?.filter(
+      ([_key, cp]) => (
+        (cp[0]?.type?.ctx === ctx || (ctx === 'isNull' && !cp[0]?.type?.ctx)) && // Either the ctx string matches, or isNull matches blank
+        cp[0]?.type?.primary === primary // Only count non-primary set custprops
+      )
+    )?.length ?? 0
+  );
+
   // We need to display any set properties, along with any non-set primary properties
   const primaryCount = custprops?.filter(cp => cp.primary === true)?.length ?? 0;
-  const optionalCount = Object.entries(customProperties)?.filter(
-    ([_key, cp]) => (
-      (cp[0]?.type?.ctx === ctx || (ctx === 'isNull' && !cp[0]?.type?.ctx)) && // Either the ctx string matches, or isNull matches blank
-      cp[0]?.type?.primary === false // Only count non-primary set custprops
-    )
-  )?.length ?? 0;
+  const optionalCount = countSetProperties(false);
+  const setPrimaryCount = countSetProperties(true);
 
   return (
     (primaryCount + optionalCount) > 0 &&
     <Accordion
       closedByDefault
-      displayWhenClosed={<Badge>{primaryCount + optionalCount}</Badge>}
-      displayWhenOpen={<Badge>{primaryCount + optionalCount}</Badge>}
+      displayWhenClosed={<Badge>{setPrimaryCount + optionalCount}</Badge>}
+      displayWhenOpen={<Badge>{setPrimaryCount + optionalCount}</Badge>}
       id={`${id}-accordion-${ctx}`}
       label={getAccordionLabel()}
     >

package/src/lib/CustomProperties/View/CustomPropertyCard.js

@@ -16,7 +16,7 @@ import * as CUSTPROP_TYPES from '../../constants/customProperties';
 const CustomPropertyCard = ({
   ctx,
   customProperty,
-  customPropertyDefinition,
+  customPropertyDefinition = {},
   index,
   labelOverrides
 }) => {
@@ -35,7 +35,7 @@ const CustomPropertyCard = ({
     // Label override for default card title,
     if (labelOverrides.retiredName && typeof labelOverrides.retiredName === 'function') {
       return (
-        labelOverrides.retiredName(customPropertyDefinition)
+        labelOverrides.retiredName(customPropertyDefinition.name)
       );
     }
 

package/src/lib/FormModal/FormModal.js

@@ -31,6 +31,7 @@ const FormModal = ({
             <ModalFooter>
               <Button
                 buttonStyle="primary"
+                marginBottom0
                 onClick={handleSubmit}
               >
                 {
@@ -39,6 +40,7 @@ const FormModal = ({
                 }
               </Button>
               <Button
+                marginBottom0
                 onClick={handleClose}
               >
                 {

package/src/lib/utils/groupCustomPropertiesByCtx.js

@@ -1,4 +1,4 @@
-const groupCustomPropertiesByCtx = (customProperties) => (
+const groupCustomPropertiesByCtx = (customProperties = []) => (
   customProperties.reduce((acc, curr) => {
     const ctx = curr.ctx ?? 'isNull';
     const returnObj = {