From a67ec7e78c2b251e673b60a00e596f2f8355886c Mon Sep 17 00:00:00 2001 From: LandaMm Date: Wed, 4 Jun 2025 12:46:48 +0200 Subject: [PATCH] fix: rename `useAdmin` to `useApiServices` --- .../ApiServiceCredentialsModal/index.tsx | 6 +- .../feature/ApiServiceUpdatedModal/index.tsx | 4 +- web/src/pages/ApiServices/Create/index.tsx | 6 +- web/src/pages/ApiServices/Update/index.tsx | 12 +-- web/src/pages/ApiServices/View/index.tsx | 12 +-- web/src/pages/ApiServices/index.tsx | 8 +- web/src/store/admin.ts | 88 +++++++++---------- web/src/types/index.ts | 2 +- 8 files changed, 69 insertions(+), 69 deletions(-) diff --git a/web/src/feature/ApiServiceCredentialsModal/index.tsx b/web/src/feature/ApiServiceCredentialsModal/index.tsx index 07e937b..4572984 100644 --- a/web/src/feature/ApiServiceCredentialsModal/index.tsx +++ b/web/src/feature/ApiServiceCredentialsModal/index.tsx @@ -2,7 +2,7 @@ import { createPortal } from "react-dom"; import { Button } from "@/components/ui/button"; import { Input } from "@/components/ui/input"; import { X } from "lucide-react"; -import { useAdmin } from "@/store/admin"; +import { useApiServices } from "@/store/admin"; import type { ApiServiceCredentials } from "@/types"; const download = (credentials: ApiServiceCredentials) => { @@ -19,8 +19,8 @@ const download = (credentials: ApiServiceCredentials) => { }; const ApiServiceCredentialsModal = () => { - const credentials = useAdmin((state) => state.createdCredentials); - const resetCredentials = useAdmin((state) => state.resetCredentials); + const credentials = useApiServices((state) => state.createdCredentials); + const resetCredentials = useApiServices((state) => state.resetCredentials); const portalRoot = document.getElementById("portal-root"); if (!portalRoot || !credentials) return null; diff --git a/web/src/feature/ApiServiceUpdatedModal/index.tsx b/web/src/feature/ApiServiceUpdatedModal/index.tsx index 9ea9532..c13b367 100644 --- a/web/src/feature/ApiServiceUpdatedModal/index.tsx +++ b/web/src/feature/ApiServiceUpdatedModal/index.tsx @@ -1,10 +1,10 @@ import { createPortal } from "react-dom"; import { Button } from "@/components/ui/button"; import { CircleCheckBig, X } from "lucide-react"; -import { useAdmin } from "@/store/admin"; +import { useApiServices } from "@/store/admin"; const ApiServiceUpdatedModal = () => { - const resetUpdated = useAdmin((state) => state.resetUpdatedApiService); + const resetUpdated = useApiServices((state) => state.resetUpdated); const portalRoot = document.getElementById("portal-root"); if (!portalRoot) return null; diff --git a/web/src/pages/ApiServices/Create/index.tsx b/web/src/pages/ApiServices/Create/index.tsx index 5acaf09..cab8363 100644 --- a/web/src/pages/ApiServices/Create/index.tsx +++ b/web/src/pages/ApiServices/Create/index.tsx @@ -2,7 +2,7 @@ import Breadcrumbs from "@/components/ui/breadcrumbs"; import { Button } from "@/components/ui/button"; import { Input } from "@/components/ui/input"; import ApiServiceCredentialsModal from "@/feature/ApiServiceCredentialsModal"; -import { useAdmin } from "@/store/admin"; +import { useApiServices } from "@/store/admin"; import { useCallback, type FC } from "react"; import { useForm } from "react-hook-form"; import { Link } from "react-router"; @@ -28,9 +28,9 @@ const ApiServiceCreatePage: FC = () => { }, }); - const createApiService = useAdmin((state) => state.createApiService); + const createApiService = useApiServices((state) => state.create); - const credentials = useAdmin((state) => state.createdCredentials); + const credentials = useApiServices((state) => state.createdCredentials); const onSubmit = useCallback( (data: FormData) => { diff --git a/web/src/pages/ApiServices/Update/index.tsx b/web/src/pages/ApiServices/Update/index.tsx index 1920159..40866d7 100644 --- a/web/src/pages/ApiServices/Update/index.tsx +++ b/web/src/pages/ApiServices/Update/index.tsx @@ -2,7 +2,7 @@ import Breadcrumbs from "@/components/ui/breadcrumbs"; import { Button } from "@/components/ui/button"; import { Input } from "@/components/ui/input"; import ApiServiceUpdatedModal from "@/feature/ApiServiceUpdatedModal"; -import { useAdmin } from "@/store/admin"; +import { useApiServices } from "@/store/admin"; import { useCallback, useEffect, type FC } from "react"; import { useForm } from "react-hook-form"; import { Link, useParams } from "react-router"; @@ -28,13 +28,13 @@ const ApiServiceEditPage: FC = () => { }); const { serviceId } = useParams(); - const apiService = useAdmin((state) => state.viewApiService); + const apiService = useApiServices((state) => state.view); - const loadService = useAdmin((state) => state.fetchApiService); + const loadService = useApiServices((state) => state.fetch); - const updateApiService = useAdmin((state) => state.updateApiService); - const updating = useAdmin((state) => state.updatingApiService); - const updated = useAdmin((state) => state.updatedApiService); + const updateApiService = useApiServices((state) => state.update); + const updating = useApiServices((state) => state.updating); + const updated = useApiServices((state) => state.updated); const onSubmit = useCallback( (data: FormData) => { diff --git a/web/src/pages/ApiServices/View/index.tsx b/web/src/pages/ApiServices/View/index.tsx index e58c7c1..d8ca55a 100644 --- a/web/src/pages/ApiServices/View/index.tsx +++ b/web/src/pages/ApiServices/View/index.tsx @@ -1,7 +1,7 @@ import Breadcrumbs from "@/components/ui/breadcrumbs"; import { Button } from "@/components/ui/button"; import { Input } from "@/components/ui/input"; -import { useAdmin } from "@/store/admin"; +import { useApiServices } from "@/store/admin"; import { useEffect, type FC } from "react"; import { Link, useParams } from "react-router"; @@ -24,13 +24,13 @@ const InfoCard = ({ const ViewApiServicePage: FC = () => { const { serviceId } = useParams(); - const apiService = useAdmin((state) => state.viewApiService); - // const loading = useAdmin((state) => state.fetchingApiService); + const apiService = useApiServices((state) => state.view); + // const loading = useApiServices((state) => state.fetchingApiService); - const loadService = useAdmin((state) => state.fetchApiService); + const loadService = useApiServices((state) => state.fetchSingle); - const toggling = useAdmin((state) => state.togglingApiService); - const toggle = useAdmin((state) => state.toggleApiService); + const toggling = useApiServices((state) => state.toggling); + const toggle = useApiServices((state) => state.toggle); useEffect(() => { if (typeof serviceId === "string") loadService(serviceId); diff --git a/web/src/pages/ApiServices/index.tsx b/web/src/pages/ApiServices/index.tsx index a2e5c39..42d05d7 100644 --- a/web/src/pages/ApiServices/index.tsx +++ b/web/src/pages/ApiServices/index.tsx @@ -1,14 +1,14 @@ import Breadcrumbs from "@/components/ui/breadcrumbs"; import { Button } from "@/components/ui/button"; -import { useAdmin } from "@/store/admin"; +import { useApiServices } from "@/store/admin"; import { Plus } from "lucide-react"; import { useEffect, type FC } from "react"; import { Link } from "react-router"; const ApiServicesPage: FC = () => { - const apiServices = useAdmin((state) => state.apiServices); - const loading = useAdmin((state) => state.loadingApiServices); - const fetchApiServices = useAdmin((state) => state.fetchApiServices); + const apiServices = useApiServices((state) => state.apiServices); + const loading = useApiServices((state) => state.loading); + const fetchApiServices = useApiServices((state) => state.fetch); useEffect(() => { fetchApiServices(); diff --git a/web/src/store/admin.ts b/web/src/store/admin.ts index 690d601..3898679 100644 --- a/web/src/store/admin.ts +++ b/web/src/store/admin.ts @@ -10,51 +10,51 @@ import { import type { ApiService, ApiServiceCredentials } from "@/types"; import { create } from "zustand"; -interface IAdminState { +interface IApiServicesState { apiServices: ApiService[]; - loadingApiServices: boolean; + loading: boolean; createdCredentials: ApiServiceCredentials | null; - creatingApiService: boolean; + creating: boolean; - viewApiService: ApiService | null; - fetchingApiService: boolean; + view: ApiService | null; + fetching: boolean; - fetchApiServices: () => Promise; - fetchApiService: (id: string) => Promise; - createApiService: (req: CreateApiServiceRequest) => Promise; + fetch: () => Promise; + fetchSingle: (id: string) => Promise; + create: (req: CreateApiServiceRequest) => Promise; resetCredentials: () => void; - togglingApiService: boolean; - toggleApiService: () => Promise; + toggling: boolean; + toggle: () => Promise; - updateApiService: (req: UpdateApiServiceRequest) => Promise; - updatingApiService: boolean; - updatedApiService: boolean; + update: (req: UpdateApiServiceRequest) => Promise; + updating: boolean; + updated: boolean; - resetUpdatedApiService: () => void; + resetUpdated: () => void; } -export const useAdmin = create((set, get) => ({ +export const useApiServices = create((set, get) => ({ apiServices: [], - loadingApiServices: false, + loading: false, createdCredentials: null, - creatingApiService: false, + creating: false, - viewApiService: null, - fetchingApiService: false, + view: null, + fetching: false, - togglingApiService: false, + toggling: false, - updatingApiService: false, - updatedApiService: false, - resetUpdatedApiService: () => set({ updatedApiService: false }), + updating: false, + updated: false, + resetUpdated: () => set({ updated: false }), resetCredentials: () => set({ createdCredentials: null }), - fetchApiServices: async () => { - set({ loadingApiServices: true }); + fetch: async () => { + set({ loading: true }); try { const response = await getApiServices(); @@ -62,58 +62,58 @@ export const useAdmin = create((set, get) => ({ } catch (err) { console.log("ERR: Failed to fetch services:", err); } finally { - set({ loadingApiServices: false }); + set({ loading: false }); } }, - fetchApiService: async (id: string) => { - set({ fetchingApiService: true }); + fetchSingle: async (id: string) => { + set({ fetching: true }); try { const response = await getApiService(id); - set({ viewApiService: response }); + set({ view: response }); } catch (err) { console.log("ERR: Failed to fetch services:", err); } finally { - set({ fetchingApiService: false }); + set({ fetching: false }); } }, - updateApiService: async (req: UpdateApiServiceRequest) => { - const viewService = get().viewApiService; + update: async (req: UpdateApiServiceRequest) => { + const viewService = get().view; if (!viewService) return; - set({ updatingApiService: true }); + set({ updating: true }); try { await putApiService(viewService.id, req); - get().fetchApiService(viewService.id); - set({ updatedApiService: true }); + get().fetchSingle(viewService.id); + set({ updated: true }); } catch (err) { console.log("ERR: Failed to toggle service:", err); } finally { - set({ updatingApiService: false }); + set({ updating: false }); } }, - toggleApiService: async () => { - const viewService = get().viewApiService; + toggle: async () => { + const viewService = get().view; if (!viewService) return; - set({ togglingApiService: true }); + set({ toggling: true }); try { await patchToggleApiService(viewService.id); - get().fetchApiService(viewService.id); + get().fetchSingle(viewService.id); } catch (err) { console.log("ERR: Failed to toggle service:", err); } finally { - set({ togglingApiService: false }); + set({ toggling: false }); } }, - createApiService: async (req: CreateApiServiceRequest) => { - set({ creatingApiService: true }); + create: async (req: CreateApiServiceRequest) => { + set({ creating: true }); try { const response = await postApiService(req); @@ -121,7 +121,7 @@ export const useAdmin = create((set, get) => ({ } catch (err) { console.log("ERR: Failed to fetch services:", err); } finally { - set({ creatingApiService: false }); + set({ creating: false }); } }, })); diff --git a/web/src/types/index.ts b/web/src/types/index.ts index 7cbaacb..086c8f9 100644 --- a/web/src/types/index.ts +++ b/web/src/types/index.ts @@ -3,7 +3,7 @@ export interface UserProfile { full_name: string; email: string; phone_number: string; - isAdmin: boolean; + is_admin: boolean; last_login: string; profile_picture: string | null; updated_at: string;