fixed edit pr

Author: jwallet

src/custom-reviewers/templates/actions.js

@@ -1,10 +1,6 @@
 // @flow
 import { h } from 'dom-chef'
 import { isCreatePullRequestURL } from '../../page-detect'
-import {
-    setStorageSyncValue,
-    getDefaultReviewersStorageKey,
-} from '../../storage'
 import {
     getCurrentReviewers,
     prefetchAllReviewers,
@@ -17,6 +13,7 @@ import {
 import {
     clearSelectedReviewers,
     insertUsersToSelectedReviewers,
+    setSavedDefaultReviewers,
     getSavedDefaultReviewers,
 } from '../ui-renderer'
 
@@ -38,10 +35,7 @@ const buttonFeedback = (button, succeeded) => {
 }
 
 async function handleSaveSelectionAsDefault(e) {
-    await setStorageSyncValue(
-        getDefaultReviewersStorageKey(),
-        getCurrentReviewers()
-    )
+    await setSavedDefaultReviewers(getCurrentReviewers())
 
     const savedReviewers: IUser[] = await getSavedDefaultReviewers()
     const currentReviewersIds: string[] = getReviewersFieldValue()
@@ -63,7 +57,6 @@ async function handleAddAllUsers(e) {
 
 async function handleReload(e) {
     const savedReviewers: IUser[] = await getSavedDefaultReviewers()
-    console.log(savedReviewers)
     if (savedReviewers.length > 0) {
         addSearchedReviewers(savedReviewers)
     }
@@ -72,7 +65,6 @@ async function handleReload(e) {
 
 async function handleReset(e) {
     const defaultReviewers: IUser[] = getDefaultReviewers()
-    console.log(defaultReviewers)
     if (defaultReviewers.length > 0) {
         addSearchedReviewers(defaultReviewers)
     }

src/custom-reviewers/ui-renderer/selected-reviewers-list.js

@@ -6,8 +6,10 @@ import { getDefaultReviewers, resetReviewers } from '../data-selectors'
 import {
     getStorageSyncValue,
     getDefaultReviewersStorageKey,
+    getStorageLocalValue,
+    setStorageSyncValue,
+    setStorageLocalValue,
 } from '../../storage'
-import { isCreatePullRequestURL } from '../../page-detect'
 
 export const getSelectedReviewerLineId = (user: IUser) =>
     `#__bbcdr_selected_reviewer_${user.account_id}`
@@ -40,7 +42,17 @@ export function resetUsersToSelectedReviewers(users: IUsers[]): void {
 }
 
 export async function getSavedDefaultReviewers(): Promise<IUser[]> {
-    return (await getStorageSyncValue(getDefaultReviewersStorageKey())) || []
+    const key = getDefaultReviewersStorageKey()
+    const syncStorage = await getStorageSyncValue(key)
+    const localStorage = await getStorageLocalValue(key)
+    return syncStorage || localStorage || []
+}
+
+export async function setSavedDefaultReviewers(reviewers: IUser[]): void {
+    const key = getDefaultReviewersStorageKey()
+    const syncStorage = await setStorageSyncValue(key, reviewers)
+    const localStorage = await setStorageLocalValue(key, reviewers)
+    return syncStorage || localStorage || []
 }
 
 export async function initSelectedReviewers(): void {

src/main.js

@@ -8,11 +8,9 @@ import customReviewersFeature from './custom-reviewers/custom-reviewers'
 import { isCreatePullRequestURL, isEditPullRequestURL } from './page-detect'
 
 function init() {
-    if (isCreatePullRequestURL()) {
-        customReviewersFeature()
-    } else if (isEditPullRequestURL()) {
-        customReviewersFeature()
-    }
+    if (!isCreatePullRequestURL() && !isEditPullRequestURL()) return
+
+    customReviewersFeature()
 }
 
 init()

src/manifest.json

@@ -19,11 +19,6 @@
     "https://api.bitbucket.org/*",
     "storage"
   ],
-  "applications": {
-    "gecko": {
-      "id": "{e25bc27e-d67f-4a12-bedf-3c8865f63bbf}"
-    }
-  },
   "content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'",
   "content_scripts": [
     {

src/storage.js

@@ -9,34 +9,51 @@ export const getDefaultReviewersStorageKey = () =>
 export const getDashboardPullRequestsStorageKey = actionId =>
     `__bbcd-dashboard-pull-requests_${actionId}`
 
-export function getStorageSyncValue(key: string): Promise<any> {
-    return new Promise(resolve => {
-        ;(chrome.storage: any).sync.get(key, result => {
-            resolve(result[key])
-        })
+export async function getStorageSyncValue(key: string): Promise<any> {
+    return new Promise((resolve, reject) => {
+        try {
+            ;(chrome.storage: any).sync.get(key, result => {
+                console.log('get result --', (result || {}).key)
+                resolve((result || {})[key])
+            })
+        } catch (ex) {
+            reject()
+        }
     })
 }
 
-export function setStorageSyncValue(key: string, value: any): void {
-    return new Promise(resolve => {
-        ;(chrome.storage: any).sync.set({ [key]: value }, () => {
-            resolve()
-        })
+export async function setStorageSyncValue(key: string, value: any): void {
+    return new Promise((resolve, reject) => {
+        try {
+            ;(chrome.storage: any).sync.set({ [key]: value }, () => {
+                resolve()
+            })
+        } catch (ex) {
+            reject()
+        }
     })
 }
 
-export function getStorageLocalValue(key: string): Promise<any> {
-    return new Promise(resolve => {
-        ;(chrome.storage: any).local.get(key, result => {
-            resolve(result[key])
-        })
+export async function getStorageLocalValue(key: string): Promise<any> {
+    return new Promise((resolve, reject) => {
+        try {
+            ;(chrome.storage: any).local.get(key, result => {
+                resolve((result || {})[key])
+            })
+        } catch (ex) {
+            reject(ex)
+        }
     })
 }
 
-export function setStorageLocalValue(key: string, value: any): void {
-    return new Promise(resolve => {
-        ;(chrome.storage: any).local.set({ [key]: value }, () => {
-            resolve()
-        })
+export async function setStorageLocalValue(key: string, value: any): void {
+    return new Promise((resolve, reject) => {
+        try {
+            ;(chrome.storage: any).local.set({ [key]: value }, () => {
+                resolve()
+            })
+        } catch (ex) {
+            reject(ex)
+        }
     })
 }