refactor: add typescript definition
This commit is contained in:
+27
-30
@@ -1,8 +1,8 @@
|
||||
import { createSlice, PayloadAction } from '@reduxjs/toolkit';
|
||||
import { getNonNullValues } from '../../common/utils';
|
||||
import BASE_URL from '../config';
|
||||
import { User } from '../../types/auth';
|
||||
import { UserLog, UserState } from '../../types/sse';
|
||||
import { createSlice, PayloadAction } from "@reduxjs/toolkit";
|
||||
import { getNonNullValues } from "../../common/utils";
|
||||
import BASE_URL from "../config";
|
||||
import { User } from "../../types/auth";
|
||||
import { UserLog, UserState } from "../../types/sse";
|
||||
|
||||
export interface StoredUser extends User {
|
||||
online?: boolean;
|
||||
@@ -20,31 +20,21 @@ const initialState: State = {
|
||||
};
|
||||
|
||||
const contactsSlice = createSlice({
|
||||
name: 'contacts',
|
||||
name: "contacts",
|
||||
initialState,
|
||||
reducers: {
|
||||
resetContacts() {
|
||||
return initialState;
|
||||
},
|
||||
fullfillContacts(state, action: PayloadAction<User[]>) {
|
||||
console.log('set Contacts store', action);
|
||||
fullfillContacts(state, action: PayloadAction<StoredUser[]>) {
|
||||
const contacts = action.payload || [];
|
||||
state.ids = contacts.map(({ uid }) => uid);
|
||||
// old code
|
||||
// state.byId = Object.fromEntries(
|
||||
// contacts.map((c) => {
|
||||
// const { uid } = c;
|
||||
// return [uid, c];
|
||||
// })
|
||||
// );
|
||||
|
||||
contacts.forEach(u => {
|
||||
state.byId[u.uid] = {
|
||||
...u,
|
||||
// todo: add avatar field
|
||||
avatar: ''
|
||||
};
|
||||
});
|
||||
state.byId = Object.fromEntries(
|
||||
contacts.map((c) => {
|
||||
const { uid } = c;
|
||||
return [uid, c];
|
||||
})
|
||||
);
|
||||
},
|
||||
removeContact(state, action: PayloadAction<number>) {
|
||||
const uid = action.payload;
|
||||
@@ -55,28 +45,35 @@ const contactsSlice = createSlice({
|
||||
const changeLogs = action.payload;
|
||||
changeLogs.forEach(({ action, uid, ...rest }) => {
|
||||
switch (action) {
|
||||
case 'update': {
|
||||
case "update": {
|
||||
const vals = getNonNullValues(rest);
|
||||
if (state.byId[uid]) {
|
||||
Object.keys(vals).forEach((k) => {
|
||||
state.byId[uid][k] = vals[k];
|
||||
if (k == 'avatar_updated_at') {
|
||||
state.byId[uid]![k] = vals[k];
|
||||
if (k == "avatar_updated_at") {
|
||||
state.byId[uid]!.avatar = `${BASE_URL}/resource/avatar?uid=${uid}&t=${vals[k]}`;
|
||||
}
|
||||
});
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 'create': {
|
||||
// todo: missing properties avatar, create_by
|
||||
state.byId[uid] = { uid, ...rest };
|
||||
case "create": {
|
||||
state.byId[uid] = {
|
||||
uid,
|
||||
avatar:
|
||||
rest.avatar_updated_at === 0
|
||||
? ""
|
||||
: `${BASE_URL}/resource/avatar?uid=${uid}&t=${rest.avatar_updated_at}`,
|
||||
create_by: "", // todo: missing properties create_by
|
||||
...rest
|
||||
};
|
||||
const idx = state.ids.findIndex((i) => i == uid);
|
||||
if (idx == -1) {
|
||||
state.ids.push(uid);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 'delete': {
|
||||
case "delete": {
|
||||
const idx = state.ids.findIndex((i) => i == uid);
|
||||
if (idx > -1) {
|
||||
state.ids.splice(idx, 1);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { createSlice, PayloadAction } from '@reduxjs/toolkit';
|
||||
import { ChannelMessage } from '../../types/channel';
|
||||
import { EntityId } from '../../types/common';
|
||||
import { createSlice, PayloadAction } from "@reduxjs/toolkit";
|
||||
import { EntityId } from "../../types/common";
|
||||
import { ChatEvent } from "../../types/sse";
|
||||
|
||||
export interface State {
|
||||
[gid: number]: number[] | undefined;
|
||||
@@ -18,7 +18,7 @@ const channelMsgSlice = createSlice({
|
||||
fullfillChannelMsg(state, action: PayloadAction<State>) {
|
||||
return action.payload;
|
||||
},
|
||||
addChannelMsg(state, action) {
|
||||
addChannelMsg(state, action: PayloadAction<ChatEvent>) {
|
||||
const { id, mid, local_id = null } = action.payload;
|
||||
if (state[id]) {
|
||||
const midExsited = state[id]!.findIndex((id) => id == mid) > -1;
|
||||
|
||||
Reference in New Issue
Block a user