@k-int/stripes-kint-components 2.8.2 → 2.8.3

package/src/artifacts/coverage-jest/lcov-report/CustomProperties/Filter/CustomPropertiesFilter.js.html

@@ -23,16 +23,16 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">23.07% </span>
+                <span class="strong">42.3% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>6/26</span>
+                <span class='fraction'>11/26</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">0% </span>
+                <span class="strong">27.77% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>0/23</span>
+                <span class='fraction'>5/18</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">25% </span>
+                <span class="strong">47.82% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>6/24</span>
+                <span class='fraction'>11/23</span>
             </div>
         
             
@@ -188,7 +188,20 @@
 <a name='L123'></a><a href='#L123'>123</a>
 <a name='L124'></a><a href='#L124'>124</a>
 <a name='L125'></a><a href='#L125'>125</a>
-<a name='L126'></a><a href='#L126'>126</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+<a name='L126'></a><a href='#L126'>126</a>
+<a name='L127'></a><a href='#L127'>127</a>
+<a name='L128'></a><a href='#L128'>128</a>
+<a name='L129'></a><a href='#L129'>129</a>
+<a name='L130'></a><a href='#L130'>130</a>
+<a name='L131'></a><a href='#L131'>131</a>
+<a name='L132'></a><a href='#L132'>132</a>
+<a name='L133'></a><a href='#L133'>133</a>
+<a name='L134'></a><a href='#L134'>134</a>
+<a name='L135'></a><a href='#L135'>135</a>
+<a name='L136'></a><a href='#L136'>136</a>
+<a name='L137'></a><a href='#L137'>137</a>
+<a name='L138'></a><a href='#L138'>138</a>
+<a name='L139'></a><a href='#L139'>139</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -211,14 +224,15 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">8x</span>
-<span class="cline-any cline-yes">8x</span>
-<span class="cline-any cline-yes">8x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">8x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -226,24 +240,17 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -258,23 +265,35 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -305,6 +324,11 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -313,9 +337,10 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { useState } from 'react';
 import PropTypes from 'prop-types';
-import { FormattedMessage } from 'react-intl';
 &nbsp;
 import {
   Accordion,
@@ -323,9 +348,10 @@ import {
   Layout,
   Spinner
 } from '@folio/stripes/components';
-import { useCustomProperties } from '../../hooks';
+import { useCustomProperties, useKintIntl } from '../../hooks';
 import useParseActiveFilterStrings from './useParseActiveFilterStrings';
 import CustomPropertiesFilterForm from './CustomPropertiesFilterForm';
+import { MULTI_REFDATA_CLASS_NAME, REFDATA_CLASS_NAME } from '../../constants/customProperties';
 &nbsp;
 const CustomPropertiesFilter = ({
   activeFilters: {
@@ -334,11 +360,15 @@ const CustomPropertiesFilter = ({
   },
   customPropertiesEndpoint,
   filterHandlers,
-  labelOverrides
+  intlKey: passedIntlKey,
+  intlNS: passedIntlNS,
+  labelOverrides = {}
  }) =&gt; {
   const [editingFilters, setEditingFilters] = useState(false);
   const openEditModal = <span class="fstat-no" title="function not covered" >()</span> =&gt; <span class="cstat-no" title="statement not covered" >setEditingFilters(true);</span>
   const closeEditModal = <span class="fstat-no" title="function not covered" >()</span> =&gt; <span class="cstat-no" title="statement not covered" >setEditingFilters(false);</span>
+&nbsp;
+  const kintIntl = useKintIntl(passedIntlKey, passedIntlNS);
 &nbsp;
   const { data: custprops, isLoading } = useCustomProperties({
     endpoint: customPropertiesEndpoint,
@@ -347,35 +377,24 @@ 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
       ],
     }
   });
-  const parsedFilterData = <span class="cstat-no" title="statement not covered" >useParseActiveFilterStrings(custPropFilters || []);</span>
+  const parsedFilterData = useParseActiveFilterStrings(custPropFilters || <span class="branch-1 cbranch-no" title="branch not covered" >[],</span> passedIntlKey, passedIntlNS, labelOverrides);
 &nbsp;
-  const getFiltersApplied = <span class="cstat-no" title="statement not covered" ><span class="fstat-no" title="function not covered" >()</span> =&gt; {</span>
-<span class="cstat-no" title="statement not covered" >    if (labelOverrides.filtersApplied &amp;&amp; typeof labelOverrides.filtersApplied === 'function') {</span>
-<span class="cstat-no" title="statement not covered" >      return labelOverrides.filtersApplied((parsedFilterData?.numberOfFilters ?? 0));</span>
-    }
-&nbsp;
-<span class="cstat-no" title="statement not covered" >    return (</span>
-      labelOverrides.filtersApplied ??
-      &lt;FormattedMessage
-        id="stripes-kint-components.customProperty.filtersApplied"
-        values={{ count: (parsedFilterData?.numberOfFilters ?? 0) }}
-      /&gt;
-    );
-  };
-&nbsp;
-<span class="cstat-no" title="statement not covered" >  if (isLoading) {</span>
+  <span class="missing-if-branch" title="if path not taken" >I</span>if (isLoading) {
 <span class="cstat-no" title="statement not covered" >    return (</span>
       &lt;Accordion
         closedByDefault
         header={FilterAccordionHeader}
         id="clickable-custprop-filter"
         label={
-          labelOverrides.customProperties ??
-          &lt;FormattedMessage id="stripes-kint-components.customProperties" /&gt;
+          kintIntl.formatKintMessage({
+            id: 'customProperties',
+            overrideValue: labelOverrides.customProperties,
+          })
         }
         separator={false}
       &gt;
@@ -384,14 +403,25 @@ const CustomPropertiesFilter = ({
     );
   }
 &nbsp;
-  const handleSubmit = <span class="cstat-no" title="statement not covered" ><span class="fstat-no" title="function not covered" >va</span>lues =&gt; {</span>
+  const handleSubmit = <span class="fstat-no" title="function not covered" >va</span>lues =&gt; {
     const { filters = <span class="branch-0 cbranch-no" title="branch not covered" >[] </span>} = <span class="cstat-no" title="statement not covered" >values;</span>
 &nbsp;
     const filterStrings = <span class="cstat-no" title="statement not covered" >filters</span>
       .filter(<span class="fstat-no" title="function not covered" >fi</span>lter =&gt; <span class="cstat-no" title="statement not covered" >filter.rules)</span>
-      .map(<span class="fstat-no" title="function not covered" >fi</span>lter =&gt; <span class="cstat-no" title="statement not covered" >filter.rules</span>
-        .map(<span class="fstat-no" title="function not covered" >ru</span>le =&gt; <span class="cstat-no" title="statement not covered" >`customProperties.${filter.customProperty}.value${rule.operator}${rule.value ?? ''}`)</span>
-        .join('||'));
+      .map(<span class="fstat-no" title="function not covered" >fi</span>lter =&gt; {
+        const relevantCustomProperty = <span class="cstat-no" title="statement not covered" >custprops?.filter(<span class="fstat-no" title="function not covered" >cp</span> =&gt; <span class="cstat-no" title="statement not covered" >cp.name === filter.customProperty)</span>?.[0] ?? {};</span>
+&nbsp;
+        const filterByValueId = (
+<span class="cstat-no" title="statement not covered" >          relevantCustomProperty?.type === MULTI_REFDATA_CLASS_NAME ||</span>
+          relevantCustomProperty?.type === REFDATA_CLASS_NAME
+        );
+&nbsp;
+<span class="cstat-no" title="statement not covered" >        return (</span>
+          filter.rules
+            .map(<span class="fstat-no" title="function not covered" >ru</span>le =&gt; <span class="cstat-no" title="statement not covered" >`customProperties.${filter.customProperty}.value${filterByValueId ? '.id' : ''}${rule.operator}${rule.value ?? ''}`)</span>
+            .join('||')
+        );
+      });
 &nbsp;
 <span class="cstat-no" title="statement not covered" >    filterHandlers.state({ ...restOfFilters, customProperties: filterStrings });</span>
 <span class="cstat-no" title="statement not covered" >    setEditingFilters(false);</span>
@@ -399,21 +429,28 @@ const CustomPropertiesFilter = ({
 <span class="cstat-no" title="statement not covered" >    return Promise.resolve();</span>
   };
 &nbsp;
-<span class="cstat-no" title="statement not covered" >  return (</span>
+  return (
     &lt;Accordion
       closedByDefault
-      displayClearButton={(parsedFilterData?.numberOfFilters ?? 0) &gt; 0}
+      displayClearButton={(parsedFilterData?.numberOfFilters ?? <span class="branch-1 cbranch-no" title="branch not covered" >0)</span> &gt; 0}
       header={FilterAccordionHeader}
       id="clickable-custprop-filter"
       label={
-        labelOverrides.customProperties ??
-        &lt;FormattedMessage id="stripes-kint-components.customProperties" /&gt;
+        kintIntl.formatKintMessage({
+          id: 'customProperties',
+          overrideValue: labelOverrides.customProperties,
+        })
       }
       onClearFilter={<span class="fstat-no" title="function not covered" >()</span> =&gt; <span class="cstat-no" title="statement not covered" >filterHandlers.state({ ...restOfFilters, customProperties: [] })}</span>
       separator={false}
     &gt;
       &lt;Layout className="padding-bottom-gutter"&gt;
-        {getFiltersApplied()}
+        {
+          kintIntl.formatKintMessage({
+            id: 'customProperty.filtersApplied',
+            overrideValue: labelOverrides.filtersApplied,
+          }, { count: (parsedFilterData?.numberOfFilters ?? <span class="branch-1 cbranch-no" title="branch not covered" >0)</span> })
+        }
       &lt;/Layout&gt;
       &lt;CustomPropertiesFilterForm
         customProperties={custprops}
@@ -434,6 +471,8 @@ CustomPropertiesFilter.propTypes = {
   activeFilters: PropTypes.object,
   customPropertiesEndpoint: PropTypes.string,
   filterHandlers: PropTypes.object,
+  intlKey: PropTypes.string,
+  intlNS: PropTypes.string,
   labelOverrides: PropTypes.object
 };
 &nbsp;
@@ -445,7 +484,7 @@ export default CustomPropertiesFilter;
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Jun 16 2022 14:59:18 GMT+0100 (British Summer Time)
+                at 2022-09-16T13:23:25.290Z
             </div>
         <script src="../../prettify.js"></script>
         <script>