@civicactions/cmsds-open-data-components 1.13.0-beta.1 → 1.13.0

package/lib/templates/Dataset/DatasetBody.js

@@ -118,7 +118,7 @@ var DatasetBody = function DatasetBody(_ref) {
     dangerouslySetInnerHTML: {
       __html: dataset.description
     }
-  }), Object.keys(distribution).length && fileFormat === 'CSV' ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("h2", {
+  }), resource.columns && Object.keys(resource.schema).length ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("h2", {
     className: "dc-resource-header"
   }, "Resource Preview"), resource.columns ? /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_ResourceHeader["default"], {
     id: id,

package/lib/templates/FilteredResource/functions.js

@@ -1,7 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -11,29 +9,35 @@ exports.cleanText = cleanText;
 exports.convertUTCToLocalDate = convertUTCToLocalDate;
 exports.operatorMapping = void 0;
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
+// Example custom column headers, where only effective date has an ! at the end
+// [
+//  {schema: 'date', Cell: ({ value }) => localeDate(value),},
+//  {accessor: 'effective_date',Cell: ({ value }) => localeDate(value) + '!',},
+// ]
 function buildCustomColHeaders(customHeaders, columns, schema) {
   return columns.map(function (column) {
-    var customHeaderIndex = customHeaders.findIndex(function (header) {
+    var customAccessorIndex = customHeaders.findIndex(function (header) {
       return header.accessor === column;
     });
-
-    if (customHeaderIndex > -1) {
-      return _objectSpread({
-        Header: schema && schema.fields[column].description ? schema.fields[column].description : column,
-        accessor: column
-      }, customHeaders[customHeaderIndex]);
+    var customSchemaIndex = customHeaders.findIndex(function (header) {
+      return header.schema === schema.fields[column].mysql_type;
+    });
+    var newColumn = {}; // If specific accessor is passed, this will override a general mysql_type Cell rewrite.
+
+    if (customAccessorIndex > -1) {
+      newColumn.Header = schema && schema.fields[column].description ? schema.fields[column].description : column;
+      newColumn.accessor = column;
+      newColumn.Cell = customHeaders[customAccessorIndex].Cell;
+    } else {
+      newColumn.Header = schema && schema.fields[column].description ? schema.fields[column].description : column;
+      newColumn.accessor = column;
+
+      if (customSchemaIndex > -1) {
+        newColumn.Cell = customHeaders[customSchemaIndex].Cell;
+      }
     }
 
-    return {
-      Header: schema && schema.fields[column].description ? schema.fields[column].description : column,
-      accessor: column
-    };
+    return newColumn;
   });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@civicactions/cmsds-open-data-components",
-  "version": "1.13.0-beta.1",
+  "version": "1.13.0",
   "description": "Components for the open data catalog frontend using CMS Design System",
   "main": "lib/index.js",
   "scripts": {