@pubuduth-aplicy/chat-ui 2.2.16 → 2.2.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pubuduth-aplicy/chat-ui",
-  "version": "2.2.16",
+  "version": "2.2.18",
   "description": "This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.",
   "license": "ISC",
   "author": "",

package/src/Chat.config.ts

@@ -1,9 +1,12 @@
+import { AxiosInstance } from "axios";
+
 // config.ts
 export interface ChatConfig {
     apiUrl: string;
     role: string;
     cdnUrl?: string;
     webSocketUrl: string;
+    apiClient:AxiosInstance
   }
   
   let chatConfig: ChatConfig;

package/src/components/messages/Message.tsx

@@ -40,6 +40,7 @@ interface MessageProps {
         bookingId: string;
         status: string; // e.g., "confirmed", "pending", "cancelled"
         serviceId: string;
+        serviceName: string;
         date: string;
         time: string;
         price: number;
@@ -91,7 +92,7 @@ const Message = ({ message }: MessageProps) => {
       <div className="system-message booking-details">
         <h4>{status}</h4>
         <div className="details">
-          <p>Service: {booking?.serviceId}</p>
+          <p>Service: {booking?.serviceName}</p>
           <p>Date: {booking?.date.split("T")[0]}</p>
           <p>Time: {booking?.time}</p>
         </div>
@@ -115,7 +116,7 @@ const Message = ({ message }: MessageProps) => {
           </button>
         )}
 
-        {status === "Completed" && (
+        {status === "Completed" && role !== "provider" && (
           <button className="confirm-button" onClick={handleReview}>
             Leave a Review ✍️
           </button>

package/src/components/messages/MessageInput.tsx

@@ -4,7 +4,6 @@ import { useMessageMutation } from "../../hooks/mutations/useSendMessage";
 import { useChatContext } from "../../providers/ChatProvider";
 import useChatUIStore from "../../stores/Zustant";
 import { FilePreview, FileType } from "../common/FilePreview";
-import { getApiClient } from "../../lib/api/apiClient";
 import { MessageStatus } from "../../types/type";
 import { Path } from "../../lib/api/endpoint";
 import { getChatConfig } from "../../Chat.config";
@@ -36,8 +35,8 @@ interface Attachment {
 }
 
 const MessageInput = () => {
-  const apiClient = getApiClient();
-  const { role } = getChatConfig();
+  // const apiClient = getApiClient();
+  const { role, apiClient ,apiUrl} = getChatConfig();
   const { socket, sendMessage, userId } = useChatContext();
   const { selectedConversation, setMessages, setLastSentMessage } = useChatUIStore();
 
@@ -315,7 +314,7 @@ const MessageInput = () => {
     file: File,
     onProgress?: (progress: number) => void
   ): Promise<{ url: string; name: string; size: number; type: FileType }> => {
-    const response = await apiClient.post(`${Path.preSignUrl}`, {
+    const response = await apiClient.post(`${apiUrl}/${Path.preSignUrl}`, {
       fileName: file.name,
       fileType: file.type,
       conversationId: selectedConversation?._id,

package/src/declarations.d.ts

@@ -23,6 +23,7 @@ declare module '@pubuduth-aplicy/chat-ui' {
     role?: string;
     webSocketUrl: string;
     cdnUrl?: string;
+    apiClient:AxiosInstance
   }
   
   interface ChatProviderProps {

package/src/service/messageService.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
+import { getChatConfig } from "../Chat.config";
 import { FileType } from "../components/common/FilePreview";
-import { getApiClient } from "../lib/api/apiClient";
 import { Path } from "../lib/api/endpoint";
 
 export const sendMessage = async (params: {
@@ -27,10 +27,11 @@ export const sendMessage = async (params: {
     senderRole,
     receiverRole,
   } = params;
-  const apiClient = getApiClient();
+  // const apiClient = getApiClient();
+const {apiClient,apiUrl} = getChatConfig();
 
   const response = await apiClient.post(
-    `${Path.sendmessage}/${receiverId}/${senderId}`,
+    `${apiUrl}/${Path.sendmessage}/${receiverId}/${senderId}`,
     {
       message,
       attachments,
@@ -48,9 +49,9 @@ export const sendMessage = async (params: {
 
 
 export const fetchMessages = async (chatId: string | undefined, userid: string, pagenum: number) => {
-  const apiClient = getApiClient();
+  const {apiClient,apiUrl} = getChatConfig();
   try {
-    const response = await apiClient.get(`${Path.getmessage}/${chatId}/${userid}`, {
+    const response = await apiClient.get(`${apiUrl}/${Path.getmessage}/${chatId}/${userid}`, {
       params: { pagenum, limit: 20 },
     });
     // console.log(response); 
@@ -70,9 +71,9 @@ export const setEditMessage = async ({
   userId: string;
   newMessage: string;
 }) => {
-  const apiClient = getApiClient();
+  const {apiClient,apiUrl} = getChatConfig();
   try {
-    const response = await apiClient.put(`${Path.editMessage}/${messageId}`, {
+    const response = await apiClient.put(`${apiUrl}/${Path.editMessage}/${messageId}`, {
       userId,
       newMessage
     });
@@ -91,10 +92,10 @@ export const deleteMessage = async ({
   messageId: string;
   userId: string;
 }) => {
-  const apiClient = getApiClient();
+  const {apiClient,apiUrl} = getChatConfig();
   try {
     const response = await apiClient.delete(
-      `${Path.deleteMessage}/${messageId}`,
+      `${apiUrl}/${Path.deleteMessage}/${messageId}`,
       {
         data: { userId } 
       }

package/src/service/sidebarApi.ts

@@ -1,18 +1,17 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { getChatConfig } from "../Chat.config";
-import { getApiClient } from "../lib/api/apiClient";
 import { Path } from "../lib/api/endpoint";
 import { ApiResponse } from "../types/type";
 
 
 export const getAllConversationData = async (userid: string) => {
   try {
-    const {role} = getChatConfig();
-    const apiClient = getApiClient();
+    const {role, apiClient,apiUrl} = getChatConfig();
+    // const apiClient = getApiClient();
    
     const endpoint = role === 'admin' 
-        ? `${Path.getConversationListByAdmin}` 
-        : `${Path.getconversation}/${userid}/${role}`;
+        ? `${apiUrl}/${Path.getConversationListByAdmin}` 
+        : `${apiUrl}/${Path.getconversation}/${userid}/${role}`;
 
     const res = await apiClient.get<ApiResponse>(endpoint);
     if (res.data) {