Fix wrong draft counter and config set

Mikescops · Jun 16, 2024 · 215c00f · 215c00f
1 parent 5701feb
commit 215c00f
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 12 deletions.
diff --git a/src/background/endpoints/getLatestDataFromGitLab.ts b/src/background/endpoints/getLatestDataFromGitLab.ts
@@ -72,11 +72,17 @@ export const getLatestDataFromGitLab = async (): Promise<void> => {
         (merge) => merge.author.id !== currentUser.id
     );
 
-    const mrReceivedDetails = await fetchMRExtraInfo({
-        gitlabApi,
-        mrList: requests,
-        gitlabCE: settings.accounts[0].gitlabCE
-    });
+    const mrReceivedDetails = (
+        await fetchMRExtraInfo({
+            gitlabApi,
+            mrList: requests,
+            gitlabCE: settings.accounts[0].gitlabCE
+        })
+    ).filter(
+        (mr) =>
+            settings.accounts[0].draftInToReviewTab ||
+            (!settings.accounts[0].draftInToReviewTab && !mr.work_in_progress)
+    );
 
     let mrToReview = 0;
     mrReceivedDetails.forEach((mr) => {

diff --git a/src/common/configuration.ts b/src/common/configuration.ts
@@ -1,12 +1,21 @@
 import * as browser from 'webextension-polyfill';
-import { TabId } from '../common/types';
+import { Configuration, TabId } from '../common/types';
 import { config } from '../config/config';
 
 export const updateConfiguration = async (objectToStore: Record<string, any>): Promise<void> => {
     await browser.storage.local.set(objectToStore);
     console.log('Configuration Updated');
 };
 
+export const updateAccountConfiguration = async (
+    accountIndex: number,
+    objectToStore: Record<string, any>
+): Promise<void> => {
+    const settings = await readConfiguration<Configuration>(['accounts']);
+    settings.accounts[accountIndex] = { ...settings.accounts[accountIndex], ...objectToStore };
+    await updateConfiguration({ accounts: settings.accounts });
+};
+
 export const readConfiguration = async <T>(keys: string[]): Promise<T> => {
     return browser.storage.local.get(keys).then((settings) => {
         if (typeof settings.defaultTab === 'number') {

diff --git a/src/options/App.tsx b/src/options/App.tsx
@@ -23,7 +23,7 @@ import {
     FileDirectoryIcon
 } from '@primer/octicons-react';
 import './style.css';
-import { updateConfiguration, readConfiguration } from '../common/configuration';
+import { updateConfiguration, readConfiguration, updateAccountConfiguration } from '../common/configuration';
 import { Account, TabId } from '../common/types';
 
 const getSettings = readConfiguration<{
@@ -72,18 +72,18 @@ export const App = () => {
 
     const updateGitlabCE = async (event: any) => {
         setGitlabCE(event.target.checked);
-        await updateConfiguration({ gitlabCE: event.target.checked });
+        await updateAccountConfiguration(0, { gitlabCE: event.target.checked });
     };
 
     const updateGitlabToken = async (event: any) => {
         setGitlabToken(event.target.value);
-        await updateConfiguration({ gitlabToken: event.target.value });
+        await updateAccountConfiguration(0, { gitlabToken: event.target.value });
         setIsGitlabTokenInLocalStorage(true);
     };
 
     const updateGitlabAddress = async (event: any) => {
         setGitlabAddress(event.target.value);
-        await updateConfiguration({ gitlabAddress: event.target.value });
+        await updateAccountConfiguration(0, { gitlabAddress: event.target.value });
         setIsGitlabAddressInLocalStorage(true);
     };
 
@@ -107,12 +107,12 @@ export const App = () => {
 
     const updateDraftInToReviewTab = async (event: any) => {
         setDraftInToReviewTab(event.target.checked);
-        await updateConfiguration({ draftInToReviewTab: event.target.checked });
+        await updateAccountConfiguration(0, { draftInToReviewTab: event.target.checked });
     };
 
     const updateProjectDirectoryPrefix = async (event: any) => {
         setProjectDirectoryPrefix(event.target.value);
-        await updateConfiguration({ projectDirectoryPrefix: event.target.value });
+        await updateAccountConfiguration(0, { projectDirectoryPrefix: event.target.value });
     };
 
     const testConnection = useCallback(() => {