Merge pull request #412 from plotly/row-ids

Row IDs

Author: alexcjohnson

CHANGELOG.md

@@ -18,13 +18,27 @@ This project adheres to [Semantic Versioning](http://semver.org/).
     - new `eq` behavior (will attempt to convert and compare numeric values if possible)
     - new readonly `derived_filter_structure` prop exposing the query structure in a programmatically friendlier way
 
+[#412](https://github.com/plotly/dash-table/pull/412)
+- Add support for row IDs, based on the `'id'` attribute of each row of `data`
+    - IDs will not be displayed unless there is a column with `id='id'`
+    - `active_cell`, `start_cell`, `end_cell`, and items in `selected_cells` contain row and column IDs: All are now dicts  `{'row', 'column', 'row_id' and 'column_id'}` rather than arrays `[row, column]`.
+    - Added new props mirroring all existing row indices props:
+        - `selected_row_ids` mirrors `selected_rows`
+        - `derived_viewport_row_ids` mirrors `derived_viewport_indices`
+        - `derived_virtual_row_ids` mirrors `derived_virtual_indices`
+        - `derived_viewport_selected_row_ids` mirrors `derived_viewport_selected_rows`
+        - `derived_virtual_selected_row_ids` mirrors `derived_virtual_selected_rows`
+
 ### Changed
 [#397](https://github.com/plotly/dash-table/pull/397)
 - Rename `filtering_settings` to `filter`
 
-[#412](https://github.com/plotly/dash-table/pull/412)
+[#417](https://github.com/plotly/dash-table/pull/417)
 - Rename `sorting_settings` to `sort_by`
 
+[#412](https://github.com/plotly/dash-table/pull/412)
+- `active_cell` and `selected_cells` items are dicts `{'row', 'column', 'row_id' and 'column_id'}` instead of arrays `[row, column]`
+
 ## [3.6.0] - 2019-03-04
 ### Fixed
 [#189](https://github.com/plotly/dash-table/issues/189)

dash_table/Format.py

@@ -1,6 +1,4 @@
 import collections
-import inspect
-import sys
 
 
 def get_named_tuple(name, dict):
@@ -26,23 +24,23 @@ def get_named_tuple(name, dict):
 })
 
 Prefix = get_named_tuple('prefix', {
-    'yocto': 10**-24,
-    'zepto': 10**-21,
-    'atto': 10**-18,
-    'femto': 10**-15,
-    'pico': 10**-12,
-    'nano': 10**-9,
-    'micro': 10**-6,
-    'milli': 10**-3,
+    'yocto': 10 ** -24,
+    'zepto': 10 ** -21,
+    'atto': 10 ** -18,
+    'femto': 10 ** -15,
+    'pico': 10 ** -12,
+    'nano': 10 ** -9,
+    'micro': 10 ** -6,
+    'milli': 10 ** -3,
     'none': None,
-    'kilo': 10**3,
-    'mega': 10**6,
-    'giga': 10**9,
-    'tera': 10**12,
-    'peta': 10**15,
-    'exa': 10**18,
-    'zetta': 10**21,
-    'yotta': 10**24
+    'kilo': 10 ** 3,
+    'mega': 10 ** 6,
+    'giga': 10 ** 9,
+    'tera': 10 ** 12,
+    'peta': 10 ** 15,
+    'exa': 10 ** 18,
+    'zetta': 10 ** 21,
+    'yotta': 10 ** 24
 })
 
 Scheme = get_named_tuple('scheme', {
@@ -102,11 +100,17 @@ def __init__(self, **kwargs):
             'type': Scheme.default
         }
 
-        valid_methods = [m for m in dir(self.__class__) if m[0] != '_' and m != 'to_plotly_json']
+        valid_methods = [
+            m for m in dir(self.__class__)
+            if m[0] != '_' and m != 'to_plotly_json'
+        ]
 
         for kw, val in kwargs.items():
             if kw not in valid_methods:
-                raise TypeError('{0} is not a format method. Expected one of'.format(kw), str(list(valid_methods)))
+                raise TypeError(
+                    '{0} is not a format method. Expected one of'.format(kw),
+                    str(list(valid_methods))
+                )
 
             getattr(self, kw)(val)
 
@@ -128,7 +132,8 @@ def _validate_non_negative_integer_or_none(self, value):
 
     def _validate_named(self, value, named_values):
         if value not in named_values:
-            raise TypeError('expected value to be one of', str(list(named_values)))
+            raise TypeError('expected value to be one of',
+                            str(list(named_values)))
 
     def _validate_string(self, value):
         if not isinstance(value, (str, u''.__class__)):
@@ -174,7 +179,9 @@ def padding_width(self, value):
     def precision(self, value):
         self._validate_non_negative_integer_or_none(value)
 
-        self._specifier['precision'] = '.{0}'.format(value) if value is not None else ''
+        self._specifier['precision'] = (
+            '.{0}'.format(value) if value is not None else ''
+        )
         return self
 
     def scheme(self, value):
@@ -238,13 +245,20 @@ def group_delimiter(self, value):
         return self
 
     def groups(self, groups):
-        groups = groups if isinstance(groups, list) else [groups] if isinstance(groups, int) else None
+        groups = (
+            groups if isinstance(groups, list) else
+            [groups] if isinstance(groups, int) else None
+        )
 
         if not isinstance(groups, list):
-            raise TypeError('expected groups to be an integer or a list of integers')
-
+            raise TypeError(
+                'expected groups to be an integer or a list of integers'
+            )
         if len(groups) == 0:
-            raise ValueError('expected groups to be an integer or a list of one or more integers')
+            raise ValueError(
+                'expected groups to be an integer or a list of '
+                'one or more integers'
+            )
 
         for group in groups:
             if not isinstance(group, int):
@@ -273,8 +287,9 @@ def to_plotly_json(self):
         f['locale'] = self._locale.copy()
         f['nully'] = self._nully
         f['prefix'] = self._prefix
+        aligned = self._specifier['align'] != Align.default
         f['specifier'] = '{}{}{}{}{}{}{}{}{}{}'.format(
-            self._specifier['fill'] if self._specifier['align'] != Align.default else '',
+            self._specifier['fill'] if aligned else '',
             self._specifier['align'],
             self._specifier['sign'],
             self._specifier['symbol'],

dash_table/FormatTemplate.py

@@ -1,4 +1,3 @@
-from enum import Enum
 from .Format import Format, Group, Scheme, Sign, Symbol
 
 

package.json

@@ -22,7 +22,7 @@
     "private::host_dash8083": "python tests/cypress/dash/v_fe_page.py",
     "private::host_js": "http-server ./dash_table -c-1 --silent",
     "private::lint:ts": "tslint '{src,demo,tests}/**/*.{js,ts,tsx}' --exclude '**/@Types/*.*'",
-    "private::lint:py": "flake8 --exclude=DataTable.py,__init__.py,_imports_.py --ignore=E501,F401,F841,F811,F821 dash_table",
+    "private::lint:py": "flake8 --exclude=DataTable.py,__init__.py,_imports_.py dash_table",
     "private::wait_dash8081": "wait-on http://localhost:8081",
     "private::wait_dash8082": "wait-on http://localhost:8082",
     "private::wait_dash8083": "wait-on http://localhost:8083",

src/dash-table/components/CellFactory.tsx

@@ -50,7 +50,6 @@ export default class CellFactory {
         } = this.props;
 
         const operations = this.cellOperations(
-            active_cell,
             data,
             virtualized.data,
             virtualized.indices,
@@ -114,4 +113,4 @@ export default class CellFactory {
             (o, c) => Array.prototype.concat(o, c)
         );
     }
-}
+}