UIEUS-307: empty values for selectboxes (#389)

* UIEUS-307-empty-values-for-selectboxes

* UIEUS-307-empty-values-for-selectboxes change to null

* UIEUS-307-empty-values-for-selectboxes increase interface version

* Move empty entry to extractHarvesterImpls function
Set undefined on empty strings in onChange functions
Change null values to undefined

Co-authored-by: elsenhans <[email protected]>
Co-authored-by: alb3rtino <[email protected]>

package.json

@@ -108,7 +108,7 @@
       "counter-reports": "3.0",
       "custom-reports": "1.0",
       "erm-usage/files": "1.0",
-      "usage-data-providers": "2.7",
+      "usage-data-providers": "2.8",
       "tags": "1.0"
     },
     "permissionSets": [

src/components/HarvestingConfiguration/HarvestingConfigurationForm.js

@@ -34,7 +34,7 @@ class HarvestingConfigurationForm extends React.Component {
   changeSelectedCounterVersion = (event) => {
     event.preventDefault();
 
-    const val = parseInt(event.target.value, 10);
+    const val = (event.target.value === '') ? undefined : parseInt(event.target.value, 10);
     const selectedReportRelease = get(
       this.props.values,
       'harvestingConfig.reportRelease',
@@ -61,7 +61,7 @@ class HarvestingConfigurationForm extends React.Component {
   changeSelectedHarvestVia = (event) => {
     event.preventDefault();
 
-    this.props.form.change(event.target.name, event.target.value);
+    this.props.form.change(event.target.name, (event.target.value === '') ? undefined : event.target.value);
     this.props.form.resetFieldState('sushiCredentials.customerId');
   };
 

src/util/data/harvestingViaOptions.js

@@ -1,4 +1,5 @@
 export default [
+  { value: undefined, label: '' },
   { value: 'aggregator', label: 'Aggregator' },
   { value: 'sushi', label: 'Sushi' }
 ];

src/util/data/reportReleaseOptions.js

@@ -1,4 +1,5 @@
 export default [
+  { value: undefined, label: '' },
   { value: 4, label: 'Counter 4' },
   { value: 5, label: 'Counter 5' },
 ];

src/util/harvesterImpls.js

@@ -1,12 +1,14 @@
 const extractHarvesterImpls = (resources) => {
-  const records = (resources.harvesterImpls || {}).records || [];
+  const records = resources.harvesterImpls?.records || [];
   const implementations = records.length
     ? records[0].implementations
     : [];
-  return implementations.map(i => ({
+  const results = implementations.map(i => ({
     value: i.type,
     label: i.name
   }));
+  results.unshift({ value: undefined, label: '' });
+  return results;
 };
 
 export default extractHarvesterImpls;