Merge branch 'main' into aimon

devflowinc · Feb 27, 2025 · 4eda1ef · 4eda1ef
2 parents cfbc8c2 + b17de2e
commit 4eda1ef
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/frontends/dashboard/src/analytics/pages/AnalyticsOverviewPage.tsx b/frontends/dashboard/src/analytics/pages/AnalyticsOverviewPage.tsx
@@ -10,14 +10,14 @@ import { DateRangePicker } from "shared/ui";
 import { Granularity } from "trieve-ts-sdk";
 import { SearchMetrics } from "../components/charts/SearchMetrics";
 import { RagMetrics } from "../components/charts/RagMetrics";
+import { subMonths } from "date-fns";
 
 export const AnalyticsOverviewPage = () => {
-  const [rpsDateRange, setRpsDateRange] = createSignal<DateRangeFilter>({
-    gt: subHours(new Date(), 1),
+  const [rtpDateRange, setRtpDateRange] = createSignal<DateRangeFilter>({
+    gt: subMonths(new Date(), 1),
   });
 
-  const [rpsGranularity, setRpsGranularity] =
-    createSignal<Granularity>("minute");
+  const [rtpGranularity, setRtpGranularity] = createSignal<Granularity>("day");
 
   const [headQueriesDate, setHeadQueriesDate] = createSignal<DateRangeFilter>({
     gt: subHours(new Date(), 1),
@@ -39,22 +39,22 @@ export const AnalyticsOverviewPage = () => {
           <RagMetrics />
         </Card>
         <Card
-          title="Requests Per Second"
+          title="Requests Per Time Period"
           controller={
             <DateRangePicker
-              onChange={(e) => setRpsDateRange(e)}
-              value={rpsDateRange()}
+              onChange={(e) => setRtpDateRange(e)}
+              value={rtpDateRange()}
               initialSelectedPresetId={3}
-              onGranularitySuggestion={(e) => setRpsGranularity(e)}
+              onGranularitySuggestion={(e) => setRtpGranularity(e)}
             />
           }
           class="flex flex-col justify-between px-4"
           width={1}
         >
           <SearchUsageGraph
             params={{
-              filter: { date_range: rpsDateRange() },
-              granularity: rpsGranularity(),
+              filter: { date_range: rtpDateRange() },
+              granularity: rtpGranularity(),
             }}
           />
         </Card>

diff --git a/frontends/dashboard/src/components/EditUserModal.tsx b/frontends/dashboard/src/components/EditUserModal.tsx
@@ -40,6 +40,7 @@ export const EditUserModal = (props: InviteUserModalProps) => {
       credentials: "include",
       headers: {
         "Content-Type": "application/json",
+        "TR-Organization": userContext.selectedOrg().id,
       },
       body: JSON.stringify({
         organization_id: userContext.selectedOrg().id,
@@ -50,6 +51,11 @@ export const EditUserModal = (props: InviteUserModalProps) => {
       createEffect(() => {
         if (res.ok) {
           props.closeModal();
+          createToast({
+            title: "Success",
+            type: "success",
+            message: "User invited or role updated successfully!",
+          });
         } else {
           void res.json().then((data) => {
             createToast({

diff --git a/frontends/dashboard/src/pages/orgs/OrgUserPage.tsx b/frontends/dashboard/src/pages/orgs/OrgUserPage.tsx
@@ -318,7 +318,9 @@ export const OrgUserPage = () => {
         editingUser={editingUser()}
         closeModal={() => {
           setEditingUser(null);
-          void userQuery.refetch();
+          setTimeout(() => {
+            void userQuery.refetch();
+          }, 250);
         }}
       />
     </div>

diff --git a/server/Dockerfile.server b/server/Dockerfile.server
@@ -32,7 +32,7 @@ RUN apt-get update -y; \
     unzip \
     ;
 
-RUN curl -fsSLO https://github.com/subtrace/subtrace/releases/download/b204/subtrace-linux-amd64 \
+RUN curl -fsSLO https://github.com/subtrace/subtrace/releases/download/b267/subtrace-linux-amd64 \
     && chmod +x ./subtrace-linux-amd64
 
 RUN curl -L -o libtorch-cxx11-abi-shared-with-deps-2.4.0+cpu.zip https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-2.4.0%2Bcpu.zip \