web: added interval minute, profile list and profile view

apps/web/prisma/migrations/20231101143637_add_minute_to_interval/migration.sql

@@ -0,0 +1,2 @@
+-- AlterEnum
+ALTER TYPE "Interval" ADD VALUE 'minute';

apps/web/prisma/schema.prisma

@@ -109,6 +109,7 @@ enum Interval {
   hour
   day
   month
+  minute
 }
 
 enum ChartType {

apps/web/src/components/Pagination.tsx

@@ -16,7 +16,9 @@ export function usePagination(take = 100) {
   );
 }
 
-export function Pagination(props: ReturnType<typeof usePagination>) {
+export type PaginationProps = ReturnType<typeof usePagination>
+
+export function Pagination(props: PaginationProps) {
   return (
     <div className="flex select-none items-center justify-end space-x-2 py-4">
       <Button

apps/web/src/components/events/EventsTable.tsx

@@ -0,0 +1,99 @@
+import { useMemo } from "react";
+import { DataTable } from "@/components/DataTable";
+import { type PaginationProps, Pagination } from "@/components/Pagination";
+import { Avatar, AvatarFallback } from "@/components/ui/avatar";
+import { Table, TableBody, TableCell, TableRow } from "@/components/ui/table";
+import { type RouterOutputs } from "@/utils/api";
+import { formatDateTime } from "@/utils/date";
+import { toDots } from "@/utils/object";
+import { AvatarImage } from "@radix-ui/react-avatar";
+import { createColumnHelper } from "@tanstack/react-table";
+import Link from "next/link";
+import { useOrganizationParams } from "@/hooks/useOrganizationParams";
+
+const columnHelper =
+  createColumnHelper<RouterOutputs["event"]["list"][number]>();
+
+type EventsTableProps = {
+  data: RouterOutputs["event"]["list"];
+  pagination: PaginationProps;
+};
+
+export function EventsTable({ data, pagination }: EventsTableProps) {
+  const params = useOrganizationParams()
+  const columns = useMemo(() => {
+    return [
+      columnHelper.accessor((row) => row.createdAt, {
+        id: "createdAt",
+        header: () => "Created At",
+        cell(info) {
+          return formatDateTime(info.getValue());
+        },
+        footer: () => "Created At",
+      }),
+      columnHelper.accessor((row) => row.name, {
+        id: "event",
+        header: () => "Event",
+        cell(info) {
+          return <span className="font-medium">{info.getValue()}</span>;
+        },
+        footer: () => "Created At",
+      }),
+      columnHelper.accessor((row) => row.profile, {
+        id: "profile",
+        header: () => "Profile",
+        cell(info) {
+          const profile = info.getValue();
+          return (
+            <Link href={`/${params.organization}/${params.project}/profiles/${profile?.id}`} className="flex items-center gap-2">
+              <Avatar className="h-6 w-6">
+                {profile?.avatar && <AvatarImage src={profile.avatar} />}
+                <AvatarFallback className="text-xs">
+                  {profile?.first_name?.at(0)}
+                </AvatarFallback>
+              </Avatar>
+              {`${profile?.first_name} ${profile?.last_name ?? ""}`}
+            </Link>
+          );
+        },
+        footer: () => "Created At",
+      }),
+      columnHelper.accessor((row) => row.properties, {
+        id: "properties",
+        header: () => "Properties",
+        cell(info) {
+          const dots = toDots(info.getValue() as Record<string, any>);
+          return (
+            <Table className="mini">
+              <TableBody>
+                {Object.keys(dots).map((key) => {
+                  return (
+                    <TableRow key={key}>
+                      <TableCell className="font-medium">{key}</TableCell>
+                      <TableCell>
+                        {typeof dots[key] === "boolean"
+                          ? dots[key]
+                            ? "true"
+                            : "false"
+                          : dots[key]}
+                      </TableCell>
+                    </TableRow>
+                  );
+                })}
+              </TableBody>
+            </Table>
+          );
+        },
+        footer: () => "Created At",
+      }),
+    ];
+  }, []);
+
+  return (
+    <>
+      <Pagination {...pagination} />
+      <DataTable data={data} columns={columns} />
+      <Pagination {...pagination} />
+    </>
+  );
+}

apps/web/src/components/navbar/NavbarMenu.tsx

@@ -7,6 +7,8 @@ export function NavbarMenu() {
   return (
     <div className="flex gap-6 items-center">
       <Link href={`/${params.organization}`}>Home</Link>
+      {params.project && <Link href={`/${params.organization}/${params.project}/events`}>Events</Link>}
+      {params.project && <Link href={`/${params.organization}/${params.project}/profiles`}>Profiles</Link>}
       <NavbarCreate />
     </div>
   );

apps/web/src/components/report/ReportDateRange.tsx

@@ -3,7 +3,7 @@ import { RadioGroup, RadioGroupItem } from "../ui/radio-group";
 import { changeDateRanges, changeInterval } from "./reportSlice";
 import { Combobox } from "../ui/combobox";
 import { type IInterval } from "@/types";
-import { timeRanges } from "@/utils/constants";
+import { intervals, timeRanges } from "@/utils/constants";
 
 export function ReportDateRange() {
   const dispatch = useDispatch();
@@ -14,7 +14,7 @@ export function ReportDateRange() {
   return (
     <>
       <RadioGroup>
-        {timeRanges.map(item => {
+        {timeRanges.map((item) => {
           return (
             <RadioGroupItem
               key={item.range}
@@ -25,7 +25,7 @@ export function ReportDateRange() {
             >
               {item.title}
             </RadioGroupItem>
-          )
+          );
         })}
       </RadioGroup>
       {chartType === "linear" && (
@@ -36,20 +36,10 @@ export function ReportDateRange() {
               dispatch(changeInterval(value as IInterval));
             }}
             value={interval}
-            items={[
+            items={Object.entries(intervals).map(([key, value]) => ({
-              {
+              label: value,
-                label: "Hour",
+              value: key,
-                value: "hour",
+            }))}
-              },
-              {
-                label: "Day",
-                value: "day",
-              },
-              {
-                label: "Month",
-                value: "month",
-              },
-            ]}
           />
         </div>
       )}

apps/web/src/components/report/chart/ReportLineChartTooltip.tsx

@@ -1,6 +1,7 @@
+import { useFormatDateInterval } from "@/hooks/useFormatDateInterval";
 import { useMappings } from "@/hooks/useMappings";
+import { useSelector } from "@/redux";
 import { type IToolTipProps } from "@/types";
-import { formatDate } from "@/utils/date";
 
 type ReportLineChartTooltipProps = IToolTipProps<{
   color: string;
@@ -17,6 +18,8 @@ export function ReportLineChartTooltip({
   payload,
 }: ReportLineChartTooltipProps) {
   const getLabel = useMappings();
+  const interval = useSelector((state) => state.report.interval);
+  const formatDate = useFormatDateInterval(interval);
 
   if (!active || !payload) {
     return null;

apps/web/src/components/report/reportSlice.ts

@@ -117,7 +117,9 @@ export const reportSlice = createSlice({
 
     changeDateRanges: (state, action: PayloadAction<IChartRange>) => {
       state.range = action.payload
-      if (action.payload === 0 || action.payload === 1) {
+      if (action.payload === 0.3 || action.payload === 0.6) {
+        state.interval = "minute";
+      } else if (action.payload === 0 || action.payload === 1) {
         state.interval = "hour";
       } else if (action.payload <= 30) {
         state.interval = "day";

apps/web/src/hooks/useFormatDateInterval.ts

@@ -2,7 +2,7 @@ import { type IInterval } from "@/types";
 
 
 export function formatDateInterval(interval: IInterval, date: Date): string {
-  if (interval === "hour") {
+  if (interval === "hour" || interval === "minute") {
     return new Intl.DateTimeFormat("en-GB", {
       hour: "2-digit",
       minute: "2-digit",
@@ -14,11 +14,11 @@ export function formatDateInterval(interval: IInterval, date: Date): string {
   }
 
   if (interval === "day") {
-    return new Intl.DateTimeFormat("en-GB", { weekday: "short" }).format(
+    return new Intl.DateTimeFormat("en-GB", { weekday: "short", day: '2-digit', month: '2-digit' }).format(
       date,
     );
   }
-
+  
   return date.toISOString();
 }
 

apps/web/src/hooks/useOrganizationParams.ts

@@ -7,6 +7,7 @@ export function useOrganizationParams() {
       organization: z.string(),
       project: z.string(),
       dashboard: z.string(),
+      profileId: z.string().optional(),
     }),
   );
 }

apps/web/src/pages/[organization]/[project]/events.tsx

@@ -1,20 +1,12 @@
 import { Container } from "@/components/Container";
-import { DataTable } from "@/components/DataTable";
 import { PageTitle } from "@/components/PageTitle";
-import { Pagination, usePagination } from "@/components/Pagination";
+import { usePagination } from "@/components/Pagination";
+import { EventsTable } from "@/components/events/EventsTable";
 import { MainLayout } from "@/components/layouts/MainLayout";
-import { Avatar, AvatarFallback } from "@/components/ui/avatar";
-import { Table, TableBody, TableCell, TableRow } from "@/components/ui/table";
 import { useOrganizationParams } from "@/hooks/useOrganizationParams";
-import { type RouterOutputs, api } from "@/utils/api";
+import { api } from "@/utils/api";
-import { formatDateTime } from "@/utils/date";
-import { toDots } from "@/utils/object";
-import { AvatarImage } from "@radix-ui/react-avatar";
-import { createColumnHelper } from "@tanstack/react-table";
-import { useMemo } from "react";
 
-const columnHelper =
+import { useMemo } from "react";
-  createColumnHelper<RouterOutputs["event"]["list"][number]>();
 
 export default function Events() {
   const pagination = usePagination();
@@ -29,80 +21,12 @@ export default function Events() {
     },
   );
   const events = useMemo(() => eventsQuery.data ?? [], [eventsQuery]);
-  const columns = useMemo(() => {
+
-    return [
-      columnHelper.accessor((row) => row.createdAt, {
-        id: "createdAt",
-        header: () => "Created At",
-        cell(info) {
-          return formatDateTime(info.getValue());
-        },
-        footer: () => "Created At",
-      }),
-      columnHelper.accessor((row) => row.name, {
-        id: "event",
-        header: () => "Event",
-        cell(info) {
-          return <span className="font-medium">{info.getValue()}</span>;
-        },
-        footer: () => "Created At",
-      }),
-      columnHelper.accessor((row) => row.profile, {
-        id: "profile",
-        header: () => "Profile",
-        cell(info) {
-          const profile = info.getValue();
-          return (
-            <div className="flex items-center gap-2">
-              <Avatar className="h-6 w-6">
-                {profile?.avatar && <AvatarImage src={profile.avatar} />}
-                <AvatarFallback className="text-xs">
-                  {profile?.first_name?.at(0)}
-                </AvatarFallback>
-              </Avatar>
-              {`${profile?.first_name} ${profile?.last_name ?? ""}`}
-            </div>
-          );
-        },
-        footer: () => "Created At",
-      }),
-      columnHelper.accessor((row) => row.properties, {
-        id: "properties",
-        header: () => "Properties",
-        cell(info) {
-          const dots = toDots(info.getValue() as Record<string, any>);
-          return (
-            <Table className="mini">
-              <TableBody>
-                {Object.keys(dots).map((key) => {
-                  return (
-                    <TableRow key={key}>
-                      <TableCell className="font-medium">{key}</TableCell>
-                      <TableCell>
-                        {typeof dots[key] === "boolean"
-                          ? dots[key]
-                            ? "true"
-                            : "false"
-                          : dots[key]}
-                      </TableCell>
-                    </TableRow>
-                  );
-                })}
-              </TableBody>
-            </Table>
-          );
-        },
-        footer: () => "Created At",
-      }),
-    ];
-  }, []);
   return (
     <MainLayout>
       <Container>
         <PageTitle>Events</PageTitle>
-        <Pagination {...pagination} />
+        <EventsTable data={events} pagination={pagination} />
-        <DataTable data={events} columns={columns}></DataTable>
-        <Pagination {...pagination} />
       </Container>
     </MainLayout>
   );

apps/web/src/pages/[organization]/[project]/profiles/[profileId].tsx

@@ -0,0 +1,41 @@
+import { Container } from "@/components/Container";
+import { PageTitle } from "@/components/PageTitle";
+import { usePagination } from "@/components/Pagination";
+import { EventsTable } from "@/components/events/EventsTable";
+import { MainLayout } from "@/components/layouts/MainLayout";
+import { useOrganizationParams } from "@/hooks/useOrganizationParams";
+import { useQueryParams } from "@/hooks/useQueryParams";
+import { api } from "@/utils/api";
+
+import { useMemo } from "react";
+import { z } from "zod";
+
+export default function ProfileId() {
+  const pagination = usePagination();
+  const params = useOrganizationParams();
+  const { profileId } = useQueryParams(
+    z.object({
+      profileId: z.string(),
+    }),
+  );
+  const eventsQuery = api.event.list.useQuery(
+    {
+      projectSlug: params.project,
+      profileId,
+      ...pagination,
+    },
+    {
+      keepPreviousData: true,
+    },
+  );
+  const events = useMemo(() => eventsQuery.data ?? [], [eventsQuery]);
+
+  return (
+    <MainLayout>
+      <Container>
+        <PageTitle>Profile</PageTitle>
+        <EventsTable data={events} pagination={pagination} />
+      </Container>
+    </MainLayout>
+  );
+}

apps/web/src/pages/[organization]/[project]/profiles/index.tsx

@@ -0,0 +1,100 @@
+import { Container } from "@/components/Container";
+import { DataTable } from "@/components/DataTable";
+import { PageTitle } from "@/components/PageTitle";
+import { Pagination, usePagination } from "@/components/Pagination";
+import { MainLayout } from "@/components/layouts/MainLayout";
+import { Avatar, AvatarFallback } from "@/components/ui/avatar";
+import { Table, TableBody, TableCell, TableRow } from "@/components/ui/table";
+import { useOrganizationParams } from "@/hooks/useOrganizationParams";
+import { type RouterOutputs, api } from "@/utils/api";
+import { formatDateTime } from "@/utils/date";
+import { toDots } from "@/utils/object";
+import { AvatarImage } from "@radix-ui/react-avatar";
+import { createColumnHelper } from "@tanstack/react-table";
+import Link from "next/link";
+import { useMemo } from "react";
+
+const columnHelper =
+  createColumnHelper<RouterOutputs["profile"]["list"][number]>();
+
+export default function Events() {
+  const pagination = usePagination();
+  const params = useOrganizationParams();
+  const eventsQuery = api.profile.list.useQuery(
+    {
+      projectSlug: params.project,
+      ...pagination,
+    },
+    {
+      keepPreviousData: true,
+    },
+  );
+  const profiles = useMemo(() => eventsQuery.data ?? [], [eventsQuery]);
+  const columns = useMemo(() => {
+    return [
+      columnHelper.accessor((row) => row.createdAt, {
+        id: "createdAt",
+        header: () => "Created At",
+        cell(info) {
+          return formatDateTime(info.getValue());
+        },
+      }),
+      columnHelper.accessor('first_name', {
+        id: "name",
+        header: () => "Name",
+        cell(info) {
+          const profile = info.row.original;
+          return (
+            <Link href={`/${params.organization}/${params.project}/profiles/${profile?.id}`} className="flex items-center gap-2">
+              <Avatar className="h-6 w-6">
+                {profile?.avatar && <AvatarImage src={profile.avatar} />}
+                <AvatarFallback className="text-xs">
+                  {profile?.first_name?.at(0)}
+                </AvatarFallback>
+              </Avatar>
+              {`${profile?.first_name} ${profile?.last_name ?? ""}`}
+            </Link>
+          );
+        },
+      }),
+      columnHelper.accessor((row) => row.properties, {
+        id: "properties",
+        header: () => "Properties",
+        cell(info) {
+          const dots = toDots(info.getValue() as Record<string, any>);
+          if(Object.keys(dots).length === 0) return 'No properties';
+          return (
+            <Table className="mini">
+              <TableBody>
+                {Object.keys(dots).map((key) => {
+                  return (
+                    <TableRow key={key}>
+                      <TableCell className="font-medium">{key}</TableCell>
+                      <TableCell>
+                        {typeof dots[key] === "boolean"
+                          ? dots[key]
+                            ? "true"
+                            : "false"
+                          : dots[key]}
+                      </TableCell>
+                    </TableRow>
+                  );
+                })}
+              </TableBody>
+            </Table>
+          );
+        },
+      }),
+    ];
+  }, []);
+  return (
+    <MainLayout>
+      <Container>
+        <PageTitle>Profiles</PageTitle>
+        <Pagination {...pagination} />
+        <DataTable data={profiles} columns={columns}></DataTable>
+        <Pagination {...pagination} />
+      </Container>
+    </MainLayout>
+  );
+}

apps/web/src/server/api/root.ts

@@ -7,6 +7,7 @@ import { projectRouter } from "./routers/project";
 import { clientRouter } from "./routers/client";
 import { dashboardRouter } from "./routers/dashboard";
 import { eventRouter } from "./routers/event";
+import { profileRouter } from "./routers/profile";
 
 /**
  * This is the primary router for your server.
@@ -22,6 +23,7 @@ export const appRouter = createTRPCRouter({
   project: projectRouter,
   client: clientRouter,
   event: eventRouter,
+  profile: profileRouter,
 });
 
 // export type definition of API

apps/web/src/server/api/routers/chart.ts

@@ -190,6 +190,10 @@ function getTotalCount(arr: ResultItem[]) {
   return arr.reduce((acc, item) => acc + item.count, 0);
 }
 
+function isFloat(n: number) {
+  return n % 1 !== 0;
+}
+
 function getDatesFromRange(range: IChartRange) {
   if (range === 0) {
     const startDate = new Date();
@@ -202,6 +206,16 @@ function getDatesFromRange(range: IChartRange) {
     };
   }
 
+  if (isFloat(range)) {
+    const startDate = new Date(Date.now() - 1000 * 60 * (range * 100));
+    const endDate = new Date().toISOString();
+
+    return {
+      startDate: startDate.toISOString(),
+      endDate: endDate,
+    };
+  }
+
   const startDate = getDaysOldDate(range).toISOString();
   const endDate = new Date().toISOString();
   return {
@@ -210,25 +224,7 @@ function getDatesFromRange(range: IChartRange) {
   };
 }
 
-async function getChartData({
+function getChartSql({ event, chartType, breakdowns, interval, startDate, endDate }: Omit<IGetChartDataInput,  'range'>) {
-  chartType,
-  event,
-  breakdowns,
-  interval,
-  range,
-  startDate: _startDate,
-  endDate: _endDate,
-}: {
-  event: IChartEvent;
-} & Omit<IChartInputWithDates, "events">) {
-  const { startDate, endDate } =
-    _startDate && _endDate
-      ? {
-          startDate: _startDate,
-          endDate: _endDate,
-        }
-      : getDatesFromRange(range);
-
   const select = [];
   const where = [];
   const groupBy = [];
@@ -338,7 +334,54 @@ async function getChartData({
     sql.push(`ORDER BY ${orderBy.join(", ")}`);
   }
 
-  const result = await db.$queryRawUnsafe<ResultItem[]>(sql.join("\n"));
+  return sql.join("\n");
+}
+
+type IGetChartDataInput = {
+  event: IChartEvent;
+} & Omit<IChartInputWithDates, "events" | 'name'>
+
+async function getChartData({
+  chartType,
+  event,
+  breakdowns,
+  interval,
+  range,
+  startDate: _startDate,
+  endDate: _endDate,
+}: IGetChartDataInput) {
+  const { startDate, endDate } =
+    _startDate && _endDate
+      ? {
+          startDate: _startDate,
+          endDate: _endDate,
+        }
+      : getDatesFromRange(range);
+
+  const sql = getChartSql({
+    chartType,
+    event,
+    breakdowns,
+    interval,
+    startDate,
+    endDate,
+  })
+
+  let result = await db.$queryRawUnsafe<ResultItem[]>(sql);
+
+  if(result.length === 0 && breakdowns.length > 0) {
+    result = await db.$queryRawUnsafe<ResultItem[]>(getChartSql({
+      chartType,
+      event,
+      breakdowns: [],
+      interval,
+      startDate,
+      endDate,
+    }));
+  }
+
+  console.log(sql);
+  
 
   // group by sql label
   const series = result.reduce(
@@ -399,7 +442,10 @@ function fillEmptySpotsInTimeline(
   const clonedEndDate = new Date(endDate);
   const today = new Date();
 
-  if (interval === "hour") {
+  if(interval === 'minute') { 
+    clonedStartDate.setSeconds(0, 0)
+    clonedEndDate.setMinutes(clonedEndDate.getMinutes() + 1, 0, 0);
+  } else if (interval === "hour") {
     clonedStartDate.setMinutes(0, 0, 0);
     clonedEndDate.setMinutes(0, 0, 0);
   } else {

apps/web/src/server/api/routers/event.ts

@@ -12,13 +12,13 @@ export const eventRouter = createTRPCRouter({
   list: protectedProcedure
     .input(
       z.object({
-        cursor: z.string().optional(),
         projectSlug: z.string(),
         take: z.number().default(100),
         skip: z.number().default(0),
+        profileId: z.string().optional(),
       }),
     )
-    .query(async ({ input: { take, skip, projectSlug } }) => {
+    .query(async ({ input: { take, skip, projectSlug, profileId } }) => {
       const project = await db.project.findUniqueOrThrow({
         where: {
           slug: projectSlug,
@@ -29,6 +29,7 @@ export const eventRouter = createTRPCRouter({
         skip,
         where: {
           project_id: project.id,
+          profile_id: profileId
         },
         orderBy: {
           createdAt: "desc",

apps/web/src/server/api/routers/profile.ts

@@ -0,0 +1,37 @@
+import { z } from "zod";
+import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc";
+import { db } from "@/server/db";
+
+export const config = {
+  api: {
+    responseLimit: false,
+  },
+};
+
+export const profileRouter = createTRPCRouter({
+  list: protectedProcedure
+    .input(
+      z.object({
+        projectSlug: z.string(),
+        take: z.number().default(100),
+        skip: z.number().default(0),
+      }),
+    )
+    .query(async ({ input: { take, skip, projectSlug } }) => {
+      const project = await db.project.findUniqueOrThrow({
+        where: {
+          slug: projectSlug,
+        },
+      });
+      return db.profile.findMany({
+        take,
+        skip,
+        where: {
+          project_id: project.id,
+        },
+        orderBy: {
+          createdAt: "desc",
+        },
+      });
+    }),
+});

apps/web/src/utils/constants.ts

@@ -14,6 +14,7 @@ export const chartTypes = {
 };
 
 export const intervals = {
+  minute: "Minute",
   day: "Day",
   hour: "Hour",
   month: "Month",
@@ -33,12 +34,14 @@ export const alphabetIds = [
 ] as const;
 
 export const timeRanges = [
+  { range: 0.3, title: "30m" },
+  { range: 0.6, title: "1h" },
   { range: 0, title: "Today" },
-  { range: 1, title: "24 hours" },
+  { range: 1, title: "24h" },
-  { range: 7, title: "7 days" },
+  { range: 7, title: "7d" },
-  { range: 14, title: "14 days" },
+  { range: 14, title: "14d" },
-  { range: 30, title: "30 days" },
+  { range: 30, title: "30d" },
-  { range: 90, title: "3 months" },
+  { range: 90, title: "3mo" },
-  { range: 180, title: "6 months" },
+  { range: 180, title: "6mo" },
-  { range: 365, title: "1 year" },
+  { range: 365, title: "1y" },
-] as const
+] as const;

apps/web/src/utils/validation.ts

@@ -39,6 +39,8 @@ export const zChartInput = z.object({
   breakdowns: zChartBreakdowns,
   range: z
     .literal(0)
+    .or(z.literal(0.3))
+    .or(z.literal(0.6))
     .or(z.literal(1))
     .or(z.literal(7))
     .or(z.literal(14))