* replaced all instances of _.isEqual, isEqual from lodash with equal from fast-deep-equal/es6
Co-authored-by: Smruti Parida <smrutiparida@Preetis-MacBook-Pro.local>
* feature: Add new pageOffset binding to Table Widget
* Add jest tests
Modify getPageOffset to account for failed tests
* Review changes
* take page size as tableData.length when Serverside pagination is on
* Update bindings count in cypress test for table widget v2
* Changes default value of pageOffset to 0
Use pageSize instead of tableData.length when tableData is not available
* Update jest tests according to changes in the code
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
* fix: show the form setting in button widget
* test: fix test case
* refactor: code refinement
* refactor: remove hidden fun. for form setting
* refactor: remove unused var
* refactor: recall the old code
* refactor: remove the parent hack for hidden
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
* fix: Table reverts column positions on sorting if columns returned differ
* Adds Cypress tests
* Update cypress tests to reorder column and validate
* Adds another assertion to table column order cypress test
## Description
This reverts commit dbcc643ccf.
Fixes#16378
## Type of change
- Revert changes which impacted performance
## How Has This Been Tested?
Manual performance verification
@ramsaptami
## 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
Co-authored-by: ohansFavour <fohanekwu@gmail.com>
The edition string will only be shown for self hosted instances. This change is being done because Appsmith Cloud doesn't yet support Business edition yet.
## Type of change
- Bug fix (non-breaking change which fixes an issue)
## How Has This Been Tested?
Manual
## 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
* css changes for members page
* fixed members page UI
* minor css change
* updated styles
* added a comment
* css change
* removed multiple copies of Back button component
## Description
This PR adds the string `Community` along with the Appsmith version. This will help users identify the type of instance that they are running.
## Type of change
- New feature (non-breaking change which adds functionality)
## How Has This Been Tested?
Manually
## 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
* POC for Shared AST Logic using Yarn Symlinks
* fix: preinstall script for bundling shared packages
* Merge commit
* fix: updated the script to link, unlink the package as shared dep
* fix: updated dependencies
* Add a post-install script and fix yarn.lock file
* Remove commented code
* fix: added verification script, readme, moved scripts to shared
* Extraction of AST Logic into shared/ast folder
* Add jest test script
* Replace hardcoded ast Logic use with Shared AST module
* Replace parse code with getAST
Co-authored-by: Aman Agarwal <aman@appsmith.com>
* fix: Table Widget shows scrollbar when not in focus
* Scroll bar fix for table widget v1
* - Shows all table scrollbars on hover for table widget v2
- Extends ScrollIndicator component to support showScrollbarOnHover functionality
* json field spec fix
* Changes requested in review
* index.js revert
* Review changes
* Club hover and active css together in scrollbarOnHoverCSS
* Fix "scroll thumb not visible until first scroll" issue
* Fix some typos in comment
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
* Add error.message only to data.reason, since the call stack being sent to responsePayload is different for different browsers. This fix ensures a consistent behaviour across all browsers
* Add integration tests
* Update test to typescript
* Fix error message
* Use new error instead of message object
* Code review fix
* Add else block to catch unknown errors
* Update tests
* Get back to original solution - error solution not working in safari
## Description
Hotfix to resolve `focusedValue` undefined error
## Type of change
- Bug fix (non-breaking change which fixes an issue)
## How Has This Been Tested?
## 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
* fix: Allow 'space' in theme name while saving a new theme
* feat: Add more relevant error message for theme name while saving theme
* chore: Remove SPECIAL_CHARACTER_ERROR msg since it's not being used anywhere
* cy fix
* cy fix
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
Co-authored-by: Aishwarya-U-R <91450662+Aishwarya-U-R@users.noreply.github.com>
## Description
Fixes#15950Fixes#16141
## Type of change
- Bug fix (non-breaking change which fixes an issue)
## How Has This Been Tested?
**Test plan**
- [ ] https://github.com/appsmithorg/TestSmith/issues/1982
- [ ] https://github.com/appsmithorg/TestSmith/issues/2049
## Checklist:
- [x] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [x] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my feature works
- [x] New and existing unit tests pass locally with my changes
* initial commit
* props hoc
* changes
* removed ignores and withWidgetProps
* added extra props to canvasStructure
* widget props changes
* list widget changes
* reintroduced widget props hook and other refactors
* remove warnings
* added deepequal for childWidgets selector
* fix global hotkeys and tabs widget jest test
* fix main container test fix
* fixed view mode width
* fix form widget values
* minor fix
* fix skeleton
* form widget validity fix
* jest test fix
* fixed tests: GlobalHotkeys, Tabs, CanvasSelectectionArena and fixed main container rendering
* minor fix
* minor comments
* reverted commented code
* simplified structure, selective redux state updates and other inconsistencies
* fix junit test cases
* stop form widget from force rendering children
* fix test case
* random commit to re run tests
* update isFormValid prop only if it exists
* detangling circular dependency
* fixing cypress tests
* cleaned up code
* clean up man cnavas props and fix jest cases
* fix rendering order of child widgets for canvas
* fix dropdown reset spec
* adding comments
* cleaning up unwanted code
* fix multiselect widget on deploy
* adressing review comments
* addressing minor review comment changes
* destructuring modal widget child and fix test case
* fix communityIssues cypress spec
* rewrite isVisible logic to match previous behaviour
* merging widget props with component props before checking isVisible
* adressing review comments for modal widget's isVisible
Co-authored-by: rahulramesha <rahul@appsmith.com>
* POC: Datatype handling autogenerated naming params client
* added array and file datatype
* handles all primitive types
* paramproperties convetred to map instead of array
* parametermap inversion
* handled no bindings bug
* feat: Consume action execution payload changes w.r.t. data type mapping (#15555)
This commit does the following things
1. It consumes data type metadata from payload
2. It consumes the mapping between the pseudo binding name and original binding name
3. It doesn't apply any logic w.r.t. data type identification after consumption
* added comments and cleaned code with proper datatypes
* removed URLencoding for binding params names
* feat: Remove URL decoding on param keys from server-side codebase (#15555)
* Remove unused import (#15555)
Co-authored-by: ChandanBalajiBP <chandan@appsmith.com>
For most browsers the default type of button is submit, this could cause the page to reload when clicked. Setting button type to button, prevents this behavior.
* feat: added loader/spinner support for table
* added empty data state in table
* updated no data UI for table
Co-authored-by: Ankita Kinger <ankita@appsmith.com>
* style: added styles to chart configs
* style: adjusted axis names and legend position
* style:
* adjusting legend position
* removed background property at the widget level
* exposed current theme data at widget level
* fix: addressed feedback on chart widget reskin
* fix:
* style according to feedback
* styled custom charts
* fix:
* added migration for accentColor and fontFamily
* implemented reskinning feedback
* fix: changed the position of properties in custom chart config
* fix:
* added unit test for migration
* changed the caption color
* fix: spacing fix
* fix: added accentColor and fontFamily defaults
* test: added cypress test for chart reskinning
* test: fixed cypress test failure
* Snaps response view to certain height and adds abort query execution feature
* make raw string a constant
* Add cypress tests
* Remove theme variable
* move raw strings to constants in messages.ts file
* Fix test case description
* Comment out query abort action execution
* cy fix
* Fix abortion of parallel action execution like onPageLoad
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
Add Autocomplete support for
- local variables
- JSObjects
- ButtonGroupWidget
Remove Autocomplete suggestion for
- `eval`
- undefined global values like `tabs`
* Modify control type for MongoDB Collection field
* Make more form control changes across datasources
* Fix cypress errors
* Fix typescript error
* Fix more cypress tests
* Fix failing MongoDBShoppingCart spec
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
* POC: Grouping for ButtonWidget
* Adds featureflag
* improve feature flag experience for unfinished widgets
* Styling of tabs
* Adds activation group for ButtonWidget
* Makes contentConfig & styleCOnfig optional to avoid typescript errors from tests
* Adds UI for search
* Fixes title, search & tabs UI to the top
* fix: style issue
* fix styles
* refactor ProeprtyPaneTab
* updates Button based on Figma design changes
* POC for AudioWidget
* chore: JSON Form Grouping & Reorganisation (#15033)
* POC: JSON Form grouping
* fix: Empty sections
* Moves icon into a separate sub section
* fix some sections based on updated Designs
* fix styling issues
* fix: double border
* udpdates based on Figma updates
* Updates order as per Figma
* refactor and better naming of function
* address review comments for JSON form configs
* fix UI issues
* reorder JSON form's array data section
* Adds Button Form settings
* Address QA comments
* update JSON form with new design changes
* Adds FilePickerWidget
* Adds MapChartWidget
* Adds ContainerWidget
* Adds MapWidget
* Adds ImageWidget
* Adds AudioRecorderWidget
* Adds CameraWidget
* Adds ChartWidget
* fix: issues found in design review
* Open array & object style by default
* trigger ci
* chore: Grouping & reorganisation of Video widget (#15297)
* POC: JSON Form grouping
* fix: Empty sections
* Moves icon into a separate sub section
* fix some sections based on updated Designs
* fix styling issues
* fix: double border
* udpdates based on Figma updates
* Updates order as per Figma
* Content & Style Config for Video Widget
* refactor and better naming of function
* address review comments for JSON form configs
* fix UI issues
* ??
* chore: Grouping & reorganisation of Document Viewer widget (#15514)
* Grouping & re-org for Document Viewer
* fix: scroll issue
* Adds FormWidget
* fix: mapchart style section heading
* refactor: cleanup
* incoorporate latest change for Camera widget
* POC: Grouping for ButtonWidget
* Adds featureflag
* improve feature flag experience for unfinished widgets
* Styling of tabs
* Adds activation group for ButtonWidget
* Makes contentConfig & styleCOnfig optional to avoid typescript errors from tests
* Adds UI for search
* Fixes title, search & tabs UI to the top
* fix: style issue
* fix styles
* refactor ProeprtyPaneTab
* updates Button based on Figma design changes
* POC for AudioWidget
* chore: JSON Form Grouping & Reorganisation (#15033)
* POC: JSON Form grouping
* fix: Empty sections
* Moves icon into a separate sub section
* fix some sections based on updated Designs
* fix styling issues
* fix: double border
* udpdates based on Figma updates
* Updates order as per Figma
* refactor and better naming of function
* address review comments for JSON form configs
* fix UI issues
* reorder JSON form's array data section
* Adds Button Form settings
* Address QA comments
* update JSON form with new design changes
* Open array & object style by default
* trigger ci
* chore: Grouping & reorganisation of Video widget (#15297)
* POC: JSON Form grouping
* fix: Empty sections
* Moves icon into a separate sub section
* fix some sections based on updated Designs
* fix styling issues
* fix: double border
* udpdates based on Figma updates
* Updates order as per Figma
* Content & Style Config for Video Widget
* refactor and better naming of function
* address review comments for JSON form configs
* fix UI issues
* ??
* chore: Grouping & reorganisation of Document Viewer widget (#15514)
* Grouping & re-org for Document Viewer
* fix: scroll issue
* feat: Search properties in property pane (#14876)
* Upgrades fuse.js package
* Property pane search POC
* POC: JSON Form grouping
* fix: Empty sections
* Moves icon into a separate sub section
* fix some sections based on updated Designs
* fix styling issues
* fix: double border
* udpdates based on Figma updates
* Updates order as per Figma
* fix unused variable after merge
* Adds empty search UI
* Makes the order of search result proper
* Refactor PropertyControlGenerator
* refactor and support for panel
* Revert "Upgrades fuse.js package"
This reverts commit 76d8038139ff4b8add79019a75eaaf40fd620e8e.
* extract out search functionality to helper
* cleanup
* fix: panel issue
* Focus on Search bar on opening the property pane
* better naming
* fix: fuzzy search params
* refactor: As suggested in the code review
* fix: section is not hidden when there's no children
* fix: issue panel properties
* Adds TextWidget
* Adds RateWidget
* Adds DividerWidget
* Adds ProgressWidget
* Adds ListWidget
* adds TabWidget
* Adds IframeWidget
* Adds StatboxWidget
* Adds ModalWidget
* changes after design review
* Remove Dropdown, SearchComponent from this repository
* Change the imports so that SearchComponent and DropdownV2 come from the design system
* Add yalc
* default imports become named imports
* remove the yalc package, add the beta version
* Change import for SearchComponent in TableHeader
* Updated Label Config
* chore: Refactor dependency Map code (#14944)
* feat: Triggerpath dependency (#15015)
* Introduce triggerpathdependency
* Code cleanup and refactor
* add jest test for removeLintErrorsFromEntityProperty
* Add triggerfieldDependencyMap jest tests for datatreeEvaluator
* Add cypress tests
* Revamp linting architecture
* Lint when creating first tree
* Prevent modification of unevaltree while linting
* improve linting performance
* Reuse allkeys for all dependencymap creation
* Add jest test for linttree
* Update jest and cypress tests
* Modify linting folder name
* remove redundant commits
* update evaluation jest tests
* Fix failing test
* Update cypress tests
* Code clean up and performance upgrade
* Update cypress tests
* Use unevalTree as global data for non-trigger field
* Improve global data creation time
* Cypress fixes
* Improve creation of global data for linting
* Only generate global data with functions when needed
* remove all unused variables
* Add overriden commit
* remove lint erros before linting
* fix merge conflicts
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
Co-authored-by: Rishabh Rathod <rishabh.rathod@appsmith.com>
Co-authored-by: Favour Ohanekwu <fohanekwu@gmail.com>
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
* POC: Grouping for ButtonWidget
* Adds featureflag
* improve feature flag experience for unfinished widgets
* Styling of tabs
* Adds activation group for ButtonWidget
* Makes contentConfig & styleCOnfig optional to avoid typescript errors from tests
* Adds UI for search
* Fixes title, search & tabs UI to the top
* fix: style issue
* fix styles
* refactor ProeprtyPaneTab
* updates Button based on Figma design changes
* POC for AudioWidget
* chore: JSON Form Grouping & Reorganisation (#15033)
* POC: JSON Form grouping
* fix: Empty sections
* Moves icon into a separate sub section
* fix some sections based on updated Designs
* fix styling issues
* fix: double border
* udpdates based on Figma updates
* Updates order as per Figma
* refactor and better naming of function
* address review comments for JSON form configs
* fix UI issues
* reorder JSON form's array data section
* Adds Button Form settings
* Address QA comments
* update JSON form with new design changes
* Open array & object style by default
* trigger ci
* chore: Grouping & reorganisation of Video widget (#15297)
* POC: JSON Form grouping
* fix: Empty sections
* Moves icon into a separate sub section
* fix some sections based on updated Designs
* fix styling issues
* fix: double border
* udpdates based on Figma updates
* Updates order as per Figma
* Content & Style Config for Video Widget
* refactor and better naming of function
* address review comments for JSON form configs
* fix UI issues
* ??
* chore: Grouping & reorganisation of Document Viewer widget (#15514)
* Grouping & re-org for Document Viewer
* fix: scroll issue
* feat: Search properties in property pane (#14876)
* Upgrades fuse.js package
* Property pane search POC
* POC: JSON Form grouping
* fix: Empty sections
* Moves icon into a separate sub section
* fix some sections based on updated Designs
* fix styling issues
* fix: double border
* udpdates based on Figma updates
* Updates order as per Figma
* fix unused variable after merge
* Adds empty search UI
* Makes the order of search result proper
* Refactor PropertyControlGenerator
* refactor and support for panel
* Revert "Upgrades fuse.js package"
This reverts commit 76d8038139ff4b8add79019a75eaaf40fd620e8e.
* extract out search functionality to helper
* cleanup
* fix: panel issue
* Focus on Search bar on opening the property pane
* better naming
* fix: fuzzy search params
* refactor: As suggested in the code review
* fix: section is not hidden when there's no children
* fix: issue panel properties
## Description
This PR adds [crypto web api](https://developer.mozilla.org/en-US/docs/Web/API/Crypto) support in linting
Fixes#15469
## Type of change
- Bug fix (non-breaking change which fixes an issue)
## How Has This Been Tested?
- [x] https://github.com/appsmithorg/TestSmith/issues/1996
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my own code
- [x] I have commented on my code, particularly in hard-to-understand areas
- [x] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [x] I have added tests that prove my fix is effective or that my feature works
- [x] New and existing unit tests pass locally with my changes
* fix: issue points Android :2,3,6
* fix: improving the camera widget
* fix: show the device menu in fullscreen mode
* refactor: use getPlatformOS for check platform os
* refactor: add missing yarn file
* fix: camera switching issue when video mode
* fix: removed the audio/video mute button from ios devices
* fix: Disable the media button instead of hide in ios devices
* fix:
* added css variables for primary color
* added styles for dropHint custom icon
* feat:
* styled the remove uploaded file icon to match re-skinning
* added theme font-family to the contents inside the upload modal
* styled upload button to match re-skinning
* feat:
* set cancel button color to theme's primary color
* set the close button style according to theme
* set the border radius of the upload modal
* set the error message styles in accordance with re-skinning
* fix: cross mark position on the top right corner of upload modal
* fix: added hover background color on modal back and add more files button
* fix: added border radius fix for file remove button
* fix: modal close icon
* fix: addressed feedback from dilip
* fix: font-family issue inside the modal
* test: added cypress test to test styling logic
## Description
Previous version of the astring library doesn't preserve parenthesis when transforming AST to JS Code. This led to syntax error when null coalesce and logical expressions are used together.
The latest version of astring library fixes this.
<img width="1291" alt="screenshot_2022-07-16_at_04 29 52" src="https://user-images.githubusercontent.com/46670083/179581475-863d70f2-0886-403a-a667-a32ad93e76b7.png">
Fixes#15283
## Type of change
- Bug fix (non-breaking change which fixes an issue)
## How Has This Been Tested?
Test plan
- [x] https://github.com/appsmithorg/TestSmith/issues/1970
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] 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
## Description
With the new documentation structure, updating the URLs which are being used in tests.
## Checklist:
- [ ] My code follows the style guidelines of this project
- [X] 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
Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local>
* Introduce triggerpathdependency
* Code cleanup and refactor
* add jest test for removeLintErrorsFromEntityProperty
* Add triggerfieldDependencyMap jest tests for datatreeEvaluator
* Add cypress tests
* Revamp linting architecture
* Lint when creating first tree
* Prevent modification of unevaltree while linting
* improve linting performance
* Reuse allkeys for all dependencymap creation
* Add jest test for linttree
* Update jest and cypress tests
* Modify linting folder name
* remove redundant commits
* update evaluation jest tests
* Fix failing test
* Update cypress tests
* Code clean up and performance upgrade
* Update cypress tests
* Use unevalTree as global data for non-trigger field
* Improve global data creation time
* Cypress fixes
* Improve creation of global data for linting
* Only generate global data with functions when needed
* remove all unused variables
* Add overriden commit
* remove lint erros before linting
* fix merge conflicts
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
* Expose message event details for Iframe Widget
* Change meta property name from messageEventProps to messageMetadata
* Cypress test for Iframe Message event details
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
Core changes in this PR
Prevents logging of lint warnings (not errors) in the debugger
Refined message for using 'await' in non-async functions
Show lint error messages that include line numbers (previously weren't shown)
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
* Added support for self signed certificate during OAuth2 flows, server side changes
* fix: authentication.useSelfSignedCert key added
* Merging from release
* Fixed issue with dependencies, plus bug with using ssl
* Cypress test attempt 1
* Cypress test attempt 2
* Cypress test attempt 3
* Clean up
* Review comments
* Enabled compression again
Co-authored-by: Aman Agarwal <aman@appsmith.com>
* migration from organization to workspace on code level
* updated a few more files
* fixed runtime errors
* update org settings URL
* Renamed organizationId in domain objects
* changed field named from organization to workspace
* Reverted AppsmithRole changes
* fixed migrations
* recreating indexes
* migration update
* seed data runs before migration, undo changes
* mock commit
* seedmongo to populate upgraded data, datasource upgrade
* fixed two test cases
* updated migrations
* updated prop name
* Upgraded AclPermission
* comment
* migrated AppsmithRole
* more changes
* final set of changes
* variable name changes
* update cypress variable name
* Update app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ApplicationControllerCE.java
* Update app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Datasource.java
Co-authored-by: Trisha Anand <trisha@appsmith.com>
* reverting encryption handler change
* refactor code to migrate from org to workspace
* migrated a few missed out org to workspace
* updated a few more
* migrated a few missed out org to workspace
* migration changes
* Removed Permission import
* reverted code change
* few more changes
* fixed failing cypress test
* fixed failing cypress test
Co-authored-by: Sidhant Goel <sidhant@appsmith.com>
Co-authored-by: Trisha Anand <trisha@appsmith.com>
Co-authored-by: Sidhant Goel <sidhant@hexcod.in>
This pull request:
introduces a new option to the menu in the JS editor which lets users prettify/auto-indent code.
introduces a new keyboard shortcut that lets users prettify/auto-indent code
Fixes bug where pressing CMD + <- in Mac (Home in windows) shifts the cursor to the first indented column. If the cursor is present on the first indented column, the cursor shifts to the 0th column in the editor
Fixes#9268
As of today, we were supporting only ECDSA keys for GitHub, GitLab, and BitBucket. For Azure, RSA key generation was not available. This PR allows users to generate RSA or ECDSA keys.
As of now we support following key types and version control service providers:
Github: ECDSA
Gitlab: RSA, ECDSA
Bitbucket: RSA, ECDSA
Azure: RSA
Fixes#14382, #14715, #14570
## Description
- Shortcut key-up and key-down were not working because the list of file operations on ui were filtered out of the `sectionTitle` but on key actions it was being referred to which was adding in the offset for the current active item.
Fixes#15264
## Type of change
- Bug fix (non-breaking change which fixes an issue)
## Description
ConflictInfo was showing up along side discard button. Moved it to a row of its own.
Fixes#15113
## Type of change
- Bug fix (non-breaking change which fixes an issue)
## Checklist:
- [x] 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
- [x] New and existing unit tests pass locally with my changes
