add .

Tatyana-js · Jan 17, 2025 · 441bf95 · 441bf95
1 parent 601260e
commit 441bf95
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/frontend/src/api/chatApi.js b/frontend/src/api/chatApi.js
@@ -1,7 +1,4 @@
 import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react';
-import { io } from 'socket.io-client';
-
-const socket = io();
 
 export const chatApi = createApi({
   reducerPath: 'chatApi',
@@ -46,18 +43,6 @@ export const chatApi = createApi({
     }),
     getMessages: builder.query({ // Сообщения
       query: () => '/messages',
-       onCacheEntryAdded: async ( event, { updateCachedData, cacheDataLoaded, cacheEntryRemoved }) => {
-        await cacheDataLoaded;
-        console.log(cacheDataLoaded);
-        const listener = () => {
-          if (event === 'addMessage') {
-            updateCachedData((draft) => draft.push(data));
-          }
-        };
-        socket.on('addMessage', listener);
-        await cacheEntryRemoved;
-        socket.close();
-        },
       providesTags: ['Messages'],
     }),
     addMessage: builder.mutation ({

diff --git a/frontend/src/init.jsx b/frontend/src/init.jsx
@@ -1,9 +1,11 @@
 import i18next from 'i18next';
+import { io } from 'socket.io-client';
 import { initReactI18next } from 'react-i18next';
 import { Provider } from 'react-redux';
 import store from './store/index.js';
 import App from './App.jsx';
 import resources from './locales/index.js';
+import { useGetMessagesQuery } from './api/chatApi.js';
 
 const init = async () => {
   const i18n = i18next.createInstance();
@@ -18,6 +20,13 @@ const init = async () => {
       }
     });
 
+const socket = io();
+const { data: messages = []} =  useGetMessagesQuery();
+socket.on('newMessage', (payload) =>  {
+  console.log(payload)
+  messages.push(payload);
+});
+
   return (
     <Provider store={store}>
       <App />