cleanup: various shopify fixes

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

@@ -12,9 +12,14 @@ import {
   TabProps,
   useBreakpoints,
   IndexFiltersProps,
+  Icon,
 } from "@shopify/polaris";
 import { IndexTableHeading } from "@shopify/polaris/build/ts/src/components/IndexTable";
 import { NonEmptyArray } from "@shopify/polaris/build/ts/src/types";
+import {
+  ChevronUpIcon,
+  ChevronDownIcon,
+} from '@shopify/polaris-icons';
 
 
 export interface Filter {
@@ -30,7 +35,7 @@ export interface AdvancedTableComponentProps {
   setPage: (page: (page: number) => number) => void;
   tabs: string[];
   label: string;
-  tableHeadings: { heading: string, tooltip: string }[];
+  tableHeadings: { heading: string, tooltip: string, sortCol?: string }[];
   sortOptions: IndexFiltersProps['sortOptions'];
   sortSelected: string[];
   setSortSelected: (sortSelected: string[]) => void;
@@ -128,11 +133,29 @@ export const AdvancedTableComponent = ({
             tableHeadings.map((heading, index) => {
               return {
                 title: (
-                  <Tooltip content={heading.tooltip} hasUnderline>
-                    <Text as="span" variant="bodyMd" fontWeight="bold">
-                      {heading.heading}
-                    </Text>
-                  </Tooltip>
+                  <div onClick={() => {
+                    if (heading.sortCol) {
+                      setSortSelected([`${heading.sortCol} ${sortSelected[0].split(" ")[0] === heading.sortCol ? (sortSelected[0].split(" ")[1] === "asc" ? "desc" : "asc") : "asc"}`]);
+                    }
+                  }} className={`${heading.sortCol ? "cursor-pointer" : ""}`}>
+                    <div className="flex flex-row items-center">
+                      <Tooltip content={heading.tooltip} hasUnderline>
+                        <Text as="span" variant="bodyMd" fontWeight="bold">
+                          {heading.heading}
+                        </Text>
+                      </Tooltip>
+                      {heading.sortCol && (
+                        <span className="ml-1">{sortSelected[0].split(" ")[0] === heading.sortCol ? (sortSelected[0].split(" ")[1] === "asc" ? <Icon
+                          source={ChevronUpIcon}
+                          tone="base"
+                        /> : <Icon
+                          source={ChevronDownIcon}
+                          tone="base"
+                        />) : ""}
+                        </span>
+                      )}
+                    </div>
+                  </div>
                 ),
                 id: index.toString(),
               };
@@ -152,7 +175,12 @@ export const AdvancedTableComponent = ({
             return (
               <IndexTable.Row key={index} id={index.toString()} position={index}>
                 {row.map((cell, innerIndex) => (
-                  <IndexTable.Cell key={innerIndex}>{cell}</IndexTable.Cell>
+                  <IndexTable.Cell
+                    key={innerIndex}
+                    className="max-w-[200px] truncate"
+                  >
+                    {cell}
+                  </IndexTable.Cell>
                 ))}
               </IndexTable.Row>
             );

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

@@ -106,7 +106,7 @@ export const AnalyticsChart = <T extends Record<string, any>>(props: AnalyticsCh
                   } else if (props.dataType === "currency") {
                     return `${props.label}: $${value.toLocaleString('en-US', { minimumFractionDigits: 2, maximumFractionDigits: 2 })}`;
                   }
-                  return `${props.label}: ${value}`;
+                  return `${props.label}: ${value.toLocaleString('en-US', { maximumFractionDigits: 2 })}`;
                 },
               },
             },

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

@@ -26,15 +26,15 @@ export const SearchFilterBar = (props: SearchFilterBarProps) => {
           value={formatStringDateRangeToDates(props.filters.date_range)}
           onChange={(s) => {
             if (
-              (s.lte || new Date()).getTime() -
-                (s.gte || new Date()).getTime() <=
-              3.6e6
+              s.lte &&
+              s.gte &&
+              s.lte.getTime() - s.gte.getTime() <= 3.6e6
             ) {
               props.setGranularity("minute");
             } else if (
-              (s.lte || new Date()).getTime() -
-                (s.gte || new Date()).getTime() <=
-              8.64e7
+              s.lte &&
+              s.gte &&
+              s.lte.getTime() - s.gte.getTime() <= 8.64e7
             ) {
               props.setGranularity("hour");
             }

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

@@ -44,9 +44,9 @@ export const AllChatsTable = () => {
       return [
         query.name,
         query.message_count,
-        query.avg_top_score,
-        query.avg_hallucination_score,
-        query.avg_query_rating ?? "N/A",
+        query.avg_top_score?.toLocaleString('en-US', { maximumFractionDigits: 2 }),
+        query.avg_hallucination_score?.toLocaleString('en-US', { maximumFractionDigits: 2 }),
+        query.avg_query_rating ? query.avg_query_rating.toLocaleString('en-US', { maximumFractionDigits: 2 }) : "N/A",
         parseCustomDateString(query.created_at).toLocaleString(),
       ];
     }) ?? [];
@@ -365,10 +365,10 @@ export const AllChatsTable = () => {
       tableHeadings={[
         { heading: "Name", tooltip: "The name created by the chatbot to represent the chat session." },
         { heading: "Message Count", tooltip: "The number of messages in the chat session." },
-        { heading: "Avg Top Score", tooltip: "The average top score of the chat session." },
-        { heading: "Avg Hallucination Score", tooltip: "The average hallucination score of the chat session." },
+        { heading: "Avg Top Score", tooltip: "The average top score of the chat session.", sortCol: "top_score" },
+        { heading: "Avg Hallucination Score", tooltip: "The average hallucination score of the chat session.", sortCol: "hallucination_score" },
         { heading: "Avg Query Rating", tooltip: "The average query rating of the chat session." },
-        { heading: "Created At", tooltip: "The date and time the chat session was created." },
+        { heading: "Created At", tooltip: "The date and time the chat session was created.", sortCol: "created_at" },
       ]}
       hasNext={data?.topics.length == 10}
       tabs={tabs}

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

@@ -23,7 +23,6 @@ export default function ComponentAnalyticsPage() {
         <Grid.Cell columnSpan={{ xs: 6, sm: 6, md: 6, lg: 6, xl: 6 }}>
           <div className="flex flex-col gap-4">
             <TotalUniqueVisitors filters={filters} granularity={granularity} />
-            <AverageInteractionTime filters={filters} granularity={granularity} />
           </div>
         </Grid.Cell>
         <Grid.Cell columnSpan={{ xs: 6, sm: 6, md: 6, lg: 6, xl: 6 }}>

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

@@ -46,15 +46,9 @@ export default function App() {
         <Link to="/app/component" rel="component">
           Component
         </Link>
-        <Link to="/app/search" rel="search">
-          Search
-        </Link>
         <Link to="/app/chat" rel="chat">
           Chat
         </Link>
-        <Link to="/app/recommendations" rel="recommendations">
-          Recommendations
-        </Link>
         <Link to="/app/settings" rel="settings">
           Settings
         </Link>

clients/trieve-shopify-extension/app/utils/formatting.ts

@@ -181,6 +181,7 @@ export const fillDate = <T>({
         const parsedDate = new Date(
           parseCustomDateString(curr[timestampKey] as string),
         );
+        console.log("parsedDate", parsedDate, curr[timestampKey]);
         if (isSameDay(parsedDate, d)) {
           foundDataPoint = {
             time: parsedDate,

clients/ts-sdk/openapi.json

@@ -16870,6 +16870,10 @@
               "type"
             ],
             "properties": {
+              "direct": {
+                "type": "boolean",
+                "nullable": true
+              },
               "filter": {
                 "allOf": [
                   {

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

@@ -3131,6 +3131,7 @@ export type SearchAnalytics = {
     filter?: ((SearchAnalyticsFilter) | null);
     type: 'event_funnel';
 } | {
+    direct?: (boolean) | null;
     filter?: ((SearchAnalyticsFilter) | null);
     granularity?: ((Granularity) | null);
     type: 'search_revenue';

server/src/data/models.rs

@@ -2378,6 +2378,7 @@ pub struct DatasetEventCount {
     ToSchema,
     QueryableByName,
     AsChangeset,
+    Default,
 )]
 #[schema(example=json!({
     "id": "e3e3e3e3-e3e3-e3e3-e3e3-e3e3e3e3e3e3",
@@ -3655,7 +3656,9 @@ impl From<serde_json::Value> for PartnerConfiguration {
     }
 }
 
-#[derive(Debug, Serialize, Deserialize, Queryable, Insertable, Selectable, Clone, ToSchema)]
+#[derive(
+    Debug, Serialize, Deserialize, Queryable, Insertable, Selectable, Clone, ToSchema, Default,
+)]
 #[schema(example = json!({
     "id": "e3e3e3e3-e3e3-e3e3-e3e3-e3e3e3e3e3e3",
     "name": "Trieve",
@@ -3888,7 +3891,7 @@ impl StripeSubscription {
     }
 }
 
-#[derive(Serialize, Deserialize, Debug, Clone, ToSchema)]
+#[derive(Serialize, Deserialize, Debug, Clone, ToSchema, Default)]
 #[schema(example = json!({
     "organization": {
         "id": "e3e3e3e3-e3e3-e3e3-e3e3-e3e3e3e3e3e3",
@@ -7320,6 +7323,7 @@ pub enum SearchAnalytics {
     #[schema(title = "SearchRevenue")]
     SearchRevenue {
         filter: Option<SearchAnalyticsFilter>,
+        direct: Option<bool>,
         granularity: Option<Granularity>,
     },
 }

server/src/handlers/analytics_handler.rs

@@ -1,9 +1,11 @@
+use std::str::FromStr;
+
 use super::auth_handler::AdminOnly;
 use crate::{
     data::models::{
         CTRAnalytics, CTRAnalyticsResponse, CTRType, ClusterAnalytics, ClusterAnalyticsResponse,
-        ComponentAnalytics, ComponentAnalyticsResponse, DatasetAndOrgWithSubAndPlan, DateRange,
-        EventDataTypes, EventNameAndCountsResponse, EventTypes, GetEventsRequestBody,
+        ComponentAnalytics, ComponentAnalyticsResponse, Dataset, DatasetAndOrgWithSubAndPlan,
+        DateRange, EventDataTypes, EventNameAndCountsResponse, EventTypes, GetEventsRequestBody,
         OrganizationWithSubAndPlan, Pool, RAGAnalytics, RAGAnalyticsResponse,
         RecommendationAnalytics, RecommendationAnalyticsResponse, SearchAnalytics,
         SearchAnalyticsResponse, TopDatasetsRequestTypes,
@@ -374,11 +376,13 @@ pub async fn get_search_analytics(
         }
         SearchAnalytics::SearchRevenue {
             filter,
+            direct,
             granularity,
         } => {
             let search_revenue = get_search_revenue_query(
                 dataset_org_plan_sub.dataset.id,
                 filter,
+                direct,
                 granularity,
                 clickhouse_client.get_ref(),
             )

server/src/operators/analytics_operator.rs

@@ -1847,7 +1847,8 @@ pub async fn get_topic_queries_query(
         }
     }
 
-    query_string.push_str("WHERE topics.dataset_id = ? ");
+    query_string
+        .push_str("WHERE topics.dataset_id = ? AND topics.name != '' AND topics.name != ' '");
 
     if let Some(ref filter) = filter {
         query_string = filter.add_to_query(query_string);
@@ -1880,8 +1881,6 @@ pub async fn get_topic_queries_query(
         (page.unwrap_or(1) - 1) * 10
     ));
 
-    println!("{}", query_string);
-
     let topics = clickhouse_client
         .query(query_string.as_str())
         .bind(dataset_id)
@@ -2164,7 +2163,7 @@ pub async fn get_ctr_metrics_over_time_query(
         WHERE 
             dataset_id = ? 
             AND event_type = 'click' 
-            AND event_name = 'Click'
+            AND (event_name = 'Click' OR event_name = 'click')
             AND request_type = 'rag'
         ",
         interval,
@@ -2687,9 +2686,9 @@ pub async fn get_chat_conversion_rate_query(
             CAST(toStartOfInterval(topics.created_at, INTERVAL {}) AS DateTime) AS time_stamp,
             count(*) as count
         FROM events
-        JOIN topics ON toUUID(events.request_id) = topics.topic_id
-        JOIN rag_queries ON topics.topic_id = rag_queries.topic_id
-        WHERE topics.dataset_id = ?
+        JOIN rag_queries ON toUUID(events.request_id) = rag_queries.id
+        JOIN topics ON rag_queries.topic_id = topics.topic_id
+        WHERE events.dataset_id = ?
         AND request_type = 'rag'
         AND is_conversion = true",
         interval
@@ -2846,6 +2845,7 @@ fn get_interval_string(granularity: &Option<Granularity>) -> &str {
 pub async fn get_search_revenue_query(
     dataset_id: uuid::Uuid,
     filter: Option<SearchAnalyticsFilter>,
+    direct: Option<bool>,
     granularity: Option<Granularity>,
     clickhouse_client: &clickhouse::Client,
 ) -> Result<SearchRevenueResponse, ServiceError> {
@@ -2854,15 +2854,25 @@ pub async fn get_search_revenue_query(
     let mut query_string = format!(
         "SELECT 
             CAST(toStartOfInterval(created_at, INTERVAL {}) AS DateTime) AS time_stamp,
-            avg(arraySum(arrayMap(x -> JSONExtract(x, 'revenue', 'Float64'), JSONExtractArrayRaw(items)))) as avg_revenue
+            sum(arraySum(arrayMap(x -> JSONExtract(x, 'revenue', 'Float64'), items))) as revenue
         FROM events
         WHERE dataset_id = ?
-        AND event_name = 'purchase' 
-        AND items != '[]' AND request_type = 'search'
+        AND event_type = 'purchase' 
+        AND items != '[]'
         ",
         interval,
     );
 
+    if let Some(direct) = direct {
+        if direct {
+            query_string.push_str(" AND request_type = 'search' AND request_id != '00000000-0000-0000-0000-000000000000'")
+        } else {
+            query_string.push_str("AND request_id == '00000000-0000-0000-0000-000000000000'")
+        }
+    } else {
+        query_string.push_str("AND request_id == '00000000-0000-0000-0000-000000000000'")
+    }
+
     if let Some(filter) = &filter {
         query_string = filter.add_to_query(query_string);
     }
@@ -2901,7 +2911,7 @@ pub async fn get_chat_revenue_query(
     let mut query_string = format!(
         "SELECT 
             CAST(toStartOfInterval(created_at, INTERVAL {}) AS DateTime) AS time_stamp,
-            avg(arraySum(arrayMap(x -> JSONExtract(x, 'revenue', 'Float64'), items))) as avg_revenue
+            sum(arraySum(arrayMap(x -> JSONExtract(x, 'revenue', 'Float64'), items))) as revenue
         FROM events
         WHERE dataset_id = ?
         AND event_type = 'purchase'