feat: add types (#5158)

Author: helenosheaa

src/writeData/subscriptions/components/JsonParsingForm.tsx

@@ -30,6 +30,7 @@ import {
   handleValidation,
   handleJsonPathValidation,
   JSON_TOOLTIP,
+  dataTypeList,
 } from 'src/writeData/subscriptions/utils/form'
 import {event} from 'src/cloud/utils/reporting'
 
@@ -44,10 +45,7 @@ interface Props {
 }
 
 const JsonParsingForm: FC<Props> = ({formContent, updateForm, edit}) => {
-  const stringType = 'String'
-  const numberType = 'Number'
-  const dataTypeList = [stringType, numberType]
-  const [dataTypeM, setDataTypeM] = useState(stringType)
+  const [dataTypeM, setDataTypeM] = useState(dataTypeList[0])
   const [useStaticMeasurement, setUseStaticMeasurement] = useState(
     !!formContent.jsonMeasurementKey.name
   )

src/writeData/subscriptions/components/JsonPathInput.tsx

@@ -29,6 +29,7 @@ import {
   handleValidation,
   JSON_TOOLTIP,
   sanitizeType,
+  dataTypeList,
 } from 'src/writeData/subscriptions/utils/form'
 import {event} from 'src/cloud/utils/reporting'
 import ValidationInputWithTooltip from './ValidationInputWithTooltip'
@@ -48,7 +49,6 @@ const JsonPathInput: FC<Props> = ({
   itemNum,
   edit,
 }) => {
-  const dataTypeList = ['String', 'Number']
   const [dataType, setDataType] = useState(dataTypeList[0])
   const tagType = name === 'Tag'
   return (

src/writeData/subscriptions/utils/form.ts

@@ -51,6 +51,13 @@ export const REGEX_TOOLTIP =
 export const JSON_TOOLTIP =
   'JsonPath expression that returns a singular value expected. See http://jsonpath.com for more info.'
 
+const stringType = 'String'
+const floatType = 'Float'
+const intType = 'Integer'
+const booleanType = 'Boolean'
+
+export const dataTypeList = [stringType, intType, floatType, booleanType]
+
 export const handleValidation = (
   property: string,
   formVal: string
@@ -89,8 +96,8 @@ export const sanitizeForm = (form: Subscription): Subscription => {
       form.jsonMeasurementKey.path = newVal
     }
   }
-  if (form.jsonMeasurementKey.type === 'number') {
-    form.jsonMeasurementKey.type = 'double'
+  if (form.jsonMeasurementKey.type === 'integer') {
+    form.jsonMeasurementKey.type = 'int'
   }
 
   if (form.jsonFieldKeys) {
@@ -100,8 +107,8 @@ export const sanitizeForm = (form: Subscription): Subscription => {
       if (newVal) {
         f.path = newVal
       }
-      if (f.type === 'number') {
-        f.type = 'double'
+      if (f.type === 'integer') {
+        f.type = 'int'
       }
     })
   }
@@ -112,8 +119,8 @@ export const sanitizeForm = (form: Subscription): Subscription => {
       if (newVal) {
         t.path = newVal
       }
-      if (t.type === 'number') {
-        t.type = 'double'
+      if (t.type === 'integer') {
+        t.type = 'int'
       }
     })
   }
@@ -139,8 +146,8 @@ export const sanitizeUpdateForm = (form: Subscription): Subscription => {
       form.jsonMeasurementKey.path = newVal
     }
   }
-  if (form.jsonMeasurementKey.type === 'number') {
-    form.jsonMeasurementKey.type = 'double'
+  if (form.jsonMeasurementKey.type === 'integer') {
+    form.jsonMeasurementKey.type = 'int'
   }
   if (form.jsonFieldKeys) {
     form.jsonFieldKeys.map(f => {
@@ -149,8 +156,8 @@ export const sanitizeUpdateForm = (form: Subscription): Subscription => {
       if (newVal) {
         f.path = newVal
       }
-      if (f.type === 'number') {
-        f.type = 'double'
+      if (f.type === 'integer') {
+        f.type = 'int'
       }
     })
   }
@@ -161,8 +168,8 @@ export const sanitizeUpdateForm = (form: Subscription): Subscription => {
       if (newVal) {
         t.path = newVal
       }
-      if (t.type === 'number') {
-        t.type = 'double'
+      if (t.type === 'integer') {
+        t.type = 'int'
       }
     })
   }
@@ -196,7 +203,10 @@ export const sanitizeUpdateForm = (form: Subscription): Subscription => {
 
 export const sanitizeType = (type: string): string => {
   if (type === 'double') {
-    type = 'Number'
+    type = 'Float'
+  }
+  if (type === 'int') {
+    type = 'Integer'
   }
   return type.charAt(0).toUpperCase() + type.slice(1)
 }