* Changes to on page load logic and consumption for update layout
* Slight clean up, tests and stuff
* - Added evaluationVersion logic based on application configuration
- Added configuration for slim and fat container rts availability
- Added backup logic of string comparison for slim containers
- Added tests for both paths
* Changes to on page load logic and consumption for update layout
* Slight clean up, tests and stuff
* Cleaned up comments all over
* Why isn't there even a setting to disable auto re-formats
* update rts logic to use updated shared AST logic
* Make changes to naming conventions
* Some temp stuff to check if update layout API changes will work out
* Added health check endpoint in RTS
* Added types for AST request
* update: type for save page request object
* update: return type for getEditorConfigs func
- Added applicationId to the type.
- Fetching from the redux store -> applications -> currentApplication -> id
* update: url generation func for update page API
- added applicationId as query param for the call
* Fixed test failures
* Fixed merge from release with on page load failure messages
* Fixed tests failing after merge
* Review comments, more tests, and fix for array index ref directly after .data path
* Test fix
* Addressed review comments
* Updated comment
* Fixed rts temporarily, added handling for data as function name, left with tests
* fix: failing rts server
* Tests for all types of actions and references
* Changes to test
* Modified type to set
* Test fixes
* Trying to make a test pass
* Added app id in cypress test update dsl
* Added app id in cypress test update dsl
* Added app id in cypress test update dsl
* Removed dep tree temp file
* Resolving compile issues after merging from release
* updated tests for applicationId
* corrected a typo
* fixed some more tests
* updated test
* Updated test
* DSL load AppId fix
* appId removal
* AgHelper LocalStorageCache()
* AgHelper LocalStorageCache() - commit 2
* AgHelper LocalStorageCache() - commit 3
* AgHelper LocalStorageCache() - commit 4
* AllWidgets_Reset_spec - Dsl fix
* Json_spec fix
* S3_2 spec fix
* fixes
* LocalStorageCache fixes
* fixes
* fixes
* fix
* OnLoadActions spec fix
* Promises spec fix
* S3_2 spec fix
* 16702 spec update
* OnLoadActions spec trial fix
* RTS fix
Co-authored-by: Nidhi Nair <cataclysm@Nidhis-MacBook-Pro.local>
Co-authored-by: Ayangade Adeoluwa <adeoluayangade@yahoo.com>
Co-authored-by: Ayush Pahwa <ayush@appsmith.com>
Co-authored-by: Aman Agarwal <aman@appsmith.com>
Co-authored-by: Apple <nandan@thinkify.io>
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
* Use the branched application for git connected apps
* Add error handling and comment
* Changes per review
* Add check before updating the action collections with the defaultPageId from the default page for git apps
* Fix git sync id not set in ImportExport flow
* Remove error handling
* Add tests for template merge flow
* chore: Moved page deleted to happen only after other resources are deleted
* Corrected the resource deletion flow on application delete operation
* fix: Fixed race condition error
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
* Add validation checks for Email and Website
* Add test cases
* Update pattern and Test cases
* Valid and Invalid samples for regex
* Update test cases.
Also fixing the comodification array error when we are removing items from a list while iterating over it.
Fixes#17030
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
* fixes rght body type not selected after curlimport
* added apiContentType key in ActionConfiguration formData property
This commit fixes the bug https://github.com/appsmithorg/appsmith/issues/13978 and changes two files:
* appsmith-server/src/test/java/com/appsmith/server/services/CurlImporterServiceTest.java
* appsmith-server/src/main/java/com/appsmith/server/services/ce/CurlImporterServiceCEImpl.java
additionaly this commit fixes the Body type detection for REST APIs with GET method when imported from cURL.
* Made changes to the casing of Header key 'content-type', now it is HTTPHeader.CONTENT_TYPE standard -> 'Content-Type'. changed test cases accordingly.
* Made header-key check in assertHeader functions case insensitive in CurlImporterServiceTest.java
* removed wildcard imports and changed some comments
* changes according to PR review comments
* updated imports for APIPaneUtils
Co-authored-by: “sneha122” <“sneha@appsmith.com”>
Co-authored-by: manish kumar <manish@appsmith.com>
## Description
> The `queryAll` method of AppsmithBaseRepository does not support the mongodb limit. This PR adds the support for the same.
## How Has This Been Tested?
- locally
## 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
Co-authored-by: Trisha Anand <trisha@appsmith.com>
* feat: Add a service layer to get AppsmithType from client-type (#16508)
This commit takes care of the following things
- It creates a service layer to get the target AppsmithType from the client-side data type and the evaluated value
- This service layer is currently not consumed by any plugins
- A full JUnit test suit for MySQL-specific types
* feat: Remove FloatType and add comments for better understanding (#16508)
* feat: Add FallbackType and covert the DataTypeService to a util class (#16508)
This commit takes care of these
- Introduce FallbackType as a separate type
- Convert the DataTypeService to a util class
- Add java doc around the methods in DataTypeService class
* feat: Rename DataTypeService to DataTypeServiceUtils (#16508)
* Refactor tests
* Use Mock.Spy to mock the method of the testing class
* Add the mock for new workspaceId in the test class
Co-authored-by: Trisha Anand <trisha@appsmith.com>
## Description
This adds the missing analytics event for workspace creation
## Type of change
- New feature (non-breaking change which adds functionality)
## How Has This Been Tested?
- Locally
## 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
- [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
* 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>
Execute action triggered events were not getting logged because of a lack of subscription. Fixed in place.
## Type of change
- Bug fix (non-breaking change which fixes an issue)
## How Has This Been Tested?
- Locally connected to segment
## 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
- [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
* -return custom slug in response to the get list of pages API
* -return custom slug for default page in home page API
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
* feat: added more data to existing analytics events
* Added extra audit data points for page and action events
* Corrected minor comment issue
* Review changes
* Removed audit references in variable names
* Review changes related to sending analytics events and DB optimization
The Installation setup complete event is not getting sent sometimes, and it's behavior looks very much like there's some race condition somewhere. I'm proposing this change towards two goals.
One, currently, we send the event after the user-entered data is saved to the DB. But, there's no actual dependency, no point to waiting on that for sending the event. The actual user itself, is already created and signed up. So, one change is that we don't wait for the DB update to be applied. I'm also changing .onSuccess to .map, hoping that might make a difference.
Two, make a debug log entry to see if it is our callback function that's not getting invoked, or if Segment's API isn't doing it's job, when the event is not sent.
This PR also fixes formatting of Segment error messages.
* chore: Added analytics for C, U, D operations on actions
* chore: Added isTemplateOrMock field in datasource
* fix: Set mock datasource field as true on creation
* Split template and mock identifiers into two. Added them to analytics as well
* Added tests as well as felt like a noob.
* Add isMock and isTemplate fields to datasources of created Actions
* Removed execute action triggered props
* Revert "Removed execute action triggered props"
This reverts commit cad1b8af504218813daa5f563f7b417fa263101b.
* Stringified response body before recording event
* Adding ds fields
* Reverting client side changes
* Fixed failing tests
Co-authored-by: Ayangade Adeoluwa <adeoluayangade@yahoo.com>
This adds a few missing analytics events and some more extra data for audit purposes. The missing event added are,
User login (login_USER)
User logout (logout_USER)
Import Application (import_APPLICATION)
Export Application (export_APPLICATION)
Clone Application (clone_APPLICATION)
Create Workspace (create_WORKSPACE)
Delete Workspace (delete_WORKSPACE)
View Page (view_NEWPAGE)
## Description
> Fix the NPE issue in theming while copying the properties.
## Type of change
- Bug fix (non-breaking change which fixes an issue)
## How Has This Been Tested?
> Locally
## 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
## Description
Fixes issue in ApplicationForkingServiceTests
## Type of change
- Bug fix (non-breaking change which fixes an issue)
## How Has This Been Tested?
- Local tests
## 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
- [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
Due to a bug, customized themes set to the parent branch where deleted when user deletes git branch. The bug has been fixed already. This PR adds a DB migration that fixes the data if there is any.
* 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>
Upgrades vulnerable dependencies in all plugins except for MySQL. That one is still failing and I'll fix it in a separate PR. Issue #14475
Co-authored-by: Nayan <nayan@appsmith.com>
Co-authored-by: Anagh Hegde <anagh@appsmith.com>
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.
* Refactor git API's to add `/app` to the API path to identify the appId
* Update the url in cypress tests
* Update the path in git spec cypress files
* Update the url for connection spec
Fix how special chars in env values are saved
Also included some refactoring to fix several compile time warnings and lint errors,
including proper formatting.
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
* fix: Switched Google Sheets JSON to local directory
* fix: Fixed placeholder text for insert row object
* fix: Enabled server side caching of plugin resources again
* Client changes 1
* add DSL functionality
* Temp commit for refactoring changes
* Do I even know what I'm doing here?
* chore: Second GS layout
* Update: Visibility conditional outputs for schemas
- Added the output from conditional outputs for schema children too
* Update: Entity selector visibility control
- Added logic for controlling visibility of sub components via the JS expressions system
* Update: Passing disabled prop to toggle button
* Update: Passing disabled prop to toggle btn
* Update: Styled component for toggle button
- Added disabled styles based on the disabled prop sent to the toggle form view JSON button
* Update: configProperty role in Entity Selector
- Removed dependance of the configProperty of the entity selector children to it's parent component
* Update: type of placeholder key
- Made placeholder key from form config JSON to accept either string or an object
- Earlier only string was accepted
- This is for pagination component
* Update: Added placeholder control for pagination
* Client changes 1
* add DSL functionality
* Do I even know what I'm doing here?
* fix: updated uqi forms ui, clubbed JS switch button to ads, updated tooltip design
* fix: updated tooltip component for wrong ui on entity explore
* temp triggers
* fix: updated uqi forms ui, clubbed JS switch button to ads, updated tooltip design (#12395)
* fix: updated uqi forms ui, clubbed JS switch button to ads, updated tooltip design
* fix: updated tooltip component for wrong ui on entity explore
* fix: updated tooltip ui, where condition placement, sort by ui
* temp form data access logic
* fix: updated sorting type width ui
* fix: updated ui for spacing, width and text issues
* Update: Type for tooltip of UQI forms
- Added option to send an object to the tooltipText object.
- This allows for composite components like pagination to have tooltips for each sub component
* Update: tooltip for pagination component
- Added handling to parse the tooltip for multiple components.
- This allows for composite components like pagination to have tooltips for each sub component
* Update: Type cast for tooltip component
- Made the content passed to tooltip component as a string only
* Update: Fixed tooltip component CSS
* Update: Dropdown option component
- Added a tooltip wrapper to each option
- This is to show on hover text like disabled state
* fix: updated ẇhere clause broken ui for condition
* Add: functions to check and extract expressions
- Loop through the formConfig and find any keys that have a value that is bindable
- Used pre defined regex to check if value is a moustache binding
* Add: Types for evaluated form configs
- Added types for the form configs to be evaluated and their output post eval
* Add: Flow to run the form config
- Run the form config and update the result to the redux state
* Update: Name of the type for formconfigs
- Updated since it was clashing with a component of the same name
* Add: Function to enforce config type checks
- This is done so that the improper configs can be weeded out and the rest of the form can be shown
* Add: Function to update evaluated config
- Added option to update the config if it's values needed evaluation
* Add: Type check for schema sections
* Update: Error handling for invalid control type
- We were throwing an exception till now, changed it to a warning text
* Add: Exposed tooltip for dropdown option disabled state
* Update: switch to json mode functionality
- Added logic to convert data to a string rather than an object when the first switch to JSON mode happens
* Update: Added key to tooltip for dropdown options
* Trigger API modification
* Add: function to fetch default trigger URL
* Update: Made URL optional in dynamic trigger config
* Update: Dynamic trigger API call
- Made the API call for dynamic triggers have URL as optional field
- Added type check to the response of the API call
* Update: resp type for trigger APIs
* Update: Moved code to utils folder
- Moved functions for UQI form eval processing to utils file
* Update: passing original controltype to JS switch
* Update: config for JSON editor mode
- Updated the config to have different options for JSON mode depending on the original control type
* Update: Connected line numbers flag to config
* Revert: CSS changes for tooltip
* Refactor: Removed consle
* Add: type for the config of dynamic values
* Add: Feature to evaluate config for triggers
* Refactor: fix type check errors
* fix: dropdown ui width with text alignment
* Update: fixed selector for dynamic values
* Update: selector call for fetchDynamicValues
* Add table header index prop for columns selector
* migration partial commit
* migration partial commit
* Refactor: removed unused import
* Update: reused function for checking dynamic value
* Update: removed unused import
* Fix format JSON issues
* Retrieve binding paths from entity selector components
* Fixes 6 remaining issues with UQI implementation
* Fix dropdown issues
* Fix dropdown height issues and fixes triggering of APIs when option is deselected
* Migration changes
* Fix QA generated UQI issues
* Fix projection component height and route change logic
* Fix multi select dropdown placeholder text issue and json stringify issue with switching view types
* Reset entity type value when command value changes
* Test changes
* Review comments
* Moved migrations around
* Corrected import statement
* Added JSON schema migration
* Updated schema version
* perf improvements and filter dropdown options feature
* Fix Code mirror component config for toggleComponentToJson input fields.
* Fix prettier issues
* fix prettier issues
* Fix style issues as a result of the merged conflicts
* Fix failing test case
* Fixed a few other flows (#14225)
* Fixed a few other flows
* Review comments
* Fix generate CRUD, fix evaluation of dynamic bindings and fix various styling issues.
* More fixes (#14367)
* Factor in the root formconfig parent key.
* Fix flickering issues, and evaluatedFormConfig issues
* fix: Teeny bugs (#14455)
* Teeny bugs
* Added previous functionality as is
* Improvements in the way we fetch dynamic values
* Fix stringiification issue and cyclic dependency issues
* Resolve projection component values deletion
* Resolve merge conflicts and fix prettier issues
* fix: Tsc issues
* Fix property pane connection navigation
* updating ee locator
* updating inputfield locator
* dropdown locator update
* Merge conflict not properly resolved.
* Fix s3 spec
* Fix Mongo Spec
* Fix some more tests
* fix: prevent cyclic dependency when switching to js mode (#14668)
* add delete events for change from array to string in diff
* add test to assert absence of cyclic dependency error when switching to js in switchgroup widget
* Assert that evaluation is not disabled when no cyclic dependency happens
* Cypress test preparations for google sheets and form controls
* Fixed a few test errors (#14874)
* Add: unit tests for uqi UI updates
- view type tests
- conditional output extraction
- processing conditional output to handle view/enabled state of the component
* Add: completed isValidFormConfig test
* Update: improved tests for update config
- These tests cover the functionality to update a section config after it's components are done evaluating
* Fix failing cypress tests and cyclic dependency issue
* Fixes some more tests
* Fixed migration of row objects (#14896)
* Bumped the version of design system package
* Update: reverted change to EE selector
* Fix deletion pointer
* Update: selector for js on load spec
- Synced with changes related to ADS dropdown
* Fix mongoDBShoppingCart spec
* Remove comments
* Fix: mongo shopping cart test failures
* fix: mongo shopping cart spec
* Dummy push to retrigger vercel
* fix: mongo shopping cart spec
* Update MongoDBShoppingCart_spec.js
* fix: removed unused click away
* dummy commit
* Update: moved helper functions to separate file
* Add: added tests for saga functions
- Worked on testing for
- extractFetchDynamicValueFormConfigs
- extractQueueOfValuesToBeFetched
* Add if check for queueOfValuesToBeFetched
* Resolve review comments
* Empty-Commit
Co-authored-by: Irongade <adeoluayangade@yahoo.com>
Co-authored-by: Ayush Pahwa <ayush@appsmith.com>
Co-authored-by: Aman Agarwal <aman@appsmith.com>
Co-authored-by: Ayangade Adeoluwa <37867493+Irongade@users.noreply.github.com>
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
Co-authored-by: Favour Ohanekwu <fohanekwu@gmail.com>
Co-authored-by: Albin <albin@appsmith.com>
* chore: Added actionId and requestedAt fields in ActionExecutionRequest
* Reverted unrelated failing test
* Fix test failures
* Refactor test
Co-authored-by: Anagh Hegde <anagh@appsmith.com>
When a new email of an existing user is added to admin emails from the admin settings page, that user does not get admin access instantly. Same happens when an existing user's email is removed from admin settings - permission is not revoked instantly.
* made test classes public
* added surefire compatible with junit 4
* Revert the changes of tests class accessibility
* Fix test failures
* test case fixes
* fixed NPE
* Fixed failing tests
Co-authored-by: Anagh Hegde <anagh@appsmith.com>
Co-authored-by: Nidhi <nidhi.nair93@gmail.com>
Return list of datasources in the GET /api/v1/datasources sorted alphabetically. Also set a flag isRecentlyCreated to the most recently created 3 datasources.
When organization name is updated, the slug is not updated. This generates a outdated URL when user clicks on a organization name from the left panel. This PR changes the following behaviors
The Organization slug will be no more unique
Link to organization applications will be based on organization id instead of slug
Organization slug will be updated whenever there is a change in organization name
All the existing organization slugs will be updated
* fix: Themeing issue when application has multiple git branches
* Don't commit published mode theme
* -updated as per review comment
Co-authored-by: Abhijeet <abhijeet@appsmith.com>
Marked Organization deprecated
Replaced all references to Organization with Workspace
Added migration to copy documents from organization collection to workspace collection
Added migration to create indexes on workspace collection
Added migration to drop organization collection
When application is exported and it does not have a theme set, a NullPointerException was raised in that case. This PR fixes that by returning the default theme when theme is missing.
* Added page sequence to metadata
* Update test resources
* Add null check for the pageOrder List
* FIx NPE
* Add logic to handle page order for deployed version
* Add tests for the page order
* Add null check for published pages
* Fix unpublished page names getting added in the order list for published
* update the variable name
* Use published page order in tests for published view
* Fix NPE
We are opening the appsmith default application when the user clicks on edit. But when the app is connected to git we should always bring up the default application of the default branch.
As a part of git-directory update we have introduced a bug where if the entity names includes the - we were not able to filter the entities in the individual page directory. This commit introduces a new name-seperator to avoid such issues.
* File migration for git
* Testcases added
* Comments added
* Update the action file names to keep unique constraints
* Separate out the theme from metadata
* Update server version to convey the file migration
* fix: Using form url encoded content type for token requests
* fix: Using form url encoded content type for cc as well
* fix: Conversion logic for expires in field
* Expose a way to export crdentials for sample apps and templates
* Export application with creds if marked as exportableWithCred in application object
* Fix and add testcases
* Add comments
Co-authored-by: Abhijeet <abhijeet@appsmith.com>
* Init commit clean urls
* Changes to builder route
* Refactored URLs
* Remove default params from url builder functions.
* Fixed more urls
* Changed selector name
* Minor url correction
* Type fixes
* Jest fixes
* Fixed routing for old published apps
* Fixed url slug replace
* page-1 -> page1 as default page slug name
* Remove application id from init editor calls
* Use default page slug
* Added comments and placeholder values for slug names
* variable rename
* Removed redirection and added back the old routes
* Prevent page slug name recompute
* Fixed home page load in view mode
* Added null checks
* Fixed jest test
* Fixed jest test
* Update URL slugs when app/page name changes
* Added unit tests and updates types
* Removed unused code
* * Removed duplication fetch page call.
* Fixes#11354
* Fixed sign up flow
* Refactored initializeEditorSaga
* Fixed warnings
* Fixed integrations screen URL bugs
* Cypress fixes
* Fixed slug names in copy/move operations and pages screen
* Minor refactor
* Fixed page highlight bug in published apps
* Added new url factory and middleware to store url params
* Changed store to default export and fix unit tests
* Fixed slugs unit test
* Minor fixes
* Fixes#11379
* Fixed set as home page feature
* Updated types
* app id adjustments for cypress
* Fixed bad merge
* Refactored routes to functional component
* * Fixed EE active entity highlight.
* Remove unused code in editor router.
* jest fix
* Mock history to prevent security errors
* constant rename
* Removed console logs
* Fixed page id regex
* Do not check for /pages in url
* Fixed missing pageId on quick edit/deploy clicks
* Missed files from previous commit
* Fixed warnings
* Fixed jest test
* New api integration
* feat: Add applicationVersion property to Application (#11626)
Added a new property to Application object - applicationVersion. This property can be used to identity when there is a breaking change and can not be solved with migration. FE will use this property to detect such conditions. Another API is added to migrate the applicationVersion to latest version when user migrates the breaking changes.
* Added manual upgrade modal.
* Test fix
* Fixed jest test
* function rename
* Fix deploy error
* Added null check
* Changes to persist URL search params when redirecting
* Added updates tooltip
* More unit test cases
* Fixed git url redirection
* Fix warning
* Fixed evaluation on upgrade
* Fixed warnings
* File rename
* Added cypress for clean urls
* Fixed import/export/fork cypress
* Cypress api server fixes
* Fixed mongo spec
* Fixed replay spec
* Fixed comments spec
* More cypress fixes
* Fixed tooltip in update btn
* Text size changes
* Minor fixes
* Jest test fix
* Fixed type error
* Fixed warnings
* Fixed todo comments
* Moved description to constants file
* Fixed cypress CI run crash
* Fixes git cypress failures
* Import/Export cypress test fixes
* Import export fork cypress fixes
* Explorer test fix
* Switch branch test fix
* Added applicationVersion in export app json
* Calls plugin forms in parallel
* Fixed warnings
* Fixed warning
* Import export CI fixes
* Reverts previous changes
* Fixes import export
* Fixed import export cypress URL verification
* Pass applicationVersion when duplicating application
* Cypress fix
* Dummy commit
Co-authored-by: Nayan <nayan@appsmith.com>
* This PR adds the JSON smart substitution feature to Firestore plugin actions.
* This smart substitution will work exactly the same way as it works for REST API actions.
* Currently, smart substitution only gets applied to the body section of Create, Set, Add or Update commands as this is the only input field that expects a JSON input type.
* It can be toggled On/Off via the Settings tab.
* It is set to On by default. However, data migration has been added to set it to Off for all existing Firestore actions so that they are not impacted by this PR's changes.
* Fix issue with policies being overridden during hydration from file system to db
* Fix tests
* Update the policies for the branched application
* Add test cases for the visibility changes for git connected applications
* Remove the visibility flag from application object while committing to git repo
* Add migration to fix the reconnect application showing for existing datasources
* Changes per review
* Check the invalids before adding the configured flag
* Fix NPE in migration
* Refactor
Co-authored-by: Abhijeet <abhijeet@appsmith.com>
We've added a new API to combine the get application details and get page list APIs as part of the clean URL project. This API was returning root application instead of branched application when application is in separate branches. This PR fixes that problem.
* updated import application modal design as v2
* updated import flow
* added title, description, uploadIcon on filepicker ads component for custom file picker
* adding modal of add credential for git import
* added "Git Import" modal
* added generating ssh key for importing flow
* fixed issue of merging
* chore: fix import
* chore: show old import modal based on feature flag
* seperated import api from connect
* added datasource list on reconnect credential modal
* chore: minor changes
* chore: move ssh keys to git sync reducer from applications reducer
* chore: minor fixes
* chore: fetch datasource config for import
* for pulling
* for review of displaying of datasource
* added reconnect datasources after git import
* fix: initialize datasource with default values
* fix: initialise redux for after updating datasource with default values
* fixed issue of git connection init when importing
* if there is a datasource config missing in import, reconnect modal should be opened
* updated logic for unconfigured datasources
* commented unnecessary code
* fixed issue of successful import
* updated import app error logic
* Add un-configured datasources to Import via file response
* Add test
* fix
* chore: refactors
* change per review
* fix: reset ssh keys / url
* Fix issue with newly created datasources not sent
* fix
* chore: minor updates
* chore: minor fix
* WIP
* added saas and rest api datasource form
* feat: fixes and updates for file import flow
* chore: close on upload
* Refactor logic ofr finding unconfigured datasources
* fix: minor fixes
* Fix issue with IsPartialImport
* fix
* Add PartialImport flag for ImportExport service
* refactoring of datasource editor form for both of importing app and editing app
* fixed collapse config
* Fix tests
* Handle redirection back to the /applications for oAuth type
* Show reconnect button on the datasources pages if the datasource configuration is skipped
* added analytic events for reconnecting datasource modal
* Fix the repo limit check for git import
* updated test of importing app from json as new work flow
* updated exported app json while testing automatically
* Add isImport flag for handling OAuth redirection in import flow
* WIP
* updated card UI for import from git title and message in import app modal
* chore: cleanup
* chore: lint
* fix: add is import query param to get token for oauth
* fix
* When the user imports the application there should not be any uncommitted changes displayed on the commit icon
* Add flag to identify OAuth redirection for git import
* Update the variable name
* refactoring reconnect datasource modal
* close git import modal when repo limit error responded
* fixed issue of restoring draft data of datasource form without save on reconnect datasource modal
* chore: update query
* updated query name of oauth redirection url
* Fix duplicate name issue in git import
* fixed rest api reconnect issue on reconnect modal
* init datasources and plugins after imported app, updated reconnect modal as new design
* added unconfigured datasource list logic when importing and updated rest api form delete button visible
* removed put default config of datasource and fixed issue on it
* Add logic to check isCOnfugred in datasource API
* Expose API to get un configured datasources for git import
* added fetch unconfigured datasource list api when redirecting form OAuth
* Remove sensitive fields from application json during export
* update put call response to check for datasourceConfig
* chore: use @appsmith for constants/messages
* chore: use download icon and Import for Importing application label
* chore: move import application text up a bit
* Fix bad merge
* chore: update skip to application tooltip text
* fixed tooltip content of skip to application CTA
* init values of datasource when importing
* updated ui of git import modal as figma design
* fixing padding issue of reconnect datasource modal
* fixed cursor issue on import app modal
* Fix issue with datasource config
* chore: make code compile
* chore: sort lines
* fixed save button issue of dbform on reconnecting modal
* fixed style of import application modal
* Fix iisue with wrong value updated to flag
* reverted from reconnection form style
* fix: update design as per slack discussions on 2022.02.23
* fix: move modal close button to the left
* Remove check for the flag and use the one from db
* Set siCOnfigured as true for mockdata sets
* updated creating datasource with isConfigured as false
* Fix NPE while importing
* fixed scrollbar issue and text alignment on reconnect datasource modal
* fixed style of form container in reconnect datasource and redirecting to app if all are configured
* remove unwanted fields from application json
* FIx NPE for file import
* fix: move close button up in import modal
* remove delete button on reconnect datasource modal
* Add isConfigured false while creating datasources
* fix: add a gap and update color
gap between git import dialog title and subtitle
update color of subtext to GREY_800
* fix: use git import feature flag
* fix: do not use older modal
* updated selecting logic of unconfigured datasource in reconnect modal
* cleanup: auto format
* cleanup: refactor react component
* cleanup: refactor some more
* cleanup: autoformat
* Fix reconnect flag for mockdatasource
* During git import set the isConfigured to false for datasources
* Remove decrypted field from the applicationJson file
* Remove decrypted field from the applicationJson file
* Add app slug to remote repo
* fixed cypress test related with git
* updated json while testing
* Changes per review
* Update the method name
* fixed cypress test related with git
* fixed migration cypress test
* set is configured field as true on tour app
* Fix issue with datasource creation for welcome tour
* fixed issue of replay_editor cypress test
Co-authored-by: Rishabh Saxena <rishabh@appsmith.com>
Co-authored-by: Anagh Hegde <anagh@appsmith.com>
Co-authored-by: Anubhav <anubhav@appsmith.com>
Co-authored-by: f0c1s <iamanubhavsaini+git@gmail.com>
Theme API path was not added added to security config path. As a result, themes in published mode in public apps were not loaded. This PR fixes that issue.
Merges the get application details and get page list API into one. This API takes either applicationId or pageId and returns the list of pages of that application.
* Fixes modal pop up bugs on page load
* send confirmBeforeExecute attribute with page execution order info
(cherry picked from commit 6d3cfdfbdb83b435e67797f3fb27024799d5d579)
Co-authored-by: Sumit Kumar <sumit@appsmith.com>
* Fix connect test
* check api response
* [wip] test comments across branches (#8704)
* Intercept only connect api
* chore: update switch branches tests (#9005)
* test switch branches from the query params
* test flow wip
* .
* fix merge status update
* change mergeAble to isMergeAble
* wip
* fix: show error popup if pulled from bottom bar
* fix: append branch query to notification links
* fix: disable git connection during onboarding
* fix: typo
* fix: typo
* fix: typo
* fix: z-index bottom bar cout
* fix: pull button minor fix
* fix: reset conflicts when the git sync modal is opened
* fix
* feat: enable search for branch dropdown
* fix
* fix: typo
* added merge conflicting on merge tab
* updated gitsyncsaga for git sync error action
* added generate ssh key on init and updated git changed count message
* removed git sync error action from error processing module(toast and log)
* commented push button on bottom git action bar temperory
* added option to use git global config
* Added latest deploy preview time: didn't appear until the duration was in minutes
* Link open repo button with repo link
* fixed of commented code part
* upated tooltip of push button on bottom quick git sync toolbar
* Update banner styles for error and warning
* updated repo publish url pattern and last deployed view part
* when the user clicks on the push icon the deploy tab should open
* when branch name is too big and user hover on it the tooltip is not displayed
* The dropdown alignment displayed for the git connect should be polished
* update tests
* fix: minor git sync fixes (#9228)
* fixed of Under the merge tab when the user searches for the branch name which is not present the pop up closes all of a sudden
* fix: update merge api, use message from api response
* fix: update field
* added tooltip of long dropdown option and updated merge tab dropdowns
* removed log
* chore: add connection cypress tests
* temp update for running tests locally
* fixed long branch name on branch list popup
* Use _ as the branch name separator, instead of -
* Use large buttons as CTAs
* Remove the % from the progress bar
* Fix alignment for the skeletons on the deploy tab
* Merge CTA moves down when the status is rendered, add offset to prevent that and error branch dropdown on merge tab
* Show progress bar after clicking on Merge CTA as the loading state and generate key button
* after generating the deploy key before clicking on connect close the pop-up and open it again the Remote URL is not visible in the input box
* fixing of conflicting issue
* updated git connection design
* Provide more spacing between the lines
* Learn more does not have a hover state
* Heading Merge Changes should be sentence cased like headings on other tabs
* Button can trigger CTA call when in loading state
* disabled clickable icon on git connect bottom bar
* Git connection tab: on error the window doesn't scroll all the way to the bottom
* updated temp remote url values on action and reducer
* updated ellipsis functions of text
* fix: prune branch flag
* fix: update page level roomId to include branch name
* fix
* fix
* feat: add a separate feature flag for git import
* feat: branch section headers bottom bar branch list
* fixed branch list comments
* fixed merge issue
* fix
* feat: hotkey for commit and push
* remove pull button on git conflict info
* move tempRemoteUrl redux to gitSyncreducer and added messages
* splited git error as individual action
* removed push button from git sync bottom buttons
* feat: section header at the merge dropdown
* added comment of converting ssh to https
* feat: show connected to git badge
* feat: show asterisk when we have uncommitted changes
* fix: upate segment header for dropdown
* t fix: remove redundant success toasts
* removed tempory git repo url from app data
* wrapped tooltip with elipsis text
* fix: rm unused vars
* fix: bottom bar icon updates
* updated dropdown option with ellipsis text
* added new props named "wrappedOption" on dropdown for wrapping ellipsis option
* rename wrappedOption to truncateOption on dropdown component
* updated dropdown option with disabled props of tooltip
* fix: remove remote branches from merge branch dropdown
* reset yarn lock
* reset yarn
* fix: keeping it same as the existing value
* fix: remove branch dropdown border
* fix: show merge success indicator
* feat: init repo limit error modal
* fix: disconnect git wip
* added git user config test
* removed test data
* fix: checkout api
* fix: lint
* chore: pre connection test specs
* added revoking git workflow
* renamed revoke to disconnectGit
* added setting on git sync action over bottom bar
* added analytic on git connection
* added learn more for remote url and init module of temp remote url when select new application
* .
* chore: test learn more ssh url
* Verify the functionality of Read documantation link
* added git connect with onboarding workflow
* Validate the Input Box displayed below Commit to master Text
* updated test module for deploy tab with commit comment and deploy preview
* test of prune branch name
* Validate the error faced when user switches between the branches
* verify the functionality when user click on "+" Icon
* Verify the functionality of serach input box inside the serach dropdown
* Verify the display of the Merge Button
* advanced of disconnect git ui
* added git disconnect modal test case
* updated repo limit error condition
* added learn more link test on git disconnect modal
* for review of repo limit error modal test script.
* fix: issue with intercept
* fixes
* fixes
* add key, misc fixes
* fix
* revert changes
* fix
* fix imports
* Fix import
* Yarn lock update
* fix
* fix imports
* chore: remove timeout for a test run
* Increase timeout for jgit APIs
* chore: try increasing timeout
* try increasing timeout further
* Handle git connect error on the basis of error type
* Add env variable to CI build script
* Fix bad commit for adding env var in workflow
* Refactor
* FAdd env var for local repo path
* fix import
* fix specs
* fix
* fix
* try
* fix
* fix
* fix
* fix
* fix: don't validate error msgs
* fix spec
* improve spec
* chore: rm unused code
* chore: update descriptions
* rm commented out code
* fix
* rm comment
* chore: rm comments
* fix: lint
* chore: update comment
* fix: wait for widget switch transition
* spec updates
* fix
* fix imports
* try waiting for getPagesForViewApp
* fix: rm unused file
* fix: remove spec
* fix: add js collection, comment out repo limit exceeded error since it seems not limited on appsmith instances
* Fix server failure
* chore: correct bootIntercom import and sort lines
Co-authored-by: Rishabh-Rathod <rishabh.rathod@appsmith.com>
Co-authored-by: haojin111 <haojin828@outlook.com>
Co-authored-by: Arpit Mohan <arpit@appsmith.com>
Co-authored-by: Abhijeet <abhijeet@appsmith.com>
Co-authored-by: Abhijeet <41686026+abhvsn@users.noreply.github.com>
Co-authored-by: Anagh Hegde <anagh@appsmith.com>
Co-authored-by: f0c1s <anubhav@appsmith.com>
Added a new API that'll return a list of plugins which are available to install. In other words, it'll return list of default/system plugins. This returns the package name, name and icon only - which will be used by templates to show datasource name and icons.
* fix: content-type is empty when it's not specified.
* feat: try to guess the content type json or form-urlencoded
* fix: broken test for curl with `--data-urlencode` parameter
* fix: fix guessing urlEncodedPattern
* fix: fix broken tests
* fix: Fixed and improved the code formatting
This PR adds API to save a customized theme so that it can be used again for that application. It also adds permission to themes. Each customized theme will have permissions set just like other domain objects.
The GET /application/new API is used to show list of organizations, applications in home page. The list of pages under each application contains only page id. As we're introducing page slugs in URLs, we need the slug of the default page inside the response of this API. This PR adds default page's slug to the response of GET /application/new API.
* Delete the pages post merge operation from application if they are removed from file system
* Changes per review
* Add tests
* changes per review
* Use string utils for null check
* Change per review
* Fix tests
* Fix tcs
* Added API to generate deploy keys and store them in a collection for import flow
* Add tests for the key generation flow
* Move the key generation to helper class
* changes per review
* Fix bad merge
* add api to import application
* handle timeout for git import
* Update the comments
* Add API for git import
* handle duplicate application name error & add profiles while importing
* Add tests for import api
* Hydrate from file system after cloning the repo
* Fix test failures
* Test cases
* changes per review
* throw error when the datasource with same name of different type exists
* Fix test failures
* Fis error messages
* Fix test failures
* Fix issue with checking the datasource types
* Add datasource name check while importing the application
* Refactor SSH key gen code for import
* Resolve issues around defaultResourceIds, don't commit app name
* Resolve the issue related to duplicate name for app during import
* Minor fixes
* WIP
* Add logic to get unconfigured datasources for the application
* Fix tests
* WIP
* revert datasource related changes
* Add a boolean flag to Datasource entity
* Add a boolean flag to Datasource entity
* Add flag to identify import status
* Set application name before importing from json files in git-import
* update the variable name
* changes per review
Co-authored-by: Abhijeet <abhijeet@appsmith.com>
* Add logic to sync the repo if the path is not updated in env file
* changes per review
* checkout branch locally when the branch is not present in remote
* Add the local checked out branch to list
When an user signs up, we store the email in lower case. When user logins with oauth2, we fetch user by email ignoring case. This creates a problem if email from oauth is in upper case. As users are registered with lowercase and we're trying to fetch with upper, users are not found.
This PR fetches user by case insensitive emails during oauth login.
* fixes js object cloning issue
* fix10463- JSObject returning new name of cloned object
Co-authored-by: Irongade <adeoluayangade@yahoo.com>
Co-authored-by: Leo Thomas <leoweb2010@gmail.com>
* Fix clone JSObject issue where cloned JSObject gets attached to both parent and cloned page
* Race condition for delete action when trying to delete page with JSObject
* Set published collection to null during fork application
We've added slug for pages. Each page has a slug which is generated from name automatically. In our get pages API /api/v1/pages/application/<app_id>, the slug names were not included in the Page DTO. This PR adds slug name in this API response.
* move away from RSA-SHA1 to ECDSA-SHA2 protocol for key generation
* Add migration to regenerate SSH keys via new protocol
* use 256 bit signature for the keys
* remove unused imports
* Fix error message for key generation
* This PR fixes the page load action execution order when the actions have been set to run on page load explicitly via the settings tab by the user and its data has not been referenced in any other widget or action. e.g.
- create action1 and action2.
- make action2 dependent on action1 by adding {{action1.data}} in action2's body.
- set both action1 and action2 to run on page load via settings tab. Do not reference action1 and action2 data in any other widget or action.
* This PR adds a limit field which sets the batchSize for aggregate command. This way the user can set the number of documents they want in their Mongo query result.
* limit is set to 10 initially. However, for pre-existing Mongo actions, migration has been added to set this field to 101 - which is the default value that has been used by Mongodb in the absence of any user set value. Ref: https://docs.mongodb.com/manual/tutorial/iterate-a-cursor/
* Added Mono sink calls for git and import application APIs
* TC for import-export
* Update TCs for gitService
* Added git commit and create branch test
* Test added for midway cancellation flow
* Added API to generate deploy keys and store them in a collection for import flow
* Add tests for the key generation flow
* Move the key generation to helper class
* changes per review
* changes per review
* Error handling for git limit
* clear cahe of git limit on connect api
* update per review
* check the repo is public before checking for the limit
* changes per review
* check if the repo is public or private during connect flow
* fix issues with sync branches
* Add sucess error handler
* changes per review
* add missing return statement
* remove unused import statements
