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
* add another migration for those Firestore actions that could not be migrated.
* handle ClassCastException via try catch and assigning default empty value.
* 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
We should last updated date of an application in the home page. If an application was updated internally e.g. a new user was added to the application, the updated date was set and it was displayed in the home page. This PR fixes that problem.
* Added check for private repos
* WIP limit repos
* Get the git connected apps from git
* Call CS to get the limit for the git connected apps
* Update comment
* Changes per review
* Add check for limiting the repo
* Cache the results from cloud service
Co-authored-by: Abhijeet <abhijeet@appsmith.com>
* Added appsmith profile as a fallback value
* Modified TC for userData to include git profile TCs
* Added check for null value when user want to use repo level profile and provide empty author name or email
* Refactor method names
* Port Firestore plugin to UQI schema
* This PR implements a non-functional requirement i.e. from an end user perspective there is no change in the features that the plugin provides. However, the underlying DSL to render and interpret the query interface has been updated.
* It also involves a migration change to port existing Firestore plugin actions to the new UQI schema.
* Server comes up
* Instead of extracting ee, we extract the ce to get the mongo repo to work
* ActionRepo migrated
* ApiTemplateRepo migrated
* Application repo migrated
* Asset Repo migrated
* Collection repo migrated
* Comment repo migrated
* Comment thread repo migrated
* Config repo migrated
* datasource repo migrated
* group repo migrated
* Invite user repo migrated
* layout repo migrated
* New action repo migratd
* .
* Migrated rest of the repos.
* Migrated the repo impl as well between ce and common
* acl package partially migrated
* Authentication migration done!
* Controllers migrated
* AppsmithPermission enum migrated to class and split
* Unnecessary change removed
* Appsmith role enum converted to class
* Revert
* Reverting enum to class conversion after failing at implementing
* All services migrated
* server.solutions package completed
* Fixed solutions failing test cases
* Code compiling! Woohoo!
* refactor api's to include branchName for git
* Check for updating Ids for move action
* Added check for global profile
* Fix bad merge
Co-authored-by: Abhijeet <abhijeet@appsmith.com>
When user duplicates an application, the source application is also being marked as recently accessed application. As a result both the duplicated application and the source application are shown in the beginning of the list of applications.
* fix: PageLoad - action.data implicitly depends on action.actionConfiguration. Added this relationship to dag
* Random walkthrough comments
* Logic does not work!
* Ignore pagination configuration from dynamic binding path list to avoid creating cyclic dependency
* The most complicated test case ever passed! Woohoo!
* Code cleanup
* Incorporated review comments
Sending the test email was using existing email configuration, this commit fixes this to use the configuration provided by the user on the admin settings UI.
* fix: Added client side execution logic and on page load logic for js
* Revert dev env
* Revert dev env
* Updated tests expectation partly to break PR
* fix: Reverted test breakage for this PR
* Untested trigger framework added
* Entity selector is working!
* Moved to query params instead of request body for the trigger api (since the trigger api is of type GET)
* Adding minor comments
* Added test case for trigger functionality
* Add API to checkout remote branch
* Create a new application on fetch
* Create a new application on checking out remote branch
* Add tests
* Change per review comments
* Changes per review comments
* Migrations for updating dynamic trigger paths for list widget in the existing pages to remove incorrect trigger paths.
* Removed an unnecessary line
* Review comment
* If widgetType is null, then this would ensure that NPE is not thrown.
* Remove Region field from S3 datasource editor page for AWS S3, Upcloud, Digital Ocean Spaces, Dream Objects, Wasabi.
* Use SDK provided property for AWS S3 to delegate region selection to the SDK.
* Extract region info from endpoint URL for Upcloud, Digital Ocean Spaces, Dream Objects and Wasabi, since the SDK property does not work for these service providers.
* Removed some redundant checks from datasourceCreate that were already part of validateDatasource
* Fix show clause in list.json
Generates and stores a slug from application name and page names when they are created or updated. Also adds a migration to set slug to existing applications and pages.
When a page is deleted, the comment threads in that page should also be deleted and should not appear to user.
The Edit mode comments should not be visible to app viewers.
* WIP
* Add relevant error messages for push action
* fix tests
* changes per review comments
* Add error message for the file system related error
* Fix test failures
* Fix test failures
When deciding whether to redirect to default application or the redirect url provided during signup, it'll compare with url path now. Earlier it was considering any query params added to the redirect url.
* core workflows of git - branch, clone, commit, pull, merge, status, log
* Rehydrate file system before merge operation
* Add logic to handle merge conflict for merge and pull flow
* Add defaultBranch to listBranch API
* Add Unit tests for git commands
* Upgrade JGit dependencies to fix the security issue
* Git command tests
* Revert unwanted changes and update delete application flow
* Disable git feature until the FE changes are merged
Co-authored-by: Abhijeet <ABHI.NAGARNAIK@GMAIL.COM>
* Recently a change was introduced to modify the default value of s3 plugin's permanent URL toggle from NO to YES. This created an issue with the older actions where the toggle didn't exist and hence no value was saved against its property. Hence, since the default is now ON and the older actions don't have any value saved, the action editor shows the toggle value as ON but behaves like the value is OFF. To fix this issue, this method adds URL toggle as NO where no toggle value exists.
Solves for two things:
1. From the welcome page signup, depending on telemetry being enabled or disabled, we report.
2. When telemetry is changed from welcome page (which, it obviously will), we make the change persistent by writing to the env file.
* Update asset urls
* fix: use successImageUrl for CRUD success popup
* Increase delay to switch between GIF and image
* Use ASSETS_CDN_URL instead of S3_BUCKET_URL
Co-authored-by: Rishabh-Rathod <rishabh.rathod@appsmith.com>
* Delete CRUD-DB-Table-Template-Application.json
* Updated Template
* Update TC to replace selectedRow with triggeredRow as per the updated template
Co-authored-by: Abhijeet <ABHI.NAGARNAIK@GMAIL.COM>
* -set user photo id when adding a new comment thread
* -update user data when users remove their profile photo
* -updated photo id in comments when user changes or set a profile photo
* -remove photoid from thread, kept it in comment only
* -resized uploaded profile image
* -added test for delete profile photo
* -add test for the comment set user photo
* -check user change event handler is called in delete user photo
* -add test for checking user photo change event is triggered after upload photo
* -fixed tests due to changes
* -make profile pictures thumbnail only
* - used get photo by asset id API to show user photo in comment card
- set cache control header in get asset by id API
* - stop using email address to show user photo
The env config API currently only changes values that are already defined in the env file. It is not capable of adding anything to the file.
This commit adds the capability to do so. However, since we don't want to let the client add just any variable, we've switched from a black list to a white list of env variables that can be managed by this API. If the requested variable is present in the whitelist, we add it, if its missing in the env file.
This commit adds the following API:
`/api/v1/admin/env` — Responds with the names and values of all environment variables currently configured, that are allowed for configuration from the UI. Some variables will be missing from this, ones that are not allowed to be edited from the configuration UI.
Doesn't take any query params. Only usable by the superuser.
Also added a `isSuperUser` boolean field to the response of `api/v1/users/me`, that will indicate whether the current user is a superuser or not.
* Currently, the list of actions to be run on page load is not updated when an action object gets deleted. Hence, sometimes, a previously deleted action may be set to run on page load which throws an error when the application tries to run it on page load.
* This PR updates the list of actions to be run on page load whenever any action gets deleted.
* Same templates for mongo fetch
* WIP
* Working version
* Minor refactoring and addition of comments for understanding the code flow
* Minor fileName change
* Extra check added to only try to read options for command
With latest update, the following fields are unavailable on the `appsmith.user` object:
- `accountNonExpired`
- `accountNonLocked`
- `credentialsNonExpired`
- `isAnonymous`
- `isEnabled`
These fields are necessary for building applications and many apps were relying on these, despite them not being listed in the documentation at <https://docs.appsmith.com/framework-reference/appsmith#user>.
* Changes to add js plugin
* routes+reducer+create template
* added debugger to js editor page
* entity explorer changes
* create js function
* added copy, move and delete action
* added js plugin
* added existing js functions to data tree
* removed actionconfig for js collection
* new js function added to data tree and entity as well
* parsing flow added
* changes to data tree
* parse and update js functions
* small changes for def creator for js action
* create delete modified
* small changes for update
* update flow change
* entity properties added
* removed linting errors
* small changes in entity explorer
* changes for update
* move, copy implementation
* conflict resolved
* changes for dependecy map creation
* Only make the variables the binding paths
* Basic eval sync working
* Minor fixes
* removed unwanted code
* entity props and autocomplete
* saving in progress show
* redirection fix after delete js action
* removed unnecessary line
* Fixing merge conflict
* added sample body
* removed dummy data and added plugin Type
* few PR comments fixed
* automplete fix
* few more PR comments fix
* PR commnets fix
* move and copy api change
* js colleciton name refactor & 'move to page' changes & search
* view changes
* autocomplete added for js collections
* removing till async is implemented
* small changes
* separate js pane response view
* Executing functions
* js collection to js objects
* entity explorer issue and resolve action on page switch
* removed unused line
* small color fix
* js file icon added
* added js action to property pane
* Property pane changes for actions
* property pane changes for js functions
* showing syntax error for now
* actions sorted in response tab
* added js objects to slash and recent entitties
* enabling this to be used inside of function
* eval fix
* feature flag changes for entity explorer and property pane
* debugger changes
* copy bug fix
* small changes for eval
* debugger bug fix
* chnaged any to specific types
* error in console fix
* icons update
* fixed test case
* test case fix
* non empty check for functions
* evaluate test case fix
* added new icons
* text change
* updated time for debounce for trial
* after release mereg
* changed icon
* after merge
* PR comments simple
* fixed PR comments - redux form, settings remove
* js object interface changes
* name refactor
* export default change
* delete resolve actions chnage
* after merge
* adding execute fn as 3rd option and removed create new js function
* issue 7054 fixed - app crash
* execute function on response tab changes
* refactor function name part 1
* refactor of js function name
* try catch added refactor
* test fix
* not used line removed
* test cases locator fixed
Co-authored-by: Nidhi <nidhi.nair93@gmail.com>
Co-authored-by: hetunandu <hetu@appsmith.com>
- Added new API that generates a new ssh key pair and stores that inside the git meta data of an application. The key is generated in open ssh format. The private key is stored as encrypted in DB.
* Insert git application metadata to application object, for git sync/version control feature there is a need to save the application in the structured format
* Added changelog to index application collection with git branch and remoteurl
* Rehydrate and dehydrate applications among different instances
* Added serailisation purpose while exporting the application to make distinction between version control and regular import-export flow
* Git file operations moved to appsmith-git module
* Delete json reference from directory for deleted resource in DB
* Added git authentication in application metadata
* Replace String with Path to handle file path in git file structure
We're not going to be collecting the company name for the self-hosted installation, but instead we'll be collecting the use-case that is being solved with Appsmith.
* Adding `APPSMITH_PLUGIN_MAX_RESPONSE_SIZE` which can be configured as an environment variable to increase plugin response size (currently only supported for Postgres Plugin)
* Updated error message + added the environment variable to the template docker env files for new installations
* WIP
* -redirect to newly created application after signup
* feat: create default application if no redirect url exists. also add a param to indicate first time user experience
* -updated function comment as per PR review
* -updated the create application using existing function
* -added check whether application is null when creating application page url
* -removed unnecessary refactoring
* -removed unused parameter from method
CRUD Info modal which pops up on successful CRUD generation, will now have dynamic data for each CRUD template.
Modal success `message` and `Image` to explain the working of the CRUD template is fetched from the backend.
Co-authored-by: Abhijeet <ABHI.NAGARNAIK@GMAIL.COM>
The superuser signup api available at /users/super currently only supports JSON payload. This PR adds support for form-data payload at the same endpoint, and makes it consistent with the normal user's signup API endpoint.
* Add errorType to response
* Fix Test Failures
* group the errors
* Add errorType to categorise the issue/error
* remove the helper class
* update changes as per review
* Update the logical groupings of errors
* Fix formatting issues
* Updated the error types
* Update error classification
* Change the name of the mock datasource
* Remove the hardcoded value for Cloud services
* Handle index out of exception
* Add check if the response contains necessary credentials for mockdb
* Change as per review comments
* Fix cypress test failures
* minor changes to fix cypress test for mock data according to new changes
* updated mock data locator
* Update the mockdata source name
Co-authored-by: Pranav Kanade <pranav@appsmith.com>
* -limit the rate for sending password reset requests
* -used encrypted token in password reset
* -add unit tests for the password reset issue
* -improved formatting
* -updated PR as per review comments
* -hanled IllegalStateException instead of Exception when parsing the encrypted token
* Added version check
* Added error message for version check while importing the file
* Added TC to check version in exported file
* Added version in FE assets for cypruss test
* Add API for env management and super user
* Add missing files
* Add API for signing up for super user
* Fix types in client code
* Add docs for env manager API
* Minor refactoring
* Remove unused updates to app startup
* Better error logging when unable to write file
Co-authored-by: Nidhi <nidhi@appsmith.com>
* Don't cache the user count (duh!)
Co-authored-by: Nidhi <nidhi@appsmith.com>
* bugfix: notification not created if user is mentioned in the first comment of a thread
* -add notification event type in comment notifications
-show different message for create thread and create comment in UI
* -send notification when comment is deleted
* -send notification when comment thread is deleted
This PR adds the email based rollout strategy to features. We can now define a list of domain names in the init-flags.yml file and define the domains for which the feature will be active.
Also added tests to assert the functionality for this flag flipping strategy.
* -add max password validation in FE and password validation in BE for signup
* -added unit test for password length limit
* - set max password length to 48
- add password length check in reset password
* -removed password limit check from login
* Re set password to avoid double encryption while creating suffix datasource
* Add test to query on mockdata source
* Check the Authentication type before setting the password
* Add analytics event for mockdata creation
* Use the correct name for the mockdatasource
* Added FE analytics for mock datasource
* Changes per review
* Remove the method call
* Fix indentation issue
Co-authored-by: Pranav Kanade <pranav@appsmith.com>
* -log widget type in analytics service when new thread created
-set viewed=true for resolved threads
* fixed typo
* fix the test case when there is not widget type
* Removed autogenerated column reference from InsertQuery
* Disable page generation flow for layout with widgets
* Updated Template
* TCs modify for updated template application
* Allow column with only String datatype as a search column in SelectQuery
* Remove AtomicRef as not needed
Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
* -added filter by resolved state in get comment thread API
* -add aggregation and lookup to fetch comment threads
* -added unit test for the repository aggregation method
* -reverted the aggregation lookup
* -add unit test for get all thread
* -removed unused method
* -resolved merge conflicts
* -skip hardcoded property value in query
* Add binding query to the suggested widget to improve the experience
* Fix test failures
* Add comments and change as per review
* Move the query template to enum class
* Change Test cases as per review
* Remove unused methods from the test class
* Remove commented code
* Use proper attributes in binding query
* Refactor suggestWidget method to support node
* Add unit tests
* Added field to autogenerate values in DB column
* Added comment and refactor
* Autogenerate field update according to names instead of type for ArangoDB
* Comments update
* S3 plugin support added
* Support for GSheet
* GSheet and S3 support, TCs update
* TC added for MongoDB datasource
* ilike opertor for SQL fixed
* Resolve merge conflicts
* Seperate template page for postgresql and other SQL datasources as there are minor changes in action bodies
* Added ListFiles query as on page load action, Insert all the columns from user's table in SelectWidget
Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
Table data was not populating when extra space inside the mustache binding, This is now fixed for list and table widget
* removed return statements from computed values
* list widget responce update
* table data handled return, added migration
* removed unused function
* updatetd rowBinding string generator
* fix failing cypress test
* fix cypress tests
* -fixed comment missing issue when user role is changed
* WIP: add test for policy utils
* -added test for policy utils comment permission when users are added or removed
* -removed unused code
* -removed public access modifier for an internal function
* -add test to verify comment thread policy updated when user role changed in organization
* -add tests for add user and remove user from organization to test comment thread policies
* -added API to and template for unsubscribe comment thread
* -changed public API url to make it sepratate from client public pages
-included the unsubscribe link to email body
* -made unsubscribe email notification API to private
* -added unsubscribe page
* -removed unused code
* Update app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Comments/UnsubscribeEmail_spec.js
Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>
* Update app/client/src/pages/common/UnsubscribeEmail.tsx
Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>
* Update app/client/src/pages/common/UnsubscribeEmail.tsx
Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>
* Update app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/BaseAppsmithRepositoryImpl.java
Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>
* -updated text as per lint error
* -updated text as per lint error
* -moved unsubscribe screen texts to messages.ts
Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>
* Refactor Page order API - Instead of the order filed use the Order persistency in Array offered by Mongo
* Add migration script to remove the order filed from the Application Pages
* Change unit tests as per the new implementation
* Fix indentation issues
* Compute pages based on the view mode
* Removed order field in response and changed the page order API response to List of pages instead of the application object
* Remove the Order filed from the Response class
* Use the $push instead of $addToSet to maintain order of pages in array
* Applied encryption for self-hosted instances username field, removed sensitive fields from request
* Request field added for Appsmith cloud instance
* Config variables moved to a central file
* API to run DB query using plugin specified templates
* Included get spreadsheet metadata in get info method
* Added TCs for checking Spreadsheet info response
* Added error message for invalid datasources
* Authentication check for datasource modified to AuthenticationStatus field
* resolved conflicts
* -fixed some issues in PR
* -used sequence in generating thread number
* -refactored the create thread method
* -refactored comment service
* -add bot reply to the first comment thread of an user
* -added a new bot thread when user resolves the first bot thread
* -handle the case when user data can be absent
* -add organization id and widget type to comment and comment threads
* -resolved conflicts
* -mark appsmith bot username as a tagged user in the bot comment
* -turn a private thread to a public thread when someone is tagged in it
* -updated as per the review comments
* -fixed compile error in unit test
* -updated as per PR review comments
* -removed commented code
* Add try catch block to handle the data conversion exception
* Suggest widget only in edit mode
* Add JsonNodeType to the widget suggestion logic
* Use ClassCastException instead of generic exception
* add tests for the array data type
* Suggest list of possible widgets instead of one
* Use constant in if condition to avoid possible NPE
Fix typo
* Call cloud services to fetch mock datasets
* Call cloud services to fetch mock datasets
* Change the MockData Config,
* Remove unused import statements and fix small indentation issues
* 1. Moved the mock data creation and fetching to a separate class
2. Added plugin type to mockdata class
3. Used pluginName to identify the db type
4. Removed the block call mock data creating method
5. Added unit tests for the mockdata
* 1. Removed unused field from contract and
2. Updated the url to cloud service
* 1. renamed the field of mockdata contract
2. Updated the test cases
* using new mock datasources apis
* 1. Added the Cloud Service release end point to env variable
Co-authored-by: Pranav Kanade <pranav@appsmith.com>
* Template application updated to include separate page for MongoDB as a datasource
* Support for mongoDB as datasource added
* Added comments
Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
* -added new API to get unread comment thread count
* -changed query to get unread comments so that it only searches where user has permission
* -added unit test for unread comment thread count
* -improved formatting
* -updated as per PR review
* Changing application public/private view can no longer be cancelled (for example by client timeout, etc.)
* Update test to only read the datasource used in the application
* Incorporated review comment
* Comment update
* Add widget suggestion to query execution flow
* Change the logic for Chart widget suggestion
* Add tests for the all the suggested widgets
* Added enum class to store widget types
* WIP: updated the email template
* -updated the comment link in email as per the user role
* -rebased from release
* Update app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/EmailEventHandler.java
Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
* -updated the template as per review comment
* -removed unused email template file
* -fixed compile error
* -checked application policy instead of role when sending email for comment
* -minor changes as per PR review comment
Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
* Added an API to get list of mock datsets
Removed the flow of
* Removed the auto populate of mock datasets flow when the user sign up first time
* Fixed indentation issues
* Instead of sending empty datasource, change template value to empty
* Add only the configs to response instead of entire mongo doc
* Add API to create mock data set
* Raw is now a command option instead of Form vs Raw
* Added database migration for migration raw input type to be of raw command type
* Fixed test case failure
* Minor cleanup
* Keymapping, Clone actions from template application, Used exported application JSON file as template app
* Delete references of widgets from action config if extra widgets not required
* Separate API added when pageId is not present with the client
* Added TCs
* Update in regex, enable reqArgsConstructor, separate DTO for CRUD page
* -send email to users who are subscribed to a thread only
* -fixed null pointer exception while set subscriber in create thread
* -updated as per PR comments and review
