Revert "10480 change result amount logic (#10557)" (#10605)

This reverts commit 4649d81.

Author: Tim Schultz

app/app/settings.py

@@ -897,7 +897,6 @@ def callback(request):
 
 
 ELASTIC_SEARCH_URL = env('ELASTIC_SEARCH_URL', default='')
-ACTIVE_ELASTIC_INDEX = env('ACTIVE_ELASTIC_INDEX', default='search-index-1')
 
 account_sid = env('TWILIO_ACCOUNT_SID', default='')
 auth_token = env('TWILIO_AUTH_TOKEN', default='')

app/assets/v2/js/search.js

@@ -4,21 +4,12 @@ if (document.getElementById('gc-search')) {
     el: '#gc-search',
     data: {
       term: '',
-      results: [],
+      results: {},
       page: 0,
       total: 0,
       perPage: 100,
       searchTerm: '',
       isLoading: false,
-      isTypeSearchLoading: false,
-      tabPageCount: {
-        Profile: 0,
-        Bounty: 0,
-        Grant: 0,
-        Kudos: 0,
-        Quest: 0,
-        Page: 0
-      },
       isDirty: false,
       currentTab: 0,
       source_types: [
@@ -48,19 +39,8 @@ if (document.getElementById('gc-search')) {
       this.search();
     },
     computed: {
-      sourceType() {
-        return this.source_types[this.currentTab];
-      },
-      currentTotal() {
-        return this.totals[this.sourceType];
-      },
-      currentPage() {
-        const page = this.currentTab > 0 ? this.tabPageCount[this.sourceType] : this.page;
-
-        return page;
-      },
       hasMoreResults() {
-        return this.currentPage !== false && this.totals[this.sourceType] && this.page * this.perPage < this.totals[this.sourceType];
+        return this.page !== false && this.total && this.page * this.perPage < this.total;
       }
     },
     methods: {
@@ -69,15 +49,8 @@ if (document.getElementById('gc-search')) {
           $('.has-search input[type=text]').focus();
         }, 100);
       },
-      loadMoreResults: function() {
-        if (this.sourceType === 'All') {
-          this.search();
-          return;
-        }
-        this.search_type(this.sourceType);
-      },
       clear: function() {
-        this.results = [];
+        this.results = {};
         this.page = 0;
         this.total = 0;
       },
@@ -94,58 +67,6 @@ if (document.getElementById('gc-search')) {
           this.fetchController = new AbortController();
         }
       },
-      change_tab: function(index, source_type) {
-        const vm = this;
-
-        vm.currentTab = index;
-
-        if (index > 0) {
-          vm.tabPageCount[source_type] = 0;
-          vm.search_type(source_type);
-        } else {
-          vm.page = 0;
-          vm.search();
-        }
-      },
-      search_type: async function(type) {
-        const vm = this;
-        // use signal to kill fetch req
-        const { signal } = vm.fetchController;
-
-
-        if (vm.isTypeSearchLoading) {
-          return;
-        }
-
-        if (vm.term.length >= 3) {
-          vm.isTypeSearchLoading = true;
-          fetch(
-            `/api/v0.1/search/?term=${vm.term}&page=${vm.tabPageCount[type]}&type=${type}`,
-            {
-              method: 'GET',
-              signal: signal
-            }
-          ).then((res) => {
-            res.json().then((response) => {
-              if (vm.tabPageCount[type] === 0) {
-                vm.results = response.results;
-              } else {
-                vm.results.push(...response.results);
-              }
-              vm.isTypeSearchLoading = false;
-              vm.tabPageCount[type] = response.page;
-            });
-          }).catch(() => {
-            if (document.current_search == thisDate) {
-              // clear the results
-              vm.clear();
-              // clear loading states
-              vm.isTypeSearchLoading = false;
-            }
-          });
-        }
-
-      },
       search: async function(e) {
         const vm = this;
         // use Date to enforce
@@ -177,13 +98,9 @@ if (document.getElementById('gc-search')) {
           ).then((res) => {
             if (document.current_search == thisDate) {
               res.json().then((response) => {
-                if (vm.page === 0) {
-                  vm.results = response.results;
-                } else {
-                  vm.results.push(...response.results);
-                }
+                vm.results = groupBySource(response.results, vm.term !== vm.searchTerm ? {} : vm.results);
                 vm.searchTerm = vm.term;
-                vm.totals = response.totals;
+                vm.total = response.total;
                 vm.page = response.page;
                 vm.perPage = response.perPage;
                 // clear loading states
@@ -210,6 +127,18 @@ if (document.getElementById('gc-search')) {
 }
 document.current_search = new Date();
 
+const groupBySource = (results, prev_results) => {
+  let grouped_result = prev_results || {};
+
+  results.map(result => {
+    const source_type = result.source_type;
+
+    grouped_result['All'] ? grouped_result['All'].push(result) : grouped_result['All'] = [result];
+    grouped_result[source_type] ? grouped_result[source_type].push(result) : grouped_result[source_type] = [result];
+  });
+  return grouped_result;
+};
+
 $(document).on('click', '.gc-search .dropdown-menu', function(event) {
   event.stopPropagation();
 });

app/assets/v2/scss/search.scss

@@ -22,7 +22,7 @@
 }
 
 .gc-search-box.dropdown-menu {
-  width: 540px;
+  width: 520px;
   background-color: #ffffff;
   border-radius: 4px;
   top: 2.3rem;

app/dashboard/templates/shared/search.html

@@ -40,20 +40,20 @@
         Click 'Go' to Search.
       </p>
     </template>
-    <template v-else-if="results.length">
+    <template v-else-if="Object.keys(results).length">
       <ul class="nav nav-tabs mt-1 gc-search-nav d-flex" role="tablist">
         <li class="nav-item flex-grow-1 text-center" v-for='(source_type, index) in source_types' :key="index">
-          <a class="nav-link nav-line gc-search-tab__title px-1" @click="change_tab(index, source_type)" :class="{active: currentTab === index}" v-bind:href="'#' + source_type" data-toggle="tab">[[ labels[source_type] ]]
-            <span v-if="typeof totals[source_type] !== 'undefined'">([[ totals[source_type] ]])</span>
+          <a class="nav-link nav-line gc-search-tab__title px-1" @click="currentTab = index" :class="{active: currentTab === index}" v-bind:href="'#' + source_type" data-toggle="tab">[[ labels[source_type] ]]
+            <span v-if="typeof results[source_type] !== 'undefined'">([[ results[source_type].length ]])</span>
             <span v-else>(0)</span>
           </a>
         </li>
       </ul>
       <div class="tab-content clearfix">
         <div class="tab-pane" :class="{active: currentTab === index}" v-bind:id="source_type" v-for='(source_type, index) in source_types' :key="index">
           <ul class="gc-search-result mb-0">
-            <template v-if="results">
-              <li v-for="result in results" class="gc-search-result__content p-3" :key="result.id">
+            <template v-if="results && results[source_type]">
+              <li v-for="result in results[source_type]" class="gc-search-result__content p-3" :key="result.id">
                <a :href="[[ result.url ]]" class="d-flex">
                   <img class="gc-search__avatar my-auto mr-3" :src="[[ result.img_url ]]" :alt="result.title" />
                   <div>
@@ -79,20 +79,20 @@
       </div>
       <template v-if="hasMoreResults">
         <div class="gc-search-more-results bg-white border-grey border-top-1 bottom-0 font-smaller-2 pb-3 position-sticky pt-3 text-center">
-          <template v-if="isLoading || isTypeSearchLoading">
+          <template v-if="isLoading">
             <a class="text-muted cursor-none disable-hover-underline" @click.prevent="false">
               <i class="font-smaller-1 fas fa-spinner fa-pulse mr-1"></i>
               Fetching result
             </a>
           </template>
           <template v-else>
-            <a class="cursor-pointer" @click="loadMoreResults">Load more results (showing [[ currentPage * perPage ]] of [[ currentTotal ]])...</a>
+            <a class="cursor-pointer" @click="search">Load more results (showing [[ page * perPage ]] of [[ total ]])...</a>
           </template>
         </div>
       </template>
     </template>
 
-    <template v-else-if="isLoading || isTypeSearchLoading">
+    <template v-else-if="isLoading">
       <p class="text-center font-smaller-2 gc-search-result__description">
         <i class="font-smaller-1 fas fa-spinner fa-pulse mr-1"></i>
         Fetching result

app/search/management/commands/create_search_index_with_active_grants.py

@@ -60,4 +60,5 @@ def handle(self, *args, **options):
                 sr.put_on_elasticsearch(index_name)
             except Exception as e:
                 print('failed:', e)
+
         print('indexing complete')

app/search/models.py

@@ -19,15 +19,15 @@ class SearchResult(SuperModel):
     description = models.TextField(default='', blank=True)
     url = models.CharField(max_length=500, default='')
     img_url = models.CharField(max_length=600, default='', null=True)
-    visible_to = models.ForeignKey('dashboard.Profile', related_name='search_results_visible',
-                                   on_delete=models.CASCADE, db_index=True, null=True)
+    visible_to = models.ForeignKey('dashboard.Profile', related_name='search_results_visible', on_delete=models.CASCADE, db_index=True, null=True)
 
     def __str__(self):
         return f"{self.source_type}; {self.url}"
 
     def check_for_active_grant(self):
         grant = Grant.objects.get(pk=self.source_id)
         return grant.active and not grant.hidden
+        
     def put_on_elasticsearch(self, index='search-index'):
         if self.visible_to:
             return None
@@ -37,8 +37,8 @@ def put_on_elasticsearch(self, index='search-index'):
             if not active_grant:
                 return None
 
-        es = Elasticsearch(settings.ELASTIC_SEARCH_URL)
-        source_type = str(str(self.source_type).replace('token', 'kudos')).title()
+        es = Elasticsearch([settings.ELASTIC_SEARCH_URL])
+        source_type  = str(str(self.source_type).replace('token', 'kudos')).title()
         full_search = f"{self.title} {self.description} {source_type}"
         doc = {
             'title': self.title,
@@ -49,77 +49,39 @@ def put_on_elasticsearch(self, index='search-index'):
             'img_url': self.img_url,
             'timestamp': timezone.now(),
             'source_type': source_type,
-            # in order to aggregate totals by type an int needs to be indexed as opposed to a string
-            'source_type_id': self.source_type_id
         }
         res = es.index(index=index, id=self.pk, body=doc)
 
-def search_by_type(query, content_type, page=0, num_results=500):
-    if not settings.ELASTIC_SEARCH_URL and not settings.ACTIVE_ELASTIC_INDEX:
-        return {}
-
-    es = Elasticsearch(settings.ELASTIC_SEARCH_URL)
-    res = es.search(index=settings.ACTIVE_ELASTIC_INDEX, body={
-        "from": page, "size": num_results,
-        "query": {
-            "bool": {
-                "must": {
-                    "match": {
-                        "source_type_id": {
-                            "query": content_type
-                        }
-                    }
-                },
-                "should": [
-                    {
-                        "query_string": {
-                            "query": f"*{query}*",
-                            "fields": ["title^10", "description", "source_type"],
-                        }
-                    }
-                ],
-                "minimum_should_match": "1"
-            }
-        },
-        "aggs": {
-            "search-totals": {
-                "terms": {
-                    "field": "source_type_id"
-                }
-            }
-        }
-    })
-    return res
-
 
 def search(query, page=0, num_results=500):
-    if not settings.ELASTIC_SEARCH_URL and not settings.ACTIVE_ELASTIC_INDEX:
+    if not settings.ELASTIC_SEARCH_URL:
         return {}
-    es = Elasticsearch(settings.ELASTIC_SEARCH_URL)
+    es = Elasticsearch([settings.ELASTIC_SEARCH_URL])
     # queries for wildcarded paginated results using boosts to lift by title and source_type=grant
     # index name will need updated once index is ready to be searched
-    res = es.search(index=settings.ACTIVE_ELASTIC_INDEX, body={
-        "from": page, "size": num_results,
-        "query": {
-            "bool": {
-                "should": [
-                    {
-                        "query_string": {
-                            "query": f"*{query}*",
-                            "fields": ["title^10", "description", "source_type"],
-                        }
-                    }
-                ],
-                "minimum_should_match": "1"
-            }
-        },
-        "aggs": {
-            "search-totals": {
-                "terms": {
-                    "field": "source_type_id"
+    res = es.search(index="search-index", body={
+      "from" : page, "size" : num_results,
+      "query": {
+        "bool": {
+          "should": [
+            {
+              "query_string": {
+                "query": f"*{query}*",
+                "fields": ["title^10", "description", "source_type"],
+              }
+            },
+            {
+              "match": {
+                "source_type": {
+                  "query": "grant",
+                  "boost": "2"
                 }
+              }
             }
+          ],
+          "minimum_should_match": "1"
         }
+      }
     })
     return res
 
@@ -132,6 +94,7 @@ def __str__(self):
         return f"{self.val}"
 
 
+
 class Page(SuperModel):
     """Records ProgrammingLanguage - the list for programming langauges"""
     title = models.CharField(max_length=255, default='')