Fix data viewer issues

news/2 Fixes/5278.md

@@ -0,0 +1 @@
+Filtered rows shows 'fetching' instead of No rows.

news/2 Fixes/5395.md

@@ -0,0 +1 @@
+Multi-dimensional arrays don't open in the data viewer.

package.nls.json

@@ -226,7 +226,8 @@
     "DataScience.dataExplorerInvalidVariableFormat": "'{0}' is not an active variable.",
     "DataScience.jupyterGetVariablesExecutionError": "Failure during variable extraction:\r\n{0}",
     "DataScience.loadingMessage": "loading ...",
-    "DataScience.noRowsInDataViewer": "Fetching data ...",
+    "DataScience.fetchingDataViewer": "Fetching data ...",
+    "DataScience.noRowsInDataViewer": "No rows match current filter",
     "DataScience.pandasTooOldForViewingFormat": "Python package 'pandas' is version {0}. Version 0.20 or greater is required for viewing data.",
     "DataScience.pandasRequiredForViewing": "Python package 'pandas' is required for viewing data.",
     "DataScience.valuesColumn": "values",

pythonFiles/datascience/getJupyterVariableDataFrameInfo.py

@@ -35,8 +35,7 @@
         _VSCODE_columnTypes = list(_VSCODE_evalResult.dtypes)
         _VSCODE_columnNames = list(_VSCODE_evalResult)
     elif _VSCODE_targetVariable['type'] == 'ndarray':
-        _VSCODE_evalResult = _VSCODE_pd.Series(_VSCODE_evalResult)
-        _VSCODE_evalResult = _VSCODE_pd.Series.to_frame(_VSCODE_evalResult)
+        _VSCODE_evalResult = _VSCODE_pd.DataFrame(_VSCODE_evalResult)
         _VSCODE_columnTypes = list(_VSCODE_evalResult.dtypes)
         _VSCODE_columnNames = list(_VSCODE_evalResult)
     elif _VSCODE_targetVariable['type'] == 'DataFrame':

pythonFiles/datascience/getJupyterVariableDataFrameRows.py

@@ -23,8 +23,7 @@
     _VSCODE_evalResult = _VSCODE_pd.Series(_VSCODE_evalResult)
     _VSCODE_df = _VSCODE_pd.Series.to_frame(_VSCODE_evalResult)
 elif _VSCODE_targetVariable['type'] == 'ndarray':
-    _VSCODE_evalResult = _VSCODE_pd.Series(_VSCODE_evalResult)
-    _VSCODE_df = _VSCODE_pd.Series.to_frame(_VSCODE_evalResult)
+    _VSCODE_df = _VSCODE_pd.DataFrame(_VSCODE_evalResult)
 # If not a known type, then just let pandas handle it.
 elif not (hasattr(_VSCODE_df, 'iloc')):
     _VSCODE_df = _VSCODE_pd.DataFrame(_VSCODE_evalResult)

pythonFiles/tests/ipython/test_variables.py

@@ -49,13 +49,15 @@ def test_dataframe_info(capsys):
 ls = list([10, 20, 30, 40])
 df = pd.DataFrame(ls)
 se = pd.Series(ls)
-np = np.array(ls)
+np1 = np.array(ls)
+np2 = np.array([[1, 2, 3], [4, 5, 6]])
 obj = {}
 ''')
     vars = get_variables(capsys)
     df = get_variable_value(vars, 'df', capsys)
     se = get_variable_value(vars, 'se', capsys)
-    np = get_variable_value(vars, 'np', capsys)
+    np = get_variable_value(vars, 'np1', capsys)
+    np2 = get_variable_value(vars, 'np2', capsys)
     ls = get_variable_value(vars, 'ls', capsys)
     obj = get_variable_value(vars, 'obj', capsys)
     assert df
@@ -65,8 +67,9 @@ def test_dataframe_info(capsys):
     assert obj
     verify_dataframe_info(vars, 'df', capsys, True)
     verify_dataframe_info(vars, 'se', capsys, True)
-    verify_dataframe_info(vars, 'np', capsys, True)
+    verify_dataframe_info(vars, 'np1', capsys, True)
     verify_dataframe_info(vars, 'ls', capsys, True)
+    verify_dataframe_info(vars, 'np2', capsys, True)
     verify_dataframe_info(vars, 'obj', capsys, False)
 
 def verify_dataframe_info(vars, name, capsys, hasInfo):
@@ -96,6 +99,27 @@ def test_dataframe_rows(capsys):
     rows = get_data_frame_rows(info, 100, 200, capsys)
     assert rows
     assert rows['data'][0]['+h2'] == 'Fy3 W[pMT['
+    get_ipython().run_cell('''
+import pandas as pd
+import numpy as np
+ls = list([10, 20, 30, 40])
+df = pd.DataFrame(ls)
+se = pd.Series(ls)
+np1 = np.array(ls)
+np2 = np.array([[1, 2, 3], [4, 5, 6]])
+obj = {}
+''')
+    vars = get_variables(capsys)
+    np2 = get_variable_value(vars, 'np2', capsys)
+    assert np2
+    info = get_data_frame_info(vars, 'np2', capsys)
+    assert 'rowCount' in info
+    assert info['rowCount'] == 2
+    rows = get_data_frame_rows(info, 0, 2, capsys)
+    assert rows
+    assert rows['data'][0]
+
+
 
 
 

src/client/common/utils/localize.ts

@@ -160,7 +160,8 @@ export namespace DataScience {
     export const pythonInteractiveCreateFailed = localize('DataScience.pythonInteractiveCreateFailed', 'Failure to create a \'Python Interactive\' window. Try reinstalling the Python extension.');
     export const jupyterGetVariablesExecutionError = localize('DataScience.jupyterGetVariablesExecutionError', 'Failure during variable extraction: \r\n{0}');
     export const loadingMessage = localize('DataScience.loadingMessage', 'loading ...');
-    export const noRowsInDataViewer = localize('DataScience.noRowsInDataViewer', 'Fetching data ...');
+    export const fetchingDataViewer = localize('DataScience.fetchingDataViewer', 'Fetching data ...');
+    export const noRowsInDataViewer = localize('DataScience.noRowsInDataViewer', 'No rows match current filter');
     export const pandasTooOldForViewingFormat = localize('DataScience.pandasTooOldForViewingFormat', 'Python package \'pandas\' is version {0}. Version 0.20 or greater is required for viewing data.');
     export const pandasRequiredForViewing = localize('DataScience.pandasRequiredForViewing', 'Python package \'pandas\' is required for viewing data.');
     export const valuesColumn = localize('DataScience.valuesColumn', 'values');

src/datascience-ui/data-explorer/emptyRowsView.css

@@ -1,9 +0,0 @@
-.progress-bar {
-    margin:2px;
-    text-align: center;
-}
-
-.progress-container {
-    padding: 20px;
-    text-align:center;
-}

src/datascience-ui/data-explorer/emptyRowsView.tsx

@@ -7,22 +7,14 @@ import * as React from 'react';
 import { getLocString } from '../react-common/locReactSide';
 
 export interface IEmptyRowsProps {
-    total: number;
-    current: number;
 }
 
-export const EmptyRowsView = (props: IEmptyRowsProps) => {
-    const percent = props.current / props.total * 100;
-    const percentText = `${Math.round(percent)}%`;
-    const style: React.CSSProperties = {
-        width: percentText
-    };
-    const message = getLocString('DataScience.noRowsInDataViewer', 'Fetching data ...');
+export const EmptyRows = (_props: IEmptyRowsProps) => {
+    const message = getLocString('DataScience.noRowsInDataViewer', 'No rows match current filter');
 
     return (
-        <div className='progress-container'>
+        <div className='container'>
             {message}
-            <div className='progress-bar' style={style}>{percentText}</div>
         </div>
     );
 };

src/datascience-ui/data-explorer/mainPanel.tsx

@@ -21,7 +21,8 @@ import { IJupyterVariable } from '../../client/datascience/types';
 import { IMessageHandler, PostOffice } from '../react-common/postOffice';
 import { StyleInjector } from '../react-common/styleInjector';
 import { CellFormatter } from './cellFormatter';
-import { EmptyRowsView } from './emptyRowsView';
+import { EmptyRows } from './emptyRowsView';
+import { ProgressBar } from './progressBar';
 import { generateTestData } from './testData';
 
 import 'bootstrap/dist/css/bootstrap.css';
@@ -118,7 +119,10 @@ export class MainPanel extends React.Component<IMainPanelProps, IMainPanelState>
 
     public componentDidUpdate() {
         // Rebind our empty rows view to our new state.
-        this.emptyRows = EmptyRowsView.bind(this, {current: this.state.fetchedRowCount, total: this.state.actualRowCount});
+        this.emptyRows = this.state.fetchedRowCount === this.state.actualRowCount ?
+            EmptyRows.bind(this, {current: this.state.fetchedRowCount, total: this.state.actualRowCount}) :
+            ProgressBar.bind(this, {current: this.state.fetchedRowCount, total: this.state.actualRowCount});
+
         this.getEmptyRows = (_props: any) => {
             return this.emptyRows ? this.emptyRows() : <div/>;
         };

src/datascience-ui/data-explorer/progressBar.css

@@ -0,0 +1,9 @@
+.progress-bar {
+    margin:2px;
+    text-align: center;
+}
+
+.progress-container {
+    padding: 20px;
+    text-align:center;
+}

src/datascience-ui/data-explorer/progressBar.tsx

@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+'use strict';
+import './progressBar.css';
+
+import * as React from 'react';
+import { getLocString } from '../react-common/locReactSide';
+
+export interface IEmptyRowsProps {
+    total: number;
+    current: number;
+}
+
+export const ProgressBar = (props: IEmptyRowsProps) => {
+    const percent = props.current / props.total * 100;
+    const percentText = `${Math.round(percent)}%`;
+    const style: React.CSSProperties = {
+        width: percentText
+    };
+    const message = getLocString('DataScience.fetchingDataViewer', 'Fetching data ...');
+
+    return (
+        <div className='progress-container'>
+            {message}
+            <div className='progress-bar' style={style}>{percentText}</div>
+        </div>
+    );
+};