Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
chore: update store selector
boojack2e5b1209868c
diff --git a/web/src/components/MemoEditor.tsx b/web/src/components/MemoEditor.tsxindex 6e36fcd0e..0c982bc0f 100644--- a/web/src/components/MemoEditor.tsx+++ b/web/src/components/MemoEditor.tsx@@ -43,10 +43,8 @@ const getCursorPostion = (input: HTMLTextAreaElement) => {interface Props {}const MemoEditor: React.FC<Props> = () => {- const {- editor: editorState,- memo: { tags },- } = useAppSelector((state) => state);+ const editorState = useAppSelector((state) => state.editor);+ const tags = useAppSelector((state) => state.memo.tags);const [isTagSeletorShown, toggleTagSeletor] = useToggle(false);const editorRef = useRef<EditorRefActions>(null);const prevGlobalStateRef = useRef(editorState);diff --git a/web/src/components/MemoFilter.tsx b/web/src/components/MemoFilter.tsxindex ec33b8003..0b0bc14e6 100644--- a/web/src/components/MemoFilter.tsx+++ b/web/src/components/MemoFilter.tsx@@ -7,9 +7,7 @@ import "../less/memo-filter.less";interface FilterProps {}const MemoFilter: React.FC<FilterProps> = () => {- const {- location: { query },- } = useAppSelector((state) => state);+ const query = useAppSelector((state) => state.location.query);const { tag: tagQuery, duration, type: memoType, text: textQuery, shortcutId } = query ?? {};const shortcut = shortcutId ? shortcutService.getShortcutById(shortcutId) : null;const showFilter = Boolean(tagQuery || (duration && duration.from < duration.to) || memoType || textQuery || shortcut);diff --git a/web/src/components/MemoList.tsx b/web/src/components/MemoList.tsxindex 70c616926..4264cd7fb 100644--- a/web/src/components/MemoList.tsx+++ b/web/src/components/MemoList.tsx@@ -11,10 +11,8 @@ import "../less/memo-list.less";interface Props {}const MemoList: React.FC<Props> = () => {- const {- location: { query },- memo: { memos },- } = useAppSelector((state) => state);+ const query = useAppSelector((state) => state.location.query);+ const memos = useAppSelector((state) => state.memo.memos);const [isFetching, setFetchStatus] = useState(true);const wrapperElement = useRef<HTMLDivElement>(null);@@ -79,7 +77,6 @@ const MemoList: React.FC<Props> = () => {const pinnedMemos = shownMemos.filter((m) => m.pinned);const unpinnedMemos = shownMemos.filter((m) => !m.pinned);const sortedMemos = pinnedMemos.concat(unpinnedMemos).filter((m) => m.rowStatus === "NORMAL");- console.log(memos.length, sortedMemos.length);useEffect(() => {memoServicediff --git a/web/src/components/MemosHeader.tsx b/web/src/components/MemosHeader.tsxindex 0b05fb459..10e3efb6f 100644--- a/web/src/components/MemosHeader.tsx+++ b/web/src/components/MemosHeader.tsx@@ -9,11 +9,8 @@ let prevRequestTimestamp = Date.now();interface Props {}const MemosHeader: React.FC<Props> = () => {- const {- location: { query },- shortcut: { shortcuts },- } = useAppSelector((state) => state);-+ const query = useAppSelector((state) => state.location.query);+ const shortcuts = useAppSelector((state) => state.shortcut.shortcuts);const [titleText, setTitleText] = useState("MEMOS");useEffect(() => {diff --git a/web/src/components/SettingDialog.tsx b/web/src/components/SettingDialog.tsxindex e0718aa77..9168d07af 100644--- a/web/src/components/SettingDialog.tsx+++ b/web/src/components/SettingDialog.tsx@@ -15,10 +15,8 @@ interface State {}const SettingDialog: React.FC<Props> = (props: Props) => {- const {- user: { user },- } = useAppSelector((state) => state);const { destroy } = props;+ const user = useAppSelector((state) => state.user.user);const [state, setState] = useState<State>({selectedSection: "my-account",});diff --git a/web/src/components/Settings/MyAccountSection.tsx b/web/src/components/Settings/MyAccountSection.tsxindex bd131810d..55f842fca 100644--- a/web/src/components/Settings/MyAccountSection.tsx+++ b/web/src/components/Settings/MyAccountSection.tsx@@ -17,8 +17,7 @@ const validateConfig: ValidatorConfig = {interface Props {}const MyAccountSection: React.FC<Props> = () => {- const { user: userState } = useAppSelector((state) => state);- const user = userState.user as User;+ const user = useAppSelector((state) => state.user.user as User);const [username, setUsername] = useState<string>(user.name);const openAPIRoute = `${window.location.origin}/h/${user.openId}/memo`;diff --git a/web/src/components/ShortcutList.tsx b/web/src/components/ShortcutList.tsxindex 3fbbd486e..e436b2915 100644--- a/web/src/components/ShortcutList.tsx+++ b/web/src/components/ShortcutList.tsx@@ -12,11 +12,10 @@ import "../less/shortcut-list.less";interface Props {}const ShortcutList: React.FC<Props> = () => {- const {- location: { query },- shortcut: { shortcuts },- } = useAppSelector((state) => state);+ const query = useAppSelector((state) => state.location.query);+ const shortcuts = useAppSelector((state) => state.shortcut.shortcuts);const loadingState = useLoading();+const pinnedShortcuts = shortcuts.filter((s) => s.rowStatus === "ARCHIVED").sort((a, b) => utils.getTimeStampByDate(b.createdTs) - utils.getTimeStampByDate(a.createdTs));diff --git a/web/src/components/Sidebar.tsx b/web/src/components/Sidebar.tsxindex b60a4bd4e..ab90337a2 100644--- a/web/src/components/Sidebar.tsx+++ b/web/src/components/Sidebar.tsx@@ -12,10 +12,9 @@ import "../less/siderbar.less";interface Props {}const Sidebar: React.FC<Props> = () => {- const {- memo: { memos, tags },- user: { user },- } = useAppSelector((state) => state);+ const { memos, tags } = useAppSelector((state) => state.memo);+ const user = useAppSelector((state) => state.user.user);+const createdDays = user ? Math.ceil((Date.now() - utils.getTimeStampByDate(user.createdTs)) / 1000 / 3600 / 24) : 0;const handleMyAccountBtnClick = () => {diff --git a/web/src/components/TagList.tsx b/web/src/components/TagList.tsxindex 97b0be6f0..6c40451ea 100644--- a/web/src/components/TagList.tsx+++ b/web/src/components/TagList.tsx@@ -15,10 +15,8 @@ interface Tag {interface Props {}const TagList: React.FC<Props> = () => {- const {- location: { query },- memo: { memos, tags: tagsText },- } = useAppSelector((state) => state);+ const { memos, tags: tagsText } = useAppSelector((state) => state.memo);+ const query = useAppSelector((state) => state.location.query);const [tags, setTags] = useState<Tag[]>([]);useEffect(() => {diff --git a/web/src/components/UsageHeatMap.tsx b/web/src/components/UsageHeatMap.tsxindex 7ba679896..f0752139b 100644--- a/web/src/components/UsageHeatMap.tsx+++ b/web/src/components/UsageHeatMap.tsx@@ -35,9 +35,7 @@ const UsageHeatMap: React.FC<Props> = () => {const usedDaysAmount = (tableConfig.width - 1) * tableConfig.height + todayDay;const beginDayTimestemp = todayTimeStamp - usedDaysAmount * DAILY_TIMESTAMP;- const {- memo: { memos },- } = useAppSelector((state) => state);+ const { memos } = useAppSelector((state) => state.memo);const [allStat, setAllStat] = useState<DailyUsageStat[]>(getInitialUsageStat(usedDaysAmount, beginDayTimestemp));const [popupStat, setPopupStat] = useState<DailyUsageStat | null>(null);const [currentStat, setCurrentStat] = useState<DailyUsageStat | null>(null);diff --git a/web/src/components/UserBanner.tsx b/web/src/components/UserBanner.tsxindex f8fe01cb1..7bee4ba74 100644--- a/web/src/components/UserBanner.tsx+++ b/web/src/components/UserBanner.tsx@@ -7,13 +7,11 @@ import "../less/user-banner.less";interface Props {}const UserBanner: React.FC<Props> = () => {- const {- user: { user },- } = useAppSelector((state) => state);- const username = user ? user.name : "Memos";-+ const user = useAppSelector((state) => state.user.user);const [shouldShowPopupBtns, setShouldShowPopupBtns] = useState(false);+ const username = user ? user.name : "Memos";+const handleUsernameClick = useCallback(() => {locationService.pushHistory("/");locationService.clearQuery();diff --git a/web/src/pages/Home.tsx b/web/src/pages/Home.tsxindex 0e145eb17..1c21c6305 100644--- a/web/src/pages/Home.tsx+++ b/web/src/pages/Home.tsx@@ -7,9 +7,7 @@ import useLoading from "../hooks/useLoading";import "../less/home.less";function Home() {- const {- location: { pathname },- } = useAppSelector((state) => state);+ const pathname = useAppSelector((state) => state.location.pathname);const loadingState = useLoading();useEffect(() => {diff --git a/web/src/store/modules/memo.ts b/web/src/store/modules/memo.tsindex b6650e72b..1e4808259 100644--- a/web/src/store/modules/memo.ts+++ b/web/src/store/modules/memo.ts@@ -13,25 +13,37 @@ const memoSlice = createSlice({} as State,reducers: {setMemos: (state, action: PayloadAction<Memo[]>) => {- state.memos = action.payload;+ return {+ ...state,+ memos: action.payload,+ };},setTags: (state, action: PayloadAction<string[]>) => {- state.tags = action.payload;+ return {+ ...state,+ tags: action.payload,+ };},createMemo: (state, action: PayloadAction<Memo>) => {- state.memos = state.memos.concat(action.payload);+ return {+ ...state,+ memos: state.memos.concat(action.payload).sort((a, b) => b.createdTs - a.createdTs),+ };},patchMemo: (state, action: PayloadAction<Partial<Memo>>) => {- state.memos = state.memos.map((m) => {- if (m.id === action.payload.id) {- return {- ...m,- ...action.payload,- };- } else {- return m;- }- });+ return {+ ...state,+ memos: state.memos.map((m) => {+ if (m.id === action.payload.id) {+ return {+ ...m,+ ...action.payload,+ };+ } else {+ return m;+ }+ }),+ };},},});diff --git a/web/src/store/modules/shortcut.ts b/web/src/store/modules/shortcut.tsindex c691e95fa..e82772966 100644--- a/web/src/store/modules/shortcut.ts+++ b/web/src/store/modules/shortcut.ts@@ -11,25 +11,37 @@ const shortcutSlice = createSlice({} as State,reducers: {setShortcuts: (state, action: PayloadAction<Shortcut[]>) => {- state.shortcuts = action.payload;+ return {+ ...state,+ shortcuts: action.payload,+ };},createShortcut: (state, action: PayloadAction<Shortcut>) => {- state.shortcuts = state.shortcuts.concat(action.payload);+ return {+ ...state,+ shortcuts: state.shortcuts.concat(action.payload).sort((a, b) => b.createdTs - a.createdTs),+ };},patchShortcut: (state, action: PayloadAction<Partial<Shortcut>>) => {- state.shortcuts = state.shortcuts.map((s) => {- if (s.id === action.payload.id) {- return {- ...s,- ...action.payload,- };- } else {- return s;- }- });+ return {+ ...state,+ shortcuts: state.shortcuts.map((s) => {+ if (s.id === action.payload.id) {+ return {+ ...s,+ ...action.payload,+ };+ } else {+ return s;+ }+ }),+ };},deleteShortcut: (state, action: PayloadAction<ShortcutId>) => {- state.shortcuts = [...state.shortcuts].filter((shortcut) => shortcut.id !== action.payload);+ return {+ ...state,+ shortcuts: [...state.shortcuts].filter((shortcut) => shortcut.id !== action.payload),+ };},},});diff --git a/web/src/store/modules/user.ts b/web/src/store/modules/user.tsindex 9cb759c61..a1e58fc37 100644--- a/web/src/store/modules/user.ts+++ b/web/src/store/modules/user.ts@@ -15,10 +15,13 @@ const userSlice = createSlice({};},patchUser: (state, action: PayloadAction<Partial<User>>) => {- state.user = {- ...state.user,- ...action.payload,- } as User;+ return {+ ...state,+ user: {+ ...state.user,+ ...action.payload,+ } as User,+ };},},});