Disable grouping when we're filtered by any other column other than level 0 of the multiindex. Fix for converting PeriodIndex values to strings in pandas 0.18.x. Don't get the _primary_key from the generated json anymore, because it seems it's often not included and we already have code that figures it out.

Author: Tim Shawver

js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qgrid",
-  "version": "1.0.5",
+  "version": "1.0.6-beta.3",
   "description": "An Interactive Grid for Sorting and Filtering DataFrames in Jupyter Notebook",
   "author": "Quantopian Inc.",
   "main": "src/index.js",

js/src/qgrid.widget.js

@@ -36,8 +36,8 @@ class QgridModel extends widgets.DOMWidgetModel {
       _view_name : 'QgridView',
       _model_module : 'qgrid',
       _view_module : 'qgrid',
-      _model_module_version : '^1.0.5',
-      _view_module_version : '^1.0.5',
+      _model_module_version : '^1.0.6-beta.3',
+      _view_module_version : '^1.0.6-beta.3',
       _df_json: '',
       _columns: {}
     });
@@ -643,6 +643,7 @@ class QgridView extends widgets.DOMWidgetView {
       this.update_timeout = setTimeout(() => {
         var df_json = JSON.parse(this.model.get('_df_json'));
         this.row_styles = this.model.get("_row_styles");
+        this.multi_index = this.model.get("_multi_index");
         var data_view = this.create_data_view(df_json.data);
 
         if (msg.triggered_by == 'sort_changed' && this.sort_indicator){
@@ -661,7 +662,23 @@ class QgridView extends widgets.DOMWidgetView {
         }
 
         this.set_data_view(data_view);
-        this.slick_grid.setCellCssStyles("grouping", this.row_styles);
+
+        var skip_grouping = false;
+        if (this.multi_index) {
+          for (var i=1; i < this.filter_list.length; i++) {
+            var cur_filter = this.filter_list[i];
+            if (cur_filter.is_active()) {
+              skip_grouping = true;
+            }
+          }
+        }
+
+        if (skip_grouping) {
+          this.slick_grid.removeCellCssStyles("grouping");
+        } else {
+          this.slick_grid.setCellCssStyles("grouping", this.row_styles);
+        }
+
         this.slick_grid.render();
 
         if ((msg.triggered_by == 'add_row' ||

qgrid/_version.py

@@ -1,4 +1,4 @@
-version_info = (1, 0, 5, 'final')
+version_info = (1, 0, 6, 'beta', 3)
 
 _specifier_ = {'alpha': 'a', 'beta': 'b', 'candidate': 'rc', 'final': ''}
 

qgrid/grid.py

@@ -472,8 +472,8 @@ class QgridWidget(widgets.DOMWidget):
     _model_name = Unicode('QgridModel').tag(sync=True)
     _view_module = Unicode('qgrid').tag(sync=True)
     _model_module = Unicode('qgrid').tag(sync=True)
-    _view_module_version = Unicode('1.0.5').tag(sync=True)
-    _model_module_version = Unicode('1.0.5').tag(sync=True)
+    _view_module_version = Unicode('1.0.6-beta.3').tag(sync=True)
+    _model_module_version = Unicode('1.0.6-beta.3').tag(sync=True)
 
     _df = Instance(pd.DataFrame)
     _df_json = Unicode('', sync=True)
@@ -493,7 +493,7 @@ class QgridWidget(widgets.DOMWidget):
     _unfiltered_df = Instance(pd.DataFrame)
     _index_col_name = Unicode('qgrid_unfiltered_index', sync=True)
     _sort_col_suffix = Unicode('_qgrid_sort_column')
-    _multi_index = Bool(False)
+    _multi_index = Bool(False, sync=True)
     _edited = Bool(False)
     _selected_rows = List([])
     _viewport_range = Tuple(Integer(), Integer(), default_value=(0, 100))
@@ -766,7 +766,8 @@ def _update_table(self,
 
             def should_be_stringified(col_series):
                 return col_series.dtype == np.dtype('O') or \
-                       hasattr(col_series, 'cat')
+                       hasattr(col_series, 'cat') or \
+                       isinstance(col_series, pd.PeriodIndex)
 
             if type(df.index) == pd.core.index.MultiIndex:
                 self._multi_index = True
@@ -809,10 +810,9 @@ def should_be_stringified(col_series):
                 not self._disable_grouping:
             previous_value = None
             row_styles = {}
-            row_styles_idx = 0
+            row_loc = from_index
             for index, row in df.iterrows():
                 row_style = {}
-                row_loc = self._df.index.get_loc(index)
                 last_row = row_loc == (len(self._df) - 1)
                 prev_idx = row_loc - 1
                 for idx, index_val in enumerate(index):
@@ -844,7 +844,7 @@ def should_be_stringified(col_series):
                                 row_styles[prev_idx][col_name] = 'group-single'
                 previous_value = index
                 row_styles[row_loc] = row_style
-                row_styles_idx += 1
+                row_loc += 1
 
             self._row_styles = row_styles
         else:
@@ -865,17 +865,6 @@ def should_be_stringified(col_series):
             parsed_json = json.loads(df_json)
             df_schema = parsed_json['schema']
 
-            if ('primaryKey' in df_schema):
-                self._primary_key = df_schema['primaryKey']
-            else:
-                # for some reason, 'primaryKey' isn't set in certain cases,
-                # like when we have an interval index. that's why this case
-                # is here.
-                if df.index.name is not None:
-                    self._primary_key = [df.index.name]
-                else:
-                    self._primary_key = ['index']
-
             columns = {}
             for i, cur_column in enumerate(df_schema['fields']):
                 col_name = cur_column['name']
@@ -896,7 +885,7 @@ def should_be_stringified(col_series):
                     level = self._primary_key.index(col_name)
                     if level == 0:
                         cur_column['first_index'] = True
-                    if level == (len(self._primary_key) - 1):
+                    if self._multi_index and level == (len(self._primary_key) - 1):
                         cur_column['last_index'] = True
 
                 cur_column['position'] = i
@@ -965,12 +954,9 @@ def _update_sort(self):
                         inplace=True
                     )
                 else:
-                    level_id = self._sort_field
-                    level_index = self._primary_key.index(level_id)
-                    if self._sort_field.startswith('level_'):
-                        level_id = int(self._sort_field[6:])
+                    level_index = self._primary_key.index(self._sort_field)
                     self._df.sort_index(
-                        level=level_id,
+                        level=level_index,
                         ascending=self._sort_ascending,
                         inplace=True
                     )
@@ -1215,11 +1201,13 @@ def _set_col_series_on_df(self, col_name, df, col_series):
         if col_name in self._primary_key:
             if len(self._primary_key) > 1:
                 key_index = self._primary_key.index(col_name)
-                col_series.name = df.index.levels[key_index].name
+                prev_name = df.index.levels[key_index].name
                 df.index.set_levels(col_series, level=key_index, inplace=True)
+                df.index.rename(prev_name, level=key_index, inplace=True)
             else:
-                col_series.name = df.index.name
+                prev_name = df.index.name
                 df.set_index(col_series, inplace=True)
+                df.index.rename(prev_name)
         else:
             df[col_name] = col_series