Skip to content
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

fix: select column to display cell value when options are mismatched #38387

Merged
merged 2 commits into from
Jan 13, 2025
Merged

fix: select column to display cell value when options are mismatched #38387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2da7c04
feat: default to cell value in cellLabelValue
jacquesikot Dec 27, 2024
d39d7f3
feat: add test
jacquesikot Dec 27, 2024
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
10 changes: 8 additions & 2 deletions app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/Select1_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,13 @@ describe(
checkSameOptionsWhileAddingNewRow();
});

it("10. should check that 'new row select options' is working", () => {
it("10. check that table shows with select options mismatch", () => {
cy.readTableV2data(0, 0).then((val) => {
expect(val).to.equal("#1");
});
});

it("11. should check that 'new row select options' is working", () => {
const checkNewRowOptions = () => {
// New row select options should be visible when "Same options in new row" is turned off
_.propPane.TogglePropertyState("Same options in new row", "Off");
Expand Down Expand Up @@ -401,7 +407,7 @@ describe(
checkNoOptionState();
});

it("11. should check that server side filering is working", () => {
it("12. should check that server side filering is working", () => {
_.dataSources.CreateDataSource("Postgres");
_.dataSources.CreateQueryAfterDSSaved(
"SELECT * FROM public.astronauts {{this.params.filterText ? `WHERE name LIKE '%${this.params.filterText}%'` : ''}} LIMIT 10;",
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/widgets/TableWidgetV2/component/cellComponents/SelectCell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ export const SelectCell = (props: SelectProps) => {

return selectedOption
? selectedOption[TableSelectColumnOptionKeys.LABEL]
: "";
: value;
}, [value, options]);

if (isEditable && isCellEditable && isCellEditMode) {
Expand Down
Loading