@k-int/stripes-kint-components 2.6.1 → 2.6.4

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 2.6.4 2022-06-21
+  * Custom property weight sorting not working as expected
+
+## 2.6.3 2022-06-21
+  * Null safety issue
+
+## 2.6.2 2022-06-21
+  * Fixed more missing translations issues
+
 ## 2.6.1 2022-06-21
   * Fixed missing translation issue
 

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

@@ -82,6 +82,9 @@ var CustomPropertiesFilter = function CustomPropertiesFilter(_ref) {
       {
         path: 'retired'
       }, // Place retired custprops at the end
+      {
+        path: 'weight'
+      }, // Within those groups, sort by weight first
       {
         path: 'label'
       } // Within those groups, sort by label

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

@@ -85,9 +85,12 @@ var CustomPropertiesViewCtx = function CustomPropertiesViewCtx(_ref) {
         path: 'primary',
         direction: 'desc'
       }, // Primary properties should display before optional
+      {
+        path: 'weight'
+      }, // Within those groups, sort by weight
       {
         path: 'label'
-      } // Within those groups, sort by label
+      } // For those with the same weight, sort by label
       ]
     }
   }),

package/es/lib/EditableRefdataList/EditableRefdataList.js

@@ -63,7 +63,7 @@ var propTypes = {
 };
 
 var EditableRefdataList = function EditableRefdataList(_ref) {
-  var _deleteModal$refdata2;
+  var _labelOverrides$delet, _deleteModal$refdata2;
 
   var afterQueryCalls = _ref.afterQueryCalls,
       catchQueryCalls = _ref.catchQueryCalls,
@@ -152,7 +152,7 @@ var EditableRefdataList = function EditableRefdataList(_ref) {
                   errorResp = _context.sent;
                   callout.sendCallout({
                     message: labelOverrides !== null && labelOverrides !== void 0 && labelOverrides.deleteError ? labelOverrides.deleteError(errorResp === null || errorResp === void 0 ? void 0 : errorResp.message, deleteModal === null || deleteModal === void 0 ? void 0 : deleteModal.refdata) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
-                      id: "stripes-kint-components.editableRefdataList.deleteLabel.errorMessage",
+                      id: "stripes-kint-components.editableRefdataList.deleteRefdataValue.errorMessage",
                       values: {
                         label: deleteModal === null || deleteModal === void 0 ? void 0 : (_deleteModal$refdata = deleteModal.refdata) === null || _deleteModal$refdata === void 0 ? void 0 : _deleteModal$refdata.label,
                         error: errorResp === null || errorResp === void 0 ? void 0 : errorResp.message
@@ -199,7 +199,7 @@ var EditableRefdataList = function EditableRefdataList(_ref) {
     var actionArray = [{
       name: 'edit',
       label: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
-        id: "stripes-kint-components.editableRefdataList.edit"
+        id: "stripes-kint-components.edit"
       }),
       icon: 'edit',
       callback: function callback(data) {
@@ -218,7 +218,7 @@ var EditableRefdataList = function EditableRefdataList(_ref) {
       actionArray.push({
         name: 'delete',
         label: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
-          id: "stripes-kint-components.editableRefdataList.delete"
+          id: "stripes-kint-components.delete"
         }),
         icon: 'trash',
         callback: function callback(data) {
@@ -269,13 +269,13 @@ var EditableRefdataList = function EditableRefdataList(_ref) {
       visibleFields: ['label', 'value']
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.ConfirmationModal, {
       confirmLabel: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
-        id: "stripes-kint-components.editableRefdataList.delete"
+        id: "stripes-kint-components.delete"
       }),
-      heading: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
-        id: "stripes-kint-components.editableRefdataList.deleteLabel"
+      heading: (_labelOverrides$delet = labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.deleteRefdataValue) !== null && _labelOverrides$delet !== void 0 ? _labelOverrides$delet : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
+        id: "stripes-kint-components.editableRefdataList.deleteRefdataValue"
       }),
-      message: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
-        id: "stripes-kint-components.editableRefdataList.deleteLabel.confirmMessage",
+      message: labelOverrides !== null && labelOverrides !== void 0 && labelOverrides.deleteRefdataValueMessage ? labelOverrides.deleteRefdataValueMessage(deleteModal === null || deleteModal === void 0 ? void 0 : deleteModal.refdata) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
+        id: "stripes-kint-components.editableRefdataList.deleteRefdataValue.confirmMessage",
         values: {
           name: deleteModal === null || deleteModal === void 0 ? void 0 : (_deleteModal$refdata2 = deleteModal.refdata) === null || _deleteModal$refdata2 === void 0 ? void 0 : _deleteModal$refdata2.label
         }

package/es/lib/hooks/useCustomProperties.js

@@ -42,6 +42,8 @@ var useCustomProperties = function useCustomProperties(_ref) {
     },
     sort: [{
       path: 'weight'
+    }, {
+      path: 'label'
     }],
     filters: [],
     stats: false,

package/package.json

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

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

@@ -33,6 +33,7 @@ const CustomPropertiesFilter = ({
       sort: [
         { path: 'ctx' }, // Group by ctx
         { path: 'retired' }, // Place retired custprops at the end
+        { path: 'weight' }, // Within those groups, sort by weight first
         { path: 'label' } // Within those groups, sort by label
       ],
     }

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

@@ -50,7 +50,9 @@ const CustomPropertiesViewCtx = ({
       sort: [
         { path: 'retired' }, // Place retired custprops at the end
         { path: 'primary', direction: 'desc' }, // Primary properties should display before optional
-        { path: 'label' } // Within those groups, sort by label
+        { path: 'weight' }, // Within those groups, sort by weight
+        { path: 'label' } // For those with the same weight, sort by label
+
       ]
     }
   });

package/src/lib/EditableRefdataList/EditableRefdataList.js

@@ -75,7 +75,7 @@ const EditableRefdataList = ({
         callout.sendCallout({
           message: labelOverrides?.deleteError ? labelOverrides.deleteError(errorResp?.message, deleteModal?.refdata) : (
             <FormattedMessage
-              id="stripes-kint-components.editableRefdataList.deleteLabel.errorMessage"
+              id="stripes-kint-components.editableRefdataList.deleteRefdataValue.errorMessage"
               values={{
                 label: deleteModal?.refdata?.label,
                 error: errorResp?.message
@@ -108,7 +108,7 @@ const EditableRefdataList = ({
     const actionArray = [
       {
         name: 'edit',
-        label: <FormattedMessage id="stripes-kint-components.editableRefdataList.edit" />,
+        label: <FormattedMessage id="stripes-kint-components.edit" />,
         icon: 'edit',
         callback: (data) => editRefdataValue(data),
         ariaLabel: (data) => intl.formatMessage(
@@ -121,7 +121,7 @@ const EditableRefdataList = ({
     if (!refdata?.internal) {
       actionArray.push({
         name: 'delete',
-        label: <FormattedMessage id="stripes-kint-components.editableRefdataList.delete" />,
+        label: <FormattedMessage id="stripes-kint-components.delete" />,
         icon: 'trash',
         callback: (data) => setDeleteModal({ visible: true, refdata: data }),
         ariaLabel: (data) => intl.formatMessage(
@@ -138,30 +138,32 @@ const EditableRefdataList = ({
       <ActionList
         actionAssigner={actionAssigner}
         columnMapping={{
-        label: <FormattedMessage id="stripes-kint-components.editableRefdataList.label" />,
-        value: <FormattedMessage id="stripes-kint-components.editableRefdataList.value" />
-      }}
+          label: <FormattedMessage id="stripes-kint-components.editableRefdataList.label" />,
+          value: <FormattedMessage id="stripes-kint-components.editableRefdataList.value" />
+        }}
         contentData={contentData}
         creatableFields={{
-        value: () => false
-      }}
+          value: () => false
+        }}
         createCallback={refdata?.internal ? null : (data) => editRefdataValue(data)}
         editableFields={{
-        value: () => false
-      }}
+          value: () => false
+        }}
         label={label}
         visibleFields={['label', 'value']}
       />
       <ConfirmationModal
         confirmLabel={
-          <FormattedMessage id="stripes-kint-components.editableRefdataList.delete" />
+          <FormattedMessage id="stripes-kint-components.delete" />
         }
         heading={
-          <FormattedMessage id="stripes-kint-components.editableRefdataList.deleteLabel" />
+          labelOverrides?.deleteRefdataValue ??
+          <FormattedMessage id="stripes-kint-components.editableRefdataList.deleteRefdataValue" />
         }
         message={
+          labelOverrides?.deleteRefdataValueMessage ? labelOverrides.deleteRefdataValueMessage(deleteModal?.refdata) :
           <FormattedMessage
-            id="stripes-kint-components.editableRefdataList.deleteLabel.confirmMessage"
+            id="stripes-kint-components.editableRefdataList.deleteRefdataValue.confirmMessage"
             values={{ name: deleteModal?.refdata?.label }}
           />
         }

package/src/lib/hooks/useCustomProperties.js

@@ -23,9 +23,8 @@ const useCustomProperties = ({
       ContextKey: 'ctx'
     },
     sort: [
-      {
-        path: 'weight'
-      }
+      { path: 'weight' },
+      { path: 'label' }
     ],
     filters: [],
     stats: false,

package/translations/stripes-kint-components/en.json

@@ -26,13 +26,13 @@
   "actionList.create": "Create",
   "actionList.actions": "Actions",
 
-  "editableRefdataList.edit": "Edit",
-  "editableRefdataList.delete": "Delete",
-  "editableRefdataList.deleteLabel": "Delete label",
-  "editableRefdataList.deleteLabel.confirmMessage": "Label <strong>{name}</strong> will be <strong>deleted</strong>.",
-  "editableRefdataList.deleteLabel.errorMessage": "<strong>Error: {label}</strong> was not deleted. {error}",
+  "editableRefdataList.deleteRefdataValue": "Delete refdata value",
+  "editableRefdataList.deleteRefdataValue.confirmMessage": "<strong>{name}</strong> will be deleted.",
+  "editableRefdataList.deleteRefdataValue.errorMessage": "<strong>Error: {label}</strong> was not deleted. {error}",
   "editableRefdataList.label": "Label",
   "editableRefdataList.value": "Value",
+  "editableRefdataList.editAriaLabel": "Edit value {label}",
+  "editableRefdataList.deleteAriaLabel": "Delete value {label}",
   
   "sasqLookupComponent.mainPane.found": "{total} records found",