#40 persisted MR settings

use-the-force · Oct 22, 2023 · 684d2c3 · 684d2c3
1 parent 792911c
commit 684d2c3
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 22 deletions.
diff --git a/board/frontend/lib/api/gitlab.js b/board/frontend/lib/api/gitlab.js
@@ -1,5 +1,5 @@
 import { get } from "svelte/store";
-import { settings } from "../store.js";
+import { settingsMergeRequests } from "../store.js";
 
 const GITLAB_API_URL = import.meta.env.VITE_GITLAB_API_URL;
 const GITLAB_API_TOKEN = import.meta.env.VITE_GITLAB_API_TOKEN;
@@ -80,7 +80,7 @@ export const getAllProjectsIssues = async (projectIds) => {
 };
 
 export const getProjectIssues = async (projectId) => {
-    const storeSettings = get(settings);
+    const storeSettingsMergeRequests = get(settingsMergeRequests);
     const perPage = 100;
     const issues = [];
     let page = 1;
@@ -101,7 +101,7 @@ export const getProjectIssues = async (projectId) => {
             for (const i of data) {
                 i.merge_requests = [];
 
-                if (storeSettings.general.mergeRequests) {
+                if (storeSettingsMergeRequests) {
                     i.merge_requests = await getProjectIssueMergeRequests(projectId, i.iid);
                 }
             }

diff --git a/board/frontend/lib/components/board/UserBoard.svelte b/board/frontend/lib/components/board/UserBoard.svelte
@@ -2,7 +2,7 @@
     import IssuesColumn from "./IssuesColumn.svelte";
     import IssuesRow from "./IssuesRow.svelte";
     import { beforeUpdate, afterUpdate } from "svelte";
-    import { settings, issues, activeProjectFilter, teamprojects, displaymode, teams } from "../../store";
+    import { settingsMergeRequests, issues, activeProjectFilter, teamprojects, displaymode, teams } from "../../store";
     import { getLabelNameById } from "../utils/labels";
     import { getTeamColumns } from "../utils/columns";
     import { getMemberAvatar } from "../utils/member";
@@ -42,7 +42,7 @@
                     return i;
                 }
 
-                if ($settings.general.mergeRequests) {
+                if ($settingsMergeRequests) {
                     // Issues by merge requests
                     if (i.merge_requests.filter(mr => member.id && mr.assignee && mr.assignee.id == member.id).length > 0 && col.gitlab_label_ids.filter(x => i.labels.includes(getLabelNameById(x))).length > 0) {
                         return i;

diff --git a/board/frontend/lib/components/pages/Home.svelte b/board/frontend/lib/components/pages/Home.svelte
@@ -1,7 +1,7 @@
 <script>
     import { onMount } from "svelte";
     import {
-        settings,
+        settingsMergeRequests,
         projects,
         teamprojects,
         members,
@@ -97,7 +97,7 @@
         $members = await getAllProjectsMembers($projects.map(({id}) => id));
         $members = [...$members, {name: "No Assignee", id: null}].sort((a, b) => a.name.localeCompare(b.name));
 
-        if ($settings.general.mergeRequests) {
+        if ($settingsMergeRequests) {
             $loadingBoardInfo = "Fetching issues and pull requests...";
         } else {
             $loadingBoardInfo = "Fetching issues...";

diff --git a/board/frontend/lib/components/pages/Settings.svelte b/board/frontend/lib/components/pages/Settings.svelte
@@ -5,12 +5,10 @@
     } from "sveltestrap";
     import Navbar from "../layout/Navbar.svelte";
     import Footer from "../layout/Footer.svelte";
-    import {settings} from "../../store.js";
+    import {settingsMergeRequests} from "../../store.js";
 
     const handleChangeSettingGeneralMergeRequests = async (e) => {
-        console.log($settings);
-        $settings.general.mergeRequests = e.target.checked;
-        console.log($settings);
+        $settingsMergeRequests = e.target.checked;
     }
 </script>
 
@@ -40,7 +38,7 @@
                         <div class="col-auto">
                             <input
                                     type="checkbox"
-                                    bind:checked={$settings.general.mergeRequests}
+                                    checked={$settingsMergeRequests == "true"}
                                     on:change={handleChangeSettingGeneralMergeRequests}/>
                         </div>
                     </div>

diff --git a/board/frontend/lib/store.js b/board/frontend/lib/store.js
@@ -3,11 +3,11 @@ import { writable, readable } from "svelte/store";
 export const loadingBoardInfo = writable("Loading...");
 export let authorized = writable(false);
 
-export const settings = writable({
-    general: {
-        mergeRequests: false
-    }
-});
+const storedSettingsMergeRequests = localStorage.getItem("settingsMergeRequests")
+export const settingsMergeRequests = writable(storedSettingsMergeRequests);
+settingsMergeRequests.subscribe(val => {
+    localStorage.setItem("settingsMergeRequests", val);
+})
 
 export const projects = writable([]);
 export const teamprojects = writable({});
@@ -33,9 +33,4 @@ export const setAuthorized = (value) => {
     authorized = value;
 };
 
-export const setSettingGeneralMergeRequests = (value) => {
-    console.log(settings);
-    settings.general.mergeRequests = value;
-};
-
 export const displaymode = writable("kanban");