From b8f3ad3e5db3653b5ae92120b78b5e8ab4516fb8 Mon Sep 17 00:00:00 2001 From: Chris Weaver <25087905+Weves@users.noreply.github.com> Date: Sun, 11 May 2025 19:31:04 -0700 Subject: [PATCH] Fix/remove ee fe (#4690) * Remove ee imports from FE * Remove ee imports from FE * Style --- web/src/app/chat/input/SelectedFilterDisplay.tsx | 2 +- web/src/app/ee/admin/billing/BillingAlerts.tsx | 2 +- web/src/app/ee/admin/billing/BillingInformationPage.tsx | 5 ++++- web/src/app/ee/admin/billing/SubscriptionSummary.tsx | 2 +- web/src/app/ee/admin/performance/lib.ts | 6 +++--- .../admin/performance/query-history/KickoffCSVExport.tsx | 2 +- .../performance/query-history/QueryHistoryTable.tsx | 7 +++++-- web/src/app/ee/admin/performance/query-history/utils.ts | 2 +- web/src/app/ee/admin/performance/usage/FeedbackChart.tsx | 2 +- web/src/app/ee/admin/performance/usage/OnyxBotChart.tsx | 2 +- .../ee/admin/performance/usage/PersonaMessagesChart.tsx | 2 +- .../ee/admin/performance/usage/QueryPerformanceChart.tsx | 2 +- web/src/app/ee/admin/performance/usage/UsageReports.tsx | 2 +- web/src/app/ee/admin/performance/usage/page.tsx | 4 ++-- web/src/app/ee/assistants/stats/[id]/AssistantStats.tsx | 9 ++++++--- .../dateRangeSelectors/AdminDateRangeSelector.tsx} | 2 +- .../SearchDateRangeSelector.tsx} | 4 ++-- .../dateRangeSelectors}/dateUtils.ts | 0 web/src/components/errorPages/AccessRestrictedPage.tsx | 2 +- web/src/components/filters/SourceSelector.tsx | 9 ++++++--- .../search/filtering/HorizontalSourceSelector.tsx | 2 +- web/src/{app/ee/admin => lib}/billing/interfaces.ts | 0 web/src/{app/ee/admin => lib}/billing/utils.ts | 2 +- web/src/lib/hooks.ts | 2 +- web/src/lib/search/interfaces.ts | 2 +- web/src/lib/search/utils.ts | 2 +- 26 files changed, 45 insertions(+), 33 deletions(-) rename web/src/{app/ee/admin/performance/DateRangeSelector.tsx => components/dateRangeSelectors/AdminDateRangeSelector.tsx} (97%) rename web/src/components/{search/DateRangeSelector.tsx => dateRangeSelectors/SearchDateRangeSelector.tsx} (93%) rename web/src/{app/ee/admin/performance => components/dateRangeSelectors}/dateUtils.ts (100%) rename web/src/{app/ee/admin => lib}/billing/interfaces.ts (100%) rename web/src/{app/ee/admin => lib}/billing/utils.ts (96%) diff --git a/web/src/app/chat/input/SelectedFilterDisplay.tsx b/web/src/app/chat/input/SelectedFilterDisplay.tsx index 9a8d952ec683..158dfc5f660a 100644 --- a/web/src/app/chat/input/SelectedFilterDisplay.tsx +++ b/web/src/app/chat/input/SelectedFilterDisplay.tsx @@ -2,7 +2,7 @@ import { SourceIcon } from "@/components/SourceIcon"; import React from "react"; import { FiBookmark, FiTag, FiX } from "react-icons/fi"; import { FilterManager } from "@/lib/hooks"; -import { DateRangePickerValue } from "@/app/ee/admin/performance/DateRangeSelector"; +import { DateRangePickerValue } from "@/components/dateRangeSelectors/AdminDateRangeSelector"; const displayTimeRange = (timeRange: DateRangePickerValue) => { if (timeRange.selectValue) { diff --git a/web/src/app/ee/admin/billing/BillingAlerts.tsx b/web/src/app/ee/admin/billing/BillingAlerts.tsx index 7015034c8478..7d47ea05f777 100644 --- a/web/src/app/ee/admin/billing/BillingAlerts.tsx +++ b/web/src/app/ee/admin/billing/BillingAlerts.tsx @@ -1,7 +1,7 @@ import React from "react"; import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert"; import { CircleAlert, Info } from "lucide-react"; -import { BillingInformation, BillingStatus } from "./interfaces"; +import { BillingInformation, BillingStatus } from "@/lib/billing/interfaces"; export function BillingAlerts({ billingInformation, diff --git a/web/src/app/ee/admin/billing/BillingInformationPage.tsx b/web/src/app/ee/admin/billing/BillingInformationPage.tsx index 7eb6a5c8b26d..5083e80cc4de 100644 --- a/web/src/app/ee/admin/billing/BillingInformationPage.tsx +++ b/web/src/app/ee/admin/billing/BillingInformationPage.tsx @@ -3,7 +3,10 @@ import { useRouter } from "next/navigation"; import { useEffect } from "react"; import { usePopup } from "@/components/admin/connectors/Popup"; -import { fetchCustomerPortal, useBillingInformation } from "./utils"; +import { + fetchCustomerPortal, + useBillingInformation, +} from "@/lib/billing/utils"; import { Card, diff --git a/web/src/app/ee/admin/billing/SubscriptionSummary.tsx b/web/src/app/ee/admin/billing/SubscriptionSummary.tsx index 56e682f607f0..c3fa2f4f85af 100644 --- a/web/src/app/ee/admin/billing/SubscriptionSummary.tsx +++ b/web/src/app/ee/admin/billing/SubscriptionSummary.tsx @@ -1,6 +1,6 @@ import React from "react"; import { InfoItem } from "./InfoItem"; -import { statusToDisplay } from "./utils"; +import { statusToDisplay } from "@/lib/billing/utils"; interface SubscriptionSummaryProps { billingInformation: any; diff --git a/web/src/app/ee/admin/performance/lib.ts b/web/src/app/ee/admin/performance/lib.ts index ce1b80c962c4..41224b39180d 100644 --- a/web/src/app/ee/admin/performance/lib.ts +++ b/web/src/app/ee/admin/performance/lib.ts @@ -8,9 +8,9 @@ import { convertDateToEndOfDay, convertDateToStartOfDay, getXDaysAgo, -} from "./dateUtils"; -import { THIRTY_DAYS } from "./DateRangeSelector"; -import { DateRangePickerValue } from "@/app/ee/admin/performance/DateRangeSelector"; +} from "../../../../components/dateRangeSelectors/dateUtils"; +import { THIRTY_DAYS } from "../../../../components/dateRangeSelectors/AdminDateRangeSelector"; +import { DateRangePickerValue } from "@/components/dateRangeSelectors/AdminDateRangeSelector"; export const useTimeRange = () => { return useState({ diff --git a/web/src/app/ee/admin/performance/query-history/KickoffCSVExport.tsx b/web/src/app/ee/admin/performance/query-history/KickoffCSVExport.tsx index 08a3f03ba36e..1714bcc2e469 100644 --- a/web/src/app/ee/admin/performance/query-history/KickoffCSVExport.tsx +++ b/web/src/app/ee/admin/performance/query-history/KickoffCSVExport.tsx @@ -1,7 +1,7 @@ import { usePopup } from "@/components/admin/connectors/Popup"; import { Button } from "@/components/ui/button"; import { useRef, useState } from "react"; -import { DateRange } from "../DateRangeSelector"; +import { DateRange } from "../../../../../components/dateRangeSelectors/AdminDateRangeSelector"; import { FaSpinner, FaRegArrowAltCircleUp } from "react-icons/fa"; import { withRequestId, withDateRange } from "./utils"; import { diff --git a/web/src/app/ee/admin/performance/query-history/QueryHistoryTable.tsx b/web/src/app/ee/admin/performance/query-history/QueryHistoryTable.tsx index 02341484f490..ad1103b6f770 100644 --- a/web/src/app/ee/admin/performance/query-history/QueryHistoryTable.tsx +++ b/web/src/app/ee/admin/performance/query-history/QueryHistoryTable.tsx @@ -23,7 +23,10 @@ import { timestampToReadableDate } from "@/lib/dateUtils"; import { FiFrown, FiMinus, FiSmile, FiMeh } from "react-icons/fi"; import { Dispatch, SetStateAction, useCallback, useState } from "react"; import { Feedback, TaskStatus } from "@/lib/types"; -import { DateRange, DateRangeSelector } from "../DateRangeSelector"; +import { + DateRange, + AdminDateRangeSelector, +} from "../../../../../components/dateRangeSelectors/AdminDateRangeSelector"; import { PageSelector } from "@/components/PageSelector"; import Link from "next/link"; import { FeedbackBadge } from "./FeedbackBadge"; @@ -319,7 +322,7 @@ export function QueryHistoryTable() { }} /> - diff --git a/web/src/app/ee/admin/performance/query-history/utils.ts b/web/src/app/ee/admin/performance/query-history/utils.ts index 85ca16adb6e9..b33336074b55 100644 --- a/web/src/app/ee/admin/performance/query-history/utils.ts +++ b/web/src/app/ee/admin/performance/query-history/utils.ts @@ -1,4 +1,4 @@ -import { DateRange } from "../DateRangeSelector"; +import { DateRange } from "../../../../../components/dateRangeSelectors/AdminDateRangeSelector"; import { START_QUERY_HISTORY_EXPORT_URL } from "./constants"; export const withRequestId = (url: string, requestId: string): string => diff --git a/web/src/app/ee/admin/performance/usage/FeedbackChart.tsx b/web/src/app/ee/admin/performance/usage/FeedbackChart.tsx index da14506fca6b..3884cfb011fe 100644 --- a/web/src/app/ee/admin/performance/usage/FeedbackChart.tsx +++ b/web/src/app/ee/admin/performance/usage/FeedbackChart.tsx @@ -3,7 +3,7 @@ import { getDatesList, useQueryAnalytics } from "../lib"; import Text from "@/components/ui/text"; import Title from "@/components/ui/title"; -import { DateRangePickerValue } from "@/app/ee/admin/performance/DateRangeSelector"; +import { DateRangePickerValue } from "@/components/dateRangeSelectors/AdminDateRangeSelector"; import CardSection from "@/components/admin/CardSection"; import { AreaChartDisplay } from "@/components/ui/areaChart"; diff --git a/web/src/app/ee/admin/performance/usage/OnyxBotChart.tsx b/web/src/app/ee/admin/performance/usage/OnyxBotChart.tsx index 9b5123525714..a7d33f06db6f 100644 --- a/web/src/app/ee/admin/performance/usage/OnyxBotChart.tsx +++ b/web/src/app/ee/admin/performance/usage/OnyxBotChart.tsx @@ -1,6 +1,6 @@ import { ThreeDotsLoader } from "@/components/Loading"; import { getDatesList, useOnyxBotAnalytics } from "../lib"; -import { DateRangePickerValue } from "@/app/ee/admin/performance/DateRangeSelector"; +import { DateRangePickerValue } from "@/components/dateRangeSelectors/AdminDateRangeSelector"; import Text from "@/components/ui/text"; import Title from "@/components/ui/title"; import CardSection from "@/components/admin/CardSection"; diff --git a/web/src/app/ee/admin/performance/usage/PersonaMessagesChart.tsx b/web/src/app/ee/admin/performance/usage/PersonaMessagesChart.tsx index 38c989dfb462..83a6561df060 100644 --- a/web/src/app/ee/admin/performance/usage/PersonaMessagesChart.tsx +++ b/web/src/app/ee/admin/performance/usage/PersonaMessagesChart.tsx @@ -6,7 +6,7 @@ import { usePersonaUniqueUsers, } from "../lib"; import { useAssistants } from "@/components/context/AssistantsContext"; -import { DateRangePickerValue } from "@/app/ee/admin/performance/DateRangeSelector"; +import { DateRangePickerValue } from "@/components/dateRangeSelectors/AdminDateRangeSelector"; import Text from "@/components/ui/text"; import Title from "@/components/ui/title"; import CardSection from "@/components/admin/CardSection"; diff --git a/web/src/app/ee/admin/performance/usage/QueryPerformanceChart.tsx b/web/src/app/ee/admin/performance/usage/QueryPerformanceChart.tsx index f9ed3f7986d7..2a4dff25b1e8 100644 --- a/web/src/app/ee/admin/performance/usage/QueryPerformanceChart.tsx +++ b/web/src/app/ee/admin/performance/usage/QueryPerformanceChart.tsx @@ -1,6 +1,6 @@ "use client"; -import { DateRangePickerValue } from "@/app/ee/admin/performance/DateRangeSelector"; +import { DateRangePickerValue } from "@/components/dateRangeSelectors/AdminDateRangeSelector"; import { getDatesList, useQueryAnalytics, useUserAnalytics } from "../lib"; import { ThreeDotsLoader } from "@/components/Loading"; import { AreaChartDisplay } from "@/components/ui/areaChart"; diff --git a/web/src/app/ee/admin/performance/usage/UsageReports.tsx b/web/src/app/ee/admin/performance/usage/UsageReports.tsx index 539ff6ee2d7b..bea6db92010e 100644 --- a/web/src/app/ee/admin/performance/usage/UsageReports.tsx +++ b/web/src/app/ee/admin/performance/usage/UsageReports.tsx @@ -24,7 +24,7 @@ import { humanReadableFormat, humanReadableFormatWithTime } from "@/lib/time"; import { ErrorCallout } from "@/components/ErrorCallout"; import { PageSelector } from "@/components/PageSelector"; import { Separator } from "@/components/ui/separator"; -import { DateRangePickerValue } from "../DateRangeSelector"; +import { DateRangePickerValue } from "../../../../../components/dateRangeSelectors/AdminDateRangeSelector"; import { Popover, PopoverContent, diff --git a/web/src/app/ee/admin/performance/usage/page.tsx b/web/src/app/ee/admin/performance/usage/page.tsx index 013ee5557281..ec5604298a23 100644 --- a/web/src/app/ee/admin/performance/usage/page.tsx +++ b/web/src/app/ee/admin/performance/usage/page.tsx @@ -1,6 +1,6 @@ "use client"; -import { DateRangeSelector } from "../DateRangeSelector"; +import { AdminDateRangeSelector } from "../../../../../components/dateRangeSelectors/AdminDateRangeSelector"; import { OnyxBotChart } from "./OnyxBotChart"; import { FeedbackChart } from "./FeedbackChart"; import { QueryPerformanceChart } from "./QueryPerformanceChart"; @@ -20,7 +20,7 @@ export default function AnalyticsPage() { title="Usage Statistics" icon={} /> - setTimeRange(value as any)} /> diff --git a/web/src/app/ee/assistants/stats/[id]/AssistantStats.tsx b/web/src/app/ee/assistants/stats/[id]/AssistantStats.tsx index f594b523ccf2..811d60724644 100644 --- a/web/src/app/ee/assistants/stats/[id]/AssistantStats.tsx +++ b/web/src/app/ee/assistants/stats/[id]/AssistantStats.tsx @@ -3,9 +3,9 @@ import { ThreeDotsLoader } from "@/components/Loading"; import { getDatesList } from "@/app/ee/admin/performance/lib"; import { useEffect, useState, useMemo } from "react"; import { - DateRangeSelector, + AdminDateRangeSelector, DateRange, -} from "@/app/ee/admin/performance/DateRangeSelector"; +} from "@/components/dateRangeSelectors/AdminDateRangeSelector"; import { useAssistants } from "@/components/context/AssistantsContext"; import { AssistantIcon } from "@/components/assistants/AssistantIcon"; import { Card, CardContent, CardHeader } from "@/components/ui/card"; @@ -146,7 +146,10 @@ export function AssistantStats({ assistantId }: { assistantId: number }) {

Assistant Analytics

- +
diff --git a/web/src/app/ee/admin/performance/DateRangeSelector.tsx b/web/src/components/dateRangeSelectors/AdminDateRangeSelector.tsx similarity index 97% rename from web/src/app/ee/admin/performance/DateRangeSelector.tsx rename to web/src/components/dateRangeSelectors/AdminDateRangeSelector.tsx index 0f57c5023fb5..acd465d0c45f 100644 --- a/web/src/app/ee/admin/performance/DateRangeSelector.tsx +++ b/web/src/components/dateRangeSelectors/AdminDateRangeSelector.tsx @@ -24,7 +24,7 @@ export type DateRange = } | undefined; -export const DateRangeSelector = memo(function DateRangeSelector({ +export const AdminDateRangeSelector = memo(function AdminDateRangeSelector({ value, onValueChange, }: { diff --git a/web/src/components/search/DateRangeSelector.tsx b/web/src/components/dateRangeSelectors/SearchDateRangeSelector.tsx similarity index 93% rename from web/src/components/search/DateRangeSelector.tsx rename to web/src/components/dateRangeSelectors/SearchDateRangeSelector.tsx index 58ae4a308f8b..fd8e283fd2c4 100644 --- a/web/src/components/search/DateRangeSelector.tsx +++ b/web/src/components/dateRangeSelectors/SearchDateRangeSelector.tsx @@ -1,11 +1,11 @@ -import { DateRangePickerValue } from "@/app/ee/admin/performance/DateRangeSelector"; +import { DateRangePickerValue } from "@/components/dateRangeSelectors/AdminDateRangeSelector"; import { FiCalendar, FiChevronDown, FiXCircle } from "react-icons/fi"; import { CustomDropdown } from "../Dropdown"; import { timeRangeValues } from "@/app/config/timeRange"; import { TimeRangeSelector } from "@/components/filters/TimeRangeSelector"; import { cn } from "@/lib/utils"; -export function DateRangeSelector({ +export function SearchDateRangeSelector({ value, onValueChange, isHorizontal, diff --git a/web/src/app/ee/admin/performance/dateUtils.ts b/web/src/components/dateRangeSelectors/dateUtils.ts similarity index 100% rename from web/src/app/ee/admin/performance/dateUtils.ts rename to web/src/components/dateRangeSelectors/dateUtils.ts diff --git a/web/src/components/errorPages/AccessRestrictedPage.tsx b/web/src/components/errorPages/AccessRestrictedPage.tsx index 3676b2678cbf..bb57e933d4cc 100644 --- a/web/src/components/errorPages/AccessRestrictedPage.tsx +++ b/web/src/components/errorPages/AccessRestrictedPage.tsx @@ -1,7 +1,7 @@ "use client"; import { FiLock } from "react-icons/fi"; import ErrorPageLayout from "./ErrorPageLayout"; -import { fetchCustomerPortal } from "@/app/ee/admin/billing/utils"; +import { fetchCustomerPortal } from "@/lib/billing/utils"; import { useState } from "react"; import { useRouter } from "next/navigation"; import { Button } from "@/components/ui/button"; diff --git a/web/src/components/filters/SourceSelector.tsx b/web/src/components/filters/SourceSelector.tsx index f9b1b9a60716..4059190769d1 100644 --- a/web/src/components/filters/SourceSelector.tsx +++ b/web/src/components/filters/SourceSelector.tsx @@ -11,8 +11,8 @@ import { FiTag, FiX, } from "react-icons/fi"; -import { DateRangeSelector } from "@/components/search/DateRangeSelector"; -import { DateRangePickerValue } from "@/app/ee/admin/performance/DateRangeSelector"; +import { SearchDateRangeSelector } from "@/components/dateRangeSelectors/SearchDateRangeSelector"; +import { DateRangePickerValue } from "@/components/dateRangeSelectors/AdminDateRangeSelector"; import { listSourceMetadata } from "@/lib/sources"; import { SourceIcon } from "@/components/SourceIcon"; import { TagFilter } from "@/components/search/filtering/TagFilter"; @@ -330,7 +330,10 @@ export function HorizontalFilters({
- +
{ diff --git a/web/src/lib/hooks.ts b/web/src/lib/hooks.ts index 49a2fd01b79c..67e5dd49fcc5 100644 --- a/web/src/lib/hooks.ts +++ b/web/src/lib/hooks.ts @@ -11,7 +11,7 @@ import { import useSWR, { mutate, useSWRConfig } from "swr"; import { errorHandlingFetcher } from "./fetcher"; import { useContext, useEffect, useMemo, useState } from "react"; -import { DateRangePickerValue } from "@/app/ee/admin/performance/DateRangeSelector"; +import { DateRangePickerValue } from "@/components/dateRangeSelectors/AdminDateRangeSelector"; import { SourceMetadata } from "./search/interfaces"; import { destructureValue, diff --git a/web/src/lib/search/interfaces.ts b/web/src/lib/search/interfaces.ts index 39413725aa0b..ec756b48dad0 100644 --- a/web/src/lib/search/interfaces.ts +++ b/web/src/lib/search/interfaces.ts @@ -1,4 +1,4 @@ -import { DateRangePickerValue } from "@/app/ee/admin/performance/DateRangeSelector"; +import { DateRangePickerValue } from "@/components/dateRangeSelectors/AdminDateRangeSelector"; import { Tag, ValidSources } from "../types"; import { Persona } from "@/app/admin/assistants/interfaces"; diff --git a/web/src/lib/search/utils.ts b/web/src/lib/search/utils.ts index c20521417145..e8b2f0c0513a 100644 --- a/web/src/lib/search/utils.ts +++ b/web/src/lib/search/utils.ts @@ -1,6 +1,6 @@ import { Tag, ValidSources } from "../types"; import { Filters, OnyxDocument, SourceMetadata } from "./interfaces"; -import { DateRangePickerValue } from "@/app/ee/admin/performance/DateRangeSelector"; +import { DateRangePickerValue } from "@/components/dateRangeSelectors/AdminDateRangeSelector"; export const buildFilters = ( sources: SourceMetadata[],