Merge branch 'development' of https://github.com/basedosdados/website …

…into development
basedosdados · Nov 6, 2024 · ba8811c · ba8811c
2 parents 675e29f + 5e6d6e9
commit ba8811c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/next/components/atoms/ObservationLevelTable.js b/next/components/atoms/ObservationLevelTable.js
@@ -18,16 +18,25 @@ export default function ObservationLevel({ resource }) {
 
   const headers = [t('observationLevelTable.entityHeader'), t('observationLevelTable.columnsHeader')];
 
-  let array = []
-  const keys = Object.keys(resource?.observationLevels)
+  function sortElements(a, b) {
+    if (a.order < b.order) {
+      return -1;
+    }
+    if (a.order > b.order) {
+      return 1;
+    }
+    return 0;
+  }
 
-  keys.forEach((elm) => {
-    const value = resource?.observationLevels[elm]
+  let array = [];
+  const keys = Object.keys(resource?.observationLevels);
+  const sortedLevels = Object.values(resource?.observationLevels).sort(sortElements);
 
+  sortedLevels.forEach((value) => {
     const valueEntity = () => {
-      if(value.entity[`name${capitalize(locale)}`]) return value.entity[`name${capitalize(locale)}`]
-      if(value.entity.name) return value.entity.name
-      return t('observationLevelTable.notProvided')
+      if(value.entity[`name${capitalize(locale)}`]) return value.entity[`name${capitalize(locale)}`];
+      if(value.entity.name) return value.entity.name;
+      return t('observationLevelTable.notProvided');
     }
 
     const valueColumns = () => {

diff --git a/next/pages/api/rawDataSources/getRawDataSource.js b/next/pages/api/rawDataSources/getRawDataSource.js
@@ -61,6 +61,7 @@ async function getRawDataSource(id, locale = 'pt') {
                   edges {
                     node {
                       _id
+                      order
                       columns {
                         edges {
                           node {

diff --git a/next/pages/api/tables/getTable.js b/next/pages/api/tables/getTable.js
@@ -46,6 +46,11 @@ async function getTable(id, locale='pt') {
                   }
                 }
                 version
+                status {
+                  _id
+                  slug
+                }
+                isDeprecated
                 temporalCoverage
                 spatialCoverage
                 fullTemporalCoverage
@@ -107,6 +112,7 @@ async function getTable(id, locale='pt') {
                   edges {
                     node {
                       _id
+                      order
                       columns {
                         edges {
                           node {
-Original file line number
+Diff line change
@@ Expand Up / @@ -61,6 +61,7 @@ async function getRawDataSource(id, locale = 'pt') { @@
                       edges {
                         node {
                           _id
+                          order
                           columns {
                             edges {
                               node {
@@ Expand Down @@