-
- Downloads
Allow joins on multiple fields in the notebook editor (#17633)
* Separate Join unit tests with newlines * Refactor Join's unit tests * Add join type getters (by conditions count) * Add getter and setter for join conditions by index * Remove old comment * Extract method converting dimensions * Update setParentDimension * Update setJoinDimension * Update joinDimensions method * Update joinDimensions method * Update join alias setter * Update default condition setter * Update isValid method * Add getConditions method * Add addEmptyDimensionsPair method * Render multiple join conditions * Fix JoinStep align-items * Fix join dimension methods usage * Fix join dimensions alignment * Temporary disable auto opening pickers * Test adding a new dimensions pair * Fix "add" join icon visibility * Add "on" label between join conditions * Remove redundant `else` * Add `removeCondition` method for `Join` * Fix JoinDimensionPicker's prop types * Allow removing empty dimension pairs * Add space between join dimensions * Simplify JoinStep tests setup * Automatically open dimension pickers * Test JoinStep updates `Join` instance correctly * Display dimensions source name * Allow overwriting NotebookCell's padding * Fix JoinStep layout * Allow to clear a selected dimension * Disable "no-unused-vars" for Join file * Fix parentDimension usage * Fix StructuredQuery's `Join` usage * Update notebook visual test * Fix E2E test * Fix JoinStep look when no dimensions selected * Extract JoinDimensionsRightControl component * Extract JoinDimensionCellItem component * Increase JoinStep's tests timeout * Extract `_getExplicitJoinsSet` from StucturedQuery * Fix unused variables in Join class * Add a comment about setTimeout * Fix join condition label * Fix dimensions picker opens when dimension is set * Make table icon container clickable * Hide fields picker tooltip on picker open * Fix Preview button overflowing JoinStep * Fix table picker click area
Showing
- frontend/src/metabase-lib/lib/queries/StructuredQuery.js 28 additions, 11 deletionsfrontend/src/metabase-lib/lib/queries/StructuredQuery.js
- frontend/src/metabase-lib/lib/queries/structured/Join.js 205 additions, 52 deletionsfrontend/src/metabase-lib/lib/queries/structured/Join.js
- frontend/src/metabase/components/Triggerable.jsx 3 additions, 1 deletionfrontend/src/metabase/components/Triggerable.jsx
- frontend/src/metabase/query_builder/components/notebook/FieldsPickerIcon.jsx 24 additions, 3 deletions...se/query_builder/components/notebook/FieldsPickerIcon.jsx
- frontend/src/metabase/query_builder/components/notebook/NotebookCell.jsx 7 additions, 2 deletions...tabase/query_builder/components/notebook/NotebookCell.jsx
- frontend/src/metabase/query_builder/components/notebook/NotebookStep.jsx 1 addition, 0 deletions...tabase/query_builder/components/notebook/NotebookStep.jsx
- frontend/src/metabase/query_builder/components/notebook/steps/DataStep.jsx 11 additions, 4 deletions...base/query_builder/components/notebook/steps/DataStep.jsx
- frontend/src/metabase/query_builder/components/notebook/steps/JoinStep.jsx 232 additions, 49 deletions...base/query_builder/components/notebook/steps/JoinStep.jsx
- frontend/src/metabase/query_builder/components/notebook/steps/JoinStep.styled.jsx 46 additions, 3 deletions...ery_builder/components/notebook/steps/JoinStep.styled.jsx
- frontend/src/metabase/query_builder/components/notebook/steps/JoinStep.unit.spec.js 200 additions, 19 deletions...y_builder/components/notebook/steps/JoinStep.unit.spec.js
- frontend/test/metabase-lib/lib/queries/StructuredQuery-joins.unit.spec.js 2 additions, 2 deletions...tabase-lib/lib/queries/StructuredQuery-joins.unit.spec.js
- frontend/test/metabase-lib/lib/queries/structured/Join.unit.spec.js 480 additions, 54 deletions...est/metabase-lib/lib/queries/structured/Join.unit.spec.js
- frontend/test/metabase-visual/notebook/notebook.cy.spec.js 23 additions, 2 deletionsfrontend/test/metabase-visual/notebook/notebook.cy.spec.js
- frontend/test/metabase/scenarios/question/reproductions/17514-ui-overlay.cy.spec.js 1 addition, 1 deletion...narios/question/reproductions/17514-ui-overlay.cy.spec.js
Loading
Please register or sign in to comment