Merge pull request #1893 from roiLeo/fix/series/backend-sorting

✨ series backend sorting
kodadot · Jan 22, 2022 · 67acea6 · 67acea6
2 parents 91a0de5 + b524d86
commit 67acea6
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 83 deletions.
diff --git a/components/series/SeriesTable.vue b/components/series/SeriesTable.vue
@@ -43,10 +43,10 @@
 
     <b-table
       :data="data"
-      :default-sort="sortBy.field"
-      :default-sort-direction="sortBy.value === -1 ? 'desc' : 'asc'"
+      :default-sort="[sortBy.field, sortBy.value]"
       backend-sorting
-      hoverable>
+      hoverable
+      @sort="onSort">
       <b-table-column
         v-slot="props"
         cell-class="is-vcentered"
@@ -99,7 +99,6 @@
         v-slot="props"
         field="dailyVolume"
         label="24h %"
-        sortable
         numeric
         cell-class="is-vcentered"
         :visible="nbDays === '24'">
@@ -127,7 +126,6 @@
         v-slot="props"
         field="weeklyVolume"
         label="7d %"
-        sortable
         numeric
         cell-class="is-vcentered"
         :visible="nbDays === '7'">
@@ -155,7 +153,6 @@
         v-slot="props"
         field="monthlyVolume"
         label="30d %"
-        sortable
         numeric
         cell-class="is-vcentered"
         :visible="nbDays === '30'">
@@ -181,38 +178,25 @@
 
       <b-table-column
         v-slot="props"
-        field="floorPrice"
+        field="floor_price"
         :label="$t('series.floorprice')"
-        sortable
         numeric
-        cell-class="is-vcentered">
+        cell-class="is-vcentered"
+        sortable>
         <template v-if="!isLoading">
           <Money :value="props.row.floorPrice" inline />
         </template>
         <b-skeleton :active="isLoading" />
       </b-table-column>
 
       <b-table-column
-        field="totalBuys"
+        field="buys"
         :label="$t('series.buys')"
         v-slot="props"
-        sortable
-        numeric
-        cell-class="is-vcentered">
-        <template v-if="!isLoading">{{ props.row.totalBuys }}</template>
-        <b-skeleton :active="isLoading" />
-      </b-table-column>
-
-      <b-table-column
-        v-slot="props"
-        field="uniqueCollectors"
-        :label="$t('series.owners')"
-        sortable
         numeric
-        cell-class="is-vcentered">
-        <template v-if="!isLoading">
-          {{ props.row.uniqueCollectors }}
-        </template>
+        cell-class="is-vcentered"
+        sortable>
+        <template v-if="!isLoading">{{ props.row.buys }}</template>
         <b-skeleton :active="isLoading" />
       </b-table-column>
 
@@ -246,7 +230,6 @@
         v-slot="props"
         field="rank"
         :label="$t('spotlight.score')"
-        sortable
         numeric
         cell-class="is-vcentered">
         <template v-if="!isLoading">
@@ -266,20 +249,15 @@
 </template>
 
 <script lang="ts">
-import { Component, mixins, Vue, Watch } from 'nuxt-property-decorator'
+import { Component, mixins, Watch } from 'nuxt-property-decorator'
 import { Column, RowSeries, SortType } from './types'
-import { columns, nftFn } from './utils'
+import { columns } from './utils'
 import collectionSeriesList from '@/queries/rmrk/subsquid/collectionSeriesList.graphql'
-import { seriesAggQuery } from '../rmrk/Gallery/Search/query'
-import { NFTMetadata, Collection } from '../rmrk/service/scheme'
+import { NFTMetadata } from '../rmrk/service/scheme'
 import { denyList } from '@/utils/constants'
-import {
-  sanitizeIpfsUrl,
-  fetchCollectionMetadata,
-} from '@/components/rmrk/utils'
+import { sanitizeIpfsUrl } from '@/components/rmrk/utils'
 import { exist } from '@/components/rmrk/Gallery/Search/exist'
 import { emptyObject } from '@/utils/empty'
-import { get, set } from 'idb-keyval'
 import PrefixMixin from '~/utils/mixins/prefixMixin'
 
 const components = {
@@ -295,7 +273,7 @@ export default class SeriesTable extends mixins(PrefixMixin) {
   protected usersWithIdentity: RowSeries[] = []
   protected nbDays = '7'
   protected nbRows = '10'
-  protected sortBy: SortType = { field: 'volume', value: -1 }
+  protected sortBy: SortType = { field: 'volume', value: 'DESC' }
   public isLoading = false
   public meta: NFTMetadata = emptyObject<NFTMetadata>()
 
@@ -308,7 +286,7 @@ export default class SeriesTable extends mixins(PrefixMixin) {
     })
     exist(this.$route.query.sort, (val) => {
       this.sortBy.field = val.slice(1)
-      this.sortBy.value = val.charAt(0) === '-' ? -1 : 1
+      this.sortBy.value = val.charAt(0) === '-' ? 'DESC' : 'ASC'
     })
     await this.fetchCollectionsSeries(Number(this.nbRows))
   }
@@ -322,46 +300,34 @@ export default class SeriesTable extends mixins(PrefixMixin) {
       query: collectionSeriesList,
       client: 'subsquid',
       variables: {
+        // denyList, not yet
         limit,
+        offset: 0,
+        orderBy: sort.field,
+        orderDirection: sort.value,
       },
     })
 
     const {
       data: { collectionEntities },
     } = collections
 
-    this.data = collectionEntities
-      .map(
-        (e): RowSeries => ({
-          ...e,
-          image: sanitizeIpfsUrl(e.image),
-          rank: e.sold * (e.unique / e.total || 1),
-        })
-      )
-      .sort((a, b) => b.rank - a.rank)
-
-    // this.data = seriesAggQuery(
-    //   limit,
-    //   sort,
-    //   collectionEntities?.nodes?.map(nftFn)
-    // ) as RowSeries[]
-
-    // // fetch metadata for images
-    // for (let index = 0; index < this.data.length; index++) {
-    //   const image = await this.fetchMetadataImage(
-    //     this.data[index].metadata
-    //   )
-
-    //   if (image) {
-    //     this.data[index].image = image
-    //   }
-    // }
+    this.data = collectionEntities.map(
+      (e): RowSeries => ({
+        ...e,
+        image: sanitizeIpfsUrl(e.image),
+        rank: e.sold * (e.unique / e.total || 1),
+      })
+    )
 
     this.isLoading = false
   }
 
   public onSort(field: string, order: string) {
-    let sort: SortType = { field: field, value: order === 'desc' ? -1 : 1 }
+    let sort: SortType = {
+      field: field,
+      value: order === 'desc' ? 'DESC' : 'ASC',
+    }
     this.$router
       .replace({
         path: String(this.$route.path),
@@ -395,17 +361,6 @@ export default class SeriesTable extends mixins(PrefixMixin) {
       .catch((e) => console.warn(e))
   }
 
-  public async fetchMetadataImage(metadata: any) {
-    const m = await get(metadata)
-    const meta = m
-      ? m
-      : await fetchCollectionMetadata({ metadata } as Collection)
-    if (!m) {
-      set(metadata, meta)
-    }
-    return sanitizeIpfsUrl(meta.image || '')
-  }
-
   public displayVolumePercent(
     priceNow: number,
     priceAgo: number,

diff --git a/components/series/types.ts b/components/series/types.ts
@@ -11,7 +11,7 @@ export type Column = {
 
 export type SortType = {
   field: string
-  value: -1 | 1
+  value: 'ASC' | 'DESC'
 }
 
 type VolumeType = number | bigint
@@ -23,7 +23,7 @@ export type RowSeries = {
   metadata: string
   sold: number
   total: number
-  totalBuys: number
+  buys: number
   volume: VolumeType
   dailyVolume: VolumeType
   weeklyVolume: VolumeType

diff --git a/components/series/utils.ts b/components/series/utils.ts
@@ -37,7 +37,7 @@ export const nftFn = (a: any): RowSeries => {
   )
 
   const buyEvents = collectionNfts.map(onlyEvents).map(pairListBuyEvent).flat()
-  const totalBuys = buyEvents.length
+  const buys = buyEvents.length
   const volume = Number(getVolume(buyEvents))
   const dailyVolume = Number(getVolume(buyEvents.filter(after(yesterdayDate))))
   const weeklyVolume = Number(getVolume(buyEvents.filter(after(lastweekDate))))
@@ -63,7 +63,7 @@ export const nftFn = (a: any): RowSeries => {
     total,
     sold,
     unique,
-    totalBuys,
+    buys,
     uniqueCollectors,
     averagePrice,
     floorPrice,

diff --git a/queries/rmrk/subsquid/collectionSeriesList.graphql b/queries/rmrk/subsquid/collectionSeriesList.graphql
@@ -1,5 +1,13 @@
-query collectionSeriesList($limit: Float) {
-  collectionEntities: seriesInsightTable(limit: $limit) {
+query collectionSeriesList(
+  $limit: Float
+  $orderBy: String
+  $orderDirection: String
+) {
+  collectionEntities: seriesInsightTable(
+    limit: $limit
+    orderBy: $orderBy
+    orderDirection: $orderDirection
+  ) {
     id
     floorPrice
     averagePrice
@@ -8,7 +16,7 @@ query collectionSeriesList($limit: Float) {
     sold
     name
     total
-    totalBuys: buys
+    buys
     unique
     uniqueCollectors
     volume