From 407b171c685e5593a97aa4e333bef9ccdf30af15 Mon Sep 17 00:00:00 2001 From: Hebi Li Date: Thu, 3 Aug 2023 10:15:50 -0700 Subject: [PATCH] fix: dashboard regression: console warnings and refetchQueries (#425) --- ui/src/lib/fetch.tsx | 2 +- ui/src/lib/store/repoMetaSlice.tsx | 2 +- ui/src/pages/dashboard.tsx | 96 +++++++++++++++--------------- 3 files changed, 49 insertions(+), 51 deletions(-) diff --git a/ui/src/lib/fetch.tsx b/ui/src/lib/fetch.tsx index 8ac84a08..e97ffcd5 100644 --- a/ui/src/lib/fetch.tsx +++ b/ui/src/lib/fetch.tsx @@ -71,7 +71,7 @@ export async function doRemoteLoadRepo(client: ApolloClient, id: string) { fetchPolicy: "no-cache", }); // refetch queries - await client.refetchQueries({ include: ["GetRepos", "GetCollabRepos"] }); + await client.refetchQueries({ include: ["GetDashboardRepos"] }); // We need to do a deep copy here, because apollo client returned immutable objects. let pods = res.data.repo.pods.map((pod) => ({ ...pod })); let edges = res.data.repo.edges; diff --git a/ui/src/lib/store/repoMetaSlice.tsx b/ui/src/lib/store/repoMetaSlice.tsx index 917b280e..2a4b27fa 100644 --- a/ui/src/lib/store/repoMetaSlice.tsx +++ b/ui/src/lib/store/repoMetaSlice.tsx @@ -62,7 +62,7 @@ export const createRepoMetaSlice: StateCreator< id: repoId, name: repoName, }, - refetchQueries: ["GetRepos", "GetCollabRepos"], + refetchQueries: ["GetDashboardRepos"], }); set((state) => produce(state, (state) => { diff --git a/ui/src/pages/dashboard.tsx b/ui/src/pages/dashboard.tsx index a6bd9347..cb4e5d4a 100644 --- a/ui/src/pages/dashboard.tsx +++ b/ui/src/pages/dashboard.tsx @@ -165,32 +165,32 @@ const KillRuntimeButton = ({ repo }) => { {/* last active: {getUpTime(info.lastActive)} */} - {/* */} - - { - killRuntime({ - variables: { - sessionId: `${me.id}_${repo.id}`, + + + - {killing ? ( - - ) : ( - - )} - - - {/* */} + }} + onClick={async () => { + killRuntime({ + variables: { + sessionId: `${me.id}_${repo.id}`, + }, + }); + }} + > + {killing ? ( + + ) : ( + + )} + + + ); @@ -276,29 +276,27 @@ const RepoCard = ({ repo }) => { return ( - - - - - - {repo.name || "Untitled"} - - - - - - - + + + + + {repo.name || "Untitled"} + + + + + + Viewed{" "} @@ -410,7 +408,7 @@ const RepoLists = () => { )} {repos.map((repo) => ( - + ))}