@uniai-fe/uds-templates 0.1.23 → 0.1.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniai-fe/uds-templates",
-  "version": "0.1.23",
+  "version": "0.1.24",
   "description": "UNIAI Design System; UI Templates Package",
   "type": "module",
   "private": false,

package/src/cctv/hooks/useCompanyData.tsx

@@ -1,23 +1,23 @@
 "use client";
 
 import { useEffect, useMemo } from "react";
-import { useFormContext } from "react-hook-form";
 import { useQueryCctvCompanyList } from "../apis";
 import { useCctvEndpoints } from "../components/Provider";
-import type { CctvContext } from "../types";
+import useCctvContext from "./useContext";
 
 export default function useCctvCompanyData({
   username,
   url,
 }: {
-  username: string;
+  username?: string;
   url?: string;
 }) {
   const { listUrl } = useCctvEndpoints();
   const resolvedUrl = useMemo(() => url ?? listUrl, [url, listUrl]);
-  const { setValue } = useFormContext<CctvContext>();
+  const { username: contextUsername, setValue } = useCctvContext();
+
   const { data, isFetching, isError, ...rest } = useQueryCctvCompanyList({
-    username,
+    username: username ?? contextUsername,
     url: resolvedUrl,
   });
 

package/src/cctv/hooks/useContext.ts

@@ -17,10 +17,10 @@ import { getCam, getCamList, getCompany } from "../utils/select";
 export default function useCctvContext(params?: { pageCode?: string }) {
   const { pageCode } = params ?? {};
 
-  // const username = useCctvUsername();
   const setCtx = useSetAtom(cctvSelectedContext);
   const { control, setValue, ...context } = useFormContext<CctvContext>();
 
+  const username = useWatch({ control, name: "username" });
   const rawData = useWatch({ control, name: "rawData" });
   // console.log("useCctvContext rawData:", rawData);
   const isFetching = useWatch({ control, name: "isFetching" });
@@ -132,6 +132,7 @@ export default function useCctvContext(params?: { pageCode?: string }) {
   return {
     isFetching,
     isError,
+    username,
     searchedKeyword,
     selectedCompanyId,
     selectedCamId,