refactor: dashboard (#422)

lihebi · web-flow · commit c8f37f8beef3 · 2023-08-03T01:06:20.000-07:00
diff --git a/api/src/resolver_repo.ts b/api/src/resolver_repo.ts
@@ -41,13 +41,22 @@ async function ensurePodEditAccess({ id, userId }) {
   }
 }
 
-async function myRepos(_, __, { userId }) {
+async function getDashboardRepos(_, __, { userId }) {
   if (!userId) throw Error("Unauthenticated");
   const repos = await prisma.repo.findMany({
     where: {
-      owner: {
-        id: userId,
-      },
+      OR: [
+        {
+          owner: {
+            id: userId,
+          },
+        },
+        {
+          collaborators: {
+            some: { id: userId },
+          },
+        },
+      ],
     },
     include: {
       UserRepoData: {
@@ -58,46 +67,17 @@ async function myRepos(_, __, { userId }) {
       stargazers: true,
     },
   });
-  // Sort by last access time.
-  repos.sort((a, b) => {
-    if (a.UserRepoData.length > 0) {
-      if (b.UserRepoData.length > 0) {
-        return (
-          b.UserRepoData[0].accessedAt.valueOf() -
-          a.UserRepoData[0].accessedAt.valueOf()
-        );
-      }
-      return -1;
-    }
-    return a.updatedAt.valueOf() - b.updatedAt.valueOf();
-  });
-  // Re-use updatedAt field (this is actually the lastviewed field).
   return repos.map((repo) => {
     return {
       ...repo,
-      updatedAt:
+      accessedAt:
         repo.UserRepoData.length > 0
           ? repo.UserRepoData[0].accessedAt
           : repo.updatedAt,
     };
   });
 }
 
-async function myCollabRepos(_, __, { userId }) {
-  if (!userId) throw Error("Unauthenticated");
-  const repos = await prisma.repo.findMany({
-    where: {
-      collaborators: {
-        some: { id: userId },
-      },
-    },
-    include: {
-      stargazers: true,
-    },
-  });
-  return repos;
-}
-
 async function updateUserRepoData({ userId, repoId }) {
   // FIXME I should probably rename this from query to mutation?
   //
@@ -609,9 +589,8 @@ async function copyRepo(_, { repoId }, { userId }) {
 
 export default {
   Query: {
-    myRepos,
     repo,
-    myCollabRepos,
+    getDashboardRepos,
     getVisibility,
   },
   Mutation: {
diff --git a/api/src/typedefs.ts b/api/src/typedefs.ts
@@ -31,6 +31,7 @@ export const typeDefs = gql`
     public: Boolean
     createdAt: String
     updatedAt: String
+    accessedAt: String
   }
 
   type Edge {
@@ -105,11 +106,10 @@ export const typeDefs = gql`
     repos: [Repo]
     repo(id: String!): Repo
     pod(id: ID!): Pod
-    myRepos: [Repo]
+    getDashboardRepos: [Repo]
     activeSessions: [String]
     getVisibility(repoId: String!): Visibility
     listAllRuntimes: [RuntimeInfo]
-    myCollabRepos: [Repo]
     infoRuntime(sessionId: String!): RuntimeInfo
   }
 
diff --git a/ui/src/pages/repos.tsx b/ui/src/pages/repos.tsx
