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: Delete the pages post merge operation from application when they are removed from file system #10810

Merged
merged 9 commits into from
Feb 4, 2022
Merged

fix: Delete the pages post merge operation from application when they are removed from file system #10810

merged 9 commits into from
Feb 4, 2022

Conversation

AnaghHegde
Copy link
Member

@AnaghHegde AnaghHegde commented Feb 2, 2022 •
edited
Loading

Description

When we try to delete the resource by using the git branching, we can see the resource if we create the new branch from the parent branch even after we merged the sub-branch where the resource was deleted.

Fixes #10773

Type of change

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

How Has This Been Tested?

  • Locally
  • JUnit Tests

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

@AnaghHegde AnaghHegde self-assigned this Feb 2, 2022
@vercel
Copy link

vercel bot commented Feb 2, 2022 •
edited
Loading

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployment, click below or on the icon next to each commit.

🔍 Inspect: https://vercel.com/get-appsmith/appsmith/Cb4ZAaxbgrRC1ZjX8Mt9Y67UKZEB
✅ Preview: https://appsmith-git-bug-merge-branch-get-appsmith.vercel.app

@github-actions github-actions bot added the Bug Something isn't working label Feb 2, 2022
@github-actions
Copy link

github-actions bot commented Feb 2, 2022

Unable to find test scripts. Please add necessary tests to the PR.

4 similar comments
@github-actions
Copy link

github-actions bot commented Feb 2, 2022

Unable to find test scripts. Please add necessary tests to the PR.

@github-actions
Copy link

github-actions bot commented Feb 2, 2022

Unable to find test scripts. Please add necessary tests to the PR.

@github-actions
Copy link

github-actions bot commented Feb 2, 2022

Unable to find test scripts. Please add necessary tests to the PR.

@github-actions
Copy link

github-actions bot commented Feb 2, 2022

Unable to find test scripts. Please add necessary tests to the PR.

abhvsn
abhvsn requested changes Feb 2, 2022
View reviewed changes
Copy link
Contributor

@abhvsn abhvsn left a comment

Choose a reason for hiding this comment

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

Added minor comments for improvements

@AnaghHegde
Copy link
Member Author

/ok-to-test sha=4f680b4

@github-actions
Copy link

github-actions bot commented Feb 2, 2022

Tests running at: https://github.com/appsmithorg/appsmith/actions/runs/1782649236.
Workflow: Appsmith External Integration Test Workflow.
Commit: 4f680b4.
PR: 10810.

@github-actions
Copy link

github-actions bot commented Feb 2, 2022

UI Performance test run logs and artifacts: https://github.com/appsmithorg/appsmith/actions/runs/1782649236.
Commit: 4f680b4.
Results:

Click to view performance test results

Run 1 Run 2 Run 3 Run 4 Run 5 Mean SD.Sample SD.Population
Edit input
scripting 328.1 1463.56 394.46 332.58 304.5 564.64 89.19 79.77
painting 26.35 18.25 12.45 10.42 7.99 15.09 48.71 43.54
rendering 17.36 18.84 20.69 21.03 13.63 18.31 16.44 14.69
Clear input
scripting 1003.95 970.77 747.69 766.98 786.53 855.18 14.27 12.76
painting 7.23 6.96 6.18 6.48 6.64 6.7 6.12 5.52
rendering 181.53 198.59 189.5 177.93 194.85 188.48 4.62 4.13
Edit input again
scripting 314.16 275.52 312.47 286.07 564.57 350.56 34.46 30.82
painting 10.61 4.41 10.07 6.95 4.77 7.36 39.27 35.19
rendering 21.07 21.18 21.54 20.56 19.49 20.77 3.85 3.42

@AnaghHegde
Copy link
Member Author

/ok-to-test sha=ea20277

@github-actions
Copy link

github-actions bot commented Feb 2, 2022

Tests running at: https://github.com/appsmithorg/appsmith/actions/runs/1783193940.
Workflow: Appsmith External Integration Test Workflow.
Commit: ea20277.
PR: 10810.

@github-actions
Copy link

github-actions bot commented Feb 2, 2022

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

Click to view performance test results

Run 1 Run 2 Run 3 Run 4 Run 5 Mean SD.Sample SD.Population
Click on table row
scripting 3342.4 2729.12 2712.1 2633.79 2622.33 2807.95 10.77 9.63
painting 31.46 15.15 37.54 18.32 10.49 22.59 50.60 45.24
rendering 451.99 305.35 298.84 294.68 290.26 328.22 21.15 18.91
Edit input
scripting 450.11 399.77 367.11 455.37 392.86 413.04 9.27 8.29
painting 8.33 17.09 7.37 13.78 30.44 15.4 60.39 54.03
rendering 24.69 21.83 29.76 28.8 19.16 24.85 18.15 16.22
Clear input
scripting 956.68 1198.16 1146.9 938.17 896.62 1027.31 13.20 11.80
painting 17.43 16.32 6.39 9.78 7.79 11.54 43.59 38.99
rendering 222.45 233.66 220.52 217.16 222.68 223.29 2.78 2.49
Edit input again
scripting 348.71 724.45 361.92 368.18 402.17 441.09 36.19 32.37
painting 6.75 12.72 6.72 10.11 11.83 9.63 29.08 26.06
rendering 22.94 30.56 39.2 33.72 22.86 29.86 23.64 21.17

@AnaghHegde
Copy link
Member Author

/ok-to-test sha=9afc003

@github-actions
Copy link

github-actions bot commented Feb 2, 2022

Tests running at: https://github.com/appsmithorg/appsmith/actions/runs/1783792979.
Workflow: Appsmith External Integration Test Workflow.
Commit: 9afc003.
PR: 10810.

@github-actions
Copy link

github-actions bot commented Feb 2, 2022

UI Performance test run logs and artifacts: https://github.com/appsmithorg/appsmith/actions/runs/1783792979.
Commit: 9afc003.
Results:

Click to view performance test results

Run 1 Run 2 Run 3 Run 4 Run 5 Mean SD.Sample SD.Population
Click on table row
scripting 2954.97 2355.62 2404.14 2335.58 2450.79 2500.22 10.32 9.23
painting 52.76 11.95 12.06 15.25 21.16 22.64 76.19 68.15
rendering 483.99 366.72 306.74 311.18 304.02 354.53 21.68 19.39
Edit input
scripting 403.82 341.75 367.75 333.22 365.47 362.4 7.60 6.79
painting 20.08 17.5 5.18 17.64 40.53 20.19 63.25 56.61
rendering 23.54 19.46 17.26 12.35 17.08 17.94 22.69 20.29
Clear input
scripting 804.51 857.62 772.4 828.08 806.36 813.79 3.88 3.47
painting 6.48 8.07 6.39 7.79 5.99 6.94 13.26 11.96
rendering 226.8 223.17 224.48 230.32 215.12 223.98 2.52 2.25
Edit input again
scripting 359.2 375.02 501.87 334.71 414.64 397.09 16.47 14.73
painting 6.76 6.75 11.32 7.54 5.64 7.6 28.82 25.79
rendering 23.75 23.24 25.76 23.73 21.8 23.66 6.00 5.37

@AnaghHegde
Copy link
Member Author

/ok-to-test sha=ab4e2ab

@github-actions
Copy link

github-actions bot commented Feb 3, 2022

Tests running at: https://github.com/appsmithorg/appsmith/actions/runs/1788987202.
Workflow: Appsmith External Integration Test Workflow.
Commit: ab4e2ab.
PR: 10810.

@github-actions
Copy link

github-actions bot commented Feb 3, 2022

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

Click to view performance test results

Run 1 Run 2 Run 3 Run 4 Run 5 Median Mean SD.Sample SD.Population
Click on table row
scripting 2372.16 2546.9 2502.19 2488.1 2583.84 2502.19 2498.64 3.21 2.87
painting 16.14 36.51 26.72 29.54 20.11 26.72 25.8 30.97 27.67
rendering 351.63 287.25 327.31 273.95 282.23 287.25 304.47 10.98 9.82
Edit input
scripting 349.37 383.96 414.56 390.97 433.54 390.97 394.48 8.10 7.25
painting 18.9 19.34 6.34 4.93 9.2 9.2 11.74 58.86 52.64
rendering 19.59 20.57 26.98 16.21 25.6 20.57 21.79 20.38 18.22
Clear input
scripting 876.13 825.68 868.05 869.98 822.93 868.05 852.55 3.05 2.73
painting 14.08 10.23 5.77 10.25 6.96 10.23 9.46 34.46 30.76
rendering 199.41 213.83 199.97 209.81 204.46 204.46 205.5 3.05 2.73
Edit input again
scripting 373.56 736.89 335.38 357.96 310.03 357.96 422.76 41.92 37.50
painting 7.89 6.31 10.89 12.63 5.69 7.89 8.68 34.45 30.76
rendering 22.89 22.5 19.06 21.64 31.16 22.5 23.45 19.45 17.40

@AnaghHegde
Copy link
Member Author

/ok-to-test sha=ab4e2ab

@github-actions
Copy link

github-actions bot commented Feb 3, 2022

Tests running at: https://github.com/appsmithorg/appsmith/actions/runs/1790029999.
Workflow: Appsmith External Integration Test Workflow.
Commit: ab4e2ab.
PR: 10810.

@github-actions
Copy link

github-actions bot commented Feb 3, 2022

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

Click to view performance test results

Run 1 Run 2 Run 3 Run 4 Run 5 Median Mean SD.Sample SD.Population
Edit input
scripting 364.61 355.78 329.04 303.61 357.07 355.78 342.02 7.41 6.63
painting 39.95 10.51 21.77 5.48 6.84 10.51 16.91 85.04 76.05
rendering 18.26 17.31 15.1 14.24 23.77 17.31 17.74 21.08 18.88
Clear input
scripting 811.07 855.96 832.13 1035.86 835.92 835.92 874.19 10.50 9.39
painting 10.06 9.05 18.09 5.69 6.47 9.05 9.87 49.95 44.68
rendering 198.52 228.14 195.17 185.39 195.57 195.57 200.56 8.07 7.22
Edit input again
scripting 322.43 332.06 315.3 327.11 316.97 322.43 322.77 2.16 1.93
painting 6.26 5.27 10.39 5.04 8.34 6.26 7.06 32.15 28.75
rendering 26.08 21.42 23.68 19.82 28.88 23.68 23.98 15.10 13.51
Click on table row
scripting 2658.8 2262.71 2213.08 2295.99 2536.14 2295.99 2393.34 8.09 7.23
painting 25.54 12.45 20.6 8.8 9.13 12.45 15.3 48.63 43.46
rendering 315.62 284.73 261.36 306.27 263.49 284.73 286.29 8.56 7.66

@AnaghHegde
Copy link
Member Author

/ok-to-test sha=ab4e2ab

@github-actions
Copy link

github-actions bot commented Feb 4, 2022

Tests running at: https://github.com/appsmithorg/appsmith/actions/runs/1793440967.
Workflow: Appsmith External Integration Test Workflow.
Commit: ab4e2ab.
PR: 10810.

@github-actions
Copy link

github-actions bot commented Feb 4, 2022

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

Click to view performance test results

Run 1 Run 2 Run 3 Run 4 Run 5 Median Mean SD.Sample SD.Population
Click on table row
scripting 2762.27 2170.17 2123.54 2220.31 2095.17 2170.17 2274.29 12.18 10.89
painting 45.42 43.13 40.65 23.94 11.89 40.65 33.01 43.99 39.35
rendering 375.72 242.21 255.38 258.23 251.67 255.38 276.64 20.14 18.01
Edit input
scripting 433.96 306.11 299.64 251.29 281.98 299.64 314.6 22.26 19.91
painting 8.48 27.16 40.25 38.29 4.59 27.16 23.75 69.68 62.32
rendering 25.78 14.15 15 16.44 23.97 16.44 19.07 28.32 25.33
Clear input
scripting 830.3 663.83 653.33 755.62 654.82 663.83 711.58 11.09 9.92
painting 15.68 6.32 8.3 6.14 7.55 7.55 8.8 44.89 40.11
rendering 197.67 172.27 181.92 180.24 176.94 180.24 181.81 5.28 4.72
Edit input again
scripting 302.14 547.83 356.17 291.68 275 302.14 354.56 31.66 28.31
painting 26.13 9.56 8.81 16.73 4.6 9.56 13.17 64.24 57.40
rendering 23.07 15.61 23.04 29.04 17.05 23.04 21.56 25.00 22.36

@AnaghHegde AnaghHegde merged commit fa06473 into release Feb 4, 2022
@AnaghHegde AnaghHegde deleted the bug/merge-branch branch February 4, 2022 06:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@abhvsn abhvsn abhvsn approved these changes

Assignees

@AnaghHegde AnaghHegde

Labels
Bug Something isn't working
Projects
None yet
Milestone
No milestone
2 participants
@AnaghHegde @abhvsn