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

#1644 Add button for VirtualizedTable Rows in Expression Builder #1645

Merged
merged 8 commits into from
Jan 5, 2024
Merged

#1644 Add button for VirtualizedTable Rows in Expression Builder #1645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
082d321
#1644 Add button for VirtualizedTable Rows in Expression Builder
veenas1 Dec 13, 2023
c628daf
#1644 Add button for VirtualizedTable Rows in Expression Builder
veenas1 Dec 13, 2023
734bcd6
#1644 Fix Cypress Testcase
veenas1 Dec 14, 2023
9b9e117
#1644 Revert schema changes & Code optimize
veenas1 Dec 15, 2023
8b6ebe1
#1644 Fixed test field changes
veenas1 Dec 16, 2023
e1b04f3
#1644 Make Add column width fixed by setting in px
veenas1 Dec 25, 2023
c7a0d97
#1644 set addColumn staticWidth true
veenas1 Jan 4, 2024
b90cdb1
#1644 fix selection off when sorted
veenas1 Jan 4, 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
56 changes: 37 additions & 19 deletions canvas_modules/common-canvas/__tests__/common-properties/controls/expression-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,10 @@ function getCopy(value) {
return JSON.parse(JSON.stringify(value));
}

function getAddButtonsList(rows) {
return rows.find("Button.expression-add-field-button");
}

var controller = new Controller();
const buttonHandler = sinon.spy();
function reset() {
Expand Down Expand Up @@ -414,7 +418,7 @@ describe("expression-builder renders correctly", () => {
// Verify values in "Return" column match with "return_type_label". Default to "return_type".
const expectedReturnType = functionInfo.locReturnType ? functionInfo.locReturnType : functionInfo.return_type;
const actualReturnType = row.find(".ReactVirtualized__Table__rowColumn")
.at(1)
.at(2) // consider Add column
.text();
expect(expectedReturnType).to.eql(actualReturnType);
});
Expand All @@ -435,7 +439,7 @@ describe("expression-builder renders correctly", () => {
// Verify values in "Return" column match with "return_type_label". Default to "return_type".
const expectedReturnType = functionInfo.locReturnType ? functionInfo.locReturnType : functionInfo.return_type;
const actualReturnType = row.find(".ReactVirtualized__Table__rowColumn")
.at(1)
.at(2)
.text();
expect(expectedReturnType).to.eql(actualReturnType);
});
Expand All @@ -455,8 +459,8 @@ describe("expression-builder renders correctly", () => {
// Verify custom header label
const header = valuesTable.find("div[data-role='properties-header-row']");
const headerLabel = header.find(".properties-vt-label-tip-icon");
expect(headerLabel).to.have.length(1);
expect(header.text()).to.equal(harnessMessages[MESSAGE_KEYS.EXPRESSION_VALUE_COLUMN]);
expect(headerLabel).to.have.length(2); // include Add column
expect(header.text()).to.equal("Add" + harnessMessages[MESSAGE_KEYS.EXPRESSION_VALUE_COLUMN]);

// Verify info icon
const headerInfoIcon = header.find(".properties-vt-info-icon-tip");
Expand Down Expand Up @@ -501,7 +505,8 @@ describe("expression-builder select from tables correctly", () => {
</Provider>
);
const fieldTable = wrapper.find("div.properties-field-table-container");
tableUtils.dblClickTableRows(fieldTable, [0]);
const addButtons = getAddButtonsList(tableUtils.getTableRows(fieldTable));
addButtons.at(0).simulate("click");
expect(controller.getPropertyValue(propertyId)).to.equal(" Age");
});

Expand All @@ -517,7 +522,8 @@ describe("expression-builder select from tables correctly", () => {
</Provider>
);
const valueTable = wrapper.find("div.properties-value-table-container");
tableUtils.dblClickTableRows(valueTable, [0]);
const addButtons = getAddButtonsList(tableUtils.getTableRows(valueTable));
addButtons.at(0).simulate("click");
expect(controller.getPropertyValue(propertyId)).to.equal(" 21");
});

Expand All @@ -537,7 +543,8 @@ describe("expression-builder select from tables correctly", () => {
tableUtils.clickTableRows(fieldTable, [1]);
// select a string value from value table.
const valueTable = wrapper.find("div.properties-value-table-container");
tableUtils.dblClickTableRows(valueTable, [1]);
const addButtons = getAddButtonsList(tableUtils.getTableRows(valueTable));
addButtons.at(1).simulate("click");
expect(controller.getPropertyValue(propertyId)).to.equal(" \"female\"");
});

Expand All @@ -554,7 +561,8 @@ describe("expression-builder select from tables correctly", () => {
);
wrapper.find("button.expresson-builder-function-tab").simulate("click");
const functionTable = wrapper.find("div.properties-functions-table-container");
tableUtils.dblClickTableRows(functionTable, [0]);
const addButtons = getAddButtonsList(tableUtils.getTableRows(functionTable));
addButtons.at(0).simulate("click");
expect(controller.getPropertyValue(propertyId)).to.equal(" to_integer(?)");
});

Expand Down Expand Up @@ -747,22 +755,24 @@ describe("expression builder generates and accesses field dropdown correctly", (
expect(wrapper.find("div.properties-expression-field-select span").text()).to.equal("Globals");
const fieldTable = wrapper.find("div.properties-field-table-container");
const valueTable = wrapper.find("div.properties-value-table-container");
tableUtils.dblClickTableRows(fieldTable, [0]);
const addFieldButtons = getAddButtonsList(tableUtils.getTableRows(fieldTable));
addFieldButtons.at(0).simulate("click");
// expect selecting a field enters the correct value
expect(controller.getPropertyValue(propertyId)).to.equal(" @GLOBAL_MEAN('AGE')");
tableUtils.clickTableRows(fieldTable, [1]);
tableUtils.dblClickTableRows(valueTable, [0]);
const addValueButtons = getAddButtonsList(tableUtils.getTableRows(valueTable));
addValueButtons.at(0).simulate("click");
expect(controller.getPropertyValue(propertyId)).to.equal(" @GLOBAL_MEAN('AGE') 8863");
// test mrs
dropDown = wrapper.find("div.properties-expression-field-select button");
dropDown.simulate("click");
dropDownList = wrapper.find("div.bx--list-box__menu .bx--list-box__menu-item");
dropDownList.at(3).simulate("click");
expect(wrapper.find("div.properties-expression-field-select span").text()).to.equal("Multi Response Set");
tableUtils.dblClickTableRows(fieldTable, [0]);
addFieldButtons.at(0).simulate("click");
expect(controller.getPropertyValue(propertyId)).to.equal(" @GLOBAL_MEAN('AGE') 8863 numberSet");
tableUtils.clickTableRows(fieldTable, [1]);
tableUtils.dblClickTableRows(valueTable, [0]);
addValueButtons.at(0).simulate("click");
expect(controller.getPropertyValue(propertyId)).to.equal(" @GLOBAL_MEAN('AGE') 8863 numberSet 1");
});
});
Expand Down Expand Up @@ -946,7 +956,10 @@ describe("expression builder correctly runs Recently Used dropdown options", ()
var dropDownList = wrapper.find("div.bx--list-box__menu .bx--list-box__menu-item");
dropDownList.at(1).simulate("click");
expect(wrapper.find("div.properties-expression-field-select span").text()).to.equal("Recently Used");
expect(wrapper.find("div.properties-field-table-container .properties-vt-column").text()).to.equal("Item");
expect(wrapper.find("div.properties-field-table-container .properties-vt-column").at(0)
.text()).to.equal("Add");
expect(wrapper.find("div.properties-field-table-container .properties-vt-column").at(1)
.text()).to.equal("Item");
fieldRows = tableUtils.getTableRows(wrapper.find("div.properties-field-table-container"));
expect(fieldRows).to.have.length(0);
// back to Fields
Expand All @@ -956,8 +969,9 @@ describe("expression builder correctly runs Recently Used dropdown options", ()
dropDownList.at(0).simulate("click");
fieldRows = tableUtils.getTableRows(wrapper.find("div.properties-field-table-container"));
// add two rows to Recently Used
fieldRows.at(0).simulate("dblclick");
fieldRows.at(1).simulate("dblclick");
const addButtons = getAddButtonsList(fieldRows);
addButtons.at(0).simulate("click");
addButtons.at(1).simulate("click");
// back to Recently used
dropDown = wrapper.find("div.properties-expression-field-select .bx--list-box__field");
dropDown.simulate("click");
Expand All @@ -979,7 +993,7 @@ describe("expression builder correctly runs Recently Used dropdown options", ()
dropDownList.at(0).simulate("click");
fieldRows = tableUtils.getTableRows(wrapper.find("div.properties-field-table-container"));
// add Age again, moving it to the top of Recently Used
fieldRows.at(0).simulate("dblclick");
addButtons.at(0).simulate("click");
// back to Recently Used
dropDown = wrapper.find("div.properties-expression-field-select .bx--list-box__field");
dropDown.simulate("click");
Expand Down Expand Up @@ -1016,6 +1030,8 @@ describe("expression builder correctly runs Recently Used dropdown options", ()
dropDownList.at(1).simulate("click");
expect(wrapper.find("div.properties-expression-function-select span").text()).to.equal("Recently Used");
expect(wrapper.find("div.properties-functions-table-container .properties-vt-column").at(0)
.text()).to.equal("Add");
expect(wrapper.find("div.properties-functions-table-container .properties-vt-column").at(1)
.text()).to.equal("Function");
funcRows = tableUtils.getTableRows(wrapper.find("div.properties-functions-table-container"));
expect(funcRows).to.have.length(0);
Expand All @@ -1026,8 +1042,9 @@ describe("expression builder correctly runs Recently Used dropdown options", ()
dropDownList.at(0).simulate("click");
funcRows = tableUtils.getTableRows(wrapper.find("div.properties-functions-table-container"));
// add two rows to Recently Used
funcRows.at(0).simulate("dblclick");
funcRows.at(1).simulate("dblclick");
const addFuncButtons = getAddButtonsList(funcRows);
addFuncButtons.at(0).simulate("click");
addFuncButtons.at(1).simulate("click");
// back to Recently used
dropDown = wrapper.find("div.properties-expression-function-select .bx--list-box__field");
dropDown.simulate("click");
Expand All @@ -1045,7 +1062,8 @@ describe("expression builder correctly runs Recently Used dropdown options", ()
dropDownList.at(0).simulate("click");
funcRows = tableUtils.getTableRows(wrapper.find("div.properties-functions-table-container"));
// add to_integer again, moving it to the top of Recently Used
funcRows.at(0).simulate("dblclick");
const addButtons = getAddButtonsList(funcRows);
addButtons.at(0).simulate("click");
// back to Recently Used
dropDown = wrapper.find("div.properties-expression-function-select .bx--list-box__field");
dropDown.simulate("click");
Expand Down
1 change: 1 addition & 0 deletions canvas_modules/common-canvas/locales/common-properties/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
"expression.values.empty.table.label": "No values found",
"expression.functions.table.label": "Functions table",
"expression.fields.dropdown": "Fields",
"expression.add.column": "Add",
"expression.fields.title": "Fields",
"expression.values.title": "Values",
"expression.field.column": "Field",
Expand Down
2 changes: 1 addition & 1 deletion ...es/common-canvas/src/common-properties/components/virtualized-table/virtualized-table.jsx
View file
Open in desktop
veenas1 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ class VirtualizedTable extends React.Component {
}

if (this.props.selectable) {
const rowSelected = this.isRowSelected(rowData.originalRowIndex);
const rowSelected = this.props.sortDirection ? this.isRowSelected(rowData.index) : this.isRowSelected(rowData.originalRowIndex); // use current row index when Sorted
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@caritaou Do you see any issue with this change? I did some testing around row selection and for the most part it doesn't really work correctly onSort in the table controls. It just clears the selection.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but this does fix the issue in the expressionBuilder around sorting and selection.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me, considering this never worked for sorting columns with row selections.

selectedRow = this.props.selectable && rowSelected;
if (this.props.rowSelection !== ROW_SELECTION.SINGLE) {
const translatedRowCheckboxLabel = this.props.intl.formatMessage(
Expand Down
1 change: 1 addition & 0 deletions canvas_modules/common-canvas/src/common-properties/constants/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ export const MESSAGE_KEYS = {
EXPRESSION_FIELDS_TITLE: "expression.fields.title",
EXPRESSION_VALUES_TITLE: "expression.values.title",
EXPRESSION_FIELD_COLUMN: "expression.field.column",
EXPRESSION_ADD_COLUMN: "expression.add.column",
EXPRESSION_FIELD_COLUMN_DESCRIPTION: "expression.field.column.description",
EXPRESSION_STORAGE_COLUMN: "expression.storage.column",
EXPRESSION_VALUE_COLUMN: "expression.value.column",
Expand Down
Loading
Loading