Sort sitemap

wbbaker · Jun 13, 2023 · 467ab29 · 467ab29
1 parent 5d4de80
commit 467ab29
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/src/modules/otus/components/Panel/PanelTypeSpecimen/PanelTypeSpecimen.vue b/src/modules/otus/components/Panel/PanelTypeSpecimen/PanelTypeSpecimen.vue
@@ -2,7 +2,7 @@
   <VCard v-if="typeMaterials.length">
     <VCardHeader class="flex justify-between">
       <h2 class="text-md">Type specimen</h2>
-      <PanelDropdown panel-key="type-material" />
+      <PanelDropdown panel-key="panel:typeMaterial" />
     </VCardHeader>
     <VCardContent class="text-sm">
       <p>
@@ -35,7 +35,7 @@ watch(
       return
     }
 
-    useOtuPageRequest('type-material', () =>
+    useOtuPageRequest('panel:typeMaterial', () =>
       TaxonWorks.getOtuTypeMaterial(props.otuId)
     ).then(({ data }) => {
       typeMaterials.value = data.type_materials_catalog_labels.sort(

diff --git a/src/modules/otus/components/SiteMap.vue b/src/modules/otus/components/SiteMap.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script setup>
-import { ref } from 'vue'
+import { ref, computed } from 'vue'
 import { useOtuPageRequestStore } from '../store/request'
 
 const isModalVisible = ref(false)

diff --git a/src/modules/otus/store/actions/loadDistribution.js b/src/modules/otus/store/actions/loadDistribution.js
@@ -4,13 +4,14 @@ import {
   makeGeoJSONFeature
 } from '../../utils'
 import TaxonWorks from '../../services/TaxonWorks'
+import { useOtuPageRequest } from '../../helpers/useOtuPageRequest'
 
 export const actionLoadDistribution = {
   async loadDistribution({ otuId, rankString }) {
     const isSpeciesGroup = rankString && isRankGrpup('SpeciesGroup', rankString)
 
     const getAggregateShape = async (otuId) => {
-      TaxonWorks.getOtuDistribution(otuId)
+      useOtuPageRequest('panel:map', () => TaxonWorks.getOtuDistribution(otuId))
         .then(({ data }) => {
           const geojson = JSON.parse(data.cached_map.geo_json)
 
@@ -27,7 +28,9 @@ export const actionLoadDistribution = {
     }
 
     if (isSpeciesGroup) {
-      TaxonWorks.getOtuGeoJSONDistribution(otuId)
+      useOtuPageRequest('panel:map', () =>
+        TaxonWorks.getOtuGeoJSONDistribution(otuId)
+      )
         .then(({ data }) => {
           if (data.request_too_large) {
             this.distribution.geojson = null

diff --git a/src/modules/otus/store/request.js b/src/modules/otus/store/request.js
@@ -13,12 +13,11 @@ export const useOtuPageRequestStore = defineStore('otuPageRequest', {
     },
 
     sitemap: (state) => {
-      const entries = Object.entries(state.requests).map(([key, value]) => [
-        key,
-        value.url
-      ])
+      const keys = Object.keys(state.requests).sort()
 
-      return Object.fromEntries(entries)
+      return Object.fromEntries(
+        keys.map((key) => [key, state.requests[key].url])
+      )
     }
   },