@k-int/stripes-kint-components 2.4.1 → 2.6.0

package/src/artifacts/coverage-jest/lcov-report/CustomProperties/Config/CustomPropertiesSettings.js.html

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">0% </span>
+                <span class="strong">11.11% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>0/47</span>
+                <span class='fraction'>6/54</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
                 <span class="strong">0% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>0/25</span>
+                <span class='fraction'>0/35</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">0% </span>
+                <span class="strong">5.26% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>0/18</span>
+                <span class='fraction'>1/19</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">0% </span>
+                <span class="strong">11.11% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>0/47</span>
+                <span class='fraction'>6/54</span>
             </div>
         
             
@@ -304,7 +304,30 @@
 <a name='L239'></a><a href='#L239'>239</a>
 <a name='L240'></a><a href='#L240'>240</a>
 <a name='L241'></a><a href='#L241'>241</a>
-<a name='L242'></a><a href='#L242'>242</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+<a name='L242'></a><a href='#L242'>242</a>
+<a name='L243'></a><a href='#L243'>243</a>
+<a name='L244'></a><a href='#L244'>244</a>
+<a name='L245'></a><a href='#L245'>245</a>
+<a name='L246'></a><a href='#L246'>246</a>
+<a name='L247'></a><a href='#L247'>247</a>
+<a name='L248'></a><a href='#L248'>248</a>
+<a name='L249'></a><a href='#L249'>249</a>
+<a name='L250'></a><a href='#L250'>250</a>
+<a name='L251'></a><a href='#L251'>251</a>
+<a name='L252'></a><a href='#L252'>252</a>
+<a name='L253'></a><a href='#L253'>253</a>
+<a name='L254'></a><a href='#L254'>254</a>
+<a name='L255'></a><a href='#L255'>255</a>
+<a name='L256'></a><a href='#L256'>256</a>
+<a name='L257'></a><a href='#L257'>257</a>
+<a name='L258'></a><a href='#L258'>258</a>
+<a name='L259'></a><a href='#L259'>259</a>
+<a name='L260'></a><a href='#L260'>260</a>
+<a name='L261'></a><a href='#L261'>261</a>
+<a name='L262'></a><a href='#L262'>262</a>
+<a name='L263'></a><a href='#L263'>263</a>
+<a name='L264'></a><a href='#L264'>264</a>
+<a name='L265'></a><a href='#L265'>265</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>
@@ -322,22 +345,20 @@
 <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-yes">1x</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>
-<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-yes">1x</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-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-yes">10x</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>
@@ -388,22 +409,36 @@
 <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-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-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-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-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-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-no">&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>
@@ -419,6 +454,7 @@
 <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-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -450,6 +486,8 @@
 <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-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -461,6 +499,8 @@
 <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-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -487,6 +527,12 @@
 <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-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>
@@ -529,7 +575,7 @@
 <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-yes">1x</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>
@@ -554,23 +600,21 @@ import { FormattedMessage, useIntl } from 'react-intl';
 &nbsp;
 import { useQueryClient } from 'react-query';
 &nbsp;
-import SafeHTMLMessage from '@folio/react-intl-safe-html';
-&nbsp;
-import { Button, ConfirmationModal, Pane } from '@folio/stripes/components';
+import { Button, ConfirmationModal, Icon, Pane } from '@folio/stripes/components';
 &nbsp;
 import FormModal from '../../FormModal/FormModal';
 &nbsp;
 import CustomPropertiesLookup from './CustomPropertiesLookup';
-import CustomPropertiesView from './CustomPropertiesView';
+import CustomPropertyView from './CustomPropertyView';
 import CustomPropertiesForm from './CustomPropertyForm';
 import { useMutateCustomProperties, useRefdata } from '../../hooks';
 &nbsp;
-const EDITING = <span class="cstat-no" title="statement not covered" >'edit';</span>
-const CREATING = <span class="cstat-no" title="statement not covered" >'create';</span>
-const VIEWING = <span class="cstat-no" title="statement not covered" >'view';</span>
+const EDITING = 'edit';
+const CREATING = 'create';
+const VIEWING = 'view';
 &nbsp;
 // A default option for setting up panes manually
-const CustomPropertiesSettings = <span class="cstat-no" title="statement not covered" ><span class="fstat-no" title="function not covered" >({</span></span>
+const CustomPropertiesSettings = ({
   afterQueryCalls,
   contextFilterOptions,
   customPropertiesEndpoint,
@@ -578,7 +622,7 @@ const CustomPropertiesSettings = <span class="cstat-no" title="statement not cov
   labelOverrides,
   refdataEndpoint,
 }) =&gt; {
-  const queryClient = <span class="cstat-no" title="statement not covered" >useQueryClient();</span>
+  const queryClient = useQueryClient();
 &nbsp;
   const intl = <span class="cstat-no" title="statement not covered" >useIntl();</span>
   const [customProperty, setCustomProperty] = <span class="cstat-no" title="statement not covered" >useState();</span>
@@ -625,20 +669,23 @@ const CustomPropertiesSettings = <span class="cstat-no" title="statement not cov
     delete: deleteCustProp
   } = <span class="cstat-no" title="statement not covered" >useMutateCustomProperties({</span>
     afterQueryCalls: {
-      put: <span class="fstat-no" title="function not covered" >()</span> =&gt; {
+      put: <span class="fstat-no" title="function not covered" >re</span>s =&gt; {
 <span class="cstat-no" title="statement not covered" >        setMode(VIEWING);</span>
 <span class="cstat-no" title="statement not covered" >        queryClient.invalidateQueries(['stripes-kint-components', 'useCustomProperties', 'custprops']);</span>
-<span class="cstat-no" title="statement not covered" >        afterQueryCallsSafe.put();</span>
+<span class="cstat-no" title="statement not covered" >        setCustomProperty(res);</span>
+<span class="cstat-no" title="statement not covered" >        afterQueryCallsSafe.put(res);</span>
       },
-      post: <span class="fstat-no" title="function not covered" >()</span> =&gt; {
+      post: <span class="fstat-no" title="function not covered" >re</span>s =&gt; {
 <span class="cstat-no" title="statement not covered" >        setMode(VIEWING);</span>
 <span class="cstat-no" title="statement not covered" >        queryClient.invalidateQueries(['stripes-kint-components', 'useCustomProperties', 'custprops']);</span>
-<span class="cstat-no" title="statement not covered" >        afterQueryCallsSafe.post();</span>
+<span class="cstat-no" title="statement not covered" >        setCustomProperty(res);</span>
+<span class="cstat-no" title="statement not covered" >        afterQueryCallsSafe.post(res);</span>
       },
-      delete: <span class="fstat-no" title="function not covered" >()</span> =&gt; {
+      delete: <span class="fstat-no" title="function not covered" >re</span>s =&gt; {
 <span class="cstat-no" title="statement not covered" >        setMode(VIEWING);</span>
 <span class="cstat-no" title="statement not covered" >        queryClient.invalidateQueries(['stripes-kint-components', 'useCustomProperties', 'custprops']);</span>
-<span class="cstat-no" title="statement not covered" >        afterQueryCallsSafe.delete();</span>
+<span class="cstat-no" title="statement not covered" >        setCustomProperty();</span>
+<span class="cstat-no" title="statement not covered" >        afterQueryCallsSafe.delete(res);</span>
       }
     },
     endpoint: customPropertiesEndpoint,
@@ -651,6 +698,17 @@ const CustomPropertiesSettings = <span class="cstat-no" title="statement not cov
       ctx: submitData?.ctx?.[0]?.value
     };
   };
+&nbsp;
+  // When POSTing a custom property, the backend expects a shorthand "Integer" or "LocalDate"
+  // When PUTing a custom property, the backend needs the full class name
+  const handleType = <span class="cstat-no" title="statement not covered" ><span class="fstat-no" title="function not covered" >(s</span>ubmitData) =&gt; {</span>
+    const typeRegex = <span class="cstat-no" title="statement not covered" >/(com\.k_int\.web\.toolkit\.custprops\.types\.CustomProperty)(.*)/g;</span>
+    const typeMatch = <span class="cstat-no" title="statement not covered" >typeRegex.exec(submitData?.type) ?? [];</span>
+<span class="cstat-no" title="statement not covered" >    return {</span>
+      ...submitData,
+      type: typeMatch[2]
+    };
+  };
 &nbsp;
 <span class="cstat-no" title="statement not covered" >  return (</span>
     &lt;&gt;
@@ -659,10 +717,11 @@ const CustomPropertiesSettings = <span class="cstat-no" title="statement not cov
         id="settings-customProperties.lookupPane"
         lastMenu={
           &lt;Button
+            buttonStyle="primary"
             marginBottom0
             onClick={<span class="fstat-no" title="function not covered" >()</span> =&gt; <span class="cstat-no" title="statement not covered" >setMode(CREATING)}</span> // TODO do we need to clear form here too?
           &gt;
-            &lt;FormattedMessage id="stripes-kint-components.create" /&gt;
+            &lt;FormattedMessage id="stripes-kint-components.new" /&gt;
           &lt;/Button&gt;
         }
         paneTitle={labelOverrides.paneTitle ??
@@ -685,7 +744,9 @@ const CustomPropertiesSettings = <span class="cstat-no" title="statement not cov
                 marginBottom0
                 onClick={<span class="fstat-no" title="function not covered" >()</span> =&gt; <span class="cstat-no" title="statement not covered" >setMode(EDITING)}</span>
               &gt;
-                &lt;FormattedMessage id="stripes-kint-components.edit" /&gt;
+                &lt;Icon icon="edit"&gt;
+                  &lt;FormattedMessage id="stripes-kint-components.edit" /&gt;
+                &lt;/Icon&gt;
               &lt;/Button&gt;,
               &lt;Button
                 buttonStyle="dropdownItem"
@@ -695,7 +756,9 @@ const CustomPropertiesSettings = <span class="cstat-no" title="statement not cov
 <span class="cstat-no" title="statement not covered" >                  onToggle();</span>
                 }}
               &gt;
-                &lt;FormattedMessage id="stripes-kint-components.delete" /&gt;
+                &lt;Icon icon="trash"&gt;
+                  &lt;FormattedMessage id="stripes-kint-components.delete" /&gt;
+                &lt;/Icon&gt;
               &lt;/Button&gt;
             ]
           )}
@@ -707,8 +770,9 @@ const CustomPropertiesSettings = <span class="cstat-no" title="statement not cov
             renderViewPaneTitle ?? customProperty?.label ?? customProperty?.name
           }
         &gt;
-          &lt;CustomPropertiesView
+          &lt;CustomPropertyView
             customProperty={customProperty}
+            helpPopovers={helpPopovers}
             labelOverrides={labelOverrides}
           /&gt;
         &lt;/Pane&gt;
@@ -723,16 +787,21 @@ const CustomPropertiesSettings = <span class="cstat-no" title="statement not cov
           } :
           {
             ...customProperty,
-            ctx: customProperty?.ctx ? [{ value: customProperty.ctx, label: customProperty.ctx }] : null
+            ctx: customProperty?.ctx ? [{ value: customProperty.ctx, label: customProperty.ctx }] : null,
+            category: customProperty?.category ? customProperty?.category?.id : null
           }
         }
         modalProps={{
           dismissible: true,
+          label: mode === CREATING ?
+            labelOverrides?.modalTitleNew ?? &lt;FormattedMessage id="stripes-kint-components.customProperty.newModal" /&gt;
+            :
+            labelOverrides?.modalTitleEdit ?? &lt;FormattedMessage id="stripes-kint-components.customProperty.editModal" /&gt;,
           onClose: <span class="fstat-no" title="function not covered" >()</span> =&gt; <span class="cstat-no" title="statement not covered" >setMode(VIEWING),</span>
           open: (mode === CREATING || mode === EDITING)
         }}
         onSubmit={mode === CREATING ?
-          compose(createCustprop, handeContextSubmit) :
+          compose(createCustprop, handeContextSubmit, handleType) :
           compose(editCustProp, handeContextSubmit)
         }
       &gt;
@@ -756,7 +825,7 @@ const CustomPropertiesSettings = <span class="cstat-no" title="statement not cov
         id="delete-job-confirmation"
         message={
           labelOverrides?.confirmMessage ??
-          &lt;SafeHTMLMessage id="stripes-kint-components.customProperties.delete.confirmMessage" values={{ name: customProperty?.name }} /&gt;
+          &lt;FormattedMessage id="stripes-kint-components.customProperties.delete.confirmMessage" values={{ name: customProperty?.name }} /&gt;
         }
         onCancel={<span class="fstat-no" title="function not covered" >()</span> =&gt; <span class="cstat-no" title="statement not covered" >setDeleteModal(false)}</span>
         onConfirm={<span class="fstat-no" title="function not covered" >()</span> =&gt; {
@@ -770,7 +839,7 @@ const CustomPropertiesSettings = <span class="cstat-no" title="statement not cov
   );
 };
 &nbsp;
-<span class="cstat-no" title="statement not covered" >CustomPropertiesSettings.propTypes = {</span>
+CustomPropertiesSettings.propTypes = {
   afterQueryCalls: PropTypes.object,
   contextFilterOptions: PropTypes.arrayOf(PropTypes.shape({
     value: PropTypes.string,
@@ -793,7 +862,7 @@ export default CustomPropertiesSettings;
             <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 Fri Mar 11 2022 16:43:16 GMT+0000 (Greenwich Mean Time)
+                at Thu Jun 16 2022 14:59:18 GMT+0100 (British Summer Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>