@civicactions/cmsds-open-data-components 1.11.0-alpha.2 → 1.11.0-alpha.4

package/lib/templates/FilteredResource/FilteredResourceBody.js

@@ -116,7 +116,8 @@ var FilteredResourceBody = function FilteredResourceBody(_ref) {
     }
   }), resource.columns && Object.keys(resource.schema).length && /*#__PURE__*/_react["default"].createElement(_QueryBuilder["default"], {
     resource: resource,
-    id: distribution.identifier
+    id: distribution.identifier,
+    customColumns: customColumns
   }), resource.columns && Object.keys(resource.schema).length ? /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_ResourceHeader["default"], {
     includeDensity: true,
     setTablePadding: setTablePadding,

package/lib/templates/FilteredResource/QueryBuilder.js

@@ -74,7 +74,8 @@ function updateQueryForDatastore(condition) {
 var QueryBuilder = function QueryBuilder(_ref) {
   var resource = _ref.resource,
       id = _ref.id,
-      includeSearchParams = _ref.includeSearchParams;
+      includeSearchParams = _ref.includeSearchParams,
+      customColumns = _ref.customColumns;
   var conditions = resource.conditions,
       schema = resource.schema,
       setConditions = resource.setConditions;
@@ -168,7 +169,6 @@ var QueryBuilder = function QueryBuilder(_ref) {
         addQueryPrefix: true
       });
 
-      console.log(urlString);
       window.history.pushState({}, '', "".concat(url.origin).concat(url.pathname).concat(urlString));
     }
   };
@@ -196,7 +196,8 @@ var QueryBuilder = function QueryBuilder(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(_designSystem.AccordionItem, {
     heading: /*#__PURE__*/_react["default"].createElement(_QueryTitle["default"], {
       schema: schema[id],
-      conditions: titleConditions
+      conditions: titleConditions,
+      customColumns: customColumns
     }),
     defaultOpen: false
   }, /*#__PURE__*/_react["default"].createElement("form", {

package/lib/templates/FilteredResource/QueryRow.js

@@ -135,19 +135,22 @@ var QueryRow = function QueryRow(_ref) {
     showYearDropdown: true,
     dropdownMode: "select",
     className: "ds-c-field",
-    popperPlacement: "top-end",
-    popperModifiers: [{
-      name: 'preventOverflow',
-      options: {
-        rootBoundary: 'viewport',
-        // tether: true,
-        altAxis: true
-      }
-    }]
+    withPortal: true // popperPlacement="top-end"
+    // popperModifiers={[
+    //   {
+    //     name: 'preventOverflow',
+    //     options: {
+    //       rootBoundary: 'viewport',
+    //       // tether: true,
+    //       altAxis: true,
+    //     },
+    //   },
+    // ]}
+
   })) : /*#__PURE__*/_react["default"].createElement(_designSystem.TextField, {
     label: "Value",
     name: "".concat(condition.key, "_value"),
-    value: cleanText(value, operator),
+    value: (0, _functions.cleanText)(value, operator),
     onChange: function onChange(e) {
       return setValue(e.target.value);
     }

package/lib/templates/FilteredResource/QueryTitle.js

@@ -15,13 +15,33 @@ var _functions = require("./functions");
 
 var QueryTitle = function QueryTitle(_ref) {
   var conditions = _ref.conditions,
-      schema = _ref.schema;
+      schema = _ref.schema,
+      customColumns = _ref.customColumns;
   var fields = schema.fields;
 
   if (!conditions.length) {
     return 'Add a filter';
   }
 
+  function formatValue(text, property) {
+    if (customColumns.length > 0) {
+      var newValue = text;
+      var customColumn = customColumns.find(function (c) {
+        return c.accessor === property;
+      });
+
+      if (customColumn && customColumn.Cell) {
+        return customColumn.Cell({
+          value: text
+        });
+      }
+
+      return text;
+    } else {
+      return text;
+    }
+  }
+
   function buildTitle() {
     var newTitle = conditions.map(function (c) {
       var field = fields[c.property];
@@ -44,6 +64,8 @@ var QueryTitle = function QueryTitle(_ref) {
       return op.value === c.operator;
     });
 
+    var cleanedText = (0, _functions.cleanText)(c.value);
+    var formattedText = formatValue(cleanedText, c.property);
     return /*#__PURE__*/_react["default"].createElement("span", {
       className: "ds-u-fill--background ds-u-padding--1 ds-u-margin-y--1 ds-u-display--inline-block ds-u-font-weight--semibold"
     }, /*#__PURE__*/_react["default"].createElement("span", {
@@ -52,7 +74,7 @@ var QueryTitle = function QueryTitle(_ref) {
       className: "ds-u-font-weight--normal"
     }, operator.label.toUpperCase()), ' ', /*#__PURE__*/_react["default"].createElement("span", {
       className: "ds-u-color--success"
-    }, (0, _functions.cleanText)(c.value)));
+    }, formattedText));
   }).reduce(function (prev, curr) {
     return [prev, /*#__PURE__*/_react["default"].createElement(_designSystem.Badge, {
       className: "ds-u-margin-x--1",

package/package.json

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