Address PR comments

Author: karenrasmussen

src/sidebar/components/KeyboardShortcutsModal.tsx

@@ -10,7 +10,6 @@ import { useMemo, useState } from 'preact/hooks';
 import ModalDialog from '../../annotator/components/ModalDialog';
 import {
   getAllShortcuts,
-  getDefaultShortcuts,
   parseShortcutInputEvent,
   repeatableShortcutGroups,
   resetShortcuts,
@@ -159,7 +158,7 @@ function ShortcutActions({
         onClick={async () => {
           resetShortcuts();
           try {
-            await session.updateShortcutPreferences(getDefaultShortcuts());
+            await session.updateShortcutPreferences({});
             onSaveError(null);
           } catch {
             onSaveError('Unable to save keyboard shortcuts');

src/sidebar/components/test/KeyboardShortcutsModal-test.js

@@ -8,10 +8,8 @@ describe('KeyboardShortcutsModal', () => {
   let fakeSession;
   let fakeStore;
   let fakeShortcuts;
-  let fakeDefaultShortcuts;
   let fakeShortcutDefinitions;
   let fakeGetAllShortcuts;
-  let fakeGetDefaultShortcuts;
   let fakeParseShortcutInputEvent;
   let fakeRepeatableShortcutGroups;
   let fakeResetShortcuts;
@@ -43,11 +41,6 @@ describe('KeyboardShortcutsModal', () => {
       annotateSelection: 'a',
     };
 
-    fakeDefaultShortcuts = {
-      applyUpdates: 'l',
-      annotateSelection: 'a',
-    };
-
     fakeShortcutDefinitions = [
       {
         id: 'applyUpdates',
@@ -69,7 +62,6 @@ describe('KeyboardShortcutsModal', () => {
     };
 
     fakeGetAllShortcuts = sinon.stub().returns(fakeShortcuts);
-    fakeGetDefaultShortcuts = sinon.stub().returns(fakeDefaultShortcuts);
     fakeParseShortcutInputEvent = sinon.stub();
     fakeResetShortcuts = sinon.stub();
     fakeSetAllShortcuts = sinon.stub();
@@ -80,7 +72,6 @@ describe('KeyboardShortcutsModal', () => {
       '../store': { useSidebarStore: () => fakeStore },
       '../../shared/shortcut-config': {
         getAllShortcuts: fakeGetAllShortcuts,
-        getDefaultShortcuts: fakeGetDefaultShortcuts,
         parseShortcutInputEvent: fakeParseShortcutInputEvent,
         repeatableShortcutGroups: fakeRepeatableShortcutGroups,
         resetShortcuts: fakeResetShortcuts,
@@ -140,10 +131,7 @@ describe('KeyboardShortcutsModal', () => {
     resetButton.props().onClick();
 
     assert.called(fakeResetShortcuts);
-    assert.calledWith(
-      fakeSession.updateShortcutPreferences,
-      fakeGetDefaultShortcuts.returnValues[0],
-    );
+    assert.calledWith(fakeSession.updateShortcutPreferences, {});
   });
 
   it('does not save shortcuts when duplicates exist', () => {

src/sidebar/components/test/UserMenu-test.js

@@ -412,17 +412,6 @@ describe('UserMenu', () => {
         }
       });
     });
-
-    it('calls onLogout when clicked', () => {
-      fakeIsThirdPartyUser.returns(false);
-      fakeServiceConfig.returns(null);
-      const wrapper = createUserMenu();
-
-      const logOutMenuItem = findMenuItem(wrapper, 'Log out');
-      logOutMenuItem.props().onClick();
-
-      assert.calledOnce(fakeOnLogout);
-    });
   });
 
   describe('open dashboard menu item', () => {

src/sidebar/services/test/session-test.js

@@ -205,7 +205,7 @@ describe('SessionService', () => {
 
     it('applies shortcut preferences from the profile', () => {
       const session = createService();
-      const shortcuts = { sidebar: { createAnnotation: ['c'] } };
+      const shortcuts = { applyUpdates: 'c' };
 
       session.update({
         userid: 'anne',
@@ -231,7 +231,7 @@ describe('SessionService', () => {
       const updatedProfile = {
         userid: 'acct:user@hypothes.is',
         preferences: {
-          shortcuts_preferences: { sidebar: { createAnnotation: ['c'] } },
+          shortcuts_preferences: { applyUpdates: 'c' },
         },
       };
       fakeApi.profile.update.resolves(updatedProfile);

src/types/api.ts

@@ -359,7 +359,9 @@ export type Annotation = ClientAnnotationData & APIAnnotationData;
  */
 export type SavedAnnotation = Annotation & { id: string };
 
-export type ShortcutsPreferences = Partial<Record<string, string | null>>;
+export type ShortcutsPreferences = Partial<
+  Record<string, string | null>
+> | null;
 
 export type Profile = {
   userid: string | null;