Add if statements where merge requests are run

use-the-force · Oct 20, 2023 · 871affc · 871affc
1 parent 95487cf
commit 871affc
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 16 deletions.
diff --git a/board/frontend/lib/api/gitlab.js b/board/frontend/lib/api/gitlab.js
@@ -1,3 +1,6 @@
+import {get} from 'svelte/store';
+import {settings} 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;
 
@@ -76,6 +79,7 @@ export const getAllProjectsIssues = async (projectIds) => {
 };
 
 export const getProjectIssues = async (projectId) => {
+    const storeSettings = get(settings);
     const perPage = 100;
     const issues = [];
     let page = 1;
@@ -90,12 +94,13 @@ export const getProjectIssues = async (projectId) => {
                     }
                 });
             data = await res.json();
-            /*
-            for (const i of data) {
-                const mrs = await getProjectIssueMergeRequests(projectId, i.iid);
-                i.merge_requests = mrs;
+
+            if (storeSettings.general.mergeRequests) {
+                for (const i of data) {
+                    const mrs = await getProjectIssueMergeRequests(projectId, i.iid);
+                    i.merge_requests = mrs;
+                }
             }
-            */
             issues.push(...data);
         } catch {
         }

diff --git a/board/frontend/lib/components/board/UserBoard.svelte b/board/frontend/lib/components/board/UserBoard.svelte
@@ -2,10 +2,10 @@
     import IssuesColumn from "./IssuesColumn.svelte";
     import IssuesRow from "./IssuesRow.svelte";
     import {beforeUpdate, afterUpdate} from "svelte";
-    import { issues, activeProjectFilter, teamprojects, displaymode, teams } from "../../store";
-    import { getLabelNameById } from "../utils/labels";
-    import { getTeamColumns } from "../utils/columns";
-    import { getMemberAvatar } from "../utils/member";
+    import {settings, issues, activeProjectFilter, teamprojects, displaymode, teams} from "../../store";
+    import {getLabelNameById} from "../utils/labels";
+    import {getTeamColumns} from "../utils/columns";
+    import {getMemberAvatar} from "../utils/member";
 
     export let member;
     let isOpen = false;
@@ -41,12 +41,13 @@
                 if (i.assignee && i.assignee.id == member.id && col.gitlab_label_ids.filter(x => i.labels.includes(getLabelNameById(x))).length > 0) {
                     return i;
                 }
-                /*
-                // 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;
+
+                if ($settings.general.mergeRequests) {
+                    // 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;
+                    }
                 }
-                 */
             }
         });
     }
@@ -121,7 +122,7 @@
         margin: 0;
     }
 
-    .assignee-wrap:hover .assignee-name{
+    .assignee-wrap:hover .assignee-name {
         text-decoration: underline;
     }
 

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