feat(EventBuilder): support overriding timestamp at user property and event level

src/components/ga4/EventBuilder/Items.tsx

@@ -82,6 +82,8 @@ const Items: React.FC<Props> = ({
             addNumberParam={() => addItemNumberParam(idx)}
             removeParam={(itemIdx: number) => removeItemParam(idx, itemIdx)}
             removeItem={() => removeItem(idx)}
+            setParamTimestamp={() => {}}
+            isUserProperty={false}
           />
         </WithHelpText>
       ))}

src/components/ga4/EventBuilder/Parameter.tsx

@@ -1,88 +1,95 @@
 import * as React from "react"
 
-import { styled } from '@mui/material/styles';
 import TextField from "@mui/material/TextField"
 import { Parameter as ParameterT } from "./types"
 import { ShowAdvancedCtx } from "."
-import { IconButton, Tooltip } from "@mui/material"
+import { IconButton, Tooltip, Grid } from "@mui/material"
 import { Delete } from "@mui/icons-material"
 
-const PREFIX = 'Parameter';
-
-const classes = {
-  parameter: `${PREFIX}-parameter`
-};
-
-const Root = styled('section')((
-  {
-    theme
-  }
-) => ({
-  [`&.${classes.parameter}`]: {
-    display: "flex",
-    "&> *": {
-      flexGrow: 1,
-    },
-    "&> :not(:first-child)": {
-      marginLeft: theme.spacing(1),
-    },
-  }
-}));
-
 interface Props {
   parameter: ParameterT
   setParamName: (name: string) => void
   setParamValue: (value: string) => void
+  setParamTimestamp: (value: number) => void
   removeParam: () => void
+  isUserProperty: boolean
 }
 
 const Parameter: React.FC<Props> = ({
   parameter,
   setParamName,
   setParamValue,
+  setParamTimestamp,
   removeParam,
+  isUserProperty,
 }) => {
-
   const showAdvanced = React.useContext(ShowAdvancedCtx)
 
   const [name, setName] = React.useState(parameter.name)
   const [value, setValue] = React.useState(parameter.value || "")
+  const [timestamp, setTimestamp] = React.useState(
+    parameter.timestamp_micros?.toString() || ""
+  )
 
   const inputs = (
-    <Root className={classes.parameter}>
-      <TextField
-        id={`#/events/0/params/${name}`}
-        variant="outlined"
-        size="small"
-        value={name}
-        onChange={e => setName(e.target.value)}
-        onBlur={() => setParamName(name)}
-        label="name"
-      />
-      <TextField
-        variant="outlined"
-        size="small"
-        value={value || ""}
-        InputLabelProps={{
-          ...(parameter.exampleValue === undefined ? {} : { shrink: true }),
-        }}
-        onChange={e => setValue(e.target.value)}
-        onBlur={() => setParamValue(value)}
-        label={`${parameter.type} value`}
-        placeholder={parameter.exampleValue?.toString()}
-      />
-    </Root>
+    <Grid container spacing={1}>
+      <Grid item xs>
+        <TextField
+          id={`#/events/0/params/${name}`}
+          variant="outlined"
+          size="small"
+          value={name}
+          onChange={e => setName(e.target.value)}
+          onBlur={() => setParamName(name)}
+          label="name"
+          fullWidth
+        />
+      </Grid>
+      <Grid item xs>
+        <TextField
+          variant="outlined"
+          size="small"
+          value={value || ""}
+          InputLabelProps={{
+            ...(parameter.exampleValue === undefined ? {} : { shrink: true }),
+          }}
+          onChange={e => setValue(e.target.value)}
+          onBlur={() => setParamValue(value)}
+          label={`${parameter.type} value`}
+          placeholder={parameter.exampleValue?.toString()}
+          fullWidth
+        />
+      </Grid>
+      {isUserProperty && (
+        <Grid item xs>
+          <TextField
+            variant="outlined"
+            size="small"
+            value={timestamp}
+            onChange={e => setTimestamp(e.target.value)}
+            onBlur={() => setParamTimestamp(parseInt(timestamp, 10))}
+            label="timestamp micros"
+            helperText="The timestamp to be applied to the user property. Optional."
+            fullWidth
+          />
+        </Grid>
+      )}
+    </Grid>
   )
   if (showAdvanced) {
     return (
-      <section /* className={formClasses.trashRow} */>
-        <Tooltip title="remove parameter">
-          <IconButton onClick={removeParam}>
-            <Delete />
-          </IconButton>
-        </Tooltip>
-        {inputs}
-      </section>
+      <Grid container spacing={1} alignItems="flex-start">
+        <Grid item>
+          <Tooltip title="remove parameter">
+            <IconButton onClick={removeParam}>
+              <Delete />
+            </IconButton>
+          </Tooltip>
+        </Grid>
+        <Grid item xs>
+          {inputs}
+        </Grid>
+      </Grid>
     )
   }
   return inputs

src/components/ga4/EventBuilder/Parameters.tsx

@@ -35,22 +35,26 @@ interface Props {
   parameters: ParameterT[]
   setParamName: (idx: number, name: string) => void
   setParamValue: (idx: number, value: string) => void
+  setParamTimestamp: (idx: number, value: number) => void
   addStringParam: () => void
   addNumberParam: () => void
   removeParam: (idx: number) => void
   removeItem?: () => void
   addItemsParam?: () => void
+  isUserProperty: boolean
 }
 
 const Parameters: React.FC<Props> = ({
   parameters,
   setParamName,
   setParamValue,
+  setParamTimestamp,
   addStringParam,
   addNumberParam,
   removeParam,
   addItemsParam,
   removeItem,
+  isUserProperty,
 }) => {
   const showAdvanced = React.useContext(ShowAdvancedCtx)
 
@@ -62,7 +66,9 @@ const Parameters: React.FC<Props> = ({
           parameter={parameter}
           setParamName={name => setParamName(idx, name)}
           setParamValue={value => setParamValue(idx, value)}
+          setParamTimestamp={timestamp => setParamTimestamp(idx, timestamp)}
           removeParam={() => removeParam(idx)}
+          isUserProperty={isUserProperty}
         />
       ))}
       <section className={classes.buttonRow} >

src/components/ga4/EventBuilder/ValidateEvent/schemas/event.ts

@@ -14,7 +14,8 @@ export const eventSchema = {
             "maxLength": 40
         },
         "params": {"type": "object"},
-        "items": itemsSchema
+        "items": itemsSchema,
+        "timestamp_micros": {}
     },
     "allOf": buildEvents()
 }

src/components/ga4/EventBuilder/ValidateEvent/schemas/userProperties.ts

@@ -8,15 +8,11 @@ export const userPropertiesSchema = {
             "type": "object",
             "required": ["value"],
             "additionalProperties": false,
-
             "properties": {
                 "value": {
                     "maxLength": 36
                 },
-                "timestamp_micros": {
-                    "type": "number",
-                    "maxLength": 36
-                }
+                "timestamp_micros": {}
             }
         }
     },

src/components/ga4/EventBuilder/ValidateEvent/usePayload.ts

@@ -28,15 +28,19 @@ const objectifyUserProperties = (acc: {}, p: Parameter) => {
   if (p.type === ParameterType.Number) {
     value = tryParseNum(value)
   }
+
+  if (p.name === "" || value === "" || value === undefined) {
+    return acc
+  }
+
+  const newProp: { value: any; timestamp_micros?: number } = { value }
+  if (p.timestamp_micros) {
+    newProp.timestamp_micros = p.timestamp_micros
+  }
+
   return {
     ...acc,
-    ...(p.name !== "" && value !== "" && value !== undefined
-      ? {
-          [p.name]: {
-            value,
-          },
-        }
-      : {}),
+    [p.name]: newProp,
   }
 }
 

src/components/ga4/EventBuilder/index.spec.tsx

@@ -130,7 +130,7 @@ describe("Event Builder", () => {
             /"app_instance_id":"my_instance_id"/
           )
           expect(payload).toHaveTextContent(/"user_id":"my_user_id"/)
-          expect(payload).toHaveTextContent(/"timestamp_micros":"1234"/)
+          expect(payload).toHaveTextContent(/"timestamp_micros":1234/)
           expect(payload).toHaveTextContent(/"non_personalized_ads":true/)
           expect(payload).toHaveTextContent(/"name":"select_content"/)
         })
@@ -206,7 +206,7 @@ describe("Event Builder", () => {
           const payload = await findByTestId("payload")
           expect(payload).toHaveTextContent(/"client_id":"my_client_id"/)
           expect(payload).toHaveTextContent(/"user_id":"my_user_id"/)
-          expect(payload).toHaveTextContent(/"timestamp_micros":"1234"/)
+          expect(payload).toHaveTextContent(/"timestamp_micros":1234/)
           expect(payload).toHaveTextContent(/"non_personalized_ads":true/)
           expect(payload).toHaveTextContent(/"name":"campaign_details"/)
         })

src/components/ga4/EventBuilder/index.tsx

@@ -91,6 +91,9 @@ const Root = styled('div')((
 
   [`& .${classes.form}`]: {
     maxWidth: "80ch",
+    "& h5:not(:first-of-type)": {
+      marginTop: theme.spacing(4),
+    },
   },
 
   [`& .${classes.items}`]: {
@@ -144,7 +147,7 @@ export type EventPayload = {
   parameters: Parameter[]
   items: Parameter[][] | undefined
   userProperties: Parameter[]
-  timestamp_micros: string | undefined
+  timestamp_micros: number | undefined
   non_personalized_ads: boolean | undefined
   clientIds: ClientIds
   instanceId: InstanceId
@@ -169,6 +172,7 @@ const EventBuilder: React.FC = () => {
     removeUserProperty,
     setUserPropertyName,
     setUserPropertyValue,
+    setUserPropertyTimestamp,
   } = useUserProperties()
 
   const {
@@ -591,6 +595,8 @@ const EventBuilder: React.FC = () => {
             setParamName={setParamName}
             setParamValue={setParamValue}
             addItemsParam={items === undefined ? addItemsParam : undefined}
+            setParamTimestamp={() => {}}
+            isUserProperty={false}
           />
           {items !== undefined && (
             <>
@@ -619,6 +625,8 @@ const EventBuilder: React.FC = () => {
                   addNumberParam={addNumberUserProperty}
                   setParamName={setUserPropertyName}
                   setParamValue={setUserPropertyValue}
+                  setParamTimestamp={setUserPropertyTimestamp}
+                  isUserProperty={true}
                 />
               </>
             )}
@@ -640,7 +648,7 @@ const EventBuilder: React.FC = () => {
             parameters,
             eventName,
             userProperties,
-            timestamp_micros,
+            timestamp_micros: (num => isNaN(num) ? undefined : num)(parseFloat(timestamp_micros || '')),
             non_personalized_ads,
             useTextBox,
             payloadObj,

src/components/ga4/EventBuilder/types.ts

@@ -67,12 +67,14 @@ export interface NumberParameter {
   name: string
   value: string | undefined
   exampleValue?: number
+  timestamp_micros?: number
 }
 export interface StringParameter {
   type: ParameterType.String
   name: string
   value: string | undefined
   exampleValue?: string
+  timestamp_micros?: number
 }
 
 export type Parameter = NumberParameter | StringParameter

src/components/ga4/EventBuilder/useUserProperties.ts

@@ -43,13 +43,21 @@ const useUserProperties = () => {
     [updateUserProperty]
   )
 
+  const setUserPropertyTimestamp = useCallback(
+    (idx: number, timestamp_micros: number) => {
+      updateUserProperty(idx, old => ({ ...old, timestamp_micros }))
+    },
+    [updateUserProperty]
+  )
+
   return {
     userProperties: userProperties || [],
     addStringUserProperty,
     addNumberUserProperty,
     removeUserProperty,
     setUserPropertyValue,
     setUserPropertyName,
+    setUserPropertyTimestamp,
   }
 }