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

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/View/CustomPropertiesViewCtx.js

@@ -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)
       );
     }