fix up

Author: mabaasit

packages/compass-query-bar/src/components/option-editor.spec.tsx

@@ -14,6 +14,7 @@ import sinon from 'sinon';
 import { createSandboxFromDefaultPreferences } from 'compass-preferences-model';
 import type { PreferencesAccess } from 'compass-preferences-model';
 import { PreferencesProvider } from 'compass-preferences-model/provider';
+import type { RecentQuery } from '@mongodb-js/my-queries-storage';
 
 class MockPasteEvent extends window.Event {
   constructor(private text: string) {
@@ -309,21 +310,21 @@ describe('OptionEditor', function () {
         skip: 1,
         limit: 1,
       },
-    ];
+    ] as unknown as RecentQuery[];
 
     it('filters out update queries', function () {
       const queries = getOptionBasedQueries('filter', 'recent', [
         ...savedQueries,
         { _lastExecuted: new Date(), update: { a: 1 }, filter: { a: 2 } },
-      ]);
+      ] as unknown as RecentQuery[]);
       expect(queries.length).to.equal(1);
     });
 
     it('filters out empty queries', function () {
       const queries = getOptionBasedQueries('filter', 'recent', [
         ...savedQueries,
         { _lastExecuted: new Date() },
-      ]);
+      ] as unknown as RecentQuery[]);
       expect(queries.length).to.equal(1);
     });
 
@@ -334,7 +335,7 @@ describe('OptionEditor', function () {
         ...savedQueries,
         { _lastExecuted: new Date() },
         { _lastExecuted: new Date() },
-      ]);
+      ] as unknown as RecentQuery[]);
       expect(queries.length).to.equal(1);
     });
 

packages/compass-query-bar/src/components/option-editor.tsx

@@ -40,6 +40,7 @@ import type {
   RecentQuery,
 } from '@mongodb-js/my-queries-storage';
 import _ from 'lodash';
+import type { QueryOptionOfTypeDocument } from '../constants/query-option-definition';
 
 const editorContainerStyles = css({
   position: 'relative',
@@ -97,9 +98,8 @@ const insightsBadgeStyles = css({
   flex: 'none',
 });
 
-type OptionEditorName = Exclude<QueryProperty, 'maxTimeMS' | 'limit' | 'skip'>;
 type OptionEditorProps = {
-  optionName: OptionEditorName;
+  optionName: QueryOptionOfTypeDocument;
   namespace: string;
   id?: string;
   hasError?: boolean;
@@ -299,7 +299,7 @@ export const OptionEditor: React.FunctionComponent<OptionEditorProps> = ({
 };
 
 export function getOptionBasedQueries(
-  optionName: OptionEditorName,
+  optionName: QueryOptionOfTypeDocument,
   type: 'recent' | 'favorite',
   queries: (RecentQuery | FavoriteQuery)[]
 ) {
@@ -339,7 +339,10 @@ export function getOptionBasedQueries(
   );
 }
 
-const mapStateToProps = (state: RootState, ownProps: OptionEditorProps) => ({
+const mapStateToProps = (
+  state: RootState,
+  ownProps: Pick<OptionEditorProps, 'optionName'>
+) => ({
   namespace: state.queryBar.namespace,
   serverVersion: state.queryBar.serverVersion,
   savedQueries: [

packages/compass-query-bar/src/components/query-option.tsx

@@ -12,7 +12,10 @@ import {
 import { connect } from '../stores/context';
 import OptionEditor from './option-editor';
 import { OPTION_DEFINITION } from '../constants/query-option-definition';
-import type { QueryOption as QueryOptionType } from '../constants/query-option-definition';
+import type {
+  QueryOptionOfTypeDocument,
+  QueryOption as QueryOptionType,
+} from '../constants/query-option-definition';
 import { changeField } from '../stores/query-bar-reducer';
 import type { QueryProperty } from '../constants/query-properties';
 import type { RootState } from '../stores/query-bar-store';
@@ -187,7 +190,7 @@ const QueryOption: React.FunctionComponent<QueryOptionProps> = ({
       <div className={cx(isDocumentEditor && documentEditorOptionStyles)}>
         {isDocumentEditor ? (
           <OptionEditor
-            optionName={name}
+            optionName={name as QueryOptionOfTypeDocument}
             hasError={hasError}
             id={id}
             onChange={onValueChange}

packages/compass-query-bar/src/constants/query-option-definition.ts

@@ -4,6 +4,10 @@ import { usePreference } from 'compass-preferences-model/provider';
 import type { QueryProperty } from './query-properties';
 
 export type QueryOption = Exclude<QueryProperty, 'update'>;
+export type QueryOptionOfTypeDocument = Exclude<
+  QueryProperty,
+  'maxTimeMS' | 'limit' | 'skip'
+>;
 
 export const OPTION_DEFINITION: {
   [optionName in QueryOption]: {

packages/compass-query-bar/src/stores/query-bar-reducer.ts

@@ -229,12 +229,15 @@ export const applyFromHistory = (
 ): QueryBarThunkAction<void, ApplyFromHistoryAction> => {
   return (dispatch, getState, { localAppRegistry, preferences }) => {
     const currentFields = getState().queryBar.fields;
-    const currentQuery = currentQueryFieldsToRetain.reduce((acc, key) => {
-      if (currentFields[key]?.value) {
-        acc[key] = currentFields[key].value;
+    const currentQuery = currentQueryFieldsToRetain.reduce<
+      Record<string, Document | number>
+    >((acc, key) => {
+      const { value } = currentFields[key];
+      if (value) {
+        acc[key] = value;
       }
       return acc;
-    }, {} as Record<string, number | Document>);
+    }, {});
     const fields = mapQueryToFormFields(
       { maxTimeMS: preferences.getPreferences().maxTimeMS },
       {