From a99b8e0479c58b5e0533ff4edd872a7fd2f30da4 Mon Sep 17 00:00:00 2001
From: Christopher Langton <chris@langton.cloud>
Date: Sun, 24 Nov 2024 03:30:10 +1100
Subject: [PATCH] feat: started PR fix

---
 src/components/Finding.vue |  90 ++++++++++++++++++++++-
 src/pages/IssuePage.vue    | 100 ++++++++++++-------------
 src/pages/NewIssues.vue    | 145 ++++++++++++++++++++-----------------
 3 files changed, 217 insertions(+), 118 deletions(-)

diff --git a/src/components/Finding.vue b/src/components/Finding.vue
index 6d68748..1f680b4 100644
--- a/src/components/Finding.vue
+++ b/src/components/Finding.vue
@@ -14,12 +14,14 @@ import VCodeBlock from '@wdns/vue-code-block';
 import { onMounted } from 'vue';
 import { useTheme } from 'vuetify';
 
-const { meta_x, meta_v } = useMagicKeys()
+const { meta_o, meta_c, meta_f } = useMagicKeys()
 onMounted(() => init())
 const emit = defineEmits(["vector-updated"]);
 
 const { global } = useTheme()
+const fixDialog = ref(false)
 const triageDialog = ref(false)
+const branchChoice = ref('')
 const response = ref('')
 const justification = ref('')
 const justificationText = ref('')
@@ -35,6 +37,10 @@ const props = defineProps({
         type: Object,
         required: true,
     },
+    branches: {
+        type: Array,
+        required: true,
+    },
     currentTriage: {
         type: Object,
         required: true,
@@ -618,8 +624,9 @@ function saveVector() {
     cvssDialog.value = false
 }
 
-watch([meta_x], () => { triageDialog.value = true })
-watch([meta_v], () => { cvssDialog.value = true })
+watch([meta_f], () => { fixDialog.value = true })
+watch([meta_o], () => { triageDialog.value = true })
+watch([meta_c], () => { cvssDialog.value = true })
 watch([
     activeTab,
     v31MetricsAV,
@@ -722,6 +729,79 @@ watch([
                     </VChip>
                 </div>
                 <div class="d-flex align-end">
+                    <VDialog
+                        v-if="props.branches.length"
+                        v-model="fixDialog"
+                        max-width="600"
+                    >
+                        <template v-slot:activator="{ props: activatorProps }">
+                            <VBtn
+                                class="me-2 text-none font-weight-regular"
+                                variant="outlined"
+                                v-bind="activatorProps"
+                            >
+                                Fix
+                                <VChip
+                                    class="ms-1"
+                                    variant="outlined"
+                                    color="#e4e4e4"
+                                >
+                                    &#8984;F
+                                </VChip>
+                            </VBtn>
+                        </template>
+
+                        <VCard>
+                            <VCardText>
+                                <!-- Analysis Form -->
+                                <VRow dense>
+                                    <VCol
+                                        cols="12"
+                                        md="6"
+                                    >
+                                        <VSelect
+                                            v-model="branchChoice"
+                                            :items="branches"
+                                            item-title="text"
+                                            item-value="value"
+                                            label="Branch"
+                                            required
+                                        />
+                                    </VCol>
+
+                                    <VCol
+                                        cols="12"
+                                        md="6"
+                                    >
+                                        PR details
+                                    </VCol>
+
+                                    <VCol cols="12">
+                                        Repo details
+                                    </VCol>
+                                </VRow>
+                            </VCardText>
+
+                            <VDivider />
+                            <VSpacer />
+
+                            <VCardActions>
+                                <VSpacer />
+                                <VBtn
+                                    text="Close"
+                                    variant="plain"
+                                    @click="fixDialog = false"
+                                ></VBtn>
+                                <VBtn
+                                    color="primary"
+                                    variant="plain"
+                                    text="Create PR"
+                                    @click="$emit('click:createPR', branchChoice); fixDialog = false"
+                                >
+                                </VBtn>
+                            </VCardActions>
+                        </VCard>
+                    </VDialog>
                     <VDialog
                         v-model="triageDialog"
                         max-width="600"
@@ -729,15 +809,17 @@ watch([
                         <template v-slot:activator="{ props: activatorProps }">
                             <VBtn
                                 class="text-none font-weight-regular"
+                                color="info"
                                 variant="outlined"
                                 v-bind="activatorProps"
                             >
                                 Triage
                                 <VChip
+                                    class="ms-1"
                                     variant="outlined"
                                     color="#e4e4e4"
                                 >
-                                    &#8984;X
+                                    &#8984;O
                                 </VChip>
                             </VBtn>
                         </template>
diff --git a/src/pages/IssuePage.vue b/src/pages/IssuePage.vue
index 107f915..5fb0ae7 100644
--- a/src/pages/IssuePage.vue
+++ b/src/pages/IssuePage.vue
@@ -19,6 +19,7 @@ const initialState = {
     info: "",
     loading: false,
     finding: null,
+    branches: [],
     currentTriage: null,
 }
 
@@ -47,6 +48,7 @@ class Controller {
                     })
                 }
                 state.finding = data.finding
+                state.branches = [...new Set([data.finding?.spdx?.repo?.defaultBranch, data.finding?.spdx?.repo?.defaultBranch].filter(i => !!i))]
                 state.currentTriage = data.finding.triage.sort((a, b) =>
                     a.lastObserved - b.lastObserved
                 ).pop()
@@ -152,58 +154,57 @@ onBeforeRouteUpdate(async (to, from) => {
 
 <template>
     <VContainer class="d-flex justify-space-between align-center">
-        <VTabs
-            v-model="tab"
-            align-tabs="start"
-            stacked
-            grow
-            @update:model-value="onTabChange"
-        >
-            <VTab value="issue">
-                <VIcon
-                    size="large"
-                    icon="eos-icons:critical-bug-outlined"
-                ></VIcon>
-                <span class="mt-2">
-                    Issue Details
-                </span>
-            </VTab>
-
-            <VTab value="dependencies">
-                <VIcon
-                    size="large"
-                    icon="tabler:packages"
-                ></VIcon>
-                <span class="mt-2">
-                    Dependency Graph
-                </span>
-            </VTab>
+        <VRow dense>
+            <VCol cols="10">
+                <VTabs
+                    v-model="tab"
+                    align-tabs="start"
+                    stacked
+                    grow
+                    @update:model-value="onTabChange"
+                >
+                    <VTab value="issue">
+                        <VIcon
+                            size="large"
+                            icon="eos-icons:critical-bug-outlined"
+                        ></VIcon>
+                        <span class="mt-2">
+                            Issue Details
+                        </span>
+                    </VTab>
 
-            <VTab value="artifacts">
-                <VIcon
-                    size="large"
-                    icon="eos-icons:file-system-outlined"
-                ></VIcon>
-                <span class="mt-2">
-                    Artifacts
-                </span>
-            </VTab>
+                    <VTab value="dependencies">
+                        <VIcon
+                            size="large"
+                            icon="tabler:packages"
+                        ></VIcon>
+                        <span class="mt-2">
+                            Dependency Graph
+                        </span>
+                    </VTab>
 
-            <VTab value="related">
-                <VIcon
-                    size="large"
-                    icon="fluent-mdl2:relationship"
-                ></VIcon>
-                <span class="mt-2">
-                    Related
-                </span>
-            </VTab>
-        </VTabs>
+                    <VTab value="artifacts">
+                        <VIcon
+                            size="large"
+                            icon="eos-icons:file-system-outlined"
+                        ></VIcon>
+                        <span class="mt-2">
+                            Artifacts
+                        </span>
+                    </VTab>
 
-        <div class="d-flex align-end">
-            <span class="mr-4 text-h5">
-            </span>
-        </div>
+                    <VTab value="related">
+                        <VIcon
+                            size="large"
+                            icon="fluent-mdl2:relationship"
+                        ></VIcon>
+                        <span class="mt-2">
+                            Related
+                        </span>
+                    </VTab>
+                </VTabs>
+            </VCol>
+        </VRow>
     </VContainer>
 
     <VTabsWindow v-model="tab">
@@ -257,6 +258,7 @@ onBeforeRouteUpdate(async (to, from) => {
                     <Finding
                         v-if="state.finding"
                         :finding="state.finding"
+                        :branches="state.branches"
                         :current-triage="state.currentTriage"
                         @click:saveTriage="controller.handleTriage"
                         @vectorUpdated="controller.vectorUpdated"
diff --git a/src/pages/NewIssues.vue b/src/pages/NewIssues.vue
index a49dc9c..c40299c 100644
--- a/src/pages/NewIssues.vue
+++ b/src/pages/NewIssues.vue
@@ -18,6 +18,7 @@ const initialState = {
     info: "",
     loading: false,
     finding: null,
+    branches: [],
     triageLoaders: {},
     currentTriage: null,
     queueTotal: 0,
@@ -57,6 +58,7 @@ class Controller {
                     })
                 }
                 state.finding = data.finding
+                state.branches = [...new Set([data.finding?.spdx?.repo?.defaultBranch, data.finding?.spdx?.repo?.defaultBranch].filter(i => !!i))]
                 state.queueTotal = data.findingCount
                 state.currentTriage = data.finding.triage.sort((a, b) =>
                     a.lastObserved - b.lastObserved
@@ -154,78 +156,90 @@ onMounted(() => {
 
 <template>
     <VContainer class="d-flex justify-space-between align-center">
-        <VTabs
-            v-model="tab"
-            align-tabs="start"
-            stacked
-            grow
-            @update:model-value="onTabChange"
-        >
-            <VTab value="issue">
-                <VIcon
-                    size="large"
-                    icon="eos-icons:critical-bug-outlined"
-                ></VIcon>
-                <span class="mt-2">
-                    Issue Details
-                </span>
-            </VTab>
-
-            <VTab value="dependencies">
-                <VIcon
-                    size="large"
-                    icon="tabler:packages"
-                ></VIcon>
-                <span class="mt-2">
-                    Dependency Graph
-                </span>
-            </VTab>
+        <VRow dense>
+            <VCol cols="10">
+                <VTabs
+                    v-model="tab"
+                    align-tabs="start"
+                    stacked
+                    grow
+                    @update:model-value="onTabChange"
+                >
+                    <VTab value="issue">
+                        <VIcon
+                            size="large"
+                            icon="eos-icons:critical-bug-outlined"
+                        ></VIcon>
+                        <span class="mt-2">
+                            Issue Details
+                        </span>
+                    </VTab>
 
-            <VTab value="artifacts">
-                <VIcon
-                    size="large"
-                    icon="eos-icons:file-system-outlined"
-                ></VIcon>
-                <span class="mt-2">
-                    Artifacts
-                </span>
-            </VTab>
+                    <VTab value="dependencies">
+                        <VIcon
+                            size="large"
+                            icon="tabler:packages"
+                        ></VIcon>
+                        <span class="mt-2">
+                            Dependency Graph
+                        </span>
+                    </VTab>
 
-            <VTab value="related">
-                <VIcon
-                    size="large"
-                    icon="fluent-mdl2:relationship"
-                ></VIcon>
-                <span class="mt-2">
-                    Related
-                </span>
-            </VTab>
-        </VTabs>
+                    <VTab value="artifacts">
+                        <VIcon
+                            size="large"
+                            icon="eos-icons:file-system-outlined"
+                        ></VIcon>
+                        <span class="mt-2">
+                            Artifacts
+                        </span>
+                    </VTab>
 
-        <div
-            class="d-flex align-end"
-            v-if="state.queueTotal"
-        >
-            <VTextField
-                v-model="queueProgress"
-                density="compact"
-                variant="outlined"
-                flat
-                type="number"
-                :min="1"
-                :max="state.queueTotal"
-                class="me-2"
-                @change="handleSkip"
-            />
-            <span class="mr-4 text-h5">
-                of {{ state.queueTotal }}
-            </span>
-        </div>
+                    <VTab value="related">
+                        <VIcon
+                            size="large"
+                            icon="fluent-mdl2:relationship"
+                        ></VIcon>
+                        <span class="mt-2">
+                            Related
+                        </span>
+                    </VTab>
+                </VTabs>
+            </VCol>
+            <VCol cols="2">
+                <VRow
+                    class="d-flex justify-center align-center"
+                    dense
+                    v-if="state.queueTotal"
+                >
+                    <VCol cols="6">
+                        <VTextField
+                            v-model="queueProgress"
+                            density="compact"
+                            variant="outlined"
+                            flat
+                            autofocus
+                            focused
+                            reverse
+                            type="number"
+                            :min="1"
+                            :max="state.queueTotal"
+                            class="me-2 text-end text-h5"
+                            @change="handleSkip"
+                        />
+                    </VCol>
+                    <VCol cols="6">
+                        <span class="text-h5">
+                            of {{ state.queueTotal }}
+                        </span>
+                    </VCol>
+                </VRow>
+            </VCol>
+        </VRow>
     </VContainer>
 
     <VTabsWindow v-model="tab">
         <VTabsWindowItem value="issue">
-
             <VCard>
                 <VProgressLinear
                     :active="state.loading"
@@ -275,6 +289,7 @@ onMounted(() => {
                     <Finding
                         v-if="state.finding"
                         :finding="state.finding"
+                        :branches="state.branches"
                         :current-triage="state.currentTriage"
                         @click:saveTriage="controller.handleTriage"
                         @vectorUpdated="controller.vectorUpdated"