From c7c328973b91e2ed6e1ea2e45334fbe946004cc6 Mon Sep 17 00:00:00 2001
From: olekkorob <korobchenko.olaksandr@gmail.com>
Date: Tue, 20 Dec 2022 16:40:50 +0200
Subject: [PATCH 1/4] chore: start working

---
 web/src/views/LocationReports.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web/src/views/LocationReports.vue b/web/src/views/LocationReports.vue
index 02ca8fbb1..152b626b2 100644
--- a/web/src/views/LocationReports.vue
+++ b/web/src/views/LocationReports.vue
@@ -75,6 +75,9 @@
             How to interpret these reports
           </router-link>
         </div>
+        <div class="d-flex align-items-center justify-content-center my-1">
+          <button class="btn btn-main-outline m-4">View World Report</button>
+        </div>
 
         <!-- <ReportLogos class="my-4"/> -->
       </div>

From 88f9e644e385db1721af25fa6e5447599b882af4 Mon Sep 17 00:00:00 2001
From: olekkorob <korobchenko.olaksandr@gmail.com>
Date: Thu, 22 Dec 2022 05:05:33 +0200
Subject: [PATCH 2/4] chore: add worldreport button

---
 web/src/api/genomics.js                       | 21 +++++++----
 web/src/components/CustomLocationForm.vue     |  7 ----
 .../components/LocationReportComponent.vue    |  7 ++--
 web/src/components/TypeaheadSelect.vue        | 36 +++++++++++++------
 web/src/js/get-location.js                    | 24 +++++++++----
 web/src/views/LocationReports.vue             | 18 +++++++++-
 6 files changed, 81 insertions(+), 32 deletions(-)

diff --git a/web/src/api/genomics.js b/web/src/api/genomics.js
index 384dca1df..ea40c6944 100644
--- a/web/src/api/genomics.js
+++ b/web/src/api/genomics.js
@@ -1929,10 +1929,12 @@ export const getBasicLocationReportData = (apiurl, location) => {
 
   const curatedLineages = filtered.map((d) => {
     let reportQuery = d.reportQuery;
-    reportQuery.loc = reportQuery.loc
-      ? uniq(reportQuery.loc.push(location))
-      : [location];
-    reportQuery.selected = location;
+    if (location !== 'Worldwide') {
+      reportQuery.loc = reportQuery.loc
+        ? uniq(reportQuery.loc.push(location))
+        : [location];
+      reportQuery.selected = location;
+    }
 
     return {
       label: d.label,
@@ -1954,9 +1956,16 @@ export const getBasicLocationReportData = (apiurl, location) => {
   const ofInterest = getVOCs();
 
   return forkJoin([
-    findLocationMetadata(apiurl, location),
+    findLocationMetadata(
+      apiurl,
+      location && location !== 'Worldwide' ? location : null,
+    ),
     getDateUpdated(apiurl),
-    getSequenceCount(apiurl, location, true),
+    getSequenceCount(
+      apiurl,
+      location && location !== 'Worldwide' ? location : null,
+      true,
+    ),
   ]).pipe(
     map(([location, dateUpdated, total]) => {
       return {
diff --git a/web/src/components/CustomLocationForm.vue b/web/src/components/CustomLocationForm.vue
index 38b21fc49..91283ffda 100644
--- a/web/src/components/CustomLocationForm.vue
+++ b/web/src/components/CustomLocationForm.vue
@@ -84,7 +84,6 @@
 </template>
 
 <script>
-import Vue from 'vue';
 import uniq from 'lodash/uniq';
 
 import { findLocation } from '@/api/genomics.js';
@@ -129,9 +128,6 @@ export default {
     this.queryLocation = findLocation;
   },
   methods: {
-    clearSelection() {
-      this.submitCount += 1;
-    },
     addVariant() {
       if (this.selectedLineage && this.selectedMutations.length) {
         this.variant.push({
@@ -167,9 +163,6 @@ export default {
 
       this.submitCount += 1;
     },
-    deleteVariant(idx, variantArr) {
-      variantArr.splice(idx, 1);
-    },
     submitQuery() {
       this.addVariant();
       const pango = uniq(this.pango.map((d) => d.qParam));
diff --git a/web/src/components/LocationReportComponent.vue b/web/src/components/LocationReportComponent.vue
index 55b6db8d8..1e8d58a37 100644
--- a/web/src/components/LocationReportComponent.vue
+++ b/web/src/components/LocationReportComponent.vue
@@ -961,6 +961,7 @@ import {
   findWHOLineage,
 } from '@/api/genomics.js';
 import { lazyLoad } from '@/js/lazy-load';
+import { worldLocation } from '@/js/get-location';
 
 import 'tippy.js/themes/material.css';
 
@@ -1435,12 +1436,14 @@ export default {
         this.curatedLineages = results.curated;
         this.voc = results.voc;
         this.voi = results.voi;
-        this.selectedLocation = results.location;
+        this.selectedLocation = results.location
+          ? results.location
+          : worldLocation;
       });
 
       this.reportSubscription = getLocationReportData(
         this.$genomicsurl,
-        this.loc,
+        this.loc && this.loc !== 'Worldwide' ? this.loc : null,
         this.muts,
         this.pango,
         this.otherThresh,
diff --git a/web/src/components/TypeaheadSelect.vue b/web/src/components/TypeaheadSelect.vue
index 000f2a65d..feb8e67a6 100644
--- a/web/src/components/TypeaheadSelect.vue
+++ b/web/src/components/TypeaheadSelect.vue
@@ -113,21 +113,37 @@ export default {
     },
     //When the user changes input
     change() {
+      console.log('########this.selected', this.selected);
       if (this.selected.length > 0) {
-        this.querySubscription = this.queryFunction(
-          this.apiUrl,
-          this.selected,
-        ).subscribe((results) => {
-          if (results.length > 10) {
-            this.matches = results.slice(0, 10);
-          } else {
-            this.matches = results;
-          }
+        if (this.selected.toLowerCase() === 'world') {
+          this.matches = [
+            {
+              admin_level: 1,
+              id: 'Worldwide',
+              label: 'World',
+              division: 'World',
+            },
+          ];
           if (this.isOpen === false) {
             this.isOpen = true;
             this.current = 0;
           }
-        });
+        } else {
+          this.querySubscription = this.queryFunction(
+            this.apiUrl,
+            this.selected,
+          ).subscribe((results) => {
+            if (results.length > 10) {
+              this.matches = results.slice(0, 10);
+            } else {
+              this.matches = results;
+            }
+            if (this.isOpen === false) {
+              this.isOpen = true;
+              this.current = 0;
+            }
+          });
+        }
       } else {
         this.matches = [];
         this.isOpen = false;
diff --git a/web/src/js/get-location.js b/web/src/js/get-location.js
index 2e235d3f2..c3b691e58 100644
--- a/web/src/js/get-location.js
+++ b/web/src/js/get-location.js
@@ -2,7 +2,7 @@ import { from, Observable, of } from 'rxjs';
 import axios from 'axios';
 import { catchError, pluck, map, mergeMap } from 'rxjs/operators';
 
-export const getLocation = (apiUrl) => {
+const getLocation = (apiUrl) => {
   return lookupLocation().pipe(
     mergeMap((loc) => processLocation(apiUrl, loc)),
     catchError((e) => {
@@ -45,11 +45,13 @@ const lookupLocation = () => {
 
 const processLocation = (apiUrl, location) => {
   const scalar = 0.05;
-  const url = `${apiUrl}query?q=mostRecent:true AND lat:[${(1 - scalar) *
-    location.coords.latitude} TO ${(1 + scalar) *
-    location.coords.latitude}] AND long:[${(1 + scalar) *
-    location.coords.longitude} TO ${(1 - scalar) *
-    location.coords.longitude}] &fields=location_id,lat,long&size=25`;
+  const url = `${apiUrl}query?q=mostRecent:true AND lat:[${
+    (1 - scalar) * location.coords.latitude
+  } TO ${(1 + scalar) * location.coords.latitude}] AND long:[${
+    (1 + scalar) * location.coords.longitude
+  } TO ${
+    (1 - scalar) * location.coords.longitude
+  }] &fields=location_id,lat,long&size=25`;
   return from(axios.get(url)).pipe(
     pluck('data', 'hits'),
     map((results) => {
@@ -78,3 +80,13 @@ const failedLocation = (location) => {
   console.log(`failed location: ${location}`);
   return of(null);
 };
+
+const worldLocation = {
+  admin_level: 0,
+  id: 'Worldwide',
+  label: 'World',
+  query_id: 'Worldwide',
+  who_region: 'World',
+};
+
+export { getLocation, worldLocation };
diff --git a/web/src/views/LocationReports.vue b/web/src/views/LocationReports.vue
index 152b626b2..85a1e15d4 100644
--- a/web/src/views/LocationReports.vue
+++ b/web/src/views/LocationReports.vue
@@ -76,7 +76,9 @@
           </router-link>
         </div>
         <div class="d-flex align-items-center justify-content-center my-1">
-          <button class="btn btn-main-outline m-4">View World Report</button>
+          <button class="btn btn-main-outline m-4" @click="toWorldReport">
+            View World Report
+          </button>
         </div>
 
         <!-- <ReportLogos class="my-4"/> -->
@@ -128,6 +130,20 @@ export default {
       this.curatedSubscription.unsubscribe();
     }
   },
+  methods: {
+    toWorldReport() {
+      this.$router.push({
+        name: 'LocationReport',
+        query: {
+          loc: 'Worldwide',
+          pango: [],
+          variant: [],
+          muts: [],
+          selected: [],
+        },
+      });
+    },
+  },
 };
 </script>
 

From e134bdcabf1c89c4eb2aba5f1b8821753d64c0bc Mon Sep 17 00:00:00 2001
From: olekkorob <korobchenko.olaksandr@gmail.com>
Date: Thu, 22 Dec 2022 05:49:44 +0200
Subject: [PATCH 3/4] update: enable geo distribution

---
 web/src/api/genomics.js                        | 13 +++----------
 web/src/components/LocationReportComponent.vue | 11 ++++++-----
 web/src/js/get-location.js                     |  2 +-
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/web/src/api/genomics.js b/web/src/api/genomics.js
index ea40c6944..6d975bfef 100644
--- a/web/src/api/genomics.js
+++ b/web/src/api/genomics.js
@@ -1929,7 +1929,7 @@ export const getBasicLocationReportData = (apiurl, location) => {
 
   const curatedLineages = filtered.map((d) => {
     let reportQuery = d.reportQuery;
-    if (location !== 'Worldwide') {
+    if (location) {
       reportQuery.loc = reportQuery.loc
         ? uniq(reportQuery.loc.push(location))
         : [location];
@@ -1956,16 +1956,9 @@ export const getBasicLocationReportData = (apiurl, location) => {
   const ofInterest = getVOCs();
 
   return forkJoin([
-    findLocationMetadata(
-      apiurl,
-      location && location !== 'Worldwide' ? location : null,
-    ),
+    findLocationMetadata(apiurl, location),
     getDateUpdated(apiurl),
-    getSequenceCount(
-      apiurl,
-      location && location !== 'Worldwide' ? location : null,
-      true,
-    ),
+    getSequenceCount(apiurl, location, true),
   ]).pipe(
     map(([location, dateUpdated, total]) => {
       return {
diff --git a/web/src/components/LocationReportComponent.vue b/web/src/components/LocationReportComponent.vue
index 1e8d58a37..0799c3e38 100644
--- a/web/src/components/LocationReportComponent.vue
+++ b/web/src/components/LocationReportComponent.vue
@@ -1428,7 +1428,7 @@ export default {
     setupReport() {
       this.basicSubscription = getBasicLocationReportData(
         this.$genomicsurl,
-        this.loc,
+        this.loc && this.loc !== 'Worldwide' ? this.loc : null,
       ).subscribe((results) => {
         this.dateUpdated = results.dateUpdated.dateUpdated;
         this.lastUpdated = results.dateUpdated.lastUpdated;
@@ -1452,9 +1452,10 @@ export default {
         this.recentWindow,
       ).subscribe((results) => {
         this.lineagesByDay = results.lineagesByDay;
-        this.noRecentData = !(
-          results.mostRecentLineages && results.mostRecentLineages.length
-        );
+        this.noRecentData =
+          this.loc !== 'Worldwide'
+            ? !(results.mostRecentLineages && results.mostRecentLineages.length)
+            : false;
 
         this.mostRecentLineages = results.mostRecentLineages;
         this.lineageDomain = results.lineageDomain;
@@ -1695,7 +1696,7 @@ export default {
     updateSequenceCount() {
       this.countSubscription = getSequenceCount(
         this.$genomicsurl,
-        this.loc,
+        this.loc && this.loc !== 'Worldwide' ? this.loc : null,
         false,
       ).subscribe((results) => {
         this.seqCounts = results;
diff --git a/web/src/js/get-location.js b/web/src/js/get-location.js
index c3b691e58..e4ace689e 100644
--- a/web/src/js/get-location.js
+++ b/web/src/js/get-location.js
@@ -84,7 +84,7 @@ const failedLocation = (location) => {
 const worldLocation = {
   admin_level: 0,
   id: 'Worldwide',
-  label: 'World',
+  label: 'Worldwide',
   query_id: 'Worldwide',
   who_region: 'World',
 };

From 7a00ddc34c2af4baa386067da15431e2c63587c8 Mon Sep 17 00:00:00 2001
From: olekkorob <korobchenko.olaksandr@gmail.com>
Date: Thu, 22 Dec 2022 06:08:27 +0200
Subject: [PATCH 4/4] chore: world location object

---
 web/src/components/TypeaheadSelect.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/web/src/components/TypeaheadSelect.vue b/web/src/components/TypeaheadSelect.vue
index feb8e67a6..ecf3cc8ca 100644
--- a/web/src/components/TypeaheadSelect.vue
+++ b/web/src/components/TypeaheadSelect.vue
@@ -39,6 +39,7 @@
 <script>
 // cribbed from https://medium.com/@fareez_ahamed/make-your-own-autocomplete-component-quickly-using-vue-js-21a642e8b140
 import debounce from 'lodash/debounce';
+import { worldLocation } from '@/js/get-location';
 export default {
   name: 'TypeaheadSelect',
   props: {
@@ -113,15 +114,12 @@ export default {
     },
     //When the user changes input
     change() {
-      console.log('########this.selected', this.selected);
       if (this.selected.length > 0) {
         if (this.selected.toLowerCase() === 'world') {
           this.matches = [
             {
-              admin_level: 1,
-              id: 'Worldwide',
+              ...worldLocation,
               label: 'World',
-              division: 'World',
             },
           ];
           if (this.isOpen === false) {