merge and handle transposing new comment update

Author: christianalfoni

.circleci/config.yml

@@ -118,6 +118,11 @@ executors:
     docker:
       - image: circleci/node:10
     working_directory: ~/codesandbox-client
+  node-xlarge:
+    docker:
+      - image: circleci/node:10
+    resource_class: xlarge
+    working_directory: ~/codesandbox-client
   node-with-puppeteer:
     docker:
       - image: codesandbox/node-puppeteer
@@ -278,12 +283,12 @@ commands:
 
 jobs:
   build-deps:
-    executor: node
+    executor: node-xlarge
     steps:
       - checkout_with_cache
       - build_deps
   build-prod:
-    executor: node
+    executor: node-xlarge
     steps:
       - checkout_with_cache
       - build_prod

packages/app/integration-tests/tests/sandboxes.test.js

@@ -131,7 +131,7 @@ describe('sandboxes', () => {
       async () => {
         browser = await browser;
 
-        const page = await loadSandboxRetry(browser, id, 30 * SECOND, 2);
+        const page = await loadSandboxRetry(browser, id, 45 * SECOND, 2);
 
         const screenshot = await page.screenshot();
 

packages/app/src/app/graphql/schema.graphql

@@ -1,5 +1,5 @@
-# source: http://server:4000/api/graphql
-# timestamp: Fri Apr 03 2020 11:58:51 GMT+0000 (Coordinated Universal Time)
+# source: https://codesandbox.io/api/graphql
+# timestamp: Wed Apr 08 2020 13:07:11 GMT+0200 (Central European Summer Time)
 
 schema {
   query: RootQuery
@@ -21,9 +21,7 @@ type Bookmarked {
   isBookmarked: Boolean
 }
 
-"""
-A team or the current user
-"""
+"""A team or the current user"""
 union BookmarkEntity = Team | User
 
 input CodeReference {
@@ -40,9 +38,7 @@ type CodeReferenceMetadata {
   path: String!
 }
 
-"""
-A collaborator on a sandbox
-"""
+"""A collaborator on a sandbox"""
 type Collaborator {
   authorization: Authorization!
   id: ID!
@@ -118,9 +114,7 @@ type Git {
   username: String
 }
 
-"""
-An invitation to a sandbox
-"""
+"""An invitation to a sandbox"""
 type Invitation {
   authorization: Authorization!
   email: String
@@ -155,178 +149,96 @@ type Reference {
   type: String!
 }
 
-"""
-The metadata of a reference
-"""
+"""The metadata of a reference"""
 union ReferenceMetadata = CodeReferenceMetadata
 
 type RootMutation {
-  """
-  Leave a team
-  """
-  leaveTeam(teamId: ID!): String
-
-  """
-  Clear notification unread count
-  """
-  clearNotificationCount: User
+  """Reject an invitation to a team"""
+  rejectTeamInvitation(teamId: ID!): String
 
-  """
-  Remove a collaborator
-  """
-  removeCollaborator(sandboxId: ID!, username: String!): Collaborator!
-  createSandboxInvitation(
-    authorization: Authorization!
-    email: String!
-    sandboxId: ID!
-  ): Invitation!
-
-  """
-  Add sandboxes to a collection
-  """
-  addToCollection(
-    collectionPath: String!
-    sandboxIds: [ID]!
-    teamId: ID
-  ): Collection!
-  renameSandbox(id: ID!, title: String!): Sandbox!
+  """Rename a collection and all subfolders"""
+  renameCollection(newPath: String!, newTeamId: ID, path: String!, teamId: ID): [Collection!]!
 
-  """
-  Revoke an invitation to a team
-  """
+  """Revoke an invitation to a team"""
   revokeTeamInvitation(teamId: ID!, userId: ID!): Team
-  unresolveComment(commentId: ID!, sandboxId: ID!): Comment!
+  revokeSandboxInvitation(invitationId: ID!, sandboxId: ID!): Invitation!
+  updateComment(commentId: ID!, content: String, sandboxId: ID!): Comment!
+  changeSandboxInvitationAuthorization(authorization: Authorization!, invitationId: ID!, sandboxId: ID!): Invitation!
 
-  """
-  Soft delete a comment. Note: all child comments will also be deleted.
-  """
-  deleteComment(commentId: ID!, sandboxId: ID!): Comment!
+  """Delete a collection and all subfolders"""
+  deleteCollection(path: String!, teamId: ID): [Collection!]!
+  redeemSandboxInvitation(invitationToken: String!, sandboxId: ID!): Invitation!
 
-  """
-  bookmark a template
-  """
-  bookmarkTemplate(teamId: ID, templateId: ID!): Template
+  """Unbookmark a template"""
+  unbookmarkTemplate(teamId: ID, templateId: ID!): Template
 
-  """
-  Set the description of the team
-  """
+  """Set the description of the team"""
   setTeamDescription(description: String!, teamId: ID!): Team
+  createSandboxInvitation(authorization: Authorization!, email: String!, sandboxId: ID!): Invitation!
 
-  """
-  Accept an invitation to a team
-  """
+  """Accept an invitation to a team"""
   acceptTeamInvitation(teamId: ID!): Team
 
-  """
-  Rename a collection and all subfolders
-  """
-  renameCollection(
-    newPath: String!
-    newTeamId: ID
-    path: String!
-    teamId: ID
-  ): [Collection!]!
-
-  """
-  Reject an invitation to a team
-  """
-  rejectTeamInvitation(teamId: ID!): String
-
-  """
-  Create a collection
-  """
+  """Create a collection"""
   createCollection(path: String!, teamId: ID): Collection!
-  updateComment(commentId: ID!, content: String, sandboxId: ID!): Comment!
+  unresolveComment(commentId: ID!, sandboxId: ID!): Comment!
 
-  """
-  Make templates from sandboxes
-  """
-  makeSandboxesTemplates(sandboxIds: [ID!]!): [Template!]!
+  """Mark all notifications as read"""
+  markAllNotificationsAsRead: User
 
-  """
-  Remove someone from a team
-  """
-  removeFromTeam(teamId: ID!, userId: ID!): Team
+  """Delete sandboxes"""
+  deleteSandboxes(sandboxIds: [ID!]!): [Sandbox!]!
 
-  """
-  Unbookmark a template
-  """
-  unbookmarkTemplate(teamId: ID, templateId: ID!): Template
+  """Remove a collaborator"""
+  removeCollaborator(sandboxId: ID!, username: String!): Collaborator!
+  permanentlyDeleteSandboxes(sandboxIds: [ID!]!): [Sandbox!]!
   resolveComment(commentId: ID!, sandboxId: ID!): Comment!
+  setSandboxesPrivacy(privacy: Int, sandboxIds: [ID!]!): [Sandbox!]!
 
-  """
-  Change authorization of a collaborator
-  """
-  changeCollaboratorAuthorization(
-    authorization: Authorization!
-    sandboxId: ID!
-    username: String!
-  ): Collaborator!
-  revokeSandboxInvitation(invitationId: ID!, sandboxId: ID!): Invitation!
+  """Soft delete a comment. Note: all child comments will also be deleted."""
+  deleteComment(commentId: ID!, sandboxId: ID!): Comment!
 
-  """
-  Mark all notifications as read
-  """
-  markAllNotificationsAsRead: User
+  """Invite someone to a team"""
+  inviteToTeam(teamId: ID!, username: String): Team
+  renameSandbox(id: ID!, title: String!): Sandbox!
 
-  """
-  Delete a collection and all subfolders
-  """
-  deleteCollection(path: String!, teamId: ID): [Collection!]!
-  redeemSandboxInvitation(invitationToken: String!, sandboxId: ID!): Invitation!
+  """Leave a team"""
+  leaveTeam(teamId: ID!): String
 
-  """
-  Add a collaborator
-  """
-  addCollaborator(
-    authorization: Authorization!
-    sandboxId: ID!
-    username: String!
-  ): Collaborator!
-
-  """
-  Create a team
-  """
-  createTeam(name: String!): Team
+  """Add a collaborator"""
+  addCollaborator(authorization: Authorization!, sandboxId: ID!, username: String!): Collaborator!
 
-  """
-  Invite someone to a team
-  """
-  inviteToTeam(teamId: ID!, username: String): Team
-  setSandboxesPrivacy(privacy: Int, sandboxIds: [ID!]!): [Sandbox!]!
+  """Add sandboxes to a collection"""
+  addToCollection(collectionPath: String!, sandboxIds: [ID]!, teamId: ID): Collection!
+
+  """Clear notification unread count"""
+  clearNotificationCount: User
 
-  """
-  Convert templates back to sandboxes
-  """
+  """Make templates from sandboxes"""
+  makeSandboxesTemplates(sandboxIds: [ID!]!): [Template!]!
+
+  """Change authorization of a collaborator"""
+  changeCollaboratorAuthorization(authorization: Authorization!, sandboxId: ID!, username: String!): Collaborator!
+
+  """Remove someone from a team"""
+  removeFromTeam(teamId: ID!, userId: ID!): Team
+
+  """bookmark a template"""
+  bookmarkTemplate(teamId: ID, templateId: ID!): Template
+  createComment(codeReference: CodeReference, content: String!, id: ID, parentCommentId: ID, sandboxId: ID!): Comment!
+
+  """Convert templates back to sandboxes"""
   unmakeSandboxesTemplates(sandboxIds: [ID!]!): [Template!]!
 
-  """
-  Delete sandboxes
-  """
-  deleteSandboxes(sandboxIds: [ID!]!): [Sandbox!]!
-  changeSandboxInvitationAuthorization(
-    authorization: Authorization!
-    invitationId: ID!
-    sandboxId: ID!
-  ): Invitation!
-  permanentlyDeleteSandboxes(sandboxIds: [ID!]!): [Sandbox!]!
-  createComment(
-    codeReference: CodeReference
-    content: String!
-    parentCommentId: ID
-    sandboxId: ID!
-  ): Comment!
+  """Create a team"""
+  createTeam(name: String!): Team
 }
 
 type RootQuery {
-  """
-  Get current user
-  """
+  """Get current user"""
   me: CurrentUser
 
-  """
-  Get a sandbox
-  """
+  """Get a sandbox"""
   sandbox(sandboxId: ID!): Sandbox
 }
 
@@ -343,9 +255,7 @@ type RootSubscriptionType {
   sandboxChanged(sandboxId: ID!): Sandbox!
 }
 
-"""
-A Sandbox
-"""
+"""A Sandbox"""
 type Sandbox {
   alias: String
   author: User
@@ -355,16 +265,12 @@ type Sandbox {
   comment(commentId: ID!): Comment
   comments: [Comment!]!
 
-  """
-  If the sandbox is a template this will be set
-  """
+  """If the sandbox is a template this will be set"""
   customTemplate: Template
   description: String
   forkedTemplate: Template
 
-  """
-  If the sandbox has a git repo tied to it this will be set
-  """
+  """If the sandbox has a git repo tied to it this will be set"""
   git: Git
   id: ID!
   insertedAt: String!
@@ -395,9 +301,7 @@ type Team {
   users: [User!]!
 }
 
-"""
-A Template
-"""
+"""A Template"""
 type Template {
   bookmarked: [Bookmarked]
   color: String
@@ -411,9 +315,7 @@ type Template {
   updatedAt: String
 }
 
-"""
-A CodeSandbox User
-"""
+"""A CodeSandbox User"""
 type User {
   avatarUrl: String!
   firstName: String