From 99b829ecefa382c7f523509d9128a23656c45f22 Mon Sep 17 00:00:00 2001
From: Marius <94525580+Marius-Patrowl@users.noreply.github.com>
Date: Mon, 27 Dec 2021 16:10:21 +0100
Subject: [PATCH 1/6] Update Requirements.txt

---
 backend_app/requirements.macos.txt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/backend_app/requirements.macos.txt b/backend_app/requirements.macos.txt
index b67d2e97..ce32505c 100644
--- a/backend_app/requirements.macos.txt
+++ b/backend_app/requirements.macos.txt
@@ -1,7 +1,7 @@
 aiohttp==3.8.1
 amqp==2.5.2
 asgiref==3.3.4
-async-timeout==3.0.1
+async-timeout==4.0.1
 attrs==19.3.0
 billiard==3.6.1.0
 boto3==1.16.23
@@ -46,8 +46,7 @@ oauthlib==3.1.0
 openapi-codec==1.3.2
 ordered-set==3.1.1
 packaging==20.3
-psycopg2==2.8.4
-psycopg2-binary==2.8.6
+psycopg2==2.9.0
 PyJWT==1.7.1
 pymongo==3.10.1
 pyparsing==2.4.6

From 861d15dbd71b7f8398b991a876ccd940336ad4fb Mon Sep 17 00:00:00 2001
From: Marius <94525580+Marius-Patrowl@users.noreply.github.com>
Date: Mon, 27 Dec 2021 16:11:16 +0100
Subject: [PATCH 2/6] Update requirements

---
 backend_app/requirements.macos.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend_app/requirements.macos.txt b/backend_app/requirements.macos.txt
index ce32505c..b869ccd4 100644
--- a/backend_app/requirements.macos.txt
+++ b/backend_app/requirements.macos.txt
@@ -70,4 +70,4 @@ uritemplate==3.0.1
 urllib3==1.26.5
 vine==1.3.0
 yarl==1.4.2
-zipp==0.6.0
+zipp==0.6.0
\ No newline at end of file

From c2ae7a87c0b25d4937a1b9b30307a1d231fef0fc Mon Sep 17 00:00:00 2001
From: Marius <94525580+Marius-Patrowl@users.noreply.github.com>
Date: Mon, 27 Dec 2021 16:51:48 +0100
Subject: [PATCH 3/6] Remove Monitored from options

---
 frontend/src/components/pages/AdvancedSearch.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/pages/AdvancedSearch.vue b/frontend/src/components/pages/AdvancedSearch.vue
index e51340ff..d059f4cb 100644
--- a/frontend/src/components/pages/AdvancedSearch.vue
+++ b/frontend/src/components/pages/AdvancedSearch.vue
@@ -181,7 +181,7 @@ export default {
         { name: 'CVSSv3', attribute: 'cvss3', criteria: 'numeric'},
         { name: 'CVSSv3 Vector', attribute: 'cvss3_vector', criteria: 'text'},
         // { name: 'Exploit count', attribute: 'exploit_count', criteria: 'numeric'},
-        { name: 'Is monitored ?', attribute: 'monitored', criteria: 'bool'},
+        // { name: 'Is monitored ?', attribute: 'monitored', criteria: 'bool'},
         { name: 'Is exploitable ?', attribute: 'is_exploitable', criteria: 'bool'},
         { name: 'Is confirmed ?', attribute: 'is_confirmed', criteria: 'bool'},
         { name: 'Is in the News ?', attribute: 'is_in_the_news', criteria: 'bool'},

From 46278ba9f40945d35b5134c12b0d30ecc45e8671 Mon Sep 17 00:00:00 2001
From: Marius <94525580+Marius-Patrowl@users.noreply.github.com>
Date: Mon, 27 Dec 2021 17:47:46 +0100
Subject: [PATCH 4/6] Add a quick filter button on monitored assets #100

---
 frontend/src/components/pages/Vulns.vue | 34 +++++++++++++++++++++----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/pages/Vulns.vue b/frontend/src/components/pages/Vulns.vue
index edf757c9..cc272587 100644
--- a/frontend/src/components/pages/Vulns.vue
+++ b/frontend/src/components/pages/Vulns.vue
@@ -5,7 +5,7 @@
         <!-- Vulnerabilities -->
         <v-container>
           <v-row>
-            <v-col class="pa-2" md="auto" >
+            <v-col class="pa-2" md="4" >
                 Vulnerabilities<br/>
             <!-- </v-col>
             <v-col class="pa-2"> -->
@@ -19,7 +19,7 @@
                 small label outlined :color="getBoolColor(this.show_last_week)"
                 @click="toggleShowLastWeek()">Last Week</v-chip>
             </v-col>
-            <v-col class="pa-2" md="6">
+            <v-col class="pa-2" md="4">
               <v-text-field
                 class="pt-0"
                 v-model="search"
@@ -29,7 +29,9 @@
                 hide-details
               ></v-text-field>
             </v-col>
-            <v-col class="pa-2" md="2">
+          </v-row>
+          <v-row>
+            <v-col class="pa-2" md="4">
               <v-slider
                 v-model="search_slider_min"
                 label="Min Score"
@@ -52,6 +54,14 @@
                 hide-details
               ></v-slider>
             </v-col>
+            <v-col class="pa-2" md="4">
+              <v-switch
+                v-model="show_monitored"
+                label="Monitored"
+                color="deep-orange"
+              >
+              </v-switch>
+            </v-col>
           </v-row>
           <v-row v-if="showAdvancedFilters">
             <v-col cols="12">
@@ -204,7 +214,7 @@
 <script>
 import Colors from "../../common/colors";
 import Users from "../../common/users";
-import FirstSteps from '@/components/pages/FirstSteps.vue';
+// import FirstSteps from '@/components/pages/FirstSteps.vue';
 import VulnAddEdit from '@/components/pages/VulnAddEdit.vue';
 import AdvancedSearch from '@/components/pages/AdvancedSearch.vue';
 import _ from 'lodash';
@@ -227,6 +237,7 @@ export default {
     show_all: true,
     show_last_day: false,
     show_last_week: false,
+    show_monitored: false, 
     options: {},
     headers: [
       { text: 'Score', value: 'score', align: 'center', width: "10%" },
@@ -277,6 +288,12 @@ export default {
       },
       deep: true
     },
+    show_monitored: {
+      handler() {
+        this.getDataFromApi();
+      }, 
+      deep: true
+    }
   },
   methods: {
     getDataFromApi(extra_filters, page_id) {
@@ -308,6 +325,7 @@ export default {
     },
     updateAdvancedSearchFilters(filters){
       this.getDataFromApi(filters, 1);
+      console.log(filters)
     },
     getVulns(page, itemsPerPage, sortBy, sortDesc, extra_filters) {
       let sorted_by = '';
@@ -330,7 +348,13 @@ export default {
         extra_filters = "&score__gte="+this.search_slider_min+"&score__lte="+this.search_slider_max
       }
 
-      this.$api.get('/api/vulns/?limit='+itemsPerPage+'&page='+page+'&search='+this.search+'&'+sorted_by+filter_by_date+extra_filters).then(res => {
+      let url = '/api/vulns/?limit='+itemsPerPage+'&page='+page+'&search='+this.search+'&'+sorted_by+filter_by_date+extra_filters
+
+      if (this.show_monitored === true) {
+        url = url + "&monitored=true"
+      }
+
+      this.$api.get(url).then(res => {
         this.vulns = res.data;
         this.loading = false;
         return this.vulns;

From 21121b67e04e87a4c375fe1ba8e9ea4c2f1c28e3 Mon Sep 17 00:00:00 2001
From: MaKyOtOx <nicolas.mattiocco@patrowl.io>
Date: Wed, 12 Jan 2022 11:00:38 +0100
Subject: [PATCH 5/6] minor refact

---
 frontend/src/components/pages/Vulns.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/pages/Vulns.vue b/frontend/src/components/pages/Vulns.vue
index cc272587..9ff620df 100644
--- a/frontend/src/components/pages/Vulns.vue
+++ b/frontend/src/components/pages/Vulns.vue
@@ -5,7 +5,7 @@
         <!-- Vulnerabilities -->
         <v-container>
           <v-row>
-            <v-col class="pa-2" md="4" >
+            <v-col class="pa-2" md="auto" >
                 Vulnerabilities<br/>
             <!-- </v-col>
             <v-col class="pa-2"> -->
@@ -237,7 +237,7 @@ export default {
     show_all: true,
     show_last_day: false,
     show_last_week: false,
-    show_monitored: false, 
+    show_monitored: false,
     options: {},
     headers: [
       { text: 'Score', value: 'score', align: 'center', width: "10%" },
@@ -291,7 +291,7 @@ export default {
     show_monitored: {
       handler() {
         this.getDataFromApi();
-      }, 
+      },
       deep: true
     }
   },

From 3e5792def794639d7a8cfd8da4e65f727ef040cf Mon Sep 17 00:00:00 2001
From: MaKyOtOx <nicolas.mattiocco@patrowl.io>
Date: Wed, 12 Jan 2022 11:12:42 +0100
Subject: [PATCH 6/6] fix monitored button

---
 frontend/src/components/pages/Vulns.vue | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/frontend/src/components/pages/Vulns.vue b/frontend/src/components/pages/Vulns.vue
index d102f429..0a15d5f2 100644
--- a/frontend/src/components/pages/Vulns.vue
+++ b/frontend/src/components/pages/Vulns.vue
@@ -7,8 +7,6 @@
           <v-row>
             <v-col class="pa-2" md="auto" >
                 Vulnerabilities<br/>
-            <!-- </v-col>
-            <v-col class="pa-2"> -->
               <v-chip
                 small label outlined :color="getBoolColor(this.show_all)"
                 @click="toggleShowAll()">All</v-chip>&nbsp;
@@ -17,7 +15,10 @@
                 @click="toggleShowLastDay()">Last 24h</v-chip>&nbsp;
               <v-chip
                 small label outlined :color="getBoolColor(this.show_last_week)"
-                @click="toggleShowLastWeek()">Last Week</v-chip>
+                @click="toggleShowLastWeek()">Last Week</v-chip>&nbsp;
+              <v-chip
+                small label outlined :color="this.show_monitored?'deep-orange':'grey'"
+                @click="toggleMonitored()">Monitored</v-chip>
             </v-col>
             <v-col class="pa-2" md="4">
               <v-text-field
@@ -29,9 +30,7 @@
                 hide-details
               ></v-text-field>
             </v-col>
-          </v-row>
-          <v-row>
-            <v-col class="pa-2" md="4">
+            <v-col class="pa-2" md="3">
               <v-slider
                 v-model="search_slider_min"
                 label="Min Score"
@@ -54,14 +53,6 @@
                 hide-details
               ></v-slider>
             </v-col>
-            <v-col class="pa-2" md="4">
-              <v-switch
-                v-model="show_monitored"
-                label="Monitored"
-                color="deep-orange"
-              >
-              </v-switch>
-            </v-col>
           </v-row>
           <v-row v-if="showAdvancedFilters">
             <v-col cols="12">
@@ -418,6 +409,9 @@ export default {
         this.show_last_day = false;
       }
     },
+    toggleMonitored() {
+      this.show_monitored = !this.show_monitored;
+    },
     showManageMetadataButtons(){
       let p = JSON.parse(this.getUserProfile());
       if (p != null && 'manage_metadata' in p){