feat: adds open favorite

kenhowardpdx · Dec 1, 2018 · 29b9cb3 · 29b9cb3
1 parent 7c9518e
commit 29b9cb3
Show file tree

Hide file tree

Showing 9 changed files with 191 additions and 121 deletions.
diff --git a/package.json b/package.json
@@ -74,7 +74,7 @@
         "key": "ctrl+alt+="
       },
       {
-        "command": "extension.clearProfiles",
+        "command": "extension.resetState",
         "key": "ctrl+alt+0"
       }
     ]

diff --git a/src/commands/__tests__/gists.commands.test.ts b/src/commands/__tests__/gists.commands.test.ts
@@ -4,18 +4,24 @@ import { commands, window } from 'vscode';
 import { TMP_DIRECTORY_PREFIX } from '../../constants';
 import { gists } from '../../gists/gists-service';
 import { logger } from '../../logger';
-import { openCodeBlock, updateCodeBlock } from '../gists.commands';
+import { profiles } from '../../profiles';
+import {
+  openCodeBlock,
+  openFavoriteCodeBlock,
+  updateCodeBlock,
+  updateGistAccessKey
+} from '../gists.commands';
 
 jest.mock('fs');
 jest.mock('path');
 
 const executeCommandSpy = jest.spyOn(commands, 'executeCommand');
+const configureSpy = jest.spyOn(gists, 'configure');
 const editSpy = jest.spyOn(gists, 'update');
 const errorSpy = jest.spyOn(logger, 'error');
-// const getSpy = jest.spyOn(gists, 'get');
 const infoSpy = jest.spyOn(logger, 'info');
-// const listSpy = jest.spyOn(gists, 'list');
 const showQuickPickSpy = jest.spyOn(window, 'showQuickPick');
+const getProfileSpy = jest.spyOn(profiles, 'get');
 
 describe('Gists Commands Tests', () => {
   afterEach(() => {
@@ -60,6 +66,15 @@ describe('Gists Commands Tests', () => {
       );
     });
   });
+  describe('#openFavoriteCodeBlock', () => {
+    test('should call openCodeBlock', async () => {
+      expect.assertions(1);
+
+      await openFavoriteCodeBlock();
+
+      expect(infoSpy.mock.calls[0][0]).toContain('openFavoriteCodeBlock');
+    });
+  });
   describe('#updateCodeBlock', () => {
     test('should save', async () => {
       expect.assertions(3);
@@ -102,4 +117,19 @@ describe('Gists Commands Tests', () => {
       expect(errorSpy).toHaveBeenCalledWith('updateCodeBlock > Not Found');
     });
   });
+  describe('#updateGistAccessKey', () => {
+    test('should update gist access key', () => {
+      expect.assertions(2);
+
+      getProfileSpy.mockReturnValue({ key: 'foo', url: 'bar' });
+
+      updateGistAccessKey();
+
+      expect(configureSpy.mock.calls).toHaveLength(1);
+      expect(configureSpy.mock.calls[0][0]).toStrictEqual({
+        key: 'foo',
+        url: 'bar'
+      });
+    });
+  });
 });
diff --git a/src/commands/__tests__/profile.commands.test.ts b/src/commands/__tests__/profile.commands.test.ts
@@ -10,12 +10,13 @@ const executeCommandSpy = jest.spyOn(commands, 'executeCommand');
 const showQuickPickSpy = jest.spyOn(window, 'showQuickPick');
 const showInformationMessageSpy = jest.spyOn(window, 'showInformationMessage');
 const showInputBoxSpy = jest.spyOn(window, 'showInputBox');
+const getMock = jest.fn();
+const mockState: any = {
+  get: getMock,
+  update: jest.fn()
+};
 
-import {
-  clearProfiles,
-  createProfile,
-  selectProfile
-} from '../profile.commands';
+import { createProfile, selectProfile } from '../profile.commands';
 
 const mockProfile = {
   key: '111',
@@ -24,20 +25,12 @@ const mockProfile = {
 };
 
 describe('Profile Commands Tests', () => {
+  beforeEach(() => {
+    profiles.configure({ state: mockState });
+  });
   afterEach(() => {
     jest.resetAllMocks();
   });
-  describe('#clearProfiles', () => {
-    test('should clear profiles', () => {
-      expect.assertions(1);
-
-      clearProfiles();
-
-      expect(executeCommandSpy).toHaveBeenCalledWith(
-        'extension.updateStatusBar'
-      );
-    });
-  });
   describe('#createProfile', () => {
     test('should show information message prompt', async () => {
       expect.assertions(2);
@@ -161,7 +154,16 @@ describe('Profile Commands Tests', () => {
 
       getAllSpy.mockReturnValue([mockProfile]);
 
+      getMock.mockImplementation(() => ({
+        'test-profile': {
+          active: true,
+          key: 'foo',
+          url: 'foo'
+        }
+      }));
+
       showQuickPickSpy.mockResolvedValueOnce({
+        label: mockProfile.name,
         profile: mockProfile
       });
 

diff --git a/src/commands/gists.commands.ts b/src/commands/gists.commands.ts
@@ -27,12 +27,14 @@ const _openDocument = async (file: string): Promise<void> => {
   commands.executeCommand('workbench.action.keepEditor');
 };
 
-const openCodeBlock = async (): Promise<void> => {
+const openCodeBlock = async (favorite = false): Promise<void> => {
   let gistName = '';
   try {
-    logger.info('User Activated "openCodeBlock"');
+    logger.info(
+      `User Activated ${!favorite ? 'openCodeBlock' : 'openFavoriteCodeBlock'}`
+    );
 
-    const gists = await _getGists();
+    const gists = await _getGists(favorite);
 
     const selected = await window.showQuickPick(gists);
     if (selected) {
@@ -48,7 +50,10 @@ const openCodeBlock = async (): Promise<void> => {
       }
 
       logger.info('Opened Gist');
-      insights.track('open', undefined, { fileCount });
+      insights.track('open', undefined, {
+        fileCount,
+        isFavorite: Number(favorite)
+      });
     }
   } catch (err) {
     const error: Error = err as Error;
@@ -65,6 +70,8 @@ const openCodeBlock = async (): Promise<void> => {
   }
 };
 
+const openFavoriteCodeBlock = async (): Promise<void> => openCodeBlock(true);
+
 const updateCodeBlock = async (doc: GistTextDocument): Promise<void> => {
   let file = '';
   try {
@@ -98,4 +105,9 @@ const updateGistAccessKey = (): void => {
   insights.track('updateGistAccessKey', { url });
 };
 
-export { updateGistAccessKey, openCodeBlock, updateCodeBlock };
+export {
+  updateGistAccessKey,
+  openCodeBlock,
+  openFavoriteCodeBlock,
+  updateCodeBlock
+};
diff --git a/src/commands/profile.commands.ts b/src/commands/profile.commands.ts
@@ -3,91 +3,105 @@ import { commands, MessageItem, QuickPickItem, window } from 'vscode';
 import { insights } from '../insights';
 import { logger } from '../logger';
 import { profiles } from '../profiles';
+import { notify } from '../utils';
 
 export const createProfile = async (): Promise<void> => {
-  const { title } = (await window.showInformationMessage(
-    'Which GitHub Platform?',
-    { modal: true },
-    { title: 'GitHub.com (common)', isCloseAffordance: true },
-    { title: 'GitHub Enterprise' }
-  )) as MessageItem;
-
-  const url =
-    title === 'GitHub Enterprise'
-      ? await window.showInputBox({ prompt: 'Enter your enterprise API url' })
-      : 'https://api.github.com';
-
-  if (!url) {
-    logger.debug('User Aborted Create Profile at "url"');
-
-    return;
-  }
-
-  const key = await window.showInputBox({ prompt: 'Enter your access token' });
+  try {
+    const { title } = (await window.showInformationMessage(
+      'Which GitHub Platform?',
+      { modal: true },
+      { title: 'GitHub.com (common)', isCloseAffordance: true },
+      { title: 'GitHub Enterprise' }
+    )) as MessageItem;
 
-  if (!key) {
-    logger.debug('User Aborted Create Profile at "key"');
-
-    return;
-  }
+    const url =
+      title === 'GitHub Enterprise'
+        ? await window.showInputBox({ prompt: 'Enter your enterprise API url' })
+        : 'https://api.github.com';
 
-  const name = await window.showInputBox({
-    prompt: 'Give this profile a name'
-  });
+    if (!url) {
+      logger.debug('User Aborted Create Profile at "url"');
 
-  if (!name) {
-    logger.debug('User Aborted Create Profile at "name"');
+      return;
+    }
 
-    return;
-  }
+    const key = await window.showInputBox({
+      prompt: 'Enter your access token'
+    });
 
-  profiles.add(name, key, url, true);
-  commands.executeCommand('extension.updateStatusBar');
-  commands.executeCommand('extension.updateGistAccessKey');
-  insights.track('createProfile');
-};
+    if (!key) {
+      logger.debug('User Aborted Create Profile at "key"');
 
-export const selectProfile = async (): Promise<void> => {
-  const allProfiles = profiles.getAll();
+      return;
+    }
 
-  if (!allProfiles || allProfiles.length === 0) {
-    commands.executeCommand('extension.createProfile');
+    const name = await window.showInputBox({
+      prompt: 'Give this profile a name'
+    });
 
-    return;
-  }
+    if (!name) {
+      logger.debug('User Aborted Create Profile at "name"');
 
-  const qp = allProfiles.map((profile) => ({
-    label: profile.name,
-    profile
-  }));
-
-  const createProfileItem: QuickPickItem = {
-    label: 'Create New Profile'
-  };
-
-  const selected = (await window.showQuickPick([createProfileItem, ...qp])) as {
-    label: string;
-    profile: Profile;
-  };
-
-  if (!selected) {
-    return;
-  }
-
-  if (selected && selected.label !== 'Create New Profile') {
-    const { key, name, url } = selected.profile;
+      return;
+    }
 
     profiles.add(name, key, url, true);
-    commands.executeCommand('extension.updateStatusBar');
-    commands.executeCommand('extension.updateGistAccessKey');
-    insights.track('slectProfile');
-  } else {
-    commands.executeCommand('extension.createProfile');
+    await commands.executeCommand('extension.updateStatusBar');
+    await commands.executeCommand('extension.updateGistAccessKey');
+    insights.track('createProfile');
+  } catch (err) {
+    const error: Error = err as Error;
+    logger.error(`createProfile > ${error && error.message}`);
+    insights.exception('createProfile', { messsage: error.message });
+    notify.error('Unable To Create Profile', error.message);
   }
 };
 
-export const clearProfiles = (): void => {
-  profiles.reset();
-  commands.executeCommand('extension.updateStatusBar');
-  insights.track('clearProfiles');
+export const selectProfile = async (): Promise<void> => {
+  try {
+    const allProfiles = profiles.getAll();
+
+    if (!allProfiles || allProfiles.length === 0) {
+      commands.executeCommand('extension.createProfile');
+
+      return;
+    }
+
+    const qp = allProfiles.map((profile) => ({
+      label: profile.name,
+      profile
+    }));
+
+    const createProfileItem: QuickPickItem = {
+      label: 'Create New Profile'
+    };
+
+    const selected = (await window.showQuickPick([
+      createProfileItem,
+      ...qp
+    ])) as {
+      label: string;
+      profile: Profile;
+    };
+
+    if (!selected) {
+      return;
+    }
+
+    if (selected && selected.label !== 'Create New Profile') {
+      const { key, name, url } = selected.profile;
+
+      profiles.add(name, key, url, true);
+      commands.executeCommand('extension.updateStatusBar');
+      commands.executeCommand('extension.updateGistAccessKey');
+      insights.track('slectProfile');
+    } else {
+      commands.executeCommand('extension.createProfile');
+    }
+  } catch (err) {
+    const error: Error = err as Error;
+    logger.error(`selectProfile > ${error && error.message}`);
+    insights.exception('selectProfile', { messsage: error.message });
+    notify.error('Unable To Select Profile', error.message);
+  }
 };
diff --git a/src/commands/status-bar.commands.ts b/src/commands/status-bar.commands.ts
@@ -1,20 +1,26 @@
 import { StatusBarAlignment, window } from 'vscode';
 
-import { profiles } from '../profiles';
-
+import { insights } from '../insights';
 import { logger } from '../logger';
+import { profiles } from '../profiles';
 
 const statusBar = window.createStatusBarItem(StatusBarAlignment.Left);
 statusBar.show();
 
 export const updateStatusBar = (): void => {
-  const activeProfile = profiles.get();
-  statusBar.text = `GIST ${
-    activeProfile ? `[${activeProfile.name}]` : '[Create Profile]'
-  }`;
-  statusBar.command = activeProfile
-    ? 'extension.toggleProfile'
-    : 'extension.createProfile';
+  try {
+    const activeProfile = profiles.get();
+    statusBar.text = `GIST ${
+      activeProfile ? `[${activeProfile.name}]` : '[Create Profile]'
+    }`;
+    statusBar.command = activeProfile
+      ? 'extension.toggleProfile'
+      : 'extension.createProfile';
 
-  logger.debug('Status Bar Updated');
+    logger.debug('Status Bar Updated');
+  } catch (err) {
+    const error: Error = err as Error;
+    logger.error(`updateStatusBar > ${error && error.message}`);
+    insights.exception('updateStatusBar', { messsage: error.message });
+  }
 };