From 19ed23a3790b32f4cbf9934e835b7fb79dd76c79 Mon Sep 17 00:00:00 2001 From: anovazzi1 Date: Wed, 26 Jun 2024 19:34:31 -0300 Subject: [PATCH] update message structure in frontend (#2388) * update messages structure to new structure without index * style: run prettier --------- Co-authored-by: Gabriel Luiz Freitas Almeida --- src/frontend/src/controllers/API/index.ts | 4 ++-- .../modals/IOModal/components/SessionView/hooks/index.tsx | 2 +- .../src/modals/IOModal/components/SessionView/index.tsx | 5 +++-- .../pages/messagesPage/hooks/use-remove-messages.tsx | 4 ++-- .../src/pages/SettingsPage/pages/messagesPage/index.tsx | 2 +- src/frontend/src/stores/messagesStore.ts | 4 ++-- src/frontend/src/types/messages/index.ts | 1 - src/frontend/src/types/zustand/messages/index.ts | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/frontend/src/controllers/API/index.ts b/src/frontend/src/controllers/API/index.ts index 17e89debe..3635f5f44 100644 --- a/src/frontend/src/controllers/API/index.ts +++ b/src/frontend/src/controllers/API/index.ts @@ -1112,7 +1112,7 @@ export async function getMessagesTable( return { rows: rowsOrganized, columns }; } -export async function deleteMessagesFn(ids: number[]) { +export async function deleteMessagesFn(ids: string[]) { try { return await api.delete(`${BASE_URL_API}monitor/messages`, { data: ids, @@ -1124,5 +1124,5 @@ export async function deleteMessagesFn(ids: number[]) { } export async function updateMessageApi(data: Message) { - return await api.post(`${BASE_URL_API}monitor/messages/${data.index}`, data); + return await api.post(`${BASE_URL_API}monitor/messages/${data.id}`, data); } diff --git a/src/frontend/src/modals/IOModal/components/SessionView/hooks/index.tsx b/src/frontend/src/modals/IOModal/components/SessionView/hooks/index.tsx index e8e638def..17b44fd2b 100644 --- a/src/frontend/src/modals/IOModal/components/SessionView/hooks/index.tsx +++ b/src/frontend/src/modals/IOModal/components/SessionView/hooks/index.tsx @@ -10,7 +10,7 @@ const useRemoveSession = (setSuccessData, setErrorData) => { await deleteMessagesFn( messages .filter((msg) => msg.session_id === session_id) - .map((msg) => msg.index), + .map((msg) => msg.id), ); deleteSession(session_id); setSuccessData({ diff --git a/src/frontend/src/modals/IOModal/components/SessionView/index.tsx b/src/frontend/src/modals/IOModal/components/SessionView/index.tsx index 2ea6ef606..70174ee72 100644 --- a/src/frontend/src/modals/IOModal/components/SessionView/index.tsx +++ b/src/frontend/src/modals/IOModal/components/SessionView/index.tsx @@ -17,7 +17,7 @@ export default function SessionView({ rows }: { rows: Array }) { const setErrorData = useAlertStore((state) => state.setErrorData); const setSuccessData = useAlertStore((state) => state.setSuccessData); - const [selectedRows, setSelectedRows] = useState([]); + const [selectedRows, setSelectedRows] = useState([]); const { handleRemoveMessages } = useRemoveMessages( setSelectedRows, @@ -52,7 +52,8 @@ export default function SessionView({ rows }: { rows: Array }) { ]} overlayNoRowsTemplate="No data available" onSelectionChanged={(event: SelectionChangedEvent) => { - setSelectedRows(event.api.getSelectedRows().map((row) => row.index)); + console.log(event.api.getSelectedRows()); + setSelectedRows(event.api.getSelectedRows().map((row) => row.id)); }} rowSelection="multiple" suppressRowClickSelection={true} diff --git a/src/frontend/src/pages/SettingsPage/pages/messagesPage/hooks/use-remove-messages.tsx b/src/frontend/src/pages/SettingsPage/pages/messagesPage/hooks/use-remove-messages.tsx index f2c8a2a4d..36cb24531 100644 --- a/src/frontend/src/pages/SettingsPage/pages/messagesPage/hooks/use-remove-messages.tsx +++ b/src/frontend/src/pages/SettingsPage/pages/messagesPage/hooks/use-remove-messages.tsx @@ -2,10 +2,10 @@ import { deleteMessagesFn } from "../../../../../controllers/API"; import { useMessagesStore } from "../../../../../stores/messagesStore"; const useRemoveMessages = ( - setSelectedRows: (data: number[]) => void, + setSelectedRows: (data: string[]) => void, setSuccessData: (data: { title: string }) => void, setErrorData: (data: { title: string }) => void, - selectedRows: number[], + selectedRows: string[], ) => { const deleteMessages = useMessagesStore((state) => state.removeMessages); diff --git a/src/frontend/src/pages/SettingsPage/pages/messagesPage/index.tsx b/src/frontend/src/pages/SettingsPage/pages/messagesPage/index.tsx index 70037ee7c..c3172f152 100644 --- a/src/frontend/src/pages/SettingsPage/pages/messagesPage/index.tsx +++ b/src/frontend/src/pages/SettingsPage/pages/messagesPage/index.tsx @@ -21,7 +21,7 @@ export default function MessagesPage() { const setErrorData = useAlertStore((state) => state.setErrorData); const setSuccessData = useAlertStore((state) => state.setSuccessData); - const [selectedRows, setSelectedRows] = useState([]); + const [selectedRows, setSelectedRows] = useState([]); const { handleRemoveMessages } = useRemoveMessages( setSelectedRows, diff --git a/src/frontend/src/stores/messagesStore.ts b/src/frontend/src/stores/messagesStore.ts index 349a1c447..cb817febc 100644 --- a/src/frontend/src/stores/messagesStore.ts +++ b/src/frontend/src/stores/messagesStore.ts @@ -29,7 +29,7 @@ export const useMessagesStore = create((set, get) => ({ updateMessage: (message) => { set(() => ({ messages: get().messages.map((msg) => - msg.index === message.index ? message : msg, + msg.id === message.id ? message : msg, ), })); }, @@ -41,7 +41,7 @@ export const useMessagesStore = create((set, get) => ({ try { set((state) => { const updatedMessages = state.messages.filter( - (msg) => !ids.includes(msg.index), + (msg) => !ids.includes(msg.id), ); get().setMessages(updatedMessages); resolve(updatedMessages); diff --git a/src/frontend/src/types/messages/index.ts b/src/frontend/src/types/messages/index.ts index 738e16258..4cb98a51d 100644 --- a/src/frontend/src/types/messages/index.ts +++ b/src/frontend/src/types/messages/index.ts @@ -1,7 +1,6 @@ type Message = { artifacts: Record; flow_id: string; - index: number; message: string; sender: string; sender_name: string; diff --git a/src/frontend/src/types/zustand/messages/index.ts b/src/frontend/src/types/zustand/messages/index.ts index b3ebd50d1..38e66c990 100644 --- a/src/frontend/src/types/zustand/messages/index.ts +++ b/src/frontend/src/types/zustand/messages/index.ts @@ -8,7 +8,7 @@ export type MessagesStoreType = { removeMessage: (message: Message) => void; updateMessage: (message: Message) => void; clearMessages: () => void; - removeMessages: (ids: number[]) => void; + removeMessages: (ids: string[]) => void; columns: Array; setColumns: (columns: Array) => void; deleteSession: (id: string) => void;