Skip to content

Table widget: default selected row, 0th #5930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
somangshu merged 11 commits into from
Aug 30, 2021
Merged

Table widget: default selected row, 0th #5930

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fa6c643
set defaultSelectedRow prop of table 0
techbhavin Jul 17, 2021
d55c4f0
Merge remote-tracking branch 'origin/release' into feature/default-se…
techbhavin Aug 3, 2021
7deaf92
added migration script
techbhavin Aug 4, 2021
6c38505
number prop changed to string
techbhavin Aug 10, 2021
d14a9e0
Merge remote-tracking branch 'origin/release' into feature/default-se…
techbhavin Aug 10, 2021
3a046f7
defaultSelectedRow interface added string type
techbhavin Aug 11, 2021
acc8431
migration updated
techbhavin Aug 13, 2021
2bb45db
Merge remote-tracking branch 'origin/release' into feature/default-se…
techbhavin Aug 18, 2021
e2c62b6
Merge branch 'release' into feature/default-selected-row-zero
techbhavin Aug 18, 2021
adcaebb
Merge remote-tracking branch 'origin/release' into feature/default-se…
techbhavin Aug 18, 2021
dbc3f8d
Merge remote-tracking branch 'origin/release' into feature/default-se…
techbhavin Aug 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/client/src/constants/WidgetConstants.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,9 @@ export const layoutConfigurations: LayoutConfigurations = {
FLUID: { minWidth: -1, maxWidth: -1 },
};

export const LATEST_PAGE_VERSION = 31;

export const LATEST_PAGE_VERSION = 32;


export const GridDefaults = {
DEFAULT_CELL_SIZE: 1,
Expand Down
1 change: 1 addition & 0 deletions app/client/src/mockResponses/WidgetConfigResponse.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
TABLE_WIDGET: {
rows: 7 * GRID_DENSITY_MIGRATION_V1,
columns: 9 * GRID_DENSITY_MIGRATION_V1,
defaultSelectedRow: "0",
label: "Data",
widgetName: "Table",
searchKey: "",
Expand Down
19 changes: 19 additions & 0 deletions app/client/src/utils/WidgetPropsUtils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,6 +812,11 @@ const transformDSL = (currentDSL: ContainerWidgetProps<WidgetProps>) => {

if (currentDSL.version === 30) {
currentDSL = migrateIsDisabledToButtonColumn(currentDSL);
currentDSL.version = 31;
}

if (currentDSL.version === 31) {
currentDSL = migrateTableDefaultSelectedRow(currentDSL);
currentDSL.version = LATEST_PAGE_VERSION;
}
return currentDSL;
Expand Down Expand Up @@ -839,6 +844,20 @@ const addIsDisabledToButtonColumn = (
return currentDSL;
};

export const migrateTableDefaultSelectedRow = (
currentDSL: ContainerWidgetProps<WidgetProps>,
) => {
if (currentDSL.type === WidgetTypes.TABLE_WIDGET) {
if (!currentDSL.defaultSelectedRow) currentDSL.defaultSelectedRow = "0";
}
if (currentDSL.children && currentDSL.children.length) {
currentDSL.children = currentDSL.children.map((child) =>
migrateTableDefaultSelectedRow(child),
);
}
return currentDSL;
};

const migrateIsDisabledToButtonColumn = (
currentDSL: ContainerWidgetProps<WidgetProps>,
) => {
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/widgets/TableWidget/TableWidgetConstants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export interface TableWidgetProps extends WidgetProps, WithMeta, TableStyles {
label: string;
searchText: string;
defaultSearchText: string;
defaultSelectedRow?: number | number[];
defaultSelectedRow?: number | number[] | string;
tableData: Array<Record<string, unknown>>;
onPageChange?: string;
pageSize: number;
Expand Down