fix: git branch protection fixes #28667

brayn003 · 2023-11-06T14:37:59Z

Description

Adds license flag for branch protection
Disables omni-bar and keyboard shortcuts for protected branches
Adds navigation for multiple pages
Hides preview on protected views
Adds feature flag for Git Connection Success

PR fixes following issue(s)

Fixes #28056

Media

Type of change

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

Testing

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Also list any relevant details for your test configuration.
Delete anything that is not relevant

Manual
JUnit
Jest
Cypress

Test Plan

Add Testsmith test cases links that relate to this PR

Issues raised during DP testing

Link issues raised during DP testing for better visiblity and tracking (copy link from comments dropped on this PR)

Checklist:

Dev activity

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
PR is being merged under a feature flag

QA activity:

Speedbreak features have been covered
Test plan covers all impacted features and areas of interest
Test plan has been peer reviewed by project stakeholders and other QA members
Manually tested functionality on DP
We had an implementation alignment call with stakeholders post QA Round 2
Cypress test cases have been added and approved by SDET/manual QA
Added Test Plan Approved label after Cypress tests were reviewed
Added Test Plan Approved label after JUnit tests were reviewed

brayn003 · 2023-11-06T15:30:33Z

/ok-to-test

github-actions · 2023-11-06T15:30:58Z

Tests running at: https://github.com/appsmithorg/appsmith/actions/runs/6772934419.
Workflow: Appsmith External Integration Test Workflow.
Commit: ``.
PR: 28667.

github-actions · 2023-11-06T16:45:28Z

Workflow run: https://github.com/appsmithorg/appsmith/actions/runs/6772934419.
Commit: ``.
Cypress dashboard: Click here!
The following are new failures, please fix them before merging the PR:

cypress/e2e/Regression/ClientSide/BugTests/AbortAction_Spec.ts
cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_spec.ts
cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Numeric_Spec.ts

To know the list of identified flaky tests - Refer here

brayn003 · 2023-11-07T05:26:49Z

/build-deploy-preview

github-actions · 2023-11-07T05:27:11Z

Deploying Your Preview: https://github.com/appsmithorg/appsmith/actions/runs/6780402356.
Workflow: On demand build Docker image and deploy preview.
skip-tests: . env: .
PR: 28667.
recreate: .

github-actions · 2023-11-07T08:31:11Z

Workflow run: https://github.com/appsmithorg/appsmith/actions/runs/6781213048.
Commit: 9ba40d2.
Cypress dashboard: Click here!
The following are new failures, please fix them before merging the PR:

cypress/e2e/Regression/ClientSide/Git/GitSync/SwitchBranches_spec.js
cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_RadioGroupField_spec.js
cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Numeric_Spec.ts

To know the list of identified flaky tests - Refer here

Parthvi12 · 2023-11-07T08:59:25Z

/build-deploy-preview skip-tests=true recreate=true

github-actions · 2023-11-07T08:59:51Z

Deploying Your Preview: https://github.com/appsmithorg/appsmith/actions/runs/6782159149.
Workflow: On demand build Docker image and deploy preview.
skip-tests: true.
env: ``.
PR: 28667.
recreate: true.

github-actions · 2023-11-07T09:13:07Z

Deploy-Preview-URL: https://ce-28667.dp.appsmith.com

Parthvi12 · 2023-11-07T09:27:59Z

@brayn003 Can you fix following bugs on the DP:

On creating new branch, the commit input box is disabled for the first time

Screen.Recording.2023-11-07.at.2.52.19.PM.mov

Able to import template in protected branch, in protected mode

Screen.Recording.2023-11-07.at.2.53.58.PM.mov

github-actions · 2023-11-07T09:34:11Z

Workflow run: https://github.com/appsmithorg/appsmith/actions/runs/6781213048.
Commit: 9ba40d2.
Cypress dashboard: Click here!
The following are new failures, please fix them before merging the PR:

cypress/e2e/Regression/ClientSide/Git/GitSync/SwitchBranches_spec.js

To know the list of identified flaky tests - Refer here

brayn003 · 2023-11-07T10:59:31Z

/build-deploy-preview skip-tests=true recreate=true

github-actions · 2023-11-07T10:59:56Z

Deploying Your Preview: https://github.com/appsmithorg/appsmith/actions/runs/6783518013.
Workflow: On demand build Docker image and deploy preview.
skip-tests: true.
env: ``.
PR: 28667.
recreate: true.

github-actions · 2023-11-07T11:13:13Z

Deploy-Preview-URL: https://ce-28667.dp.appsmith.com

dipyamanbiswas07

LGTM

Parthvi12 · 2023-11-07T11:56:18Z

/build-deploy-preview skip-tests=true

github-actions · 2023-11-07T11:56:41Z

Deploying Your Preview: https://github.com/appsmithorg/appsmith/actions/runs/6784108427.
Workflow: On demand build Docker image and deploy preview.
skip-tests: true.
env: ``.
PR: 28667.
recreate: .

github-actions · 2023-11-07T12:09:29Z

Deploy-Preview-URL: https://ce-28667.dp.appsmith.com

brayn003 · 2023-11-07T12:23:40Z

/ok-to-test sha=d6e49aa

github-actions · 2023-11-07T12:24:07Z

Tests running at: https://github.com/appsmithorg/appsmith/actions/runs/6784417883.
Workflow: Appsmith External Integration Test Workflow.
Commit: d6e49aa.
PR: 28667.

github-actions · 2023-11-07T13:34:09Z

Workflow run: https://github.com/appsmithorg/appsmith/actions/runs/6784417883.
Commit: d6e49aa.
Cypress dashboard: Click here!
The following are new failures, please fix them before merging the PR:

cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts
cypress/e2e/Regression/ClientSide/Git/GitSync/SwitchBranches_spec.js
cypress/e2e/Regression/ClientSide/Widgets/Checkbox/CheckBoxGroupTest.ts

To know the list of identified flaky tests - Refer here

github-actions · 2023-11-07T14:10:38Z

Workflow run: https://github.com/appsmithorg/appsmith/actions/runs/6784417883.
Commit: d6e49aa.
Cypress dashboard: Click here!
The following are new failures, please fix them before merging the PR:

cypress/e2e/Regression/ClientSide/Git/GitSync/SwitchBranches_spec.js

To know the list of identified flaky tests - Refer here

dipyamanbiswas07

LGTM

## Description - Adds license flag for branch protection - Disables omni-bar and keyboard shortcuts for protected branches - Adds navigation for multiple pages - Hides preview on protected views - Adds feature flag for Git Connection Success #### PR fixes following issue(s) Fixes #28056 #### Media <img width="1728" alt="image" src="https://github.com/appsmithorg/appsmith/assets/8724051/ddbad4d8-9852-439f-b46d-fd5d58dd883b"> #### Type of change - Bug fix (non-breaking change which fixes an issue) ## Testing > #### How Has This Been Tested? > Please describe the tests that you ran to verify your changes. Also list any relevant details for your test configuration. > Delete anything that is not relevant - [x] Manual - [ ] JUnit - [ ] Jest - [x] Cypress > > #### Test Plan > Add Testsmith test cases links that relate to this PR > > #### Issues raised during DP testing > Link issues raised during DP testing for better visiblity and tracking (copy link from comments dropped on this PR) > > > ## Checklist: #### Dev activity - [ ] 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 - [ ] PR is being merged under a feature flag #### QA activity: - [ ] [Speedbreak features](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#speedbreakers-) have been covered - [ ] Test plan covers all impacted features and [areas of interest](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#areas-of-interest-) - [ ] Test plan has been peer reviewed by project stakeholders and other QA members - [ ] Manually tested functionality on DP - [ ] We had an implementation alignment call with stakeholders post QA Round 2 - [ ] Cypress test cases have been added and approved by SDET/manual QA - [ ] Added `Test Plan Approved` label after Cypress tests were reviewed - [ ] Added `Test Plan Approved` label after JUnit tests were reviewed

brayn003 added 3 commits November 6, 2023 18:31

fix: fixing flag issues

402e07c

fix: handling protected mode for multiple pages

b0fb823

fix: disabling shortcuts for protected mode

63c8e09

github-actions bot added Git Pod Anything related to git sync Git Version Control Issues related to version control labels Nov 6, 2023

brayn003 added skip-changelog Adding this label to a PR prevents it from being listed in the changelog skip-testPlan Does not require QA intervention or approval process and removed Git Version Control Issues related to version control Git Pod Anything related to git sync labels Nov 6, 2023

brayn003 self-assigned this Nov 6, 2023

github-actions bot added Bug Something isn't working Git Pod Anything related to git sync Git Version Control Issues related to version control and removed skip-changelog Adding this label to a PR prevents it from being listed in the changelog labels Nov 6, 2023

brayn003 marked this pull request as ready for review November 6, 2023 14:38

brayn003 requested review from hetunandu and a team as code owners November 6, 2023 14:38

brayn003 requested review from jsartisan and removed request for a team November 6, 2023 14:38

brayn003 added 3 commits November 6, 2023 20:24

fix: removing unecessary action creators

b11e7ec

fix: fixing failing unit tests

9e564cb

fix: added default branch update message

f66aad4

brayn003 requested a review from sneha122 November 6, 2023 15:35

fix: readding back preview mode

77eff0e

brayn003 requested a review from dipyamanbiswas07 November 7, 2023 05:38

fix: updating enterprise url

c813784

brayn003 added 2 commits November 7, 2023 15:49

fix: git first commit issue

79bed63

fix: remove templates on adding git

abd6c05

dipyamanbiswas07 previously approved these changes Nov 7, 2023

View reviewed changes

fix: filtering protected branch

d6e49aa

brayn003 dismissed dipyamanbiswas07’s stale review via d6e49aa November 7, 2023 11:55

Parthvi12 added Test Plan Approved Manual/Cypress tests covers changes made on the PR. Else, add skip-testPlan label if not applicable and removed skip-testPlan Does not require QA intervention or approval process labels Nov 7, 2023

fix: adding test locators

ff1f799

dipyamanbiswas07 approved these changes Nov 7, 2023

View reviewed changes

trishaanand merged commit b061ce1 into release Nov 7, 2023
14 of 15 checks passed

trishaanand deleted the fix/git-branch-protection-fixes branch November 7, 2023 14:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: git branch protection fixes #28667

fix: git branch protection fixes #28667

brayn003 commented Nov 6, 2023

brayn003 commented Nov 6, 2023

github-actions bot commented Nov 6, 2023

github-actions bot commented Nov 6, 2023

brayn003 commented Nov 7, 2023

github-actions bot commented Nov 7, 2023

github-actions bot commented Nov 7, 2023

Parthvi12 commented Nov 7, 2023

github-actions bot commented Nov 7, 2023

github-actions bot commented Nov 7, 2023

Parthvi12 commented Nov 7, 2023 •

edited

github-actions bot commented Nov 7, 2023

brayn003 commented Nov 7, 2023

github-actions bot commented Nov 7, 2023

github-actions bot commented Nov 7, 2023

dipyamanbiswas07 left a comment

Parthvi12 commented Nov 7, 2023

github-actions bot commented Nov 7, 2023

github-actions bot commented Nov 7, 2023

brayn003 commented Nov 7, 2023

github-actions bot commented Nov 7, 2023

github-actions bot commented Nov 7, 2023

github-actions bot commented Nov 7, 2023

dipyamanbiswas07 left a comment

fix: git branch protection fixes #28667

fix: git branch protection fixes #28667

Conversation

brayn003 commented Nov 6, 2023

Description

PR fixes following issue(s)

Media

Type of change

Testing

How Has This Been Tested?

Test Plan

Issues raised during DP testing

Checklist:

Dev activity

QA activity:

brayn003 commented Nov 6, 2023

github-actions bot commented Nov 6, 2023

github-actions bot commented Nov 6, 2023

brayn003 commented Nov 7, 2023

github-actions bot commented Nov 7, 2023

github-actions bot commented Nov 7, 2023

Parthvi12 commented Nov 7, 2023

github-actions bot commented Nov 7, 2023

github-actions bot commented Nov 7, 2023

Parthvi12 commented Nov 7, 2023 • edited

github-actions bot commented Nov 7, 2023

brayn003 commented Nov 7, 2023

github-actions bot commented Nov 7, 2023

github-actions bot commented Nov 7, 2023

dipyamanbiswas07 left a comment

Choose a reason for hiding this comment

Parthvi12 commented Nov 7, 2023

github-actions bot commented Nov 7, 2023

github-actions bot commented Nov 7, 2023

brayn003 commented Nov 7, 2023

github-actions bot commented Nov 7, 2023

github-actions bot commented Nov 7, 2023

github-actions bot commented Nov 7, 2023

dipyamanbiswas07 left a comment

Choose a reason for hiding this comment

Parthvi12 commented Nov 7, 2023 •

edited