@civicactions/cmsds-open-data-components 1.1.0 → 1.2.0

package/lib/components/ResourceFilter/index.js

@@ -21,9 +21,9 @@ var _designSystem = require("@cmsgov/design-system");
 
 var _ResourceConditionField = _interopRequireDefault(require("../ResourceConditionField"));
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
 var ResourceFilter = function ResourceFilter(_ref) {
   var id = _ref.id,

package/lib/components/ResourceHeader/index.js

@@ -32,6 +32,7 @@ var ResourceHeader = function ResourceHeader(_ref) {
       count = resource.count,
       setLimit = resource.setLimit,
       setOffset = resource.setOffset;
+  var intCount = count ? parseInt(count) : 0;
   return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("div", {
     className: "ds-l-row"
   }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -48,8 +49,8 @@ var ResourceHeader = function ResourceHeader(_ref) {
     className: "ds-l-row ds-u-align-items--center"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "ds-l-col--6"
-  }, count && /*#__PURE__*/_react["default"].createElement(_dataCatalogComponents.DataTablePageResults, {
-    totalRows: parseInt(count),
+  }, /*#__PURE__*/_react["default"].createElement(_dataCatalogComponents.DataTablePageResults, {
+    totalRows: intCount,
     limit: limit,
     offset: offset
   })), /*#__PURE__*/_react["default"].createElement("div", {

package/lib/components/ResourcePreview/index.js

@@ -88,7 +88,15 @@ var ResourcePreview = function ResourcePreview(_ref2) {
       minWidth: 50
     },
     customColumnFilter: DefaultColumnFilter,
-    options: options
+    options: options,
+    CustomLoadingComponent: /*#__PURE__*/_react["default"].createElement("div", {
+      className: "ds-u-display--flex ds-u-padding--3"
+    }, /*#__PURE__*/_react["default"].createElement(_designSystem.Spinner, {
+      className: "ds-u-valign--middle"
+    })),
+    CustomNoResults: /*#__PURE__*/_react["default"].createElement("div", {
+      className: "ds-u-display--flex ds-u-padding--3"
+    }, /*#__PURE__*/_react["default"].createElement("p", null, "No results returned."))
   }));
 };
 

package/lib/components/useAddLoginLink/index.js

@@ -13,9 +13,9 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 
 var _react = require("react");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
 var useAddLoginLink = function useAddLoginLink(hosts, menuItems, targetKey, loginLinkObj) {
   var _useState = (0, _react.useState)(_objectSpread({}, menuItems)),

package/lib/templates/Dataset/index.js

@@ -2,12 +2,14 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
+var _typeof = require("@babel/runtime/helpers/typeof");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
@@ -17,13 +19,26 @@ var _DatasetBody = _interopRequireDefault(require("./DatasetBody"));
 
 var _PageNotFound = _interopRequireDefault(require("../PageNotFound"));
 
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
 var Dataset = function Dataset(_ref) {
   var id = _ref.id,
       rootUrl = _ref.rootUrl,
       additionalParams = _ref.additionalParams,
-      customColumns = _ref.customColumns;
+      customColumns = _ref.customColumns,
+      setDatasetTitle = _ref.setDatasetTitle;
   var metastore = (0, _dataCatalogServices.useMetastoreDataset)(id, rootUrl, additionalParams);
   var dataset = metastore.dataset;
+  var title = dataset.title ? dataset.title : "";
+  (0, _react.useEffect)(function () {
+    if (title) {
+      if (setDatasetTitle) {
+        setDatasetTitle(title);
+      }
+    }
+  }, [title]);
 
   var notFoundContent = /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("h1", null, "Error: Dataset not found"), /*#__PURE__*/_react["default"].createElement("p", null, "We're sorry, but there is no dataset ID that matches your entry. You may have been directed here because:"), /*#__PURE__*/_react["default"].createElement("ol", null, /*#__PURE__*/_react["default"].createElement("li", null, "The address you typed contains a typo;"), /*#__PURE__*/_react["default"].createElement("li", null, "The requested dataset no longer exists.")), /*#__PURE__*/_react["default"].createElement("p", null, /*#__PURE__*/_react["default"].createElement("span", {
     className: "ds-u-font-weight--bold"

package/lib/templates/DatasetSearch/index.js

@@ -33,9 +33,9 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
 function updateUrl(selectedFacets, fulltext, sort) {
   var newParams = _objectSpread({}, selectedFacets);

package/lib/templates/FilteredResource/FilteredResourceBody.js

@@ -39,9 +39,9 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
 var FilteredResourceBody = function FilteredResourceBody(_ref) {
   var id = _ref.id,

package/lib/templates/FilteredResource/index.js

@@ -29,7 +29,8 @@ var FilteredResource = function FilteredResource(_ref) {
       location = _ref.location,
       apiDocPage = _ref.apiDocPage,
       additionalParams = _ref.additionalParams,
-      customColumns = _ref.customColumns;
+      customColumns = _ref.customColumns,
+      setDatasetTitle = _ref.setDatasetTitle;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
@@ -53,6 +54,10 @@ var FilteredResource = function FilteredResource(_ref) {
     if (dataset.distribution && dataset.distribution.length) {
       setReady(true);
 
+      if (setDatasetTitle) {
+        setDatasetTitle(dataset.title);
+      }
+
       if (!dataset.distribution[distIndex]) {
         setError(true);
       }

package/lib/templates/Footer/index.js

@@ -7,6 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _react = _interopRequireDefault(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
@@ -88,7 +92,26 @@ var Footer = function Footer(_ref) {
     className: "ds-h6 dc-footer--heading ds-u-margin-bottom--2"
   }, "Additional resources"), /*#__PURE__*/_react["default"].createElement("ul", {
     className: "ds-u-font-size--small"
-  }, footerAdditionalResourcesLinks.map(function (link) {
+  }, footerAdditionalResourcesLinks.filter(function (link) {
+    var noOnClick = Object.keys(link).findIndex(function (l) {
+      return l === "onClick";
+    });
+
+    if (noOnClick === -1 || link.onClick && link.dataTag) {
+      return link;
+    }
+  }).map(function (link) {
+    if (link.onClick && link.dataTag) {
+      return /*#__PURE__*/_react["default"].createElement("li", {
+        className: "ds-u-margin-bottom--1",
+        key: link.id
+      }, /*#__PURE__*/_react["default"].createElement("a", (0, _extends2["default"])({
+        href: link.url
+      }, (0, _defineProperty2["default"])({}, 'data-' + link.dataTag.name, link.dataTag.value), {
+        onClick: link.onClick
+      }), link.label));
+    }
+
     return /*#__PURE__*/_react["default"].createElement("li", {
       className: "ds-u-margin-bottom--1",
       key: link.id

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@civicactions/cmsds-open-data-components",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Components for the open data catalog frontend using CMS Design System",
   "main": "lib/index.js",
   "scripts": {
@@ -19,9 +19,9 @@
   "author": "",
   "license": "GPL-3.0",
   "dependencies": {
-    "@civicactions/data-catalog-components": "^2.0.0-alpha.10",
-    "@civicactions/data-catalog-services": "^1.0.0",
-    "@cmsgov/design-system": "^2.7.0",
+    "@civicactions/data-catalog-components": "2.0.0-beta.2",
+    "@civicactions/data-catalog-services": "1.2.0",
+    "@cmsgov/design-system": "~2.6.1",
     "@reach/router": "^1.3.3",
     "enzyme": "^3.10.0",
     "enzyme-adapter-react-16": "^1.14.0",