Skip to content

Same agent Smaller bill. The tools and infrastructure to get more work from your AI. Fewer tokens. Less compute. Lower cost.

feat: state management implemented for user, filter (#168)

Aman Agarwalccff78b654e6
diff --git a/src/client/package-lock.json b/src/client/package-lock.json
index cf3b49f9..153f0a1e 100644
--- a/src/client/package-lock.json
+++ b/src/client/package-lock.json
@@ -9,6 +9,7 @@
"version": "0.1.0",
"dependencies": {
"@clickhouse/client": "^0.3.0",
+ "@dhmk/zustand-lens": "^4.0.0",
"@headlessui/react": "^1.7.18",
"@heroicons/react": "^2.1.1",
"@next-auth/prisma-adapter": "^1.0.7",
@@ -24,7 +25,8 @@
"react": "^18",
"react-dom": "^18",
"react-hot-toast": "^2.4.1",
- "react-syntax-highlighter": "^15.5.0"
+ "react-syntax-highlighter": "^15.5.0",
+ "zustand": "^4.5.2"
},
"devDependencies": {
"@types/lodash": "^4.14.202",
@@ -74,20 +76,20 @@
}
},
"node_modules/@clickhouse/client": {
- "version": "0.3.0",
- "resolved": "https://registry.npmjs.org/@clickhouse/client/-/client-0.3.0.tgz",
- "integrity": "sha512-wRzx+e/P3Q3A3DcHJ1iJZ4UOcr0J+D6ZrVO1FdD7ueur4io41OlCVLJ2nwGJoQ+whJPJpqHBzd5DIgShILubYw==",
+ "version": "0.3.1",
+ "resolved": "https://registry.npmjs.org/@clickhouse/client/-/client-0.3.1.tgz",
+ "integrity": "sha512-5ywbK3oJJ8HIMzSZ6qJAhr6SyjmaBLy9fnVrLdacnZpFhD8j2RMKyM9yu3kAOzCF2HhFbdTPM/+KVWTpKjJlpA==",
"dependencies": {
- "@clickhouse/client-common": "0.3.0"
+ "@clickhouse/client-common": "0.3.1"
},
"engines": {
"node": ">=16"
}
},
"node_modules/@clickhouse/client-common": {
- "version": "0.3.0",
- "resolved": "https://registry.npmjs.org/@clickhouse/client-common/-/client-common-0.3.0.tgz",
- "integrity": "sha512-LcfJfyMglUTbGuDN/s6e/R3LwtbQXpv6juIJID+tVXxcGzPijhDB+XXQpqbprunqnm48vHmLfCB6/68Pgp5qvg=="
+ "version": "0.3.1",
+ "resolved": "https://registry.npmjs.org/@clickhouse/client-common/-/client-common-0.3.1.tgz",
+ "integrity": "sha512-SXErzkCLLp/cRs2P8ihEgOiz1D0RMcQGcccnxrU5+DKWpYMu5/ZR48gBLaUVpVg/hXdBR/9n9XH8CB8d1xKiuQ=="
},
"node_modules/@cspotcode/source-map-support": {
"version": "0.8.1",
@@ -111,6 +113,22 @@
"@jridgewell/sourcemap-codec": "^1.4.10"
}
},
+ "node_modules/@dhmk/utils": {
+ "version": "4.3.3",
+ "resolved": "https://registry.npmjs.org/@dhmk/utils/-/utils-4.3.3.tgz",
+ "integrity": "sha512-exxhD1uCs4yzpDjtAXdgDGGZ6BBDdxYKHSg6Qo3tsw/bTIRFTJZSPvYh/XuKTaaHiN44d+UTViBIP4TDmTHSeg=="
+ },
+ "node_modules/@dhmk/zustand-lens": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/@dhmk/zustand-lens/-/zustand-lens-4.0.0.tgz",
+ "integrity": "sha512-xx9Dz/zcsA92cJxBmv8voTJ8hc5/+KNB6y2cWoY7YLv0QsAZGaWghiQhGAYeWmZMKvFtpc7CwSeN8cLLaMdOCw==",
+ "dependencies": {
+ "@dhmk/utils": "^4.3.3"
+ },
+ "peerDependencies": {
+ "zustand": "^4.0.0"
+ }
+ },
"node_modules/@eslint-community/eslint-utils": {
"version": "4.4.0",
"resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
@@ -422,9 +440,9 @@
}
},
"node_modules/@next/eslint-plugin-next/node_modules/minimatch": {
- "version": "9.0.3",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
- "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+ "version": "9.0.4",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
+ "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
"dev": true,
"dependencies": {
"brace-expansion": "^2.0.1"
@@ -854,9 +872,9 @@
"dev": true
},
"node_modules/@types/node": {
- "version": "20.11.30",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.30.tgz",
- "integrity": "sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==",
+ "version": "20.12.2",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.2.tgz",
+ "integrity": "sha512-zQ0NYO87hyN6Xrclcqp7f8ZbXNbRfoGWNcMvHTPQp9UUrwI0mI7XBz+cu7/W6/VClYo2g63B0cjull/srU7LgQ==",
"devOptional": true,
"dependencies": {
"undici-types": "~5.26.4"
@@ -866,13 +884,13 @@
"version": "15.7.11",
"resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.11.tgz",
"integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==",
- "dev": true
+ "devOptional": true
},
"node_modules/@types/react": {
"version": "18.2.48",
"resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.48.tgz",
"integrity": "sha512-qboRCl6Ie70DQQG9hhNREz81jqC1cs9EVNcjQ1AU+jH6NFfSAhVVbrrY/+nSF+Bsk4AOwm9Qa61InvMCyV+H3w==",
- "dev": true,
+ "devOptional": true,
"dependencies": {
"@types/prop-types": "*",
"@types/scheduler": "*",
@@ -901,7 +919,7 @@
"version": "0.16.8",
"resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz",
"integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==",
- "dev": true
+ "devOptional": true
},
"node_modules/@types/unist": {
"version": "2.0.10",
@@ -5616,6 +5634,14 @@
"punycode": "^2.1.0"
}
},
+ "node_modules/use-sync-external-store": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",
+ "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==",
+ "peerDependencies": {
+ "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+ }
+ },
"node_modules/util-deprecate": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -5892,6 +5918,33 @@
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
+ },
+ "node_modules/zustand": {
+ "version": "4.5.2",
+ "resolved": "https://registry.npmjs.org/zustand/-/zustand-4.5.2.tgz",
+ "integrity": "sha512-2cN1tPkDVkwCy5ickKrI7vijSjPksFRfqS6237NzT0vqSsztTNnQdHw9mmN7uBdk3gceVXU0a+21jFzFzAc9+g==",
+ "dependencies": {
+ "use-sync-external-store": "1.2.0"
+ },
+ "engines": {
+ "node": ">=12.7.0"
+ },
+ "peerDependencies": {
+ "@types/react": ">=16.8",
+ "immer": ">=9.0.6",
+ "react": ">=16.8"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ },
+ "immer": {
+ "optional": true
+ },
+ "react": {
+ "optional": true
+ }
+ }
}
}
}
diff --git a/src/client/package.json b/src/client/package.json
index 22478548..d260ccb9 100644
--- a/src/client/package.json
+++ b/src/client/package.json
@@ -11,6 +11,7 @@
},
"dependencies": {
"@clickhouse/client": "^0.3.0",
+ "@dhmk/zustand-lens": "^4.0.0",
"@headlessui/react": "^1.7.18",
"@heroicons/react": "^2.1.1",
"@next-auth/prisma-adapter": "^1.0.7",
@@ -26,7 +27,8 @@
"react": "^18",
"react-dom": "^18",
"react-hot-toast": "^2.4.1",
- "react-syntax-highlighter": "^15.5.0"
+ "react-syntax-highlighter": "^15.5.0",
+ "zustand": "^4.5.2"
},
"devDependencies": {
"@types/lodash": "^4.14.202",
diff --git a/src/client/src/app/(auth)/layout.tsx b/src/client/src/app/(auth)/layout.tsx
new file mode 100644
index 00000000..95c0566d
--- /dev/null
+++ b/src/client/src/app/(auth)/layout.tsx
@@ -0,0 +1,9 @@
+"use client";
+
+export default function AuthLayout({
+ children,
+}: {
+ children: React.ReactNode;
+}) {
+ return children;
+}
diff --git a/src/client/src/app/(auth)/login/page.tsx b/src/client/src/app/(auth)/login/page.tsx
index ca64d68a..7cd0a1d2 100644
--- a/src/client/src/app/(auth)/login/page.tsx
+++ b/src/client/src/app/(auth)/login/page.tsx
@@ -1,5 +1,4 @@
-"use client";
-import { AuthForm } from "../auth-form";
+import { AuthForm } from "../../../components/(auth)/auth-form";
export default function Login() {
return <AuthForm type={"login"} />;
diff --git a/src/client/src/app/(auth)/register/page.tsx b/src/client/src/app/(auth)/register/page.tsx
index b3d21e13..54656954 100644
--- a/src/client/src/app/(auth)/register/page.tsx
+++ b/src/client/src/app/(auth)/register/page.tsx
@@ -1,5 +1,4 @@
-"use client";
-import { AuthForm } from "../auth-form";
+import { AuthForm } from "../../../components/(auth)/auth-form";
export default function Login() {
return <AuthForm type={"register"} />;
diff --git a/src/client/src/app/(playground)/dashboard/data-charts.tsx b/src/client/src/app/(playground)/dashboard/data-charts.tsx
index 2e442e71..d6532437 100644
--- a/src/client/src/app/(playground)/dashboard/data-charts.tsx
+++ b/src/client/src/app/(playground)/dashboard/data-charts.tsx
@@ -1,11 +1,12 @@
import { memo, useCallback, useEffect } from "react";
-import { useFilter } from "../filter-context";
import Card from "@/components/common/card";
import { DonutChart } from "@tremor/react";
import Legend from "@/components/common/legend";
import useFetchWrapper from "@/utils/hooks/useFetchWrapper";
import { round } from "lodash";
import { getChartColors } from "@/constants/chart-colors";
+import { useRootStore } from "@/store";
+import { getFilterDetails } from "@/selectors/filter";
const valueFormatter = (number: number) => `${round(number, 7)}`;
@@ -51,7 +52,7 @@ const PieChartCard = memo(
indexKey,
url,
}: PieChartCardProps) => {
- const [filter] = useFilter();
+ const filter = useRootStore(getFilterDetails);
const { data, fireRequest, isFetched, isLoading } = useFetchWrapper();
const fetchData = useCallback(async () => {
diff --git a/src/client/src/app/(playground)/dashboard/page.tsx b/src/client/src/app/(playground)/dashboard/page.tsx
index 6d421c72..92ff8936 100644
--- a/src/client/src/app/(playground)/dashboard/page.tsx
+++ b/src/client/src/app/(playground)/dashboard/page.tsx
@@ -1,5 +1,5 @@
"use client";
-import Filter from "../filter";
+import Filter from "../../../components/(playground)/filter";
import DataCharts from "./data-charts";
import NumberStats from "./number-stats";
import RequestsPerTime from "./requests-per-time";
diff --git a/src/client/src/app/(playground)/dashboard/requests-per-time.tsx b/src/client/src/app/(playground)/dashboard/requests-per-time.tsx
index 2ccf085f..9fdf0dde 100644
--- a/src/client/src/app/(playground)/dashboard/requests-per-time.tsx
+++ b/src/client/src/app/(playground)/dashboard/requests-per-time.tsx
@@ -1,13 +1,14 @@
import { useCallback, useEffect } from "react";
-import { useFilter } from "../filter-context";
import Card from "@/components/common/card";
import { LineChart } from "@tremor/react";
import useFetchWrapper from "@/utils/hooks/useFetchWrapper";
import toast from "react-hot-toast";
import { getChartColors } from "@/constants/chart-colors";
+import { useRootStore } from "@/store";
+import { getFilterDetails } from "@/selectors/filter";
export default function RequestsPerTime() {
- const [filter] = useFilter();
+ const filter = useRootStore(getFilterDetails);
const { data, fireRequest, isFetched, isLoading } = useFetchWrapper();
const fetchData = useCallback(async () => {
fireRequest({
diff --git a/src/client/src/app/(playground)/dashboard/token-charts.tsx b/src/client/src/app/(playground)/dashboard/token-charts.tsx
index edcb20b7..252a7c7c 100644
--- a/src/client/src/app/(playground)/dashboard/token-charts.tsx
+++ b/src/client/src/app/(playground)/dashboard/token-charts.tsx
@@ -1,13 +1,14 @@
import StatCard from "@/components/(playground)/stat-card";
import { AreaChart, BarList, LineChart } from "@tremor/react";
import { useCallback, useEffect } from "react";
-import { useFilter } from "../filter-context";
import useFetchWrapper from "@/utils/hooks/useFetchWrapper";
import Card from "@/components/common/card";
import { getChartColors } from "@/constants/chart-colors";
+import { getFilterDetails } from "@/selectors/filter";
+import { useRootStore } from "@/store";
function TopModels() {
- const [filter] = useFilter();
+ const filter = useRootStore(getFilterDetails);
const { data, fireRequest, isFetched, isLoading } = useFetchWrapper();
const fetchData = useCallback(async () => {
@@ -56,7 +57,7 @@ function TopModels() {
}
function ModelsPerTime() {
- const [filter] = useFilter();
+ const filter = useRootStore(getFilterDetails);
const { data, fireRequest, isFetched, isLoading } = useFetchWrapper();
const fetchData = useCallback(async () => {
fireRequest({
@@ -108,7 +109,7 @@ function ModelsPerTime() {
}
function TokensPerTime() {
- const [filter] = useFilter();
+ const filter = useRootStore(getFilterDetails);
const { data, fireRequest, isFetched, isLoading } = useFetchWrapper();
const fetchData = useCallback(async () => {
fireRequest({
diff --git a/src/client/src/app/(playground)/getting-started/page.tsx b/src/client/src/app/(playground)/getting-started/page.tsx
index c4668716..1eab1fab 100644
--- a/src/client/src/app/(playground)/getting-started/page.tsx
+++ b/src/client/src/app/(playground)/getting-started/page.tsx
@@ -1,5 +1,3 @@
-"use client";
-
import CodeBlock from "@/components/common/code-block";
import { Tab } from "@headlessui/react";
diff --git a/src/client/src/app/(playground)/layout.tsx b/src/client/src/app/(playground)/layout.tsx
index e1f1cf12..674b81b1 100644
--- a/src/client/src/app/(playground)/layout.tsx
+++ b/src/client/src/app/(playground)/layout.tsx
@@ -1,25 +1,34 @@
+"use client";
import Sidebar from "@/components/(playground)/sidebar";
-import { FilterProvider } from "./filter-context";
import Header from "@/components/(playground)/header";
+import { useEffect } from "react";
+import { useRootStore } from "@/store";
+import { getIsUserFetched, setUser } from "@/selectors/user";
+import { fetchAndPopulateCurrentUserStore } from "@/helpers/user";
export default function PlaygroundLayout({
- children, // will be a page or nested layout
+ children,
}: {
children: React.ReactNode;
}) {
+ const isFetched = useRootStore(getIsUserFetched);
+ const updateUser = useRootStore(setUser);
+
+ useEffect(() => {
+ if (!isFetched) fetchAndPopulateCurrentUserStore(updateUser);
+ }, [isFetched]);
+
return (
<div className="h-screen w-screen overflow-hidden flex bg-secondary/[.6]">
<Sidebar />
- <FilterProvider>
- <main className="w-full h-full py-2 pr-2 overflow-hidden">
- <div className="flex flex-col w-full h-full overflow-hidden rounded-lg bg-white/[0.9]">
- <Header />
- <div className="flex flex-col grow w-full h-full px-4 overflow-hidden">
- {children}
- </div>
+ <main className="w-full h-full py-2 pr-2 overflow-hidden">
+ <div className="flex flex-col w-full h-full overflow-hidden rounded-lg bg-white/[0.9]">
+ <Header />
+ <div className="flex flex-col grow w-full h-full px-4 overflow-hidden">
+ {children}
</div>
- </main>
- </FilterProvider>
+ </div>
+ </main>
</div>
);
}
diff --git a/src/client/src/app/(playground)/requests/page.tsx b/src/client/src/app/(playground)/requests/page.tsx
index 249aad16..e83b1d17 100644
--- a/src/client/src/app/(playground)/requests/page.tsx
+++ b/src/client/src/app/(playground)/requests/page.tsx
@@ -1,15 +1,16 @@
"use client";
import RequestTable from "./request-table";
-import { useFilter } from "../filter-context";
import { useCallback, useEffect } from "react";
import RequestFilter, { FilterConfigProps } from "./request-filter";
import { RequestProvider } from "./request-context";
import useFetchWrapper from "@/utils/hooks/useFetchWrapper";
import RequestDetails from "./request-details";
import toast from "react-hot-toast";
+import { getFilterDetails } from "@/selectors/filter";
+import { useRootStore } from "@/store";
export default function RequestPage() {
- const [filter] = useFilter();
+ const filter = useRootStore(getFilterDetails);
const { data, fireRequest, isFetched, isLoading } = useFetchWrapper();
const fetchData = useCallback(async () => {
fireRequest({
diff --git a/src/client/src/app/(playground)/requests/request-filter.tsx b/src/client/src/app/(playground)/requests/request-filter.tsx
index a385036b..3f288a69 100644
--- a/src/client/src/app/(playground)/requests/request-filter.tsx
+++ b/src/client/src/app/(playground)/requests/request-filter.tsx
@@ -1,7 +1,8 @@
import Pagination from "@/components/common/pagination";
-import Filter from "../filter";
-import { useFilter } from "../filter-context";
import { ceil } from "lodash";
+import Filter from "../../../components/(playground)/filter";
+import { getFilterDetails, getUpdateFilter } from "@/selectors/filter";
+import { useRootStore } from "@/store";
export type FilterConfigProps = {
endpoints: string[];
@@ -15,7 +16,8 @@ export default function RequestFilter({
}: {
config: FilterConfigProps | undefined;
}) {
- const [filter, updateFilter] = useFilter();
+ const filter = useRootStore(getFilterDetails);
+ const updateFilter = useRootStore(getUpdateFilter);
const onClickPageAction = (dir: -1 | 1) => {
updateFilter("offset", filter.offset + dir * filter.limit);
};
diff --git a/src/client/src/app/(playground)/settings/profile.tsx b/src/client/src/app/(playground)/settings/profile.tsx
index 1145b80d..4ba1e4fd 100644
--- a/src/client/src/app/(playground)/settings/profile.tsx
+++ b/src/client/src/app/(playground)/settings/profile.tsx
@@ -1,5 +1,7 @@
import FormBuilder from "@/components/common/form-builder";
import SideTabs, { SideTabItemProps } from "@/components/common/side-tabs";
+import { getUserDetails, setUser } from "@/selectors/user";
+import { useRootStore } from "@/store";
import useFetchWrapper from "@/utils/hooks/useFetchWrapper";
import { User } from "@prisma/client";
import {
@@ -106,13 +108,18 @@ function ModifyProfileDetails({
}
export default function Profile() {
- const { data: user, fireRequest: getUser } = useFetchWrapper();
+ const userDetails = useRootStore(getUserDetails);
+ const setUserDetails = useRootStore(setUser);
+ const { fireRequest: getUser } = useFetchWrapper();
const fetchUser = () => {
getUser({
requestType: "GET",
url: "/api/user/profile",
responseDataKey: "data",
+ successCb(res) {
+ setUserDetails(res);
+ },
failureCb: (err?: string) => {
toast.error(err || "Unauthorized access!", {
id: PROFILE_TOAST_ID,
@@ -137,12 +144,10 @@ export default function Profile() {
setSelectedTabId(itemId);
};
- useEffect(() => {
- fetchUser();
- }, []);
-
const updatedItems = items.map((item) =>
- item.id === "details" ? { ...item, badge: (user as User)?.email } : item
+ item.id === "details"
+ ? { ...item, badge: (userDetails as User)?.email }
+ : item
);
return (
@@ -154,7 +159,10 @@ export default function Profile() {
/>
<div className="flex flex-1 w-full h-full">
{selectedTabId === "details" ? (
- <ModifyProfileDetails user={user as User} fetchUser={fetchUser} />
+ <ModifyProfileDetails
+ user={userDetails as User}
+ fetchUser={fetchUser}
+ />
) : null}
</div>
</div>
diff --git a/src/client/src/app/(auth)/auth-form.tsx b/src/client/src/components/(auth)/auth-form.tsx
similarity index 100%
rename from src/client/src/app/(auth)/auth-form.tsx
rename to src/client/src/components/(auth)/auth-form.tsx
diff --git a/src/client/src/app/(playground)/filter.tsx b/src/client/src/components/(playground)/filter.tsx
similarity index 63%
rename from src/client/src/app/(playground)/filter.tsx
rename to src/client/src/components/(playground)/filter.tsx
index cf052218..1aa37b95 100644
--- a/src/client/src/app/(playground)/filter.tsx
+++ b/src/client/src/components/(playground)/filter.tsx
@@ -1,9 +1,15 @@
import { Tab } from "@headlessui/react";
-import {
- DEFAULT_TIME_RANGE,
- TIME_RANGE_TYPE,
- useFilter,
-} from "./filter-context";
+import { getFilterDetails, getUpdateFilter } from "@/selectors/filter";
+import { useRootStore } from "@/store";
+
+const DEFAULT_TIME_RANGE = "24H";
+
+const TIME_RANGE_TYPE: Record<"24H" | "7D" | "1M" | "3M", string> = {
+ "24H": "24H",
+ "7D": "7D",
+ "1M": "1M",
+ "3M": "3M",
+};
const TIME_RANGE_TABS: { key: string; label: string }[] = Object.keys(
TIME_RANGE_TYPE
@@ -12,20 +18,21 @@ const TIME_RANGE_TABS: { key: string; label: string }[] = Object.keys(
label: TIME_RANGE_TYPE[k as keyof typeof TIME_RANGE_TYPE],
}));
-const DEFAULT_CHECKED_INDEX = TIME_RANGE_TABS.findIndex(
- ({ key }) => key === DEFAULT_TIME_RANGE
-);
-
const Filter = () => {
- const [, updateFilter] = useFilter();
+ const filter = useRootStore(getFilterDetails);
+ const updateFilter = useRootStore(getUpdateFilter);
const handleChange = (index: number) => {
const selectedTab = TIME_RANGE_TABS[index].key;
updateFilter("timeLimit.type", selectedTab);
};
+ const DEFAULT_CHECKED_INDEX = TIME_RANGE_TABS.findIndex(
+ ({ key }) => key === (filter.timeLimit.type || DEFAULT_TIME_RANGE)
+ );
+
return (
<div className="flex pb-3 pt-2">
- <Tab.Group defaultIndex={DEFAULT_CHECKED_INDEX} onChange={handleChange}>
+ <Tab.Group selectedIndex={DEFAULT_CHECKED_INDEX} onChange={handleChange}>
<Tab.List className="flex space-x-1 rounded-xl bg-secondary/[0.8] p-1">
{TIME_RANGE_TABS.map(({ label, key }) => (
<Tab
diff --git a/src/client/src/components/(playground)/header.tsx b/src/client/src/components/(playground)/header.tsx
index c7e4e9f4..01590178 100644
--- a/src/client/src/components/(playground)/header.tsx
+++ b/src/client/src/components/(playground)/header.tsx
@@ -1,4 +1,3 @@
-"use client";
import { usePathname } from "next/navigation";
import { signOut } from "next-auth/react";
import Dropdown from "../common/drop-down";
diff --git a/src/client/src/components/(playground)/sidebar.tsx b/src/client/src/components/(playground)/sidebar.tsx
index 5caf330e..f6ff233f 100644
--- a/src/client/src/components/(playground)/sidebar.tsx
+++ b/src/client/src/components/(playground)/sidebar.tsx
@@ -1,5 +1,3 @@
-"use client";
-
import { ReactElement } from "react";
import {
AcademicCapIcon,
@@ -11,6 +9,7 @@ import {
import Image from "next/image";
import { usePathname } from "next/navigation";
import { LinkIcon, WrenchScrewdriverIcon } from "@heroicons/react/24/outline";
+import Link from "next/link";
type SidebarItemProps = {
className?: string;
@@ -75,21 +74,36 @@ const SIDEBAR_BOTTOM_ITEMS: SidebarItemProps[] = [
];
const SidebarItem = (props: SidebarItemProps) => {
+ if (props.target || !props.link)
+ return (
+ <a
+ href={props.link}
+ className={`flex items-center p-2 cursor-pointer ${
+ props.className || ""
+ }`}
+ onClick={props.onClick}
+ target={props.target}
+ >
+ {props.leftIcon}
+ <span className={`${props.leftIcon && "ml-5"} text-nowrap`}>
+ {props.text}
+ </span>
+ {props.rightIcon}
+ </a>
+ );
return (
- <a
- href={props.link}
+ <Link
className={`flex items-center p-2 cursor-pointer ${
props.className || ""
}`}
- onClick={props.onClick}
- target={props.target}
+ href={props.link}
>
{props.leftIcon}
<span className={`${props.leftIcon && "ml-5"} text-nowrap`}>
{props.text}
</span>
{props.rightIcon}
- </a>
+ </Link>
);
};
diff --git a/src/client/src/components/(playground)/stat-card.tsx b/src/client/src/components/(playground)/stat-card.tsx
index 23fe0ae2..00830525 100644
--- a/src/client/src/components/(playground)/stat-card.tsx
+++ b/src/client/src/components/(playground)/stat-card.tsx
@@ -1,8 +1,9 @@
-import { useFilter } from "@/app/(playground)/filter-context";
import useFetchWrapper from "@/utils/hooks/useFetchWrapper";
import { memo, useCallback, useEffect } from "react";
import Card, { CardProps } from "../common/card";
import { round } from "lodash";
+import { getFilterDetails } from "@/selectors/filter";
+import { useRootStore } from "@/store";
type StatCardProps = Partial<CardProps> & {
dataKey: string;
@@ -24,7 +25,7 @@ const StatCard = memo(
url,
...rest
}: StatCardProps) => {
- const [filter] = useFilter();
+ const filter = useRootStore(getFilterDetails);
const { data, isFetched, isLoading, fireRequest } = useFetchWrapper();
const fetchData = useCallback(async () => {
diff --git a/src/client/src/helpers/user.ts b/src/client/src/helpers/user.ts
new file mode 100644
index 00000000..b9b549d6
--- /dev/null
+++ b/src/client/src/helpers/user.ts
@@ -0,0 +1,15 @@
+import { getData } from "@/utils/api";
+import asaw from "@/utils/asaw";
+import { redirect } from "next/navigation";
+
+export const fetchAndPopulateCurrentUserStore = async (updateUser) => {
+ const [, user] = await asaw(
+ getData({
+ url: "/api/user/profile",
+ method: "GET",
+ })
+ );
+
+ if (!user) return redirect("/login");
+ updateUser(user);
+};
diff --git a/src/client/src/lib/user.ts b/src/client/src/lib/user.ts
index 51fbdf8e..bb4ca740 100644
--- a/src/client/src/lib/user.ts
+++ b/src/client/src/lib/user.ts
@@ -4,17 +4,15 @@ import { getCurrentUser } from "./session";
import { User } from "@prisma/client";
import { getHashedPassword, doesPasswordMatches } from "@/utils/user";
-function exclude<User>(
+function exclude<User extends Record<string, unknown>, K extends keyof User>(
user: User,
- keys: string[] = ["password"]
-): Omit<User, string> {
- // @ts-expect-error
+ keys: K[] = ["password"] as K[]
+): Omit<User, K> {
return Object.fromEntries(
- // @ts-expect-error
Object.entries(user).filter(([key]) =>
- typeof keys.includes === "function" ? !keys.includes(key) : true
+ typeof keys.includes === "function" ? !keys.includes(key as K) : true
)
- );
+ ) as Omit<User, K>;
}
export const getUserByEmail = async ({
@@ -33,8 +31,7 @@ export const getUserByEmail = async ({
if (!user) throw new Error("No user with this email exists");
- // @ts-expect-error
- return exclude(user, selectPassword && []);
+ return exclude(user, selectPassword ? [] : undefined);
};
export const getUserById = async ({
@@ -51,8 +48,7 @@ export const getUserById = async ({
},
});
- // @ts-expect-error
- return exclude(user, selectPassword && []);
+ return exclude(user, selectPassword ? [] : undefined);
};
export const createNewUser = async (
@@ -78,8 +74,7 @@ export const createNewUser = async (
});
if (createdUser?.id) {
- // @ts-expect-error
- return exclude(createdUser, options?.selectPassword && []);
+ return exclude(createdUser, options?.selectPassword ? [] : undefined);
}
throw new Error("Cannot create a user!");
diff --git a/src/client/src/selectors/filter.ts b/src/client/src/selectors/filter.ts
new file mode 100644
index 00000000..e16ed2a5
--- /dev/null
+++ b/src/client/src/selectors/filter.ts
@@ -0,0 +1,5 @@
+import { RootStore } from "@/store";
+
+export const getFilterDetails = (state: RootStore) => state.filter.details;
+
+export const getUpdateFilter = (state: RootStore) => state.filter.updateFilter;
diff --git a/src/client/src/selectors/user.ts b/src/client/src/selectors/user.ts
new file mode 100644
index 00000000..6e835b77
--- /dev/null
+++ b/src/client/src/selectors/user.ts
@@ -0,0 +1,9 @@
+import { RootStore } from "@/store";
+
+export const getUserDetails = (state: RootStore) => state.user.details;
+
+export const getIsUserFetched = (state: RootStore) => state.user.isFetched;
+
+export const setUser = (state: RootStore) => state.user.set;
+
+export const resetUser = (state: RootStore) => state.user.reset;
diff --git a/src/client/src/app/(playground)/filter-context.tsx b/src/client/src/store/filter.ts
similarity index 68%
rename from src/client/src/app/(playground)/filter-context.tsx
rename to src/client/src/store/filter.ts
index bfc37268..3773600d 100644
--- a/src/client/src/app/(playground)/filter-context.tsx
+++ b/src/client/src/store/filter.ts
@@ -1,8 +1,6 @@
-"use client";
-
-import React, { ReactNode, createContext, useContext, useState } from "react";
-import { merge, set } from "lodash";
+import { set } from "lodash";
import { addDays, addMonths, addWeeks } from "date-fns";
+import { lens } from "@dhmk/zustand-lens";
export const TIME_RANGE_TYPE: Record<"24H" | "7D" | "1M" | "3M", string> = {
"24H": "24H",
@@ -23,10 +21,6 @@ export interface FilterType {
offset: number;
}
-const FilterContext = createContext<
- [FilterType, (key: string, value: any) => void] | undefined
->(undefined);
-
function getTimeLimitObject(value: string, keyPrefix: string) {
let object = {};
if (value === TIME_RANGE_TYPE["24H"]) {
@@ -58,9 +52,14 @@ const INITIAL_FILTER: FilterType = {
offset: 0,
};
-export function FilterProvider({ children }: { children: ReactNode }) {
- const [filter, setFilter] = useState(INITIAL_FILTER);
- const updateFilter = (key: string, value: any) => {
+export type FilterStore = {
+ details: FilterType;
+ updateFilter: (key: string, value: any) => void;
+};
+
+export const filterStoreSlice: FilterStore = lens((setStore, getStore) => ({
+ details: INITIAL_FILTER,
+ updateFilter: (key: string, value: any) => {
let object = {};
switch (key) {
case "timeLimit.type":
@@ -76,20 +75,6 @@ export function FilterProvider({ children }: { children: ReactNode }) {
}
set(object, key, value);
- setFilter((e) => merge({}, e, object));
- };
-
- return (
- <FilterContext.Provider value={[filter, updateFilter]}>
- {children}
- </FilterContext.Provider>
- );
-}
-
-export function useFilter() {
- const context = useContext(FilterContext);
- if (context === undefined) {
- throw new Error("useFilter must be used within a FilterProvider");
- }
- return context;
-}
+ setStore({ details: { ...getStore().details, ...object } });
+ },
+}));
diff --git a/src/client/src/store/index.ts b/src/client/src/store/index.ts
new file mode 100644
index 00000000..f48cb861
--- /dev/null
+++ b/src/client/src/store/index.ts
@@ -0,0 +1,19 @@
+import { create } from "zustand";
+import { UserStore, userStoreSlice } from "./user";
+import { FilterStore, filterStoreSlice } from "./filter";
+import { withLenses } from "@dhmk/zustand-lens";
+import { devtools } from "zustand/middleware";
+
+export type RootStore = {
+ user: UserStore;
+ filter: FilterStore;
+};
+
+export const useRootStore = create<RootStore>()(
+ devtools(
+ withLenses({
+ user: userStoreSlice,
+ filter: filterStoreSlice,
+ })
+ )
+);
diff --git a/src/client/src/store/user.ts b/src/client/src/store/user.ts
new file mode 100644
index 00000000..a7fe02b4
--- /dev/null
+++ b/src/client/src/store/user.ts
@@ -0,0 +1,26 @@
+"use client";
+import { lens } from "@dhmk/zustand-lens";
+import { User } from "@prisma/client";
+
+export type UserStore = {
+ details?: User;
+ isFetched: boolean;
+ set: (u: User) => void;
+ reset: () => void;
+};
+
+export const userStoreSlice: UserStore = lens((setStore, getStore) => ({
+ details: undefined,
+ isFetched: false,
+ set: (u) =>
+ setStore(() => ({
+ details: u,
+ isFetched: true,
+ })),
+ reset: () =>
+ setStore(() => ({
+ ...getStore(),
+ details: undefined,
+ isFetched: true,
+ })),
+}));
diff --git a/src/client/tsconfig.json b/src/client/tsconfig.json
index 06294b09..1ef65e97 100644
--- a/src/client/tsconfig.json
+++ b/src/client/tsconfig.json
@@ -25,6 +25,9 @@
"@/prisma/*": ["./prisma/*"],
"@/utils/*": ["./src/utils/*"],
"@/constants/*": ["./src/constants/*"],
+ "@/store/*": ["./src/store/*"],
+ "@/helpers/*": ["./src/helpers/*"],
+ "@/selectors/*": ["./src/selectors/*"],
}
},
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts", "prisma/seed.js"],