grimhilt/mail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

load message in page loading

Browse Source
This commit is contained in:
grimhilt
2023-05-08 01:10:13 +02:00
parent 53c79aebc4
commit 4ecd723cec
4 changed files with 29 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
front/src/store/store.ts
View File

@@ -77,8 +77,6 @@ function updateSeen(state: State, roomId: number, flag: string[], adding: boolea
}
}
}
// define injection key todo
// export const key: InjectionKey<Store<State>> = Symbol()
const store = createStore<State>({
state: {
@@ -96,9 +94,6 @@ const store = createStore<State>({
},
setActiveRoom(state, payload) {
state.activeRoom = payload;
// todo load room on load page
const room = roomOnId(state, payload);
if (!room) return;
let roomMessage = msgOnRoomId(state, payload);
if (!roomMessage) {
state.roomMessages.push({ messages: [], fetch: LoadingState.notLoaded, roomId: payload });
@@ -115,7 +110,6 @@ const store = createStore<State>({
});
},
addRooms(state, payload) {
// todo add if not exist
const buffer: RoomFromBack[] = [];
payload.rooms.forEach((room: RoomFromBack) => {
if (room.roomType == RoomType.THREAD) {
@@ -134,7 +128,6 @@ const store = createStore<State>({
});
},
removeRoom(state, payload) {
console.log(payload);
const roomMessageIndex = state.roomMessages.findIndex((roomM) => roomM.roomId === payload.roomId);
state.roomMessages.splice(roomMessageIndex, 1);
const roomIndex = state.rooms.findIndex((room) => room.id === payload.roomId);
@@ -147,21 +140,18 @@ const store = createStore<State>({
parentRoom.threadIds = parentRoom?.threadIds.filter((id) => id !== roomToDelete.id);
}
}
// todo fix to many at the same time bug
state.rooms.splice(roomIndex, 1);
// state.activeRoom = state.rooms[0].id;
// router.push(`/${state.activeRoom}`);
},
addMessages(state, payload) {
// todo add if not exist
const room = roomOnId(state, payload.roomId);
if (!room) return;
let roomMessage = msgOnRoomId(state, payload.roomId);
if (!roomMessage) {
state.roomMessages.push({ roomId: payload.roomId, messages: [], fetch: LoadingState.notLoaded });
roomMessage = msgOnRoomId(state, payload.roomId);
}
if (!roomMessage) return;
payload.messages.forEach((message: any) => {
message.flags = message.flags?.split(",") ?? [];
roomMessage?.messages.push(message);
@@ -225,9 +215,14 @@ const store = createStore<State>({
messages:
(state) =>
(roomId: number): Message[] => {
if (!roomId) return [];
const roomMessage = msgOnRoomId(state, roomId);
if (roomMessage) return roomMessage.messages;
state.roomMessages.push({ messages: [], roomId: roomId, fetch: LoadingState.notLoaded });
if (roomMessage && roomMessage.fetch === LoadingState.loaded) return roomMessage.messages;
if (!roomMessage) {
state.roomMessages.push({ messages: [], roomId: roomId, fetch: LoadingState.notLoaded });
} else if (roomMessage.fetch === LoadingState.loaded) {
return roomMessage.messages;
}
store.dispatch("fetchMessages", { roomId: roomId, obj: msgOnRoomId(state, roomId) });
return msgOnRoomId(state, roomId)?.messages ?? [];
},

8
front/src/views/room/RoomView.vue
View File

@@ -17,10 +17,10 @@ const id = ref(parseInt(route.params.id));
let room = ref();
onBeforeMount(async () => {
console.log(id.value);
store.commit("setActiveRoom", id.value);
room.value = store.getters.room(id.value);
messages.value = store.getters.messages(room.value?.id);
console.log(room.value);
messages.value = store.getters.messages(id.value);
});
onBeforeRouteUpdate(async (to, from) => {
@@ -28,9 +28,7 @@ onBeforeRouteUpdate(async (to, from) => {
id.value = parseInt(to.params.id);
store.commit("setActiveRoom", id.value);
room.value = await store.getters.room(id.value);
messages.value = store.getters.messages(room.value?.id);
console.log(room.value);
messages.value = store.getters.messages(id.value);
}
});