Update datastore fetch to build columns from schema (#25)

* Update datastore fetch to build columns from schema
GetDKAN · Nov 9, 2021 · aef035f · aef035f
1 parent bb8f047
commit aef035f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@civicactions/data-catalog-services",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Functions and React components to connect to the DKAN api.",
   "main": "lib/index.js",
   "scripts": {

diff --git a/src/hooks/useDatastore/fetch.js b/src/hooks/useDatastore/fetch.js
@@ -28,10 +28,11 @@ export async function fetchDataFromQuery(id, rootUrl, options, additionalParams)
   })
   .then((res) => {
     const { data } = res;
+    const propertyKeys = data.schema[id] && data.schema[id].fields ? Object.keys(data.schema[id].fields) : [];
     setValues(data.results),
     setCount(data.count)
     if(data.results.length) {
-      setColumns(prepareColumns ? prepareColumns(Object.keys(data.results[0])) : Object.keys(data.results[0]))
+      setColumns(prepareColumns ? prepareColumns(propertyKeys) : propertyKeys)
     }
     setSchema(data.schema)
     if(typeof setLoading === 'function') {