@civicactions/cmsds-open-data-components 1.14.0-alpha.1 → 1.14.0-alpha.2

package/dist/scss/templates/dataset.scss

@@ -31,3 +31,7 @@
     background-color: $color-primary;
   }
 }
+
+.dc-c-metadata-description {
+  white-space: pre-line;
+}

package/lib/components/ResourcePreview/index.js

@@ -57,6 +57,7 @@ var ResourcePreview = function ResourcePreview(_ref2) {
       id = _ref2.id,
       options = _ref2.options,
       resource = _ref2.resource,
+      defaultSort = _ref2.defaultSort,
       customColumns = _ref2.customColumns,
       truncateCellHeader = _ref2.truncateCellHeader,
       columnSettings = _ref2.columnSettings,
@@ -95,6 +96,7 @@ var ResourcePreview = function ResourcePreview(_ref2) {
   }, previewContainer.current && /*#__PURE__*/_react["default"].createElement(_dataCatalogComponents.DataTable, {
     filterTitle: "Filter columns",
     data: resource.values,
+    sortDefaults: defaultSort,
     columns: customColumns ? customColumns : prepareColumns(resource.columns, resource.schema[id]),
     schema: resource.schema,
     totalRows: parseInt(resource.totalRows),
@@ -130,7 +132,8 @@ ResourcePreview.defaultProps = {
     columnSort: true,
     columnResize: true
   },
-  truncateCellHeader: true
+  truncateCellHeader: true,
+  defaultSort: []
 };
 var _default = ResourcePreview;
 exports["default"] = _default;

package/lib/components/useScrollToTop/index.js

@@ -0,0 +1,22 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = require("react");
+
+var _reactRouterDom = require("react-router-dom");
+
+var useScrollToTop = function useScrollToTop() {
+  var _useLocation = (0, _reactRouterDom.useLocation)(),
+      pathname = _useLocation.pathname;
+
+  (0, _react.useEffect)(function () {
+    window.scrollTo(0, 0);
+  }, [pathname]);
+};
+
+var _default = useScrollToTop;
+exports["default"] = _default;

package/lib/index.js

@@ -173,6 +173,12 @@ Object.defineProperty(exports, "useAddLoginLink", {
     return _useAddLoginLink["default"];
   }
 });
+Object.defineProperty(exports, "useScrollToTop", {
+  enumerable: true,
+  get: function get() {
+    return _useScrollToTop["default"];
+  }
+});
 
 var _NavLink = _interopRequireDefault(require("./components/NavLink"));
 
@@ -228,4 +234,6 @@ var _APIPage = _interopRequireDefault(require("./templates/APIPage"));
 
 var _useAddLoginLink = _interopRequireDefault(require("./components/useAddLoginLink"));
 
+var _useScrollToTop = _interopRequireDefault(require("./components/useScrollToTop"));
+
 var _frequencyMap = _interopRequireDefault(require("./assets/frequencyMap"));

package/lib/templates/Dataset/DatasetBody.js

@@ -115,10 +115,11 @@ var DatasetBody = function DatasetBody(_ref) {
   }, "Updated ", /*#__PURE__*/_react["default"].createElement(_TransformedDate["default"], {
     date: dataset.modified
   }))), /*#__PURE__*/_react["default"].createElement("p", {
+    className: "dc-c-metadata-description",
     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/FilteredResourceBody.js

@@ -110,7 +110,7 @@ var FilteredResourceBody = function FilteredResourceBody(_ref) {
   }, "Back to ", dataset.title), /*#__PURE__*/_react["default"].createElement("h1", {
     className: "ds-title"
   }, customTitle ? customTitle : pageTitle), /*#__PURE__*/_react["default"].createElement("p", {
-    className: "ds-u-margin-top--0",
+    className: "ds-u-margin-top--0 dc-c-metadata-description",
     dangerouslySetInnerHTML: {
       __html: distribution.data.description
     }

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.14.0-alpha.1",
+  "version": "1.14.0-alpha.2",
   "description": "Components for the open data catalog frontend using CMS Design System",
   "main": "lib/index.js",
   "scripts": {
@@ -15,7 +15,7 @@
   "author": "",
   "license": "GPL-3.0",
   "dependencies": {
-    "@civicactions/data-catalog-components": "2.0.0-beta.7",
+    "@civicactions/data-catalog-components": "2.0.1-alpha.1",
     "@civicactions/data-catalog-services": "~1.5.0",
     "@cmsgov/design-system": "~3.3.0",
     "@popperjs/core": "^2.11.4",
@@ -24,6 +24,7 @@
     "react-datepicker": "^4.2.1",
     "react-popper": "^2.2.5",
     "react-responsive": "^8.2.0",
+    "react-router-dom": "^6.2.2",
     "react-table": "^7.6.2",
     "react-text-truncate": "^0.18.0",
     "swagger-ui-react": "^4.1.3"
@@ -84,6 +85,7 @@
   },
   "files": [
     "lib",
-    "dist"
+    "dist",
+    "twig"
   ]
 }