ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Stop map column names for notebook grid, instead use field with unique values (#3975)

Browse Source
This commit is contained in:
Chris LaFreniere
2019-02-08 09:59:36 -10:00
committed by GitHub
parent 160ab8d0ae
commit b692088c94
1 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/sql/parts/notebook/outputs/tableRenderers.ts
View File

@@ -46,7 +46,7 @@ export function renderDataResource(
let rowNumberColumn = new RowNumberColumn({ numberOfRows: source.length }); let rowNumberColumn = new RowNumberColumn({ numberOfRows: source.length });
columnsTransformed.unshift(rowNumberColumn.getColumnDefinition()); columnsTransformed.unshift(rowNumberColumn.getColumnDefinition());
let transformedData = transformData(sourceObject.data, columns); let transformedData = transformData(sourceObject.data, columnsTransformed);
tableResultsData.push(transformedData); tableResultsData.push(transformedData);
let detailTable = new Table(tableContainer, { let detailTable = new Table(tableContainer, {
@@ -72,12 +72,13 @@ export function renderDataResource(
} }
// SlickGrid requires columns and data to be in a very specific format; this code was adapted from tableInsight.component.ts // SlickGrid requires columns and data to be in a very specific format; this code was adapted from tableInsight.component.ts
function transformData(rows: any[], columns: string[]): { [key: string]: string }[] { function transformData(rows: any[], columns: Slick.Column<any>[]): { [key: string]: string }[] {
return rows.map(row => { return rows.map(row => {
let dataWithSchema = {}; let dataWithSchema = {};
Object.keys(row).forEach((val, index) => { Object.keys(row).forEach((val, index) => {
let displayValue = String(Object.values(row)[index]); let displayValue = String(Object.values(row)[index]);
dataWithSchema[columns[index]] = { // Since the columns[0] represents the row number, start at 1
dataWithSchema[columns[index + 1].field] = {
displayValue: displayValue, displayValue: displayValue,
ariaLabel: escape(displayValue), ariaLabel: escape(displayValue),
isNull: false isNull: false
@@ -88,11 +89,11 @@ function transformData(rows: any[], columns: string[]): { [key: string]: string
} }
function transformColumns(columns: string[]): Slick.Column<any>[] { function transformColumns(columns: string[]): Slick.Column<any>[] {
return columns.map(col => { return columns.map((col, index) => {
return <Slick.Column<any>>{ return <Slick.Column<any>>{
name: col, name: col,
id: col, id: col,
field: col, field: index.toString(),
formatter: textFormatter formatter: textFormatter
}; };
}); });