Use refactored search adapter

theme/js/components/dataset/card.vue

@@ -1,7 +1,11 @@
 <template>
   <article class="dataset-card compact">
     <div class="card-logo">
-      <Placeholder type="reuse" :src="image_url" :alt="title" />
+      <Placeholder type="dataset" :src="imageUrl" :alt="title" />
+      <div class="logo-badge">
+        <span v-html="privateIcon" v-if="private" />
+        <span v-html="certified" v-else-if="organizationCertified" />
+      </div>
     </div>
     <div class="card-data">
       <h3 class="card-body h4">
@@ -16,14 +20,31 @@
 
 <script>
 import Placeholder from "../utils/placeholder";
+import certified from "svg/certified.svg";
+import privateIcon from "svg/private.svg";
+import useOrganizationCertified from "../../composables/useOrganizationCertified";
+import useUserAvatar from "../../composables/useUserAvatar";
 
 export default {
-  components: {
-    Placeholder,
+  created() {
+    this.certified = certified;
+    this.privateIcon = privateIcon;
+    this.imageUrl = this.organization ? this.organization.logo_thumbnail : useUserAvatar(this.owner, 100);
+    this.organizationCertified = this.organization ? useOrganizationCertified(this.organization) : false;
+  },
+  data() {
+    return {
+      imageUrl: null,
+    };
   },
   props: {
     title: String,
-    image_url: String,
+    organization: Object,
+    owner: Object,
+    private: Boolean,
+  },
+  components: {
+    Placeholder,
   },
 };
 </script>

theme/js/components/dataset/search-result.vue

@@ -46,8 +46,8 @@ Vue. -->
     </dl>
     <ul class="card-footer">
       <li>
-        <strong>{{ resources.length || 0 }}</strong>
-        {{ $tc("resources", resources.length || 0) }}
+        <strong>{{ resources.total }}</strong>
+        {{ $tc("resources", resources.total) }}
       </li>
       <li>
         <strong>{{ metrics.reuses || 0 }}</strong>
@@ -79,7 +79,7 @@ export default {
     frequency: String,
     spatial: Object,
     metrics: Object,
-    resources: Array,
+    resources: Object,
     private: Boolean,
   },
   components: {

theme/js/components/reuse/card.vue

@@ -6,11 +6,11 @@ Vue and simpler -->
     <Placeholder
       class="reuse-image fr-mb-3v fr-responsive-img"
       alt=""
-      :src="image_url"
+      :src="image"
       type="reuse"
     />
-    <div>
-      {{ type_label }}
+    <div class="text-grey-300">
+          {{ $tc('X datasets', datasets.length) }}
     </div>
     <div>
       {{ title }}
@@ -25,8 +25,7 @@ import Placeholder from "../utils/placeholder";
 export default {
   props: {
     title: String,
-    image_url: String,
-    type_label: String,
+    image: String,
     metrics: Object,
     datasets: {
       type: Number,

theme/js/components/search/search.vue

@@ -300,8 +300,8 @@ export default {
 
       this.currentRequest = generateCancelToken();
 
-      this.$api
-        .get("/datasets/", {
+      this.$apiv2
+        .get("/datasets/search/", {
           cancelToken: this.currentRequest.token,
           params: {
             q: this.queryString,

theme/js/components/search/suggest-box.vue

@@ -133,16 +133,16 @@ export default {
       this.currentRequest = generateCancelToken();
 
       const promises = endpoints.map(({ name, size }) =>
-        this.$api
-          .get(name + "/suggest/", {
+        this.$apiv2
+          .get(name + "/search/", {
             cancelToken: this.currentRequest.token,
             params: {
               q: queryString,
-              size,
+              page_size: size,
             },
           })
           .then((res) => ({
-            [name]: res.data,
+            [name]: res.data.data,
           }))
       );
 

theme/js/locales/en.json

@@ -117,5 +117,7 @@
   "Private": "Private",
   "Unfeature this content": "Unfeature this content",
   "Feature this content": "Feature this content",
-  "Preview of resource X": "Preview of resource {title}"
-}
+  "Preview of resource X": "Preview of resource {title}",
+  "X datasets": "0 datasets | 1 dataset | {n} datasets",
+  "An error occurred while featuring this subject.": ""
+}

theme/js/locales/es.json

@@ -117,5 +117,7 @@
   "Private": "Private",
   "Unfeature this content": "Unfeature this content",
   "Feature this content": "Feature this content",
-  "Preview of resource X": "Preview of resource {title}"
-}
+  "Preview of resource X": "Preview of resource {title}",
+  "X datasets": "",
+  "An error occurred while featuring this subject.": ""
+}

theme/js/locales/fr.json

@@ -117,5 +117,7 @@
   "Private": "Privé",
   "Unfeature this content": "Ne plus mettre en avant ce contenu",
   "Feature this content": "Mettre ce contenu en avant",
-  "Preview of resource X": "Prévisualisation de la ressource {title}"
-}
+  "Preview of resource X": "Prévisualisation de la ressource {title}",
+  "X datasets": "0 jeu de données | 1 jeu de données | {n} jeux de données",
+  "An error occurred while featuring this subject.": ""
+}

udata_front/views/base.py

@@ -94,13 +94,8 @@ class SearchView(Templated, BaseView):
     search_adapter = None
 
     def get_queryset(self):
-        adapter = search.adapter_for(self.search_adapter or self.model)
-        parser = adapter.as_request_parser()
-        params = not_none_dict(parser.parse_args())
-        params['facets'] = True
-        adapter = self.search_adapter or self.model
-        result = search.query(adapter, **params)
-        return result
+        parser = self.search_adapter.as_request_parser()
+        return search.query(self.search_adapter, **not_none_dict(parser.parse_args()))
 
     def get_context(self):
         context = super(SearchView, self).get_context()

udata_front/views/organization.py

@@ -19,6 +19,7 @@
 from udata.core.organization.permissions import (
     EditOrganizationPermission, OrganizationPrivatePermission
 )
+from udata.core.organization.search import OrganizationSearch
 
 
 blueprint = I18nBlueprint('organizations', __name__,
@@ -36,6 +37,7 @@ class OrganizationListView(SearchView):
     model = Organization
     context_name = 'organizations'
     template_name = 'organization/list.html'
+    search_adapter = OrganizationSearch
 
 
 class OrgView(object):

udata_front/views/reuse.py

@@ -10,6 +10,7 @@
 
 from udata.core.reuse.models import Reuse
 from udata.core.reuse.permissions import ReuseEditPermission
+from udata.core.reuse.search import ReuseSearch
 
 blueprint = I18nBlueprint('reuses', __name__, url_prefix='/reuses')
 
@@ -48,6 +49,7 @@ class ReuseListView(SearchView):
     model = Reuse
     context_name = 'reuses'
     template_name = 'reuse/list.html'
+    search_adapter = ReuseSearch
 
 
 navbar = nav.Bar('edit_reuse', [