Implement tests for the subscription check

WorldBrain · May 13, 2024 · 02e9ce6 · 02e9ce6
1 parent 49200c6
commit 02e9ce6
Show file tree

Hide file tree

Showing 7 changed files with 430 additions and 87 deletions.
diff --git a/src/content-scripts/content_script/global.ts b/src/content-scripts/content_script/global.ts
@@ -121,7 +121,7 @@ import {
 } from '@worldbrain/memex-common/lib/annotations/utils'
 import {
     COUNTER_STORAGE_KEY,
-    DEFAULT_COUNTER_STORAGE_KEY,
+    DEFAULT_COUNTER_STORAGE_VALUE,
 } from '@worldbrain/memex-common/lib/subscriptions/constants'
 import type { RemoteSearchInterface } from 'src/search/background/types'
 import * as anchoring from '@worldbrain/memex-common/lib/annotations'
@@ -1495,7 +1495,8 @@ export async function main(
                     subscriptionBefore[COUNTER_STORAGE_KEY]
 
                 const subscriptionsBefore =
-                    subscriptionDataBefore?.pU ?? DEFAULT_COUNTER_STORAGE_KEY.pU
+                    subscriptionDataBefore?.pU ??
+                    DEFAULT_COUNTER_STORAGE_VALUE.pU
 
                 await sleepPromise(1000)
                 await runInBackground<
@@ -1509,7 +1510,8 @@ export async function main(
                     subscriptionAfter[COUNTER_STORAGE_KEY]
 
                 const subscriptionsAfter =
-                    subscriptionDataAfter?.pU ?? DEFAULT_COUNTER_STORAGE_KEY.pU
+                    subscriptionDataAfter?.pU ??
+                    DEFAULT_COUNTER_STORAGE_VALUE.pU
 
                 let keyChanged = false
                 for (const key in subscriptionsBefore) {

diff --git a/src/custom-lists/background/storage.ts b/src/custom-lists/background/storage.ts
@@ -920,11 +920,7 @@ export default class CustomListStorage extends StorageModule {
                     await trackSpaceEntryCreate(analyticsBG, {
                         type: isShared ? 'shared' : 'private',
                     })
-                } catch (error) {
-                    console.error(
-                        `Error tracking space Entry create event', ${error}`,
-                    )
-                }
+                } catch (error) {}
             }
 
             if (isPkmSyncEnabled({ storageAPI: this.options.___storageAPI })) {

diff --git a/src/sidebar/annotations-sidebar/components/AnnotationsSidebar.tsx b/src/sidebar/annotations-sidebar/components/AnnotationsSidebar.tsx
@@ -1214,8 +1214,6 @@ export class AnnotationsSidebar extends React.Component<
             })
         }
 
-        console.log('listAnnotations', !annotationsData?.length)
-
         return (
             <FollowedNotesContainer zIndex={parseFloat(listData.unifiedId)}>
                 {(cacheUtils.deriveListOwnershipStatus(

diff --git a/src/sidebar/annotations-sidebar/containers/logic.ts b/src/sidebar/annotations-sidebar/containers/logic.ts
@@ -3349,80 +3349,6 @@ export class SidebarContainerLogic extends UILogic<
         }
     }
 
-    // saveAIPrompt: EventHandler<'saveAIPrompt'> = async ({
-    //     event,
-    //     previousState,
-    // }) => {
-    //     this.emitMutation({
-    //         showAISuggestionsDropDown: { $set: true },
-    //     })
-    //     let suggestions = this.AIpromptSuggestions
-
-    //     let newSuggestion = { prompt: event.prompt, focused: null }
-
-    //     suggestions.unshift(newSuggestion)
-
-    //     const newSuggestionsToSave = suggestions.map((item) => item.prompt)
-
-    //     await this.syncSettings.openAI.set(
-    //         'promptSuggestions',
-    //         newSuggestionsToSave,
-    //     )
-
-    //     this._updateFocusAISuggestions(-1, suggestions)
-
-    //     this.AIpromptSuggestions = suggestions
-    // }
-
-    // toggleAISuggestionsDropDown: EventHandler<
-    //     'toggleAISuggestionsDropDown'
-    // > = async ({ event, previousState }) => {
-    //     if (previousState.showAISuggestionsDropDown) {
-    //         this._updateFocusAISuggestions(-1, previousState.AIsuggestions)
-    //         this.emitMutation({
-    //             showAISuggestionsDropDown: {
-    //                 $set: false,
-    //             },
-    //         })
-    //         return
-    //     }
-
-    //     const rawSuggestions = await this.syncSettings.openAI.get(
-    //         'promptSuggestions',
-    //     )
-
-    //     let suggestions = []
-
-    //     if (!rawSuggestions) {
-    //         await this.syncSettings.openAI.set(
-    //             'promptSuggestions',
-    //             AI_PROMPT_DEFAULTS,
-    //         )
-
-    //         suggestions = AI_PROMPT_DEFAULTS.map((prompt: string) => {
-    //             return { prompt, focused: null }
-    //         })
-    //     } else {
-    //         suggestions = rawSuggestions.map((prompt: string) => ({
-    //             prompt,
-    //             focused: null,
-    //         }))
-    //     }
-
-    //     this.emitMutation({
-    //         showAISuggestionsDropDown: {
-    //             $set: !previousState.showAISuggestionsDropDown,
-    //         },
-    //     })
-
-    //     if (!previousState.showAISuggestionsDropDown) {
-    //         this.emitMutation({
-    //             AIsuggestions: { $set: suggestions },
-    //         })
-    //     }
-    //     this.AIpromptSuggestions = suggestions
-    // }
-
     private _updateFocusAISuggestions = (
         focusIndex: number | undefined,
         displayEntries?: { prompt: string; focused: boolean }[],

diff --git a/src/summarization-llm/background/index.ts b/src/summarization-llm/background/index.ts
@@ -15,7 +15,10 @@ import {
 import { SidebarTab } from 'src/sidebar/annotations-sidebar/containers/types'
 import browser, { Browser } from 'webextension-polyfill'
 import { COUNTER_STORAGE_KEY } from '@worldbrain/memex-common/lib/subscriptions/constants'
-import { AIActionAllowed } from '@worldbrain/memex-common/lib/subscriptions/storage'
+import {
+    AIActionAllowed,
+    updateTabAISessions,
+} from '@worldbrain/memex-common/lib/subscriptions/storage'
 
 export interface SummarizationInterface<Role extends 'provider' | 'caller'> {
     startPageSummaryStream: RemoteFunction<
@@ -75,6 +78,30 @@ export default class SummarizeBackground {
         makeRemotelyCallable(this.remoteFunctions, { insertExtraArg: true })
     }
 
+    async saveActiveTabId(hasKey: boolean, AImodel: AImodels) {
+        const isAlreadySaved = await updateTabAISessions(
+            this.options.browserAPIs,
+        )
+
+        if (isAlreadySaved) {
+            return
+        } else {
+            await AIActionAllowed(
+                this.options.browserAPIs,
+                this.options.analyticsBG,
+                hasKey,
+                true,
+                AImodel,
+            )
+        }
+
+        this.options.browserAPIs.tabs.onRemoved.addListener(this.onTabClosed)
+    }
+
+    onTabClosed = (tabId, removeInfo) => {
+        updateTabAISessions(this.options.browserAPIs, tabId)
+    }
+
     startPageSummaryStream: SummarizationInterface<
         'provider'
     >['startPageSummaryStream'] = async (
@@ -90,6 +117,8 @@ export default class SummarizeBackground {
             promptData,
         },
     ) => {
+        await this.saveActiveTabId(apiKey?.length > 0, AImodel)
+
         let isAllowed = null
 
         isAllowed = await AIActionAllowed(