Merge branch 'release/1.1.2'

Author: pipisebastian

.github/workflows/deploy.yml

@@ -23,10 +23,9 @@ jobs:
           JWT_SECRET: ${{ secrets.JWT_SECRET }}
           JWT_REFRESH_SECRET: ${{ secrets.JWT_REFRESH_SECRET }}
           VITE_API_URL: ${{ secrets.VITE_API_URL }}
-          CLOVASTUDIO_PROMPT: ${{ secrets.CLOVASTUDIO_PROMPT }}
-          CLOVASTUDIO_API_URL: ${{ secrets.CLOVASTUDIO_API_URL }}
-          CLOVASTUDIO_API_KEY: ${{ secrets.CLOVASTUDIO_API_KEY }}
-          CLOVASTUDIO_REQUEST_ID: ${{ secrets.CLOVASTUDIO_REQUEST_ID }}
+          AI_PROMPT: ${{ secrets.AI_PROMPT }}
+          AI_API_URL: ${{ secrets.AI_API_URL }}
+          AI_API_KEY: ${{ secrets.AI_API_KEY }}
         run: |
           docker-compose up -d --build
 

@noctaCrdt/src/types/Interfaces.ts

@@ -62,7 +62,8 @@ export type PageIconType =
   // 협업 관련
   | "Team" // 팀 문서
   | "Shared" // 공유 문서
-  | "Feedback"; // 피드백/리뷰
+  | "Feedback" // 피드백/리뷰
+  | "AI";
 
 export type TextColorType = Exclude<BackgroundColorType, "transparent">;
 

client/src/apis/ai.ts

@@ -4,14 +4,16 @@ import { unAuthorizationFetch } from "./axios";
 // TODO 실패 시 예외처리
 export const useCreateAIDocumentMutation = (onSuccess: () => void) => {
   const fetcher = ({
+    socketId,
     clientId,
     workspaceId,
     message,
   }: {
+    socketId: string;
     clientId: number | null;
     workspaceId: string | undefined;
     message: string;
-  }) => unAuthorizationFetch.post("/ai/chat", { clientId, workspaceId, message });
+  }) => unAuthorizationFetch.post("/ai/chat", { socketId, clientId, workspaceId, message });
 
   return useMutation({
     mutationFn: fetcher,

client/src/components/Toast/ToastContainer.style.ts

@@ -4,8 +4,8 @@ export const ToastContainerStyle = css({
   display: "flex",
   zIndex: "9999",
   position: "fixed",
+  top: "6",
   right: "6",
-  bottom: "6",
   gap: "2",
   flexDirection: "column-reverse",
 });

client/src/constants/PageIconButton.config.ts

@@ -25,7 +25,8 @@ import {
   // 협업 관련
   RiGroupLine, // team: 팀 문서
   RiDiscussLine, // feedback: 피드백
-  RiAddFill, // plus: 추가
+  RiAddFill,
+  RiRobot2Line, // plus: 추가
 } from "react-icons/ri";
 
 export interface IconConfig {
@@ -108,6 +109,11 @@ export const iconComponents: Record<PageIconType | "plus", IconConfig> = {
     icon: RiAddFill,
     color: "#2B4158",
   },
+
+  AI: {
+    icon: RiRobot2Line,
+    color: "#6a00f4",
+  },
 };
 
 export const iconGroups = [

client/src/features/ai/AIModal.tsx

@@ -13,6 +13,8 @@ export const AIModal = ({ onCloseButton }: { onCloseButton: () => void }) => {
   const [message, setMessage] = useState("");
   const { mutate: createAIDocument, status } = useCreateAIDocumentMutation(onCloseButton);
   const isLoading = status === "pending";
+  const { getSocketId } = useSocketStore();
+  const socketId = getSocketId() || "";
 
   const { addToast } = useToastStore();
   const handleSubmit = () => {
@@ -21,7 +23,7 @@ export const AIModal = ({ onCloseButton }: { onCloseButton: () => void }) => {
       return;
     }
     if (!isLoading) {
-      createAIDocument({ clientId, workspaceId: workspace?.id, message });
+      createAIDocument({ socketId, clientId, workspaceId: workspace?.id, message });
     }
   };