Imporve options ordering

src/components/options.component.tsx

@@ -38,7 +38,7 @@ export const Options = ({
     data={options}
     keyExtractor={(item) => item.title}
     persistentScrollbar={true}
-    onScrollToIndexFailed={() => console.log('SCROLL FAILED')}
+    onScrollToIndexFailed={() => null}
     renderItem={({ item, index }) => (
       <TouchableOpacity onPress={() => onSubmit(index)}>
         <Option
@@ -113,8 +113,14 @@ export const OptionHotkeyHints = ({ option }: { option: SpotterPluginOption }) =
     flexDirection: 'row',
     alignItems: 'center',
   }}>
-    <OptionHotkeyHint style={{}} placeholder={'tab'}></OptionHotkeyHint>
-    <OptionHotkeyHint style={{marginLeft: 5}} placeholder={'enter'}></OptionHotkeyHint>
+    {option.onQuery
+      ? <OptionHotkeyHint style={{}} placeholder={'tab'}></OptionHotkeyHint>
+      : null
+    }
+    {option.action
+      ? <OptionHotkeyHint style={{marginLeft: 5}} placeholder={'enter'}></OptionHotkeyHint>
+      : null
+    }
   </View>
 };
 

src/containers/spotter.tsx

@@ -155,7 +155,6 @@ export const App: FC<{}> = () => {
       return;
     }
 
-    console.log(option)
     registries.plugins.activateOption(option);
     api.queryInput.setValue('');
 

src/core/interfaces.ts

@@ -50,10 +50,8 @@ export declare abstract class SpotterSettingsRegistry {
 }
 
 export declare abstract class SpotterHistoryRegistry {
-  abstract getPluginHistory(): Promise<SpotterHistory>;
   abstract getOptionsHistory(): Promise<SpotterHistory>;
-  abstract increasePluginHistory(plugin: string, query: string): void;
-  abstract increaseOptionHistory(option: string, query: string): void;
+  abstract increaseOptionHistory(path: string[], query: string): void;
 }
 
 export declare abstract class SpotterShell {
@@ -115,7 +113,7 @@ export type SpotterOptionBaseImage = string | number | { uri: string } | undefin
 
 export interface SpotterOption {
   title: string;
-  action: SpotterAction;
+  action?: SpotterAction;
   onQuery?: (query: string) => Promise<SpotterOption[]> | SpotterOption[];
   subtitle?: string;
   keywords?: string[];

src/registries/history.registry.ts

@@ -2,49 +2,39 @@ import { SpotterHistory, SpotterHistoryRegistry, SpotterApi } from '../core';
 
 export class HistoryRegistry implements SpotterHistoryRegistry {
   private nativeModules: SpotterApi;
-  private PLUGIN_HISTORY_STORAGE_KEY = 'PLUGIN_HISTORY_STORAGE_KEY_v1';
   private OPTIONS_HISTORY_STORAGE_KEY = 'OPTIONS_HISTYRY_STORAGE_KEY_v1';
   private defaultValue: SpotterHistory = {};
 
   constructor(nativeModules: SpotterApi) {
     this.nativeModules = nativeModules;
   }
 
-  async getPluginHistory(): Promise<SpotterHistory> {
-    const history = await this.nativeModules
-      .storage
-      .getItem<SpotterHistory>(this.PLUGIN_HISTORY_STORAGE_KEY);
-    return history ?? this.defaultValue;
-  }
-
   async getOptionsHistory(): Promise<SpotterHistory> {
     const history = await this.nativeModules
       .storage
       .getItem<SpotterHistory>(this.OPTIONS_HISTORY_STORAGE_KEY);
     return history ?? this.defaultValue;
   }
 
-  async increaseOptionHistory(option: string, query: string) {
+  async increaseOptionHistory(path: string[], query: string) {
     const currentHistory = await this.getOptionsHistory();
-    const nextHistory = this.increase(currentHistory, option, query);
+    const nextHistory = this.increase(currentHistory, path, query);
     this.nativeModules.storage.setItem(this.OPTIONS_HISTORY_STORAGE_KEY, nextHistory);
   }
 
-  async increasePluginHistory(option: string, query: string) {
-    const currentHistory = await this.getPluginHistory();
-    const nextHistory = this.increase(currentHistory, option, query);
-    this.nativeModules.storage.setItem(this.PLUGIN_HISTORY_STORAGE_KEY, nextHistory);
-  }
-
   private increase(
     history: SpotterHistory,
-    title: string,
+    path: string[],
     query: string,
   ): SpotterHistory {
-    const currentOptionHistory = history[title] ?? { queries: {}, total: 0 };
+    if (!path.length) {
+      return history;
+    }
+    const stringPath = path.join('#');
+    const currentOptionHistory = history[stringPath] ?? { queries: {}, total: 0 };
     return {
       ...history,
-      ...({[title]: {
+      ...({[stringPath]: {
         queries: {
           ...currentOptionHistory.queries,
           [query]: currentOptionHistory.queries[query] ? currentOptionHistory.queries[query] + 1 : 1,

src/registries/plugins.registry.ts

@@ -55,6 +55,10 @@ export class PluginsRegistry implements SpotterPluginsRegistry {
     return this.activeOptionSubject$.asObservable();
   }
 
+  get activeOption(): SpotterPluginOption | null {
+    return this.activeOptionSubject$.getValue();
+  }
+
   private currentOptionsSubject$ = new BehaviorSubject<SpotterPluginOption[]>([]);
 
   get currentOptions(): SpotterPluginOption[] {
@@ -69,7 +73,11 @@ export class PluginsRegistry implements SpotterPluginsRegistry {
     const activeOption = this.activeOptionSubject$.value;
     if (activeOption && activeOption.onQuery && activeOption.plugin) {
       const options = await activeOption.onQuery(query);
-      this.currentOptionsSubject$.next(options.map(o => ({...o, plugin: activeOption.plugin})));
+      const sortedOptions = await this.getSortedPluginOptions(
+        options.map(o => ({...o, plugin: activeOption.plugin})),
+        query,
+      );
+      this.currentOptionsSubject$.next(sortedOptions);
       return;
     }
 
@@ -102,24 +110,23 @@ export class PluginsRegistry implements SpotterPluginsRegistry {
     this.currentOptionsSubject$.next(sortedOptions);
   }
 
+  private getFullHistoryPath(option: string): string {
+    return this.activeOption ? `${this.activeOption.title}#${option}` : option;
+  }
+
   private async getSortedPluginOptions(
     options: SpotterPluginOption[],
     query: string,
   ): Promise<SpotterPluginOption[]> {
 
-    const pluginHistory: SpotterHistory = await this.historyRegistry.getPluginHistory();
     const optionsHistory: SpotterHistory = await this.historyRegistry.getOptionsHistory();
 
     return options
       .sort((a, b) => (
-        (pluginHistory[b.title]?.total ?? 0) -
-        (pluginHistory[a.title]?.total ?? 0)
-      ))
-      .sort((a, b) => (
-        (Object.entries(optionsHistory[b.title]?.queries ?? {})
+        (Object.entries(optionsHistory[this.getFullHistoryPath(b.title)]?.queries ?? {})
           .reduce((acc, [q, counter]) => q.startsWith(query) ? acc + counter : acc, 0)
         ) -
-        (Object.entries(optionsHistory[a.title]?.queries ?? {})
+        (Object.entries(optionsHistory[this.getFullHistoryPath(a.title)]?.queries ?? {})
           .reduce((acc, [q, counter]) => q.startsWith(query) ? acc + counter : acc, 0)
         )
       ));
@@ -132,19 +139,24 @@ export class PluginsRegistry implements SpotterPluginsRegistry {
   }
 
   public async submitOption(
-    optionWithIdentifier: SpotterPluginOption,
+    option: SpotterPluginOption,
     query: string,
     callback: (success: boolean) => void,
   ) {
-    if (!optionWithIdentifier?.action) {
+    if (!option?.action) {
       callback(false);
       return;
     };
 
-    this.historyRegistry.increasePluginHistory(optionWithIdentifier.plugin, query);
-    this.historyRegistry.increaseOptionHistory(optionWithIdentifier.title, query);
+    this.historyRegistry.increaseOptionHistory(
+      [
+        ...(this.activeOption ? [this.activeOption.title] : []),
+        option.title,
+      ],
+      query,
+    );
 
-    const success = await optionWithIdentifier.action();
+    const success = await option.action();
 
     if (typeof success === 'function') {
       const options = success();