@urbanos/react-discovery-ui 2.1.56 → 2.1.57

package/lib/components/code-editor/code-editor.js

@@ -51,6 +51,7 @@ var CodeEditor = /*#__PURE__*/function (_React$Component) {
         },
         padding: 10,
         onBlur: this.props.onBlur,
+        ignoreTabKey: true,
         style: {
           fontFamily: '"Fira code", "Fira Mono", monospace',
           fontSize: 12,

package/lib/components/data-view/data-view.js

@@ -175,8 +175,6 @@ var DataTable = function DataTable(_ref) {
     if (coords) activateCell(coords.row, coords.col);
   };
   var dataRows = table.getRowModel().rows;
-  var pageIndex = pagination.pageIndex;
-  var pageSize = pagination.pageSize;
   return /*#__PURE__*/_react.default.createElement("div", {
     style: {
       height: '400px',
@@ -184,30 +182,22 @@ var DataTable = function DataTable(_ref) {
     }
   }, /*#__PURE__*/_react.default.createElement("table", {
     ref: tableRef,
-    role: "table",
     tabIndex: 0,
-    "aria-activedescendant": activeCellId,
-    "aria-rowcount": dataRows.length + 1,
-    "aria-colcount": columns.length,
     style: {
-      width: table.getTotalSize()
+      width: table.getTotalSize() == 0 ? '100%' : table.getTotalSize()
     },
     onClick: handleTableClick
   }, /*#__PURE__*/_react.default.createElement("caption", null, datasetName ? "".concat(datasetName, " Dataset Preview") : 'Dataset Preview'), /*#__PURE__*/_react.default.createElement("thead", null, table.getHeaderGroups().map(function (headerGroup) {
     return /*#__PURE__*/_react.default.createElement("tr", {
-      key: headerGroup.id,
-      role: "row",
-      "aria-rowindex": 1
+      key: headerGroup.id
     }, headerGroup.headers.map(function (header, colIndex) {
       var _header$column$column;
       return /*#__PURE__*/_react.default.createElement("th", {
         key: header.id,
         id: colHeaderId(colIndex),
-        role: "columnheader",
         scope: "col",
         "data-row": 0,
         "data-col": colIndex,
-        "aria-colindex": colIndex + 1,
         className: "".concat(((_header$column$column = header.column.columnDef.meta) === null || _header$column$column === void 0 ? void 0 : _header$column$column.headerClassName) || 'table-header').concat(activeCellId === colHeaderId(colIndex) ? ' active-cell' : ''),
         style: {
           width: header.getSize(),
@@ -220,40 +210,30 @@ var DataTable = function DataTable(_ref) {
         "aria-hidden": "true"
       }));
     }));
-  })), /*#__PURE__*/_react.default.createElement("tbody", null, dataRows.length === 0 ? /*#__PURE__*/_react.default.createElement("tr", {
-    role: "row"
-  }, /*#__PURE__*/_react.default.createElement("td", {
-    role: "gridcell",
-    colSpan: columns.length,
+  })), /*#__PURE__*/_react.default.createElement("tbody", null, dataRows.length === 0 ? /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", {
+    colSpan: Math.max(columns.length, 1),
     className: "no-data-message"
   }, "No rows found")) : dataRows.map(function (row, rowIndex) {
     var tableRow = rowIndex + 1;
-    var ariaRowIndex = pageIndex * pageSize + rowIndex + 2; // +1 for header, +1 for 1-based
     return /*#__PURE__*/_react.default.createElement("tr", {
       key: row.id,
-      role: "row",
-      "aria-rowindex": ariaRowIndex,
       className: rowIndex % 2 === 0 ? 'striped-row' : ''
     }, row.getVisibleCells().map(function (cell, colIndex) {
       var content = (0, _reactTable.flexRender)(cell.column.columnDef.cell, cell.getContext());
       return colIndex === 0 ? /*#__PURE__*/_react.default.createElement("th", {
         key: cell.id,
         id: rowHeaderId(rowIndex),
-        role: "rowheader",
         scope: "row",
         headers: colHeaderId(0),
         "data-row": tableRow,
         "data-col": colIndex,
-        "aria-colindex": 1,
         className: "row-header".concat(activeCellId === rowHeaderId(rowIndex) ? ' active-cell' : '')
       }, content) : /*#__PURE__*/_react.default.createElement("td", {
         key: cell.id,
         id: dataCellId(rowIndex, colIndex),
-        role: "gridcell",
         headers: "".concat(colHeaderId(colIndex), " ").concat(rowHeaderId(rowIndex)),
         "data-row": tableRow,
         "data-col": colIndex,
-        "aria-colindex": colIndex + 1,
         className: activeCellId === dataCellId(rowIndex, colIndex) ? 'active-cell' : undefined
       }, content);
     }));
@@ -266,6 +246,9 @@ var DataTable = function DataTable(_ref) {
     disabled: !table.getCanPreviousPage(),
     "aria-label": "Previous page"
   }, '<'), /*#__PURE__*/_react.default.createElement("span", null, "Page", ' ', /*#__PURE__*/_react.default.createElement("input", {
+    id: "page-number-input",
+    type: "number",
+    label: "Page number input",
     "data-testid": "page-number-input",
     value: table.getState().pagination.pageIndex + 1,
     onChange: function onChange(e) {

package/lib/components/dataset-metadata/dataset-metadata.js

@@ -88,7 +88,6 @@ var MetadataTable = function MetadataTable(_ref) {
   })));
 };
 var _default = exports.default = function _default(_ref2) {
-  var _dataset$homepage, _dataset$sourceUrl, _dataset$license, _dataset$license2;
   var dataset = _ref2.dataset;
   if (!dataset) return /*#__PURE__*/_react.default.createElement("div", null);
   var referenceUrls = dataset.referenceUrls || [];
@@ -119,10 +118,8 @@ var _default = exports.default = function _default(_ref2) {
   }, {
     Field: 'Data Dictionary URL',
     Value: dataset.describedByUrl ? /*#__PURE__*/_react.default.createElement("a", {
-      role: "link",
       href: dataset.describedByUrl,
       target: "_blank",
-      "aria-label": "Data Dictionary URL",
       rel: "noreferrer"
     }, dataset.describedByUrl) : /*#__PURE__*/_react.default.createElement("span", null, "Unavailable")
   }, {
@@ -137,46 +134,38 @@ var _default = exports.default = function _default(_ref2) {
   }, {
     Field: 'Homepage URL',
     Value: dataset.homepage ? /*#__PURE__*/_react.default.createElement("a", {
-      role: "link",
       href: dataset.homepage,
       target: "_blank",
-      "aria-label": "Homepage URL",
       rel: "noreferrer"
-    }, (_dataset$homepage = dataset.homepage) !== null && _dataset$homepage !== void 0 ? _dataset$homepage : 'Unavailable') : /*#__PURE__*/_react.default.createElement("span", null, "Unavailable")
+    }, dataset.homepage) : /*#__PURE__*/_react.default.createElement("span", null, "Unavailable")
   }, {
     Field: 'Related Documents',
     Value: referenceUrls.length === 0 ? /*#__PURE__*/_react.default.createElement("span", null, "None") : referenceUrls.map(function (url) {
       return /*#__PURE__*/_react.default.createElement("div", {
         key: url
       }, /*#__PURE__*/_react.default.createElement("a", {
-        role: "link",
         href: url,
         target: "_blank",
-        "aria-label": "Related Document URL",
         rel: "noreferrer"
       }, url));
     })
   }, {
     Field: 'Source URL',
     Value: dataset.sourceUrl ? /*#__PURE__*/_react.default.createElement("a", {
-      role: "link",
       href: dataset.sourceUrl,
       target: "_blank",
-      "aria-label": "Source URL",
       rel: "noreferrer"
-    }, (_dataset$sourceUrl = dataset.sourceUrl) !== null && _dataset$sourceUrl !== void 0 ? _dataset$sourceUrl : 'Unavailable') : /*#__PURE__*/_react.default.createElement("span", null, "Unavailable")
+    }, dataset.sourceUrl) : /*#__PURE__*/_react.default.createElement("span", null, "Unavailable")
   }, {
     Field: 'Source Type',
     Value: dataset.sourceType
   }, {
     Field: 'License',
     Value: dataset.license ? /*#__PURE__*/_react.default.createElement("a", {
-      role: "link",
       href: dataset.license,
       target: "_blank",
-      "aria-label": (_dataset$license = dataset.license) !== null && _dataset$license !== void 0 ? _dataset$license : 'Unavailable',
       rel: "noreferrer"
-    }, (_dataset$license2 = dataset.license) !== null && _dataset$license2 !== void 0 ? _dataset$license2 : 'Unavailable') : /*#__PURE__*/_react.default.createElement("span", null, "Unavailable")
+    }, dataset.license) : /*#__PURE__*/_react.default.createElement("span", null, "Unavailable")
   }, {
     Field: 'Category',
     Value: dataset.catagories
@@ -205,7 +194,6 @@ var _default = exports.default = function _default(_ref2) {
 function mailto(email, name) {
   if (email) {
     return /*#__PURE__*/_react.default.createElement("a", {
-      role: "link",
       href: 'mailto:' + email
     }, name);
   } else {

package/lib/pages/dataset-detail-view/dataset-detail-view.scss

@@ -83,9 +83,6 @@ dataset-detail-view {
       min-width:400px;
       padding:4%;  
     }
-    dataset-view .header {
-      display:none;
-    } 
     .left-section, .right-section {
       width:100%;
       float:none;

package/lib/pages/dataset-view/dataset-view.js

@@ -41,12 +41,21 @@ var _default = exports.default = /*#__PURE__*/function (_Component) {
     _this = _callSuper(this, _default);
     _this.state = {
       index: 0,
-      localTitle: ''
+      localTitle: '',
+      isMobileMenuOpen: false
     };
     return _this;
   }
   _inherits(_default, _Component);
   return _createClass(_default, [{
+    key: "selectTab",
+    value: function selectTab(tabIndex) {
+      this.setState({
+        index: tabIndex,
+        isMobileMenuOpen: false
+      });
+    }
+  }, {
     key: "generateVisualizationLink",
     value: function generateVisualizationLink() {
       return this.props.visualizationId && (0, _reactRouter.generatePath)(_routes.default.visualizationView, {
@@ -117,9 +126,7 @@ var _default = exports.default = /*#__PURE__*/function (_Component) {
         className: "dataset-view",
         selectedIndex: this.state.index,
         onSelect: function onSelect(tabIndex) {
-          return _this2.setState({
-            index: tabIndex
-          });
+          return _this2.selectTab(tabIndex);
         }
       }, /*#__PURE__*/_react.default.createElement(_reactTabs.TabList, {
         className: "header"
@@ -148,7 +155,39 @@ var _default = exports.default = /*#__PURE__*/function (_Component) {
         target: "_blank",
         href: "https://plotly.com/chart-studio-help/tutorials/#basic",
         rel: "noreferrer"
-      }, "Plot.ly Help")))), this.isNotDatasetDetailsTab() && /*#__PURE__*/_react.default.createElement("span", {
+      }, "Plot.ly Help")))), /*#__PURE__*/_react.default.createElement("div", {
+        className: "mobile-tab-menu"
+      }, /*#__PURE__*/_react.default.createElement("button", {
+        type: "button",
+        className: "mobile-tab-toggle",
+        onClick: function onClick() {
+          return _this2.setState(function (_ref2) {
+            var isMobileMenuOpen = _ref2.isMobileMenuOpen;
+            return {
+              isMobileMenuOpen: !isMobileMenuOpen
+            };
+          });
+        },
+        "aria-label": "Open tab menu",
+        "aria-expanded": this.state.isMobileMenuOpen
+      }, "\u2630"), this.state.isMobileMenuOpen && /*#__PURE__*/_react.default.createElement("div", {
+        className: "mobile-tab-dropdown"
+      }, /*#__PURE__*/_react.default.createElement("button", {
+        type: "button",
+        onClick: function onClick() {
+          return _this2.selectTab(0);
+        }
+      }, "Dataset Details"), /*#__PURE__*/_react.default.createElement("button", {
+        type: "button",
+        onClick: function onClick() {
+          return _this2.selectTab(1);
+        }
+      }, "Write SQL"), this.isVisualizationEnabled() && /*#__PURE__*/_react.default.createElement("button", {
+        type: "button",
+        onClick: function onClick() {
+          return _this2.selectTab(2);
+        }
+      }, "Visualize"))), this.isNotDatasetDetailsTab() && /*#__PURE__*/_react.default.createElement("span", {
         className: "action-area"
       }, /*#__PURE__*/_react.default.createElement(_visualizationListMenuItem.default, {
         isAuthenticated: this.props.auth.isAuthenticated

package/lib/pages/dataset-view/dataset-view.scss

@@ -92,4 +92,56 @@ dataset-view {
   loading-element {
     @include default-loading-icon();
   }
+
+  .mobile-tab-menu {
+    display: none;
+    position: relative;
+  }
+
+  @media only screen and (max-width: 600px) {
+    .header {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+    }
+
+    .tab-area {
+      font-size: small;
+    }
+    
+    .react-tabs__tab {
+      padding: 6px 12px;
+    }
+
+    .mobile-tab-menu {
+      display: block;
+    }
+
+    .mobile-tab-toggle {
+      border: 0;
+      background: transparent;
+      font-size: 22px;
+      padding: 8px 12px;
+      cursor: pointer;
+    }
+
+    .mobile-tab-dropdown {
+      position: absolute;
+      top: calc(100% + 4px);
+      left: 0;
+      z-index: 20;
+      background: white;
+      border: 1px solid $light-grey;
+      box-shadow: 0 4px 12px rgba(0, 0, 0, 0.12);
+    }
+
+    .mobile-tab-dropdown button {
+      display: block;
+      width: 100%;
+      text-align: left;
+      padding: 10px 12px;
+      border: 0;
+      background: white;
+    }
+  }
 }

package/lib/pages/dataset-view/dataset-view.test.js

@@ -1,5 +1,5 @@
 import { shallow } from 'enzyme'
-import { Tab, TabPanel, TabList } from 'react-tabs'
+import { Tab, TabPanel, TabList, Tabs } from 'react-tabs'
 
 import DatasetView from './dataset-view'
 import QueryView from '../query-view'
@@ -62,6 +62,60 @@ describe('dataset view', () => {
     expect(subject.find(VisualizationSaveMenuItem)).toHaveLength(0)
     expect(subject.find(VisualizationListMenuItem)).toHaveLength(0)
   })
+
+  describe('mobile tab menu', () => {
+    it('renders mobile menu toggle button', () => {
+      const mobileMenuToggle = subject.find('.mobile-tab-toggle')
+      expect(mobileMenuToggle).toHaveLength(1)
+      expect(mobileMenuToggle.prop('aria-expanded')).toBe(false)
+    })
+
+    it('toggles dropdown open and closed when menu button is clicked', () => {
+      subject.find('.mobile-tab-toggle').simulate('click')
+      expect(subject.state('isMobileMenuOpen')).toBe(true)
+      expect(subject.find('.mobile-tab-dropdown')).toHaveLength(1)
+
+      subject.find('.mobile-tab-toggle').simulate('click')
+      expect(subject.state('isMobileMenuOpen')).toBe(false)
+      expect(subject.find('.mobile-tab-dropdown')).toHaveLength(0)
+    })
+
+    it('selecting Dataset Details from dropdown sets index to 0 and closes menu', () => {
+      subject.setState({ index: 2, isMobileMenuOpen: true })
+
+      subject.find('.mobile-tab-dropdown button').at(0).simulate('click')
+
+      expect(subject.state('index')).toBe(0)
+      expect(subject.state('isMobileMenuOpen')).toBe(false)
+    })
+
+    it('selecting Write SQL from dropdown sets index to 1 and closes menu', () => {
+      subject.setState({ index: 0, isMobileMenuOpen: true })
+
+      subject.find('.mobile-tab-dropdown button').at(1).simulate('click')
+
+      expect(subject.state('index')).toBe(1)
+      expect(subject.state('isMobileMenuOpen')).toBe(false)
+    })
+
+    it('selecting Visualize from dropdown sets index to 2 when visualizations are enabled', () => {
+      subject.setState({ index: 0, isMobileMenuOpen: true })
+
+      subject.find('.mobile-tab-dropdown button').at(2).simulate('click')
+
+      expect(subject.state('index')).toBe(2)
+      expect(subject.state('isMobileMenuOpen')).toBe(false)
+    })
+
+    it('closes mobile menu when selecting a tab via Tabs onSelect callback', () => {
+      subject.setState({ isMobileMenuOpen: true })
+
+      subject.find(Tabs).prop('onSelect')(1)
+
+      expect(subject.state('index')).toBe(1)
+      expect(subject.state('isMobileMenuOpen')).toBe(false)
+    })
+  })
 })
 
 describe('Visualizations when DISABLE_VISUALIZATIONS is true', () => {
@@ -87,6 +141,11 @@ describe('Visualizations when DISABLE_VISUALIZATIONS is true', () => {
     const test = subject.find('#plotlyhelp')
     expect(test.length).toEqual(0)
   })
+
+  it('does not have the visualize option in the mobile tab dropdown', () => {
+    subject.find('.mobile-tab-toggle').simulate('click')
+    expect(subject.find('.mobile-tab-dropdown button')).toHaveLength(2)
+  })
 })
 
 describe('dataset view when dataset is not loaded', () => {

package/lib/pages/visualization-view/visualization-view.scss

@@ -107,9 +107,4 @@ visualization-view {
   .visualization--selected {
     display: flex;
   }
-  @media only screen and (max-width: 600px) {
-    .header {
-      display:none;
-    } 
-  } 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@urbanos/react-discovery-ui",
-  "version": "2.1.56",
+  "version": "2.1.57",
   "description": "React component for dataset discovery UI",
   "main": "./lib/ReactDiscoveryUI.js",
   "repository": {