Merge pull request #12 from ecency/bugfix/final-review

Bugfix/final review

src/api/mutations/account-claiming.ts

@@ -1,10 +1,12 @@
-import { useMutation } from "@tanstack/react-query";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { PrivateKey } from "@hiveio/dhive";
 import { claimAccount, claimAccountByKeychain } from "../operations";
 import { FullAccount } from "@/entities";
-import { getQueryClient, QueryIdentifiers } from "@/core/react-query";
+import { QueryIdentifiers } from "@/core/react-query";
 
 export function useAccountClaiming(account: FullAccount) {
+  const queryClient = useQueryClient();
+
   return useMutation({
     mutationKey: ["account-claiming", account.name],
     mutationFn: async ({ isKeychain, key }: { key?: PrivateKey; isKeychain?: boolean }) => {
@@ -23,7 +25,7 @@ export function useAccountClaiming(account: FullAccount) {
       }
     },
     onSuccess: () => {
-      getQueryClient().setQueryData<FullAccount>(
+      queryClient.setQueryData<FullAccount>(
         [QueryIdentifiers.GET_ACCOUNT_FULL, account.name],
         (data) => {
           if (!data) {

src/api/mutations/bookmarks.ts

@@ -1,4 +1,4 @@
-import { useMutation } from "@tanstack/react-query";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { error, success } from "@/features/shared";
 import { Entry } from "@/entities";
 import { addBookmark } from "@/api/private-api";
@@ -7,10 +7,11 @@ import { appAxios } from "@/api/axios";
 import { apiBase } from "@/api/helper";
 import { useGlobalStore } from "@/core/global-store";
 import i18next from "i18next";
-import { getQueryClient, QueryIdentifiers } from "@/core/react-query";
+import { QueryIdentifiers } from "@/core/react-query";
 
 export function useBookmarkAdd(entry: Entry) {
   const activeUser = useGlobalStore((s) => s.activeUser);
+  const queryClient = useQueryClient();
 
   return useMutation({
     mutationKey: ["bookmarks", "addBookmark"],
@@ -29,7 +30,7 @@ export function useBookmarkAdd(entry: Entry) {
     },
     onSuccess: () => {
       success(i18next.t("bookmark-btn.added"));
-      getQueryClient().invalidateQueries({
+      queryClient.invalidateQueries({
         queryKey: [QueryIdentifiers.BOOKMARKS, activeUser?.username]
       });
     },
@@ -39,6 +40,7 @@ export function useBookmarkAdd(entry: Entry) {
 
 export function useBookmarkDelete(bookmarkId?: string) {
   const activeUser = useGlobalStore((s) => s.activeUser);
+  const queryClient = useQueryClient();
 
   return useMutation({
     mutationKey: ["bookmarks", "deleteBookmark"],
@@ -53,7 +55,7 @@ export function useBookmarkDelete(bookmarkId?: string) {
     },
     onSuccess: () => {
       success(i18next.t("bookmark-btn.deleted"));
-      getQueryClient().invalidateQueries({
+      queryClient.invalidateQueries({
         queryKey: [QueryIdentifiers.BOOKMARKS, activeUser?.username]
       });
     },

src/api/mutations/delete-comment.ts

@@ -1,13 +1,14 @@
-import { useMutation } from "@tanstack/react-query";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { broadcastPostingOperations, formatError } from "@/api/operations";
 import { useGlobalStore } from "@/core/global-store";
 import { Entry } from "@/entities";
 import { error } from "@/features/shared";
 import { Operation } from "@hiveio/dhive";
-import { getQueryClient, QueryIdentifiers } from "@/core/react-query";
+import { QueryIdentifiers } from "@/core/react-query";
 
 export function useDeleteComment(entry: Entry, onSuccess: () => void, parent?: Entry) {
   const activeUser = useGlobalStore((state) => state.activeUser);
+  const queryClient = useQueryClient();
 
   return useMutation({
     mutationKey: ["deleteComment", activeUser?.username, entry?.id],
@@ -29,12 +30,12 @@ export function useDeleteComment(entry: Entry, onSuccess: () => void, parent?: E
     onSuccess: () => {
       if (parent) {
         const previousReplies =
-          getQueryClient().getQueryData<Entry[]>([
+          queryClient.getQueryData<Entry[]>([
             QueryIdentifiers.FETCH_DISCUSSIONS,
             parent?.author,
             parent?.permlink
           ]) ?? [];
-        getQueryClient().setQueryData(
+        queryClient.setQueryData(
           [QueryIdentifiers.FETCH_DISCUSSIONS, parent?.author, parent?.permlink],
           [
             ...previousReplies.filter(

src/api/mutations/notifications/update-notifications-settings.ts

@@ -1,15 +1,16 @@
-import { useMutation } from "@tanstack/react-query";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { saveNotificationsSettings } from "@/api/private-api";
 import { useGlobalStore } from "@/core/global-store";
 import { NotifyTypes } from "@/enums";
-import { getQueryClient, QueryIdentifiers } from "@/core/react-query";
+import { QueryIdentifiers } from "@/core/react-query";
 import * as ls from "@/utils/local-storage";
 import { error, success } from "@/features/shared";
 import i18next from "i18next";
 import { formatError } from "@/api/operations";
 
 export function useUpdateNotificationsSettings() {
   const activeUser = useGlobalStore((state) => state.activeUser);
+  const queryClient = useQueryClient();
 
   return useMutation({
     mutationKey: ["notifications", "update-settings"],
@@ -23,7 +24,7 @@ export function useUpdateNotificationsSettings() {
     onError: (e) => error(...formatError(e)),
     onSuccess: (settings) => {
       success(i18next.t("preferences.updated"));
-      getQueryClient().setQueryData(
+      queryClient.setQueryData(
         [QueryIdentifiers.NOTIFICATIONS_SETTINGS, activeUser?.username],
         settings
       );

src/api/mutations/update-profile.ts

@@ -1,11 +1,13 @@
-import { useMutation } from "@tanstack/react-query";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { updateProfile } from "@/api/operations";
 import { AccountProfile, FullAccount } from "@/entities";
 import { error, success } from "@/features/shared";
 import i18next from "i18next";
-import { getQueryClient, QueryIdentifiers } from "@/core/react-query";
+import { QueryIdentifiers } from "@/core/react-query";
 
 export function useUpdateProfile(account: FullAccount) {
+  const queryClient = useQueryClient();
+
   return useMutation({
     mutationKey: ["update-profile", account],
     mutationFn: async ({ nextProfile }: { nextProfile: AccountProfile }) => {
@@ -16,7 +18,7 @@ export function useUpdateProfile(account: FullAccount) {
     onSuccess: (profile) => {
       success(i18next.t("g.success"));
 
-      getQueryClient().setQueryData<FullAccount>(
+      queryClient.setQueryData<FullAccount>(
         [QueryIdentifiers.GET_ACCOUNT_FULL, account.name],
         (data) => {
           if (!data) {

src/api/queries/get-account-posts-query.ts

@@ -2,7 +2,7 @@ import { EcencyQueriesManager, QueryIdentifiers } from "@/core/react-query";
 import { bridgeApiCall, resolvePost } from "@/api/bridge";
 import { Entry } from "@/entities";
 
-type PageParam = { author: string | undefined; permlink: string | undefined };
+type PageParam = { author: string | undefined; permlink: string | undefined; hasNextPage: boolean };
 
 export const getAccountPostsQuery = (
   username: string | undefined,
@@ -14,6 +14,10 @@ export const getAccountPostsQuery = (
   EcencyQueriesManager.generateClientServerInfiniteQuery({
     queryKey: [QueryIdentifiers.GET_POSTS, username, filter, limit],
     queryFn: async ({ pageParam }) => {
+      if (!pageParam.hasNextPage) {
+        return [];
+      }
+
       const resp = await bridgeApiCall<Entry[] | null>("get_account_posts", {
         sort: filter,
         account: username,
@@ -30,12 +34,13 @@ export const getAccountPostsQuery = (
     },
     enabled: !!username && enabled,
     initialData: { pages: [], pageParams: [] },
-    initialPageParam: { author: undefined, permlink: undefined } as PageParam,
+    initialPageParam: { author: undefined, permlink: undefined, hasNextPage: true } as PageParam,
     getNextPageParam: (lastPage: Entry[]) => {
       const last = lastPage?.[lastPage!.length - 1];
       return {
         author: last?.author,
-        permlink: last?.permlink
+        permlink: last?.permlink,
+        hasNextPage: (lastPage?.length ?? 0) > 0
       };
     }
   });