feature: show status field and got all filters working

Author: cdxker

clients/trieve-shopify-extension/app/components/analytics/AdvancedTableComponent.tsx

@@ -6,7 +6,6 @@ import {
   IndexTable,
   IndexFilters,
   useSetIndexFiltersMode,
-  TabProps,
   useBreakpoints,
   IndexFiltersProps,
   Icon,
@@ -22,7 +21,6 @@ import {
   ViewIcon,
 } from "@shopify/polaris-icons";
 import { ReactNode } from "react";
-import { add } from "date-fns";
 
 export interface Filter {
   key: string;
@@ -40,13 +38,11 @@ export interface AdvancedTableComponentProps {
   data: AdvancedTableCell[][];
   page: number;
   setPage: (page: (page: number) => number) => void;
-  tabs: string[];
   label: string;
   tableHeadings: { heading: string; tooltip: string; sortCol?: string }[];
   sortOptions: IndexFiltersProps["sortOptions"];
   sortSelected: string[];
   setSortSelected: (sortSelected: string[]) => void;
-  tooltipContent: string;
   hasNext: boolean;
   loading: boolean;
   appliedFilters: IndexFiltersProps["appliedFilters"];
@@ -67,8 +63,6 @@ export const AdvancedTableComponent = ({
   page,
   setPage,
   label,
-  tooltipContent,
-  tabs,
   tableHeadings,
   hasNext,
   loading,
@@ -89,13 +83,6 @@ export const AdvancedTableComponent = ({
 }: AdvancedTableComponentProps) => {
   const { mode, setMode } = useSetIndexFiltersMode();
 
-  const indexTabs: TabProps[] = tabs.map((tab, index) => ({
-    content: tab,
-    index,
-    id: `${tab}-${index}`,
-    isLocked: index === 0,
-  }));
-
   return (
     <Page title={label} fullWidth={true}>
       <Card>

clients/trieve-shopify-extension/app/components/analytics/chat/ChatEventsFilter.tsx

@@ -1,16 +1,16 @@
 import { Select } from "@shopify/polaris";
-import { TopicEventFilter } from "trieve-ts-sdk";
+import { TopicEventFilter, EventTypesFilter } from "trieve-ts-sdk";
 import { Dispatch, SetStateAction } from "react";
-import { KnownEventNames } from "app/utils/formatting";
 
 interface EventFiltersProps {
   eventsFilters: TopicEventFilter;
   setEventsFilter: Dispatch<SetStateAction<TopicEventFilter>>;
 }
 
-const AVAILABLE_EVENT_TYPES: { label: string; value: KnownEventNames }[] = [
-  { label: "Checkout", value: "site-checkout" },
-  { label: "Add to Cart", value: "site-add_to_cart" },
+const AVAILABLE_EVENT_TYPES: { label: string; value: EventTypesFilter }[] = [
+  { label: "Checkout", value: "purchase" },
+  { label: "Add to Cart", value: "add_to_cart" },
+  { label: "Click", value: "click" },
 ];
 
 const eventTypeSelectOptions = [
@@ -29,14 +29,14 @@ export function EventFilters({
 }: EventFiltersProps) {
   const handleInvertedChange = (selectedValue: string) => {
     const isInverted = selectedValue === "excludes";
-    setEventsFilter((prev) => ({
+    setEventsFilter((prev: TopicEventFilter) => ({
       ...prev,
       inverted: isInverted,
     }));
   };
 
   const handleEventTypeChange = (selectedValue: string) => {
-    setEventsFilter((prev) => ({
+    setEventsFilter((prev: TopicEventFilter) => ({
       ...prev,
       event_types: selectedValue ? [selectedValue as any] : [],
     }));

clients/trieve-shopify-extension/app/components/analytics/search/AllSearchesTable.tsx

@@ -355,7 +355,6 @@ export const AllSearchesTable = () => {
       page={page}
       setPage={setPage}
       label="Searches"
-      tooltipContent="View and filter all your users' searches."
       tableHeadings={[
         { heading: "Query", tooltip: "The search query" },
         { heading: "Search Type", tooltip: "Represents the type of search. Can be Search, Autocomplete, Search Over Groups, or Search Within Groups" },
@@ -367,7 +366,6 @@ export const AllSearchesTable = () => {
         { heading: "Created At", tooltip: "The date and time the search was made" },
       ]}
       hasNext={data?.queries.length == 10}
-      tabs={tabs}
       filters={shopifyFilters}
       query={query}
       setQuery={setQuery}

clients/trieve-shopify-extension/app/routes/app._dashboard.chats.tsx

@@ -76,8 +76,13 @@ export default function ChatsPage() {
     // TODO: Create badge with "highest ranking event"
     let newData: AdvancedTableCell[][] =
       data?.topics.map((topic) => {
+        const topic_events = data?.events?.filter(
+          (event) => event.event_type === topic.topic_id
+        );
+
         return [
           { content: topic.name, url: `/app/chatview/${topic.topic_id}` },
+          { content: topic.status },
           { content: topic.message_count.toLocaleString() },
           {
             content: topic.products_shown?.toLocaleString("en-US", {
@@ -97,8 +102,8 @@ export default function ChatsPage() {
           {
             content: topic.avg_query_rating
               ? topic.avg_query_rating.toLocaleString("en-US", {
-                  maximumFractionDigits: 2,
-                })
+                maximumFractionDigits: 2,
+              })
               : "N/A",
           },
           { content: parseCustomDateString(topic.created_at).toLocaleString() },
@@ -452,33 +457,36 @@ export default function ChatsPage() {
       page={page}
       setPage={setPage}
       label="Chat Sessions"
-      tooltipContent="View and filter all your users' chat sessions."
       tableHeadings={[
         {
           heading: "Name",
           tooltip:
             "The name created by the chatbot to represent the chat session.",
         },
+        {
+          heading: "Status",
+          tooltip: "The last recorded event of the chat session.",
+        },
         {
           heading: "Message Count",
           tooltip: "The number of messages in the chat session.",
         },
         {
-          heading: "Number of Products Shown",
+          heading: "Products Shown",
           tooltip: "The number of products displayed in the chat session.",
         },
         {
-          heading: "Avg Top Score",
+          heading: "Average Score",
           tooltip: "The average top score of the chat session.",
           sortCol: "top_score",
         },
         {
-          heading: "Avg Hallucination Score",
+          heading: "Hallucination Score",
           tooltip: "The average hallucination score of the chat session.",
           sortCol: "hallucination_score",
         },
         {
-          heading: "Avg Query Rating",
+          heading: "Query Rating",
           tooltip: "The average query rating of the chat session.",
         },
         {
@@ -488,7 +496,6 @@ export default function ChatsPage() {
         },
       ]}
       hasNext={data?.topics.length == 10}
-      tabs={[]}
       filters={shopifyFilters}
       query={query}
       setQuery={setQuery}

clients/trieve-shopify-extension/package.json

@@ -52,7 +52,7 @@
     "react-dom": "^18.2.0",
     "tailwind-merge": "^3.1.0",
     "tailwindcss": "^3.4.17",
-    "trieve-ts-sdk": "0.0.76",
+    "trieve-ts-sdk": "0.0.78",
     "vite-tsconfig-paths": "^5.0.1",
     "trieve-search-component": "0.4.50"
   },

clients/trieve-shopify-extension/yarn.lock

@@ -9337,10 +9337,10 @@ trieve-search-component@0.4.50:
     tailwind-merge "^3.0.2"
     trieve-ts-sdk "^0.0.69"
 
-trieve-ts-sdk@0.0.76:
-  version "0.0.76"
-  resolved "https://registry.yarnpkg.com/trieve-ts-sdk/-/trieve-ts-sdk-0.0.76.tgz#7d896d90acbdbc29679fc1ee46031a09794166e2"
-  integrity sha512-A92FP8S/1X0Ox4LFij8FfGqVibidFxRN+SUooCFIyq/O+Mxr9HVAeXtIBBGzEGpwy7gpOaRMgS/dW+6q4Pt3MQ==
+trieve-ts-sdk@0.0.78:
+  version "0.0.78"
+  resolved "https://registry.yarnpkg.com/trieve-ts-sdk/-/trieve-ts-sdk-0.0.78.tgz#624ee877b829a84ffce633423876bb1d4ab49455"
+  integrity sha512-tYvJgZJzjTu4sXpdzf+BdcDtjKUxPlX6R0Paw7db0tO8SmE73BYmPoIm1zkMDCye76wyZuIdG/0rIMpR/TKfXA==
 
 trieve-ts-sdk@^0.0.69:
   version "0.0.69"

clients/ts-sdk/openapi.json

@@ -9059,7 +9059,8 @@
           "message_count",
           "avg_top_score",
           "avg_hallucination_score",
-          "products_shown"
+          "products_shown",
+          "status"
         ],
         "properties": {
           "avg_hallucination_score": {
@@ -9098,6 +9099,9 @@
             "format": "int64",
             "minimum": 0
           },
+          "status": {
+            "type": "string"
+          },
           "topic_id": {
             "type": "string",
             "format": "uuid"
@@ -12129,11 +12133,11 @@
       "EventTypesFilter": {
         "type": "string",
         "enum": [
-          "add_to_cart",
-          "purchase",
           "view",
+          "filter_clicked",
           "click",
-          "filter_clicked"
+          "add_to_cart",
+          "purchase"
         ]
       },
       "EventsForTopicResponse": {
@@ -20310,16 +20314,9 @@
       "TopicQueriesResponse": {
         "type": "object",
         "required": [
-          "topics",
-          "events"
+          "topics"
         ],
         "properties": {
-          "events": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/EventData"
-            }
-          },
           "topics": {
             "type": "array",
             "items": {

clients/ts-sdk/package.json

@@ -17,7 +17,7 @@
   "files": [
     "dist"
   ],
-  "version": "0.0.77",
+  "version": "0.0.79",
   "license": "MIT",
   "scripts": {
     "lint": "eslint 'src/**/*.ts'",

clients/ts-sdk/src/types.gen.ts

@@ -562,6 +562,7 @@ export type ClickhouseTopicAnalyticsSummary = {
     name: string;
     owner_id: string;
     products_shown: number;
+    status: string;
     topic_id: string;
     updated_at: string;
 };
@@ -1779,7 +1780,7 @@ export type EventTypes = {
 
 export type event_type = 'view';
 
-export type EventTypesFilter = 'add_to_cart' | 'purchase' | 'view' | 'click' | 'filter_clicked';
+export type EventTypesFilter = 'view' | 'filter_clicked' | 'click' | 'add_to_cart' | 'purchase';
 
 export type EventsForTopicResponse = {
     events: Array<EventData>;
@@ -4106,7 +4107,6 @@ export type TopicEventFilter = {
 };
 
 export type TopicQueriesResponse = {
-    events: Array<EventData>;
     topics: Array<ClickhouseTopicAnalyticsSummary>;
 };
 

server/src/data/models.rs

@@ -7281,19 +7281,32 @@ pub struct EventAnalyticsFilter {
     pub metadata_filter: Option<String>,
 }
 
-#[derive(Debug, Serialize, Deserialize, ToSchema, Clone, Display)]
+#[derive(Debug, Serialize, Deserialize, ToSchema, Clone, Display, PartialEq, PartialOrd)]
 #[serde(rename_all = "snake_case")]
 pub enum EventTypesFilter {
-    #[display(fmt = "add_to_cart")]
-    AddToCart,
-    #[display(fmt = "purchase")]
-    Purchase,
     #[display(fmt = "view")]
     View,
-    #[display(fmt = "click")]
-    Click,
     #[display(fmt = "filter_clicked")]
     FilterClicked,
+    #[display(fmt = "click")]
+    Click,
+    #[display(fmt = "add_to_cart")]
+    AddToCart,
+    #[display(fmt = "purchase")]
+    Purchase,
+}
+
+impl EventTypesFilter {
+    pub fn from_string(value: &str) -> EventTypesFilter {
+        match value {
+            "view" => EventTypesFilter::View,
+            "filter_clicked" => EventTypesFilter::FilterClicked,
+            "click" => EventTypesFilter::Click,
+            "add_to_cart" => EventTypesFilter::AddToCart,
+            "purchase" => EventTypesFilter::Purchase,
+            _ => EventTypesFilter::View,
+        }
+    }
 }
 
 #[derive(Debug, Serialize, Deserialize, ToSchema, Clone)]
@@ -8040,7 +8053,6 @@ pub struct SearchAverageRatingResponse {
 #[derive(Debug, Row, Serialize, Deserialize, ToSchema)]
 pub struct TopicQueriesResponse {
     pub topics: Vec<ClickhouseTopicAnalyticsSummary>,
-    pub events: Vec<EventData>,
 }
 
 #[derive(Debug, Row, Serialize, Deserialize, ToSchema)]
@@ -8060,6 +8072,7 @@ pub struct TopicAnalyticsSummaryClickhouse {
     pub avg_hallucination_score: f64,
     pub avg_query_rating: Option<f64>,
     pub products_shown: u64,
+    pub status: String,
 }
 
 #[derive(Debug, Serialize, Deserialize, ToSchema)]
@@ -8075,6 +8088,7 @@ pub struct ClickhouseTopicAnalyticsSummary {
     pub avg_hallucination_score: f64,
     pub avg_query_rating: Option<f64>,
     pub products_shown: u64,
+    pub status: String,
 }
 
 impl From<TopicAnalyticsSummaryClickhouse> for ClickhouseTopicAnalyticsSummary {
@@ -8091,6 +8105,7 @@ impl From<TopicAnalyticsSummaryClickhouse> for ClickhouseTopicAnalyticsSummary {
             avg_hallucination_score: value.avg_hallucination_score,
             avg_query_rating: value.avg_query_rating,
             products_shown: value.products_shown,
+            status: value.status,
         }
     }
 }