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

Jump to bottom

fix: Grouped widgets moving to the bottom most row, even when widgets are not overlapping with the multi select box #13658

Merged
merged 18 commits into from
May 20, 2022
Merged

fix: Grouped widgets moving to the bottom most row, even when widgets are not overlapping with the multi select box #13658

merged 18 commits into from
May 20, 2022

Conversation

rahulramesha
Copy link
Contributor

@rahulramesha rahulramesha commented May 8, 2022 •
edited by github-actions bot

Description

Currently, when the widgets selected are grouped in to a container, it expands by 2 rows from the selection box.
When this happens if there are any collisions with other widgets because of the addition 2 rows and only because of those 2 rows, the widgets below are reflowed below by 2 rows to make space for the grouped container.

Fixes #9646
Fixes #12320

Type of change

  • Bug fix (non-breaking change which fixes an issue)

How Has This Been Tested?

Manual UI test, cypress test

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes

Test coverage results 🧪

🔴 Total coverage has decreased 
// Code coverage diff between base branch:release and head branch: groupingWidgetsFix
Status File % Stmts % Branch % Funcs % Lines
🔴 total 56.62 (-0.03) 38.63 (-0.05) 35.94 (-0.03) 56.87 (-0.04)
🟢 app/client/src/sagas/WidgetOperationSagas.tsx 61.94 (0.04) 51.42 (0.35) 61.54 (0) 63.62 (-0.13)
🔴 app/client/src/sagas/WidgetOperationUtils.ts 64.12 (-4.81) 40.17 (-4.99) 61.04 (-7.45) 63.22 (-5.3)
🔴 app/client/src/utils/autocomplete/TernServer.ts 52.71 (-0.23) 40.83 (-0.84) 36.21 (0) 56.74 (-0.25)

rahulramesha added 17 commits April 13, 2022 19:55
copy paste commit
e9c84eb
merge from release and resolve conflicts
7ce3dd5
merge from release and resolve conflicts
215f47e
class name generator changes
8d5e9a7
modal widget fixes change
bc3f7ed
addressing review comments
fd48cdc
Merge branch 'release' of github.com:appsmithorg/appsmith into copyPa…
d58e71e 
…steUX
bug fix for after deleting a widget by undoing action
9aa9ff5
additional fix for modal widget
573b93a
additional tests for fixes
a4b0466
Merge branch 'release' of github.com:appsmithorg/appsmith into copyPa…
0fd955c 
…steUX
Merge branch 'release' of github.com:appsmithorg/appsmith into copyPa…
e31478e 
…steUX
Merge branch 'copyPasteUX' of github.com:appsmithorg/appsmith into gr…
fab3910 
…oupingWidgetsFix
Merge branch 'release' of github.com:appsmithorg/appsmith into groupi…
f16f8cd 
…ngWidgetsFix
changes to reflow below widgets
62823cd
merge from release and resolve merge confllicts
c16da5c
minor changes and adding cypress tests
dd000a4
@vercel
Copy link

vercel bot commented May 8, 2022 •
edited

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Updated
appsmith ✅ Ready (Inspect) Visit Preview May 20, 2022 at 9:10AM (UTC)

@github-actions github-actions bot added App Viewers Pod This label assigns issues to the app viewers pod Bug Something isn't working Container Widget Container widget High This issue blocks a user from building or impacts a lot of users Needs Triaging Needs attention from maintainers to triage Release UI Builders Pod Issues that UI Builders face using appsmith UI Building Pod UX Improvement Widget Grouping Issues related to Widget Grouping and removed Bug Something isn't working labels May 8, 2022
@rahulramesha
Copy link
Contributor Author

/ok-to-test sha=dd000a4

@github-actions
Copy link

github-actions bot commented May 8, 2022

Tests running at: https://github.com/appsmithorg/appsmith/actions/runs/2290031762.
Workflow: Appsmith External Integration Test Workflow.
Commit: dd000a4.
PR: 13658.

@github-actions
Copy link

github-actions bot commented May 8, 2022

UI Performance test run logs and artifacts: https://github.com/appsmithorg/appsmith/actions/runs/2290031762.
Commit: dd000a4.
Results:

Click to view performance test results

Run 1 Run 2 Run 3 Run 4 Run 5 Median Mean SD.Sample SD.Population
SELECT_CATEGORY
scripting 679.95 730.89 715.65 749.38 702.17 715.65 715.61 3.71 3.32
painting 3.76 3.89 7.32 6.14 4 4 5.02 32.27 28.88
rendering 282.97 291.18 285.7 315.98 281.5 285.7 291.47 4.87 4.35
BIND_TABLE_DATA
scripting 2235.1 2226.8 2245.14 2331.27 2279.45 2245.14 2263.55 1.89 1.69
painting 10.7 18.86 17.93 14.2 18.61 17.93 16.06 22.04 19.68
rendering 548.52 552.54 568.49 574.7 565.89 565.89 562.03 1.97 1.76
CLICK_ON_TABLE_ROW
scripting 1805.06 1832.93 2012.27 1867.56 1917.89 1867.56 1887.14 4.33 3.87
painting 13.79 14.56 15.4 16.33 22.84 15.4 16.58 21.83 19.54
rendering 280.44 279.64 287.67 280.55 279.67 280.44 281.59 1.21 1.09
UPDATE_POST_TITLE
scripting 2806.08 2839.17 3331.62 3348.19 2922.13 2922.13 3049.44 8.81 7.88
painting 14.3 27.08 17.29 15.24 22.76 17.29 19.33 28.09 25.14
rendering 358.28 363.3 386.91 495.66 351.25 363.3 391.08 15.34 13.72
OPEN_MODAL
scripting 1286.15 1190.07 2078.42 1255.43 1175.66 1255.43 1397.15 27.45 24.55
painting 11.47 15.21 14.14 11.84 10.02 11.84 12.54 16.75 14.99
rendering 415.42 412.02 422 428.85 396.47 415.42 414.95 2.94 2.62
CLOSE_MODAL
scripting 607.96 822.52 734.76 658.1 573.35 658.1 679.34 14.78 13.22
painting 4.71 10.35 4.16 9.16 4.14 4.71 6.5 46.31 41.38
rendering 337.29 327.92 324.05 325.35 324.99 325.35 327.92 1.66 1.48
SELECT_WIDGET_MENU_OPEN
scripting 1388.41 1552.39 1420.82 1531.74 1534.58 1531.74 1485.59 5.06 4.53
painting 5.31 10.07 10.14 5.39 9.15 9.15 8.01 30.71 27.47
rendering 467.92 511.13 500.24 490.43 515.48 500.24 497.04 3.82 3.41
SELECT_WIDGET_SELECT_OPTION
scripting 196.24 231.63 245.84 330.6 229.07 231.63 246.68 20.39 18.24
painting 5.77 11.05 3.01 3.39 3.11 3.39 5.27 65.09 58.06
rendering 13.31 14.56 13.66 22.83 16.32 14.56 16.14 24.29 21.75

@rahulramesha rahulramesha changed the title Grouping widgets fix fix: Grouped widgets moving to the bottom most row, even when widgets are not overlapping with the multi select box May 8, 2022
@github-actions github-actions bot added the Bug Something isn't working label May 8, 2022
@github-actions
Copy link

github-actions bot commented May 8, 2022

UI Performance test run logs and artifacts: https://github.com/appsmithorg/appsmith/actions/runs/2290031762.
Commit: dd000a4.
Results:

Click to view performance test results

Run 1 Run 2 Run 3 Run 4 Run 5 Median Mean SD.Sample SD.Population
SELECT_CATEGORY
scripting 679.95 730.89 715.65 749.38 702.17 715.65 715.61 3.71 3.32
painting 3.76 3.89 7.32 6.14 4 4 5.02 32.27 28.88
rendering 282.97 291.18 285.7 315.98 281.5 285.7 291.47 4.87 4.35
BIND_TABLE_DATA
scripting 2235.1 2226.8 2245.14 2331.27 2279.45 2245.14 2263.55 1.89 1.69
painting 10.7 18.86 17.93 14.2 18.61 17.93 16.06 22.04 19.68
rendering 548.52 552.54 568.49 574.7 565.89 565.89 562.03 1.97 1.76
CLICK_ON_TABLE_ROW
scripting 1805.06 1832.93 2012.27 1867.56 1917.89 1867.56 1887.14 4.33 3.87
painting 13.79 14.56 15.4 16.33 22.84 15.4 16.58 21.83 19.54
rendering 280.44 279.64 287.67 280.55 279.67 280.44 281.59 1.21 1.09
UPDATE_POST_TITLE
scripting 2806.08 2839.17 3331.62 3348.19 2922.13 2922.13 3049.44 8.81 7.88
painting 14.3 27.08 17.29 15.24 22.76 17.29 19.33 28.09 25.14
rendering 358.28 363.3 386.91 495.66 351.25 363.3 391.08 15.34 13.72
OPEN_MODAL
scripting 1286.15 1190.07 2078.42 1255.43 1175.66 1255.43 1397.15 27.45 24.55
painting 11.47 15.21 14.14 11.84 10.02 11.84 12.54 16.75 14.99
rendering 415.42 412.02 422 428.85 396.47 415.42 414.95 2.94 2.62
CLOSE_MODAL
scripting 607.96 822.52 734.76 658.1 573.35 658.1 679.34 14.78 13.22
painting 4.71 10.35 4.16 9.16 4.14 4.71 6.5 46.31 41.38
rendering 337.29 327.92 324.05 325.35 324.99 325.35 327.92 1.66 1.48
SELECT_WIDGET_MENU_OPEN
scripting 1388.41 1552.39 1420.82 1531.74 1534.58 1531.74 1485.59 5.06 4.53
painting 5.31 10.07 10.14 5.39 9.15 9.15 8.01 30.71 27.47
rendering 467.92 511.13 500.24 490.43 515.48 500.24 497.04 3.82 3.41
SELECT_WIDGET_SELECT_OPTION
scripting 196.24 231.63 245.84 330.6 229.07 231.63 246.68 20.39 18.24
painting 5.77 11.05 3.01 3.39 3.11 3.39 5.27 65.09 58.06
rendering 13.31 14.56 13.66 22.83 16.32 14.56 16.14 24.29 21.75

@github-actions
Copy link

This PR has not seen activitiy for a while. It will be closed in 7 days unless further activity is detected.

@github-actions github-actions bot added the Stale label May 17, 2022
@rahulramesha
Copy link
Contributor Author

/ok-to-test sha=ed5f3f7

@github-actions
Copy link

Tests running at: https://github.com/appsmithorg/appsmith/actions/runs/2357256715.
Workflow: Appsmith External Integration Test Workflow.
Commit: ed5f3f7.
PR: 13658.

@github-actions
Copy link

UI Performance test run logs and artifacts: https://github.com/appsmithorg/appsmith/actions/runs/2357256715.
Commit: ed5f3f7.
Results:

Click to view performance test results

Run 1 Run 2 Run 3 Run 4 Run 5 Median Mean SD.Sample SD.Population
SELECT_CATEGORY
scripting 555 1635.61 546.17 575.72 534.69 555 769.44 62.96 56.31
painting 5.08 6.16 4.65 4.2 7.13 5.08 5.44 21.87 19.49
rendering 303.77 257.32 263.6 272.82 273.93 272.82 274.29 6.50 5.82
BIND_TABLE_DATA
scripting 2279.98 2183.91 2205.47 2239.29 2206.8 2206.8 2223.09 1.68 1.51
painting 18.42 15.13 16.44 17.99 16.42 16.44 16.88 7.88 7.05
rendering 524.59 500.93 551.87 510.44 537.06 524.59 524.98 3.88 3.47
CLICK_ON_TABLE_ROW
scripting 1351.67 1570.13 1444.64 1429.81 1334.64 1429.81 1426.18 6.56 5.87
painting 15.96 12.77 11.54 10.84 12.23 12.23 12.67 15.63 13.97
rendering 274.78 266.39 276.8 248.13 255.79 266.39 264.38 4.65 4.16
UPDATE_POST_TITLE
scripting 2086.18 2142.8 2058.13 1992.29 2797.84 2086.18 2215.45 14.90 13.32
painting 16.15 14.49 18.17 15.99 16.78 16.15 16.32 8.15 7.29
rendering 317.5 345.72 336.31 320.69 327.25 327.25 329.49 3.51 3.14
OPEN_MODAL
scripting 894.95 857.66 933.35 936.87 923.14 923.14 909.19 3.65 3.26
painting 9.99 9.43 14.32 13.96 13.83 13.83 12.31 19.33 17.30
rendering 369.58 373.94 384.15 370.01 377.92 373.94 375.12 1.62 1.45
CLOSE_MODAL
scripting 556.33 1645.74 590.23 590.65 550.31 590.23 786.65 61.10 54.65
painting 4.12 4.11 4.38 4.84 3.79 4.12 4.25 9.18 8.24
rendering 297.76 292.57 300 321.27 329.15 300 308.15 5.21 4.66
SELECT_WIDGET_MENU_OPEN
scripting 1505.86 1416.07 1476.91 1457.77 1419.07 1457.77 1455.14 2.63 2.36
painting 20.95 3.63 7.13 10.6 4.25 7.13 9.31 75.94 67.88
rendering 420.67 420.3 411.2 426.53 389.57 420.3 413.65 3.52 3.14
SELECT_WIDGET_SELECT_OPTION
scripting 231.22 208.79 167.95 251.35 172.94 208.79 206.45 17.53 15.68
painting 3.51 2.49 2.69 8.39 2.33 2.69 3.88 65.98 59.02
rendering 13.4 13.47 12.15 15.05 11.41 13.4 13.1 10.69 9.54

1 similar comment
@github-actions
Copy link

UI Performance test run logs and artifacts: https://github.com/appsmithorg/appsmith/actions/runs/2357256715.
Commit: ed5f3f7.
Results:

Click to view performance test results

Run 1 Run 2 Run 3 Run 4 Run 5 Median Mean SD.Sample SD.Population
SELECT_CATEGORY
scripting 555 1635.61 546.17 575.72 534.69 555 769.44 62.96 56.31
painting 5.08 6.16 4.65 4.2 7.13 5.08 5.44 21.87 19.49
rendering 303.77 257.32 263.6 272.82 273.93 272.82 274.29 6.50 5.82
BIND_TABLE_DATA
scripting 2279.98 2183.91 2205.47 2239.29 2206.8 2206.8 2223.09 1.68 1.51
painting 18.42 15.13 16.44 17.99 16.42 16.44 16.88 7.88 7.05
rendering 524.59 500.93 551.87 510.44 537.06 524.59 524.98 3.88 3.47
CLICK_ON_TABLE_ROW
scripting 1351.67 1570.13 1444.64 1429.81 1334.64 1429.81 1426.18 6.56 5.87
painting 15.96 12.77 11.54 10.84 12.23 12.23 12.67 15.63 13.97
rendering 274.78 266.39 276.8 248.13 255.79 266.39 264.38 4.65 4.16
UPDATE_POST_TITLE
scripting 2086.18 2142.8 2058.13 1992.29 2797.84 2086.18 2215.45 14.90 13.32
painting 16.15 14.49 18.17 15.99 16.78 16.15 16.32 8.15 7.29
rendering 317.5 345.72 336.31 320.69 327.25 327.25 329.49 3.51 3.14
OPEN_MODAL
scripting 894.95 857.66 933.35 936.87 923.14 923.14 909.19 3.65 3.26
painting 9.99 9.43 14.32 13.96 13.83 13.83 12.31 19.33 17.30
rendering 369.58 373.94 384.15 370.01 377.92 373.94 375.12 1.62 1.45
CLOSE_MODAL
scripting 556.33 1645.74 590.23 590.65 550.31 590.23 786.65 61.10 54.65
painting 4.12 4.11 4.38 4.84 3.79 4.12 4.25 9.18 8.24
rendering 297.76 292.57 300 321.27 329.15 300 308.15 5.21 4.66
SELECT_WIDGET_MENU_OPEN
scripting 1505.86 1416.07 1476.91 1457.77 1419.07 1457.77 1455.14 2.63 2.36
painting 20.95 3.63 7.13 10.6 4.25 7.13 9.31 75.94 67.88
rendering 420.67 420.3 411.2 426.53 389.57 420.3 413.65 3.52 3.14
SELECT_WIDGET_SELECT_OPTION
scripting 231.22 208.79 167.95 251.35 172.94 208.79 206.45 17.53 15.68
painting 3.51 2.49 2.69 8.39 2.33 2.69 3.88 65.98 59.02
rendering 13.4 13.47 12.15 15.05 11.41 13.4 13.1 10.69 9.54

@mohanarpit mohanarpit merged commit f2c02ab into release May 20, 2022
@mohanarpit mohanarpit deleted the groupingWidgetsFix branch May 20, 2022 13:57
This was referenced May 31, 2022
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jsartisan jsartisan jsartisan approved these changes

Assignees
No one assigned
Labels
App Viewers Pod This label assigns issues to the app viewers pod Bug Something isn't working Container Widget Container widget High This issue blocks a user from building or impacts a lot of users Needs Triaging Needs attention from maintainers to triage Release UI Builders Pod Issues that UI Builders face using appsmith UX Improvement Widget Grouping Issues related to Widget Grouping
Projects
None yet
Milestone
No milestone
3 participants
@rahulramesha @jsartisan @mohanarpit