Merge pull request #68 from pullflow/release/2.0.0

Release 2.0.0

.vscode/launch.json

@@ -3,7 +3,7 @@
 // Hover to view descriptions of existing attributes.
 // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
 {
-	"version": "1.3.0",
+	"version": "2.0.0",
 	"configurations": [
 		{
 			"name": "Run Extension",

package.json

@@ -3,7 +3,7 @@
   "publisher": "Pullflow",
   "displayName": "Pullflow",
   "description": "Code review collaboration across GitHub, Slack, and VS Code.",
-  "version": "1.3.0",
+  "version": "2.0.0",
   "preview": true,
   "license": "MIT",
   "engines": {

src/api/spaceUsersApi.ts

@@ -4,8 +4,8 @@ import { PullflowApi } from '../utils/pullflowApi'
 
 const module = 'spaceUsersApi.ts'
 
-const SPACE_USERS_QUERY = `query spaceUsersForVscode {
-	spaceUsersForVscode {
+const SPACE_USERS_QUERY = `query spaceUsersForVscode($codeReviewId: String!) {
+	spaceUsersForVscode(codeReviewId: $codeReviewId) {
     message
     spaceUsers {
 		  name
@@ -16,17 +16,19 @@ const SPACE_USERS_QUERY = `query spaceUsersForVscode {
 `
 export const SpaceUsersApi = {
   get: async ({
-    context,
     authToken,
+    codeReviewId,
+    context,
   }: {
     authToken: string
+    codeReviewId: string
     context: ExtensionContext
   }) => {
     log.info(`fetching space users`, module)
 
     const pullflowApi = new PullflowApi(context, authToken)
     try {
-      const data = await pullflowApi.fetch(SPACE_USERS_QUERY)
+      const data = await pullflowApi.fetch(SPACE_USERS_QUERY, { codeReviewId })
       return data.spaceUsersForVscode
     } catch (e) {
       log.error(`error in fetching space users, ${e}`, module)

src/models/spaceUsers.ts

@@ -0,0 +1,29 @@
+import { ExtensionContext, window } from 'vscode'
+import { Authorization } from '../utils/authorization'
+import { SpaceUsersApi } from '../api/spaceUsersApi'
+
+export const SpaceUsers = {
+  get: async ({
+    context,
+    codeReviewId,
+  }: {
+    context: ExtensionContext
+    codeReviewId: string
+  }) => {
+    const session = await Authorization.currentSession(context)
+    const response = await SpaceUsersApi.get({
+      codeReviewId,
+      authToken: session?.accessToken ?? '',
+      context,
+    })
+
+    if (!response || response.message || response.error) {
+      window.showInformationMessage(
+        `Failed to fetch space users, please try again.`
+      )
+      return false
+    }
+
+    return response.spaceUsers
+  },
+}

src/pullRequestQuickActions/pullRequestQuickActions.test.ts

@@ -39,6 +39,7 @@ describe('Pull Request Quick Actions', () => {
   })
 
   it('adds assignee to pull request', async () => {
+    mockSpaceUsers.SpaceUsers.get.mockReturnValue([])
     await subject().addAssignee({
       codeReview: mockModel,
       context: mockModel,
@@ -49,13 +50,15 @@ describe('Pull Request Quick Actions', () => {
         context: mockModel,
         placeholder: 'Select a user',
         title: 'Add assignee to pull request',
+        spaceUsers: [],
       })
     )
     expect(mockPresence.Presence.set).toBeCalled()
     expect(mockPullRequestState.PullRequestState.updateWithDelay).toBeCalled()
   })
 
   it('adds reviewer on pull request', async () => {
+    mockSpaceUsers.SpaceUsers.get.mockReturnValue([])
     await subject().requestReview({
       codeReview: mockModel,
       context: mockModel,
@@ -66,6 +69,7 @@ describe('Pull Request Quick Actions', () => {
         context: mockModel,
         placeholder: 'Select a user',
         title: 'Add reviewer to pull request',
+        spaceUsers: [],
       })
     )
     expect(mockPresence.Presence.set).toBeCalled()
@@ -84,6 +88,7 @@ const subject = () => {
   jest.mock('../utils/pullRequestsState', () => mockPullRequestState)
   jest.mock('../views/quickpicks/spaceUserPicker', () => mockSpaceUserPicker)
   jest.mock('../views/quickpicks/timePicker', () => mockTimerPicker)
+  jest.mock('../models/spaceUsers', () => mockSpaceUsers)
   return require('./pullRequestQuickActions').PullRequestQuickActions
 }
 
@@ -109,6 +114,11 @@ const mockPullRequestState = {
     updateWithDelay: jest.fn(),
   },
 }
+const mockSpaceUsers = {
+  SpaceUsers: {
+    get: jest.fn(),
+  },
+}
 const mockSpaceUserPicker = {
   spaceUserPicker: jest.fn(),
 }

src/pullRequestQuickActions/pullRequestQuickActions.ts

@@ -7,6 +7,7 @@ import { Presence } from '../models/presence'
 import { TimeSelectionItem, timePicker } from '../views/quickpicks/timePicker'
 import moment = require('moment')
 import { PullRequestState } from '../utils/pullRequestsState'
+import { SpaceUsers } from '../models/spaceUsers'
 
 export const PullRequestQuickActions = {
   applyLabel: async ({
@@ -118,10 +119,19 @@ export const PullRequestQuickActions = {
     context: ExtensionContext
     statusBar: StatusBarItem
   }) => {
+    const spaceUsers = await SpaceUsers.get({
+      context,
+      codeReviewId: codeReview.id,
+    })
+    if (!spaceUsers) {
+      return false
+    }
+
     spaceUserPicker({
       context,
       placeholder: 'Select a user',
       title: 'Add assignee to pull request',
+      spaceUsers,
       onDidChangeSelection: async (item) => {
         if (!item[0].description) return false
 
@@ -156,6 +166,7 @@ export const PullRequestQuickActions = {
       context,
       statusBar,
     })
+    return true
   },
 
   requestReview: async ({
@@ -167,10 +178,19 @@ export const PullRequestQuickActions = {
     context: ExtensionContext
     statusBar: StatusBarItem
   }) => {
+    const spaceUsers = await SpaceUsers.get({
+      context,
+      codeReviewId: codeReview.id,
+    })
+    if (!spaceUsers) {
+      return false
+    }
+
     spaceUserPicker({
       context,
       placeholder: 'Select a user',
       title: 'Add reviewer to pull request',
+      spaceUsers,
       onDidChangeSelection: async (item) => {
         if (!item[0].description) return false
 
@@ -209,6 +229,7 @@ export const PullRequestQuickActions = {
       context,
       statusBar,
     })
+    return true
   },
 
   refresh: async ({

src/utils/initialize.ts

@@ -2,7 +2,6 @@ import {
   ExtensionContext,
   StatusBarItem,
   WindowState,
-  commands,
   window,
   workspace,
 } from 'vscode'
@@ -11,9 +10,7 @@ import { log } from './logger'
 import { StatusBar } from '../views/statusBar/statusBar'
 import { Authorization } from './authorization'
 import { StatusBarState } from './types'
-import { SpaceUsersApi } from '../api/spaceUsersApi'
 import { PullRequestState } from './pullRequestsState'
-import { Command } from './commands'
 import { trackUserPresence } from '../userPresence/trackUserPresence'
 
 const POLLING_TIME = 60000 // in ms
@@ -103,21 +100,8 @@ const setSpaceUsers = async ({
     return
   }
 
-  const spaceUsers = await SpaceUsersApi.get({
-    authToken: session?.accessToken ?? '',
-    context,
-  })
-  if (spaceUsers.error || spaceUsers.message) {
-    window.showInformationMessage(
-      `Error in fetching space users ${spaceUsers.error || spaceUsers.message}`
-    )
-    commands.executeCommand(Command.signOut)
-    return
-  }
-
   await Store.set(context, {
     isFocused: window.state.focused,
-    spaceUsers: spaceUsers.spaceUsers,
   })
 }
 

src/views/quickpicks/spaceUserPicker.ts

@@ -1,5 +1,4 @@
-import { ExtensionContext, window } from 'vscode'
-import { Store } from '../../utils/store'
+import { ExtensionContext } from 'vscode'
 import { SpaceUser, SpaceUserSelectionItem } from '../../utils'
 import { QuickPick } from './quickPick'
 
@@ -8,19 +7,16 @@ export const spaceUserPicker = ({
   placeholder,
   title,
   onDidChangeSelection,
+  spaceUsers,
 }: {
   context: ExtensionContext
   placeholder: string
   title: string
   onDidChangeSelection: (
     item: readonly SpaceUserSelectionItem[]
   ) => Promise<boolean>
+  spaceUsers: SpaceUser[]
 }) => {
-  const spaceUsers = Store.get(context)?.spaceUsers
-  if (!spaceUsers) {
-    window.showInformationMessage(`Failed to find space users`)
-    return
-  }
   const spaceUsersItems = spaceUsers.map((user: SpaceUser) => {
     return {
       label: user.name,