feat(client): Respect Sub-topic and Dataset order

Vizzuality · Nov 22, 2024 · 45785d2 · 45785d2
1 parent dd90257
commit 45785d2
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 15 deletions.
diff --git a/client/src/components/panels/contextual-layers/index.tsx b/client/src/components/panels/contextual-layers/index.tsx
@@ -9,12 +9,7 @@ import XMarkIcon from "@/svgs/xmark.svg";
 import Item from "./item";
 
 const ContextualLayersPanel = () => {
-  const { data, isLoading } = useDatasetsBySubTopic(
-    "contextual",
-    "sub_topic.name,name",
-    ["layer", "download_link"],
-    true,
-  );
+  const { data, isLoading } = useDatasetsBySubTopic("contextual", ["layer", "download_link"], true);
 
   return (
     <>

diff --git a/client/src/components/panels/drought/index.tsx b/client/src/components/panels/drought/index.tsx
@@ -8,7 +8,6 @@ import useDatasetsBySubTopic from "@/hooks/use-datasets-by-sub-topic";
 const DroughtPanel = () => {
   const { data, isLoading } = useDatasetsBySubTopic(
     "drought",
-    "sub_topic.name:desc,name",
     ["name", "params_config", "download_link"],
     true,
   );

diff --git a/client/src/components/panels/flood/index.tsx b/client/src/components/panels/flood/index.tsx
@@ -8,7 +8,6 @@ import useDatasetsBySubTopic from "@/hooks/use-datasets-by-sub-topic";
 const FloodPanel = () => {
   const { data, isLoading } = useDatasetsBySubTopic(
     "flood",
-    "sub_topic.name:desc,name",
     ["name", "params_config", "download_link"],
     true,
   );

diff --git a/client/src/components/panels/hydrometeorological/index.tsx b/client/src/components/panels/hydrometeorological/index.tsx
@@ -9,7 +9,6 @@ import HydrometeorologicalImage from "../../../../public/assets/images/hydromete
 const HydrometeorologicalPanel = () => {
   const { data, isLoading } = useDatasetsBySubTopic(
     "hydrometeorological",
-    "sub_topic.name:desc,name",
     ["name", "params_config", "download_link"],
     true,
   );

diff --git a/client/src/hooks/use-datasets-by-sub-topic.ts b/client/src/hooks/use-datasets-by-sub-topic.ts
@@ -15,7 +15,6 @@ type DatasetsBySubTopic = {
 
 export default function useDatasetsBySubTopic(
   topicSlug: string,
-  sort = "sub_topic.name,name",
   layersFields = ["name"],
   includeMetadata = false,
 ) {
@@ -25,10 +24,10 @@ export default function useDatasetsBySubTopic(
     {
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore-error
-      fields: ["name", "short_description"],
+      fields: ["name", "short_description", "order"],
       populate: {
         sub_topic: {
-          fields: ["name"],
+          fields: ["name", "order"],
         },
         default_layer: {
           fields: ["id"],
@@ -46,7 +45,7 @@ export default function useDatasetsBySubTopic(
           },
         },
       },
-      sort,
+      sort: "sub_topic.order,order",
     },
     {
       query: {

diff --git a/client/src/hooks/use-topic-tab-layer-management.ts b/client/src/hooks/use-topic-tab-layer-management.ts
@@ -10,7 +10,7 @@ export default function useTopicTabLayerManagement() {
 
   const [layers, { addLayer, removeLayer }] = useMapLayers();
 
-  const { data, isLoading } = useDatasetsBySubTopic(tab, "sub_topic.name:desc,name");
+  const { data, isLoading } = useDatasetsBySubTopic(tab);
 
   // The ids of all the layers that belong to the topic
   const topicLayerIds = useMemo(() => {

diff --git a/cms/src/extensions/documentation/documentation/1.0.0/full_documentation.json b/cms/src/extensions/documentation/documentation/1.0.0/full_documentation.json
@@ -14,7 +14,7 @@
       "name": "Apache 2.0",
       "url": "https://www.apache.org/licenses/LICENSE-2.0.html"
     },
-    "x-generation-date": "2024-11-22T14:00:12.515Z"
+    "x-generation-date": "2024-11-22T14:01:53.948Z"
   },
   "x-strapi-config": {
     "path": "/documentation",