OpenPanel is an open-source web and product analytics platform, an open-source alternative to Mixpanel with optional self-hosting.
fix(api,dashboard): use correct id with formula
Carl-Gerhard Lindesvärdda9df800799b
diff --git a/apps/dashboard/src/components/report/sidebar/ReportFormula.tsx b/apps/dashboard/src/components/report/sidebar/ReportFormula.tsxindex 8e181726f..727b1b142 100644--- a/apps/dashboard/src/components/report/sidebar/ReportFormula.tsx+++ b/apps/dashboard/src/components/report/sidebar/ReportFormula.tsx@@ -3,6 +3,10 @@import { Input } from '@/components/ui/input';import { useDispatch, useSelector } from '@/redux';+import { Badge } from '@/components/ui/badge';+import { AnimatePresence, motion } from 'framer-motion';+import { RefreshCcwIcon } from 'lucide-react';+import { type InputHTMLAttributes, useEffect, useState } from 'react';import { changeFormula } from '../reportSlice';export function ReportFormula() {@@ -13,14 +17,65 @@ export function ReportFormula() {<div><h3 className="mb-2 font-medium">Formula</h3><div className="flex flex-col gap-4">- <Input+ <InputFormulaplaceholder="eg: A/B"- value={formula}- onChange={(event) => {- dispatch(changeFormula(event.target.value));+ value={formula ?? ''}+ onChangeValue={(value) => {+ dispatch(changeFormula(value));}}/></div></div>);}++function InputFormula({+ value,+ onChangeValue,+ ...props+}: {+ value: string | undefined;+ onChangeValue: (value: string) => void;+} & InputHTMLAttributes<HTMLInputElement>) {+ const [internalValue, setInternalValue] = useState(value ?? '');++ useEffect(() => {+ if (value !== internalValue) {+ setInternalValue(value ?? '');+ }+ }, [value]);++ return (+ <div className="relative w-full">+ <Input+ {...props}+ value={internalValue}+ onChange={(e) => setInternalValue(e.target.value)}+ onKeyDown={(e) => {+ if (e.key === 'Enter') {+ onChangeValue(internalValue);+ }+ }}+ size="default"+ />+ <div className="absolute right-2 top-1/2 -translate-y-1/2">+ <AnimatePresence>+ {internalValue !== value && (+ <motion.button+ key="refresh"+ initial={{ opacity: 0, scale: 0.8 }}+ animate={{ opacity: 1, scale: 1 }}+ exit={{ opacity: 0, scale: 0.8 }}+ onClick={() => onChangeValue(internalValue)}+ >+ <Badge variant="muted">+ Press enter+ <RefreshCcwIcon className="ml-1 h-3 w-3" />+ </Badge>+ </motion.button>+ )}+ </AnimatePresence>+ </div>+ </div>+ );+}diff --git a/packages/trpc/src/routers/chart.helpers.ts b/packages/trpc/src/routers/chart.helpers.tsindex 5477f3dd8..7afc7d7d9 100644--- a/packages/trpc/src/routers/chart.helpers.ts+++ b/packages/trpc/src/routers/chart.helpers.ts@@ -99,19 +99,20 @@ export function withFormula(};});}-return [{...series[0],data: series[0].data.map((item, dIndex) => {- const scope = series.reduce((acc, item) => {- if (!item.event.id) {- return acc;+ const scope = series.reduce((acc, item, index) => {+ const readableId = alphabetIds[index];++ if (!readableId) {+ throw new Error('no alphabet id for serie in withFormula');}return {...acc,- [item.event.id]: item.data[dIndex]?.count ?? 0,+ [readableId]: item.data[dIndex]?.count ?? 0,};}, {});