## 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
* - Save the DOM on test failures.
- Handle promise rejection in tests.
- Save console logs to a file instead of stdout
* - Fix golden app tests
- Upgrade widgets in golden app to latest version
* - Removing logging to file temporarily
- Add test index to the file names
* Some final cleanup
Co-authored-by: Satish Gandham <satish@appsmith.com>
* fix: Enable parsing dates before Jan 1, 1970 in MongoDB
This commit takes care of three things
1. It enables the application to parse dates before Jan 1, 1970 in case of MongoDB
2. JUnit test
3. Cypress test
* fix: Enable parsing dates before Jan 1, 1970 in MongoDB
This commit takes care of three things
1. It enables the application to parse dates before Jan 1, 1970 in case of MongoDB
2. JUnit test
3. Cypress test
Co-authored-by: Nidhi <nidhi.nair93@gmail.com>
* Adds analytics for DropdownControl
* Add isUpdatedViaKeyboard to WIDGET_PROPERTY_UPDATE
* fix: jest test for iconselectorcontrol
* refactor: Interaction analytics event dispatching moved to a hook
* refactor: event collection logic to HOC
* Analytics for SwitchControl
* Analytics for CodeEditor
* Analytics for InputTextControl
* Analytics for ColorPicker
* fix issue with ColorPicker
* refactor to re-use ref
* rename the hook to ts
* Analytics for StepControl
* Analytics for ButtonTabComponent
* Analytics for NumericInputControl
* Analytics for IconSelector
* fix: failed test
* Analytics for ActionSelector
* fix: failed jest test
* fix: jest test for StepControl
* Analytics for Option Control
* Analytics for LocationSearchControl
* Adds Analytics for Tab key
* analytics for Property pane connections
* Add analytics for widget name
* Adds analytics for copy & delete button
* fix issue with widget name analytics
* add useCallback for tab keydown handler for button
* Create separate Event handling for design system
* removes unused imports
* changes ADS_EVENT to DS_EVENT
* Changes AdsEventTypes to DSEventTypes
* Changes AdsEventDetail to DSEventDetail
* changes occurences of Ads to DS
* avoids creation of intermediate function
* removes trace of 'analytics' from DS components
* rename dispatchDSEvent to emitDSEvent
* fix: Cypress selector
In order to import a specific page or browse to that page, the templates FE need page names and page ids. This PR replaces the list of page names with a list of objects that contains the page names and page ids.
* Run perf tests only on buildjet machine
* - Set chrome process priority to maximum to stabilise the run data
* Update index.js
* Update perf.js
* Update index.js
* - Move around args
* - Add --no-sandbox option to initial setup
* -We don't need sudo on the main script, we can use sudo in node scripts to set process priority
* - Some tweaks to the perf scripts.
* - Remove no-sandbox option in puppeteer launch
* - Remove sudo at unnecessary places
* - Add code to force grabage collection in chrome
* Update logins and some cleanup
* Remove unsed import
Co-authored-by: Satish Gandham <satish@appsmith.com>
* Outdated design for Queries/JS/API Editor
* updated cypress test cases and colors reference
* updated cypress test cases with add and delete datasource
* added indexing for testcases
Co-authored-by: Chandan Balaji <chandanbalaji@Chandans-MacBook-Pro.local>
* fix: clear search input on selection
* fix: added comments in single select test case.
* fix: single select tree widget clear search on close
* fix: test cases for mult-select-spec
* fix: clear the filterText on select widget close
* fix: added resetOnClose to select component
* fix: resetOnClose only when serverSideFiltering is off
* fixes google sheets datasource global search error
* Adds cypress test
* Fix cypress test
* Fixes navigating to google sheets queries from global search issue
* fix:
* removed the componentWillUnmount to avoid uppy reset
* added cypress test case
* fix:
* added componentWillUnmount again
* added reason argument to the file-remove handler
* fix: switch datasource option list contains similar ds
* fix: test case for switching datasource
* fix: updated the numbering of test case, deleted the postgres ds
