PromucFlow_constructor/app/client/src
arunvjn b57b1b3c6e
chore: resolves merge conflicts in AnalyticsUtil (#23046)
## Description
Fixes conflicts in AnalyticsUtil.tsx

#### PR fixes following issue(s)
Fixes # (issue number)
> if no issue exists, please create an issue and ask the maintainers
about this first
>
>
#### Media
> A video or a GIF is preferred. when using Loom, don’t embed because it
looks like it’s a GIF. instead, just link to the video
>
>
#### Type of change
> Please delete options that are not relevant.
- Bug fix (non-breaking change which fixes an issue)
- New feature (non-breaking change which adds functionality)
- Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- Chore (housekeeping or task changes that don't impact user perception)
- This change requires a documentation update
>
>
>
## 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
- [ ] 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](https://github.com/appsmithorg/TestSmith/wiki/Test-plan-implementation#speedbreaker-features-to-consider-for-every-change)
have been covered
- [ ] Test plan covers all impacted features and [areas of
interest](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans/_edit#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
2023-05-07 13:22:44 +05:30
..
actions feat: signposting stickiness (#22088) 2023-05-02 15:22:05 +05:30
api feat: remove bloat from large files during upload (WIP) (#21757) 2023-04-27 10:33:32 +07:00
assets feat: self host google fonts (#22129) 2023-04-13 18:48:37 +05:30
ce chore: Minor Tasks for Auto Layout feature, Sentry errors, metrics and Beta tag (#22792) 2023-05-07 10:40:03 +05:30
components fix: Editor loses focus when ESC is pressed (#22975) 2023-05-06 19:30:20 +05:30
constants fix: Add current index property to min max fields (#22556) 2023-05-05 19:25:10 +05:30
ee feat: App navigation - Logo upload (#22297) 2023-05-05 12:19:20 +05:30
enterprise chore: Format files to match prettier rules and exclude third-party files (#21586) 2023-03-20 19:04:31 +05:30
entities fix: removed gsheet feature flag (#22758) 2023-05-05 20:38:04 +05:30
globalStyles chore: code splitting changes for appsmith ai v0.1 (#22521) 2023-04-20 20:42:35 +05:30
icons chore: upgrade to prettier v2 + enforce import types (#21013)Co-authored-by: Satish Gandham <hello@satishgandham.com> Co-authored-by: Satish Gandham <satish.iitg@gmail.com> 2023-03-16 17:11:47 +05:30
mockComponentProps
mockResponses ci: Add lint check to the build step (#21442) 2023-03-20 22:50:44 +05:30
mocks chore: integrate msw to browser to mock api requests (#15965) 2022-08-17 12:01:55 +05:30
navigation fix: added condition to store nav context if datasource already created on changing the page from ds routes (#22557) 2023-04-26 16:03:35 +00:00
normalizers chore: upgrade to prettier v2 + enforce import types (#21013)Co-authored-by: Satish Gandham <hello@satishgandham.com> Co-authored-by: Satish Gandham <satish.iitg@gmail.com> 2023-03-16 17:11:47 +05:30
pages chore: Minor Tasks for Auto Layout feature, Sentry errors, metrics and Beta tag (#22792) 2023-05-07 10:40:03 +05:30
polyfills chore: upgrade to prettier v2 + enforce import types (#21013)Co-authored-by: Satish Gandham <hello@satishgandham.com> Co-authored-by: Satish Gandham <satish.iitg@gmail.com> 2023-03-16 17:11:47 +05:30
reducers fix: Clear cache when switching pages (#22776) 2023-05-06 19:30:50 +05:30
reflow chore: upgrade to prettier v2 + enforce import types (#21013)Co-authored-by: Satish Gandham <hello@satishgandham.com> Co-authored-by: Satish Gandham <satish.iitg@gmail.com> 2023-03-16 17:11:47 +05:30
resizable feat: Add widget responsiveness and conversion algorithm (#21386) 2023-04-07 09:51:35 -04:00
sagas chore: Minor Tasks for Auto Layout feature, Sentry errors, metrics and Beta tag (#22792) 2023-05-07 10:40:03 +05:30
selectors fix: Layout Conversion bugs for auto Layout (#22565) 2023-05-03 04:26:52 +00:00
templates
theme chore: upgrade to prettier v2 + enforce import types (#21013)Co-authored-by: Satish Gandham <hello@satishgandham.com> Co-authored-by: Satish Gandham <satish.iitg@gmail.com> 2023-03-16 17:11:47 +05:30
transformers chore: upgrade to prettier v2 + enforce import types (#21013)Co-authored-by: Satish Gandham <hello@satishgandham.com> Co-authored-by: Satish Gandham <satish.iitg@gmail.com> 2023-03-16 17:11:47 +05:30
usagePulse chore: Removing feature flag for app level invites (#22650) 2023-04-26 12:48:16 +05:30
utils chore: resolves merge conflicts in AnalyticsUtil (#23046) 2023-05-07 13:22:44 +05:30
WidgetQueryGenerators chore: [One-click binding] Mongo db widget query generator (#22226) 2023-04-13 15:48:51 +05:30
widgets fix: Add current index property to min max fields (#22556) 2023-05-05 19:25:10 +05:30
workers fix: this.params shows error in IIFE (#22683) 2023-05-03 12:38:39 +05:30
App.css
AppErrorBoundry.tsx
config.d.ts chore: upgrade to prettier v2 + enforce import types (#21013)Co-authored-by: Satish Gandham <hello@satishgandham.com> Co-authored-by: Satish Gandham <satish.iitg@gmail.com> 2023-03-16 17:11:47 +05:30
Globals.d.ts feat: Auto layout appsmith editor and mobile responsiveness (#21151) 2023-03-04 12:55:54 +05:30
index.css feat: Google sheet file picker on blank page (#22148) 2023-04-14 12:49:42 +05:30
index.tsx chore: upgrade to prettier v2 + enforce import types (#21013)Co-authored-by: Satish Gandham <hello@satishgandham.com> Co-authored-by: Satish Gandham <satish.iitg@gmail.com> 2023-03-16 17:11:47 +05:30
LandingScreen.tsx chore: upgrade to prettier v2 + enforce import types (#21013)Co-authored-by: Satish Gandham <hello@satishgandham.com> Co-authored-by: Satish Gandham <satish.iitg@gmail.com> 2023-03-16 17:11:47 +05:30
react-app-env.d.ts
RouteBuilder.test.ts fix: Encode query params in URLs (#22594) 2023-05-03 09:00:27 +05:30
RouteBuilder.ts fix: Encode query params in URLs (#22594) 2023-05-03 09:00:27 +05:30
RouteChangeListener.tsx chore: Add new navigation scenarios for route change event (#21682) 2023-03-30 11:03:29 +05:30
RouteParamsMiddleware.ts chore: upgrade to prettier v2 + enforce import types (#21013)Co-authored-by: Satish Gandham <hello@satishgandham.com> Co-authored-by: Satish Gandham <satish.iitg@gmail.com> 2023-03-16 17:11:47 +05:30
serviceWorker.js fix: Log ChunkLoadError on Sentry only after 3rd failure (#18196) 2022-11-18 09:33:23 +00:00
store.ts chore: upgrade to prettier v2 + enforce import types (#21013)Co-authored-by: Satish Gandham <hello@satishgandham.com> Co-authored-by: Satish Gandham <satish.iitg@gmail.com> 2023-03-16 17:11:47 +05:30
wdyr.ts