Commit Graph

1488 Commits

Author SHA1 Message Date
Abhijeet
b13cf320f0
chore: Add manual and auto update fields within application object to distinguish between the migration related changes (#12099) 2022-03-26 10:40:59 +05:30
arunvjn
69c09c03aa
feat: adding slug names in urls (#10957)
* 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>
2022-03-25 16:13:26 +05:30
Nayan
468ed8454f
chore: Send test email error message to client (#11968)
Passes error message from server to client when there is error in send test email
2022-03-24 14:52:51 +06:00
Sumit Kumar
47ad7cc9b1
feat: add JSON smart substitution feature to Firestore plugin actions
* 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.
2022-03-24 13:02:54 +05:30
Anagh Hegde
fae7fc6e7c
fix: App visibility of git connected application is reset after git merge (#11890)
* 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
2022-03-24 07:01:28 +00:00
Abhijeet
b4dfb6919f
fix: Archived pages are getting copied in forked application (#12050)
* Filter cloning archived pages in application fork action
2022-03-23 17:34:42 +05:30
Anagh Hegde
e44a81e031
fix: Reconnect application showing for existing datasources due to missing flag value (#12034)
* 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>
2022-03-23 09:03:39 +05:30
Nidhi
1ca9fd803a
fix: S3 formData path for bucket name (#12049) 2022-03-22 12:56:42 +01:00
Nidhi
608e7b4fa0
chore: Updated Template for form/json mode for Firestore, S3 and Mongo (#12021)
Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2022-03-21 16:13:52 +05:30
Nidhi
dddb85abbf
Null map values (#12018) 2022-03-21 15:37:04 +05:30
Nidhi
079689951d
Null map values (#12017) 2022-03-21 15:19:55 +05:30
Nidhi
aef4001fde
chore: Ignore actions that are already migrated (#12013)
* Ignore actions that are already migrated

* Logging exception
2022-03-21 14:47:55 +05:30
Nidhi
ac3cdc7325
Added null checks for formData keys (#12010) 2022-03-21 14:15:19 +05:30
Nidhi
9912aac4c6
Added null checks for formData (#12009) 2022-03-21 13:52:16 +05:30
Shrikant Sharat Kandula
1d916e1c3c
Fix NPE in form-data migration (#12006) 2022-03-21 13:14:32 +05:30
Nidhi
c97b7e31e7
chore: Migrations to enable JSON and form mode (#11534)
* feat: added new component to perform generic json raw toggle functionality

* chore: Migration to convert formData references

* fix: Redid migration for per plugin changes, fixed consumption

* fix: Added JSON migration for git import

* Added JSON migration as well

* Reverted client side changes

* fix: Modified plugin config aggregation logic

* Merge conflict fixes

* different paths for different commands

* Whoopsie

* Modified usage to different paths

* Reverting env change

* Config changes to show json mode

* Test fixes

* Migrated body,path,next,prev

* Cypress test fixes

* Modified dynamic binding replacement

* Changed view type

* Reverted json form mode display

* Modified structure of JSON mmigrations

Co-authored-by: Aman Agarwal <aman@appsmith.com>
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
2022-03-21 11:22:14 +05:30
Anagh Hegde
f869930c92
chore: Update error message for checkout remote branch flow (#11891)
* Update error message for checkout remote branch flow

* Changes per review
2022-03-21 11:19:55 +05:30
Abhijeet
f8b62894d6
fix: Handle JSON schema migration for CRUD page generation JSON template (#11948)
* Added migration for CRUD psge generation resource

* Testcase for JSON migration
2022-03-18 14:48:56 +00:00
Nayan
5cdda5a450
fix: Combined API returns branched application id instead of root application id (#11925)
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.
2022-03-18 09:49:04 +00:00
Nayan
e1ba450c91
feat: Added new fields to templates (#11940)
Added two new fields to templates - productImageUrl and sortPriority.
2022-03-18 15:34:59 +06:00
Nayan
21151b851a
-added migration to change default theme name (#11898)
Changes the name of the default theme by introducing a new theme property - display name.
2022-03-18 09:24:29 +06:00
Nayan
ed790f9794
fix: added response meta to the response for import template API (#11662)
Added Response meta to the JSON response for import template API.
2022-03-17 10:51:29 +00:00
haojin111
9cfca0518f
feat: 9754 import work flow (#10453)
* 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>
2022-03-17 15:58:54 +05:30
Nayan
a1255582e4
feat: Added analytics events on themes (#11866)
This PR adds analytics events on different actions on themes - save, customize, delete, apply.
2022-03-17 15:28:36 +06:00
Nidhi
496d908a92
fix: Modified import export flow to use valid names for actions (#11879)
* fix: Modified import export flow to use valid names for actions

* Added test
2022-03-16 20:50:29 +05:30
Abhijeet
9e896dde06
fix: Fix git repository visibility status check and update error messages for git-checkout API (#11858) 2022-03-15 15:29:48 +05:30
Nayan
215285cfeb
Application template fork fails (#11719) 2022-03-15 13:04:34 +05:30
Trisha Anand
b526c0b1b6
fix: Analytics sendEvent should be able to send events even during sign in process (#11818) 2022-03-13 22:23:08 +05:30
Anagh Hegde
1921af9b28
fix: Support repo url conversion for all top level domains (#11694)
* Add support for all top level domains

* Fix tests

* Add tests for git util class
2022-03-10 09:20:12 +00:00
Abhijeet
bc929f2f67
chore: Don't take client subscription into account for discard git changes (#11666) 2022-03-09 16:58:54 +05:30
Nidhi
aaf12c513d
fix: Adds user set on load prop from actions to exported JSON file (#11718) 2022-03-09 16:57:45 +05:30
akash-codemonk
a6946fbcf0
fix: end guided tour on exiting editor (#11084) 2022-03-08 20:25:20 +05:30
Shrikant Sharat Kandula
ae5f9569c9
Fix startup failing if signup disabled is empty (#11686)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-03-07 17:38:18 +05:30
Shrikant Sharat Kandula
1233f7f7ee
chore: Change watchtower to latest from latest-dev (#11669)
This is because watchtower:latest-dev doesn't run on ARM architectures.
2022-03-07 13:58:20 +05:30
Nayan
be5b12b7bb
[Fix] Added permission in security config for themes (#11527)
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.
2022-03-07 01:43:26 +06:00
Anagh Hegde
dde1eb1735
Add check for default branch before deleting branch (#11631) 2022-03-05 08:30:29 +00:00
Shrikant Sharat Kandula
cde48bf9a9
Don't provide extra information on forgot password (#11596) 2022-03-04 15:16:58 +05:30
Nayan
caab37de26
feat: Add new API to combine get application details and get pages API (#11448)
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.
2022-03-04 12:32:48 +06:00
Abhijeet
13d6450616
chore: Soft delete resources across Appsmith board for delete operation (#11555)
* Soft delete resources

* Add TC and migrations
2022-03-03 23:06:34 +05:30
Nidhi
8b1638aba6
chore: Modified plugin config aggregation logic (#11561)
* fix: Modified plugin config aggregation logic

* Modified logs a bit

* Reverted incorrect path from another branch
2022-03-03 19:26:55 +05:30
Nidhi
d57207d224
fix: Changed test class reference to CE (#11578) 2022-03-03 12:00:55 +05:30
Abhijeet
cdf06cb773
feat: API to discard changes for git connected applications (#11362)
* Add discard changes functionality for git

* Recover deleted resources from the file system and refactor

* Remove untracked files, remove unwanted actions

* Testcases added for discard changes

* Added comments
2022-03-02 19:54:09 +00:00
Nidhi
5c994975d7
fix: Modified action execution endpoint (#9473) 2022-03-02 16:01:50 +00:00
Anagh Hegde
1d90a9fed9
feat: Add API for delete branch for git connected application (#11432)
* Add API to delete git branches

* WIP

* Fix test failures

* Change the method from POST to DELETE

* Changes per review

* Changes per review
2022-03-02 13:42:16 +00:00
Nayan
3cfc3781f1
Handle NPE in home page API (#11481) 2022-03-02 11:54:24 +05:30
Ayangade Adeoluwa
51b43daa1b
fix: Fixes modal pop up bugs on page load (#11504)
* 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>
2022-02-28 23:07:21 +05:30
Shrikant Sharat Kandula
8056e76946
Fix casing of plugin names (#11447)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-02-25 13:10:31 +05:30
Rishabh Saxena
acf01995bd
chore: git sync cypress tests (#10006)
* 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>
2022-02-25 06:13:16 +00:00
Abhijeet
612d7d6727
feat: API to provide a way to distinguish if the application is updated manually or through DB migration (#11414)
* Added check for updating application resources manually

* Refactor to include client-side migration
2022-02-24 14:17:50 +00:00
Nayan
10033aea09
-Added new API to return list of default plugins (#11297)
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.
2022-02-24 16:43:11 +06:00
Nayan
32757a9f35
-set feature flag for templates (#11368)
Adds feature flag for templates.
2022-02-24 16:39:15 +06:00
Mojtaba
450950d68f
fix: curl import tries to guess the content-type from the body if content-type header is not specified (#11295)
* 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
2022-02-24 13:58:26 +03:30
Abhijeet
86c7c09982
fix: Map correct collection ids for onPageLoad actions during import application (#11328)
* Introduce defaultCollectionId for onLayoutLoadAction

* Added TC for clone application

* ImportExportSpec & Dropdown resetSpec flaky fix

* Fix test failures

Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
2022-02-24 12:42:28 +05:30
Nayan
4ae0b5b1de
fix: Set comment authors email address as reply to field in comment notification email (#11251) 2022-02-23 21:56:57 +05:30
Nayan
f060ab8c03
feat: Allow saving theme customizations (#11165)
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.
2022-02-23 12:32:18 +06:00
Trisha Anand
860b573bc2
chore: Rename metadata to idToken (#11313) 2022-02-21 16:43:37 +05:30
Nayan
a877d137a6
fix: NPE when application has no page (#11204)
This PR fixes a NPE when application has no page or page are missing.
2022-02-18 12:14:02 +00:00
Shrikant Sharat Kandula
4d3e1282ad
Move data counts to properties for analytics (#11236)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-02-17 19:07:31 +05:30
Trisha Anand
ac7ccfd243
feat: Disable form login configurable via admin settings page. (#11234) 2022-02-17 07:54:07 +00:00
Abhijeet
aaf9740674
chore: Remove theme ids during git commit (#11225) 2022-02-17 05:33:25 +00:00
Anagh Hegde
9992a9ae3c
feat: Add api to check the git connection after the key is regenerated (#11144)
* Add api to check the git connection

* Add analytics event for test connection api
2022-02-16 22:25:38 +05:30
Abhijeet
325f27982a
fix: Take previously connected git applications accessibility into consideration to accurately calculate private repo count (#11151)
* Take already connected apps repo accessibility into account during connect and import flows

* Testcases for private repo limit check
2022-02-16 13:36:39 +05:30
Nayan
eefae47b09
feat: Return page slug for default pages in get applications API in home page (#11080)
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.
2022-02-16 12:19:29 +06:00
Abhijeet
ce2cf1ba3a
fix: Fix error code for application controller test case(#11161)
* Fix error code for the application controller TCs

* Fix import-export TCs
2022-02-15 16:28:02 +05:30
Trisha Anand
e892ba18a7
Moving ActionServiceTest to ce package (#11125) 2022-02-15 06:54:03 +00:00
Abhijeet
d8e4ba61fe
fix: Add migration for actionCollection and newAction to improve the performance for getResourceByPageId queries (#11148) 2022-02-14 20:07:02 +00:00
Trisha Anand
80bab90e28
chore: Minor code refactoring for bean utils and action execution (#11102) 2022-02-14 10:24:54 +05:30
Anagh Hegde
eb54d7d325
fix: Remove default error fields for git-sync related analytics for success events (#11097)
* Do not include the error data points in the map for success states

Co-authored-by: Abhijeet <abhijeet@appsmith.com>
2022-02-12 15:10:52 +05:30
Abhijeet
d218b48cf6
fix: Increase supported header size for multipart data (#11058)
* Increase supported header size for multipart data to 128kB

* Update error to be thrown from the global exception handler
2022-02-11 11:26:40 +00:00
Abhijeet
6f7691b6aa
fix: Update error handling for git connect (#11070)
* Update error handling for git connect

* Add testcase for git generic error
2022-02-11 16:17:02 +05:30
Anagh Hegde
5bb73ce36f
Fix NPE in git analytics (#11072) 2022-02-11 05:49:29 +00:00
Abhijeet
860318e0fe
chore: Add stopwatch to log execution time by process name (#11069)
* Add stopwatch to log execution time by process name

* Refactor
2022-02-10 16:59:26 +05:30
Abhijeet
ee6d639e42
chore: Update error handling for resource not found exception for clone, fork and import APIs #11044 2022-02-10 10:26:07 +05:30
Nayan
a5dec675b1
feat: Added application templates (#10952)
Added the required BE API for application templates. It gets templates from Appsmith cloud services through REST API.
2022-02-09 23:13:31 +06:00
Anagh Hegde
b1055cc94d
feat: Add gitHosting provider to analytics (#11036)
* Add gitHosting provider to analytics

* Add support for git provierders like bitbucket

* Change the logic to get provider name
2022-02-09 16:41:19 +00:00
Trisha Anand
d7ce026b93
Minor refactor of code to avoid merge conflicts. (#11039) 2022-02-09 13:53:57 +00:00
Shrikant Sharat Kandula
6e1e2faaac
chore: Anonymous stats if telemetry is enabled (#11014)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-02-09 10:31:00 +05:30
Sumit Kumar
aa2290405d
fix: fix refresh token flow in REST API OAuth (#10875)
Co-authored-by: Segun Daniel Oluwadare <dodanieloluwadare@gmail.com>
2022-02-09 09:38:58 +05:30
Abhijeet
fa0e900f3f
fix: Sort unordered set elements before committing to git repo so as to have same serialised output string for identical set of elements (#10933) 2022-02-08 00:48:20 +05:30
Abhijeet
fba0fc2fd7
chore: Remove git feature-flag (#10914)
* Remove git feature-flag
2022-02-07 06:46:15 +00:00
Anagh Hegde
fa06473d63
fix: Delete the pages post merge operation from application when they are removed from file system (#10810)
* 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
2022-02-04 12:07:07 +05:30
Abhijeet
2e5c1ea4ec
chore: Update doc urls for errors related to git (#10852)
* Update doc urls for errors and SSH key response
2022-02-03 21:13:40 +05:30
Abhijeet
7329d7ff23
fix: Fix NPE during import application when page ids are missing for published action and actionCollection (#10858)
* Provide a fallback pageIds for missing ones in action and JSObjects published version

* Add TC
2022-02-03 20:08:58 +05:30
Abhijeet
e356fd039f
chore: Commit only unpublished resources to git repo which includes queries, JSObjects, pages to avoid data duplication (#10776)
* Commit only unpublished resources to avoid resolving merge conflicts twice

* Added TCs

* Update directory names, fix pull issue in JSObjects
2022-02-03 11:47:57 +00:00
Keyur Paralkar
da638d7f2b
Updated Template (#10853)
Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2022-02-03 15:23:56 +05:30
Abhijeet
0b1a8ad20b
fix: Update ApplicationPageId with defaultPageId while fetching applications for homepage (#10812) 2022-02-03 10:56:35 +05:30
Tolulope Adetula
bb2f7da823
feat: Select and Multiselect V2 (#10359)
* fix: Select V2

* Fix: CI Fail

* fix: failing test

* fix: failing test

* Fix: MultiSelect

* Fix: loading issue

* Fix: loadin state

* Fix: loading

* fix: failing test

* fix: evaluation tests

* Fix: failing tests

* Fix: failing test

* fix: failing tests

* Fix: Failing tests

* fix: select All

* fix: filtering

* Fix: filtering

* fix: refactor Select widget

* fix: hide MultiSelect

* fix: select options

* Fix: failing tests

* fix: failing tests

* Fix: issues

* Update system-themes.json

* Update system-themes.json

* Update system-themes.json

* Update system-themes.json

* fix: PR reviews

* Update EntityDefinitions.ts

* Fix: issues

* fix: console

* fix: QA issues

* fix: options issues

* fix: add widget icons

* fix: update Selectv2

* empty commit to fix CI

* fix: failing test
2022-02-02 06:15:07 -08:00
Nidhi
bc93a1d413
fix: Removed filter of JS actions from get method (#10726) 2022-02-02 08:28:41 +00:00
Nidhi
b02a7f53f6
fix: Disabled generate CRUD page feature for MsSQL (#10811) 2022-02-02 08:27:59 +00:00
Keyur Paralkar
2ec0d2b02a
fix: Updated Template (#10694)
* Updated Template

* Updated Template

* Updated Template

Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2022-02-02 12:50:21 +05:30
Abhijeet
6b1e3fe7c0
fix: Add branch param for redirect url while authorising Google Sheet when application is connected to git (#10715)
* Add branch param in the redirect url
2022-01-31 10:11:12 +05:30
Abhijeet
8c4d711f5b
chore: Make sure to keep forked application in valid state even if client exits the flow before server responds (#10704) 2022-01-30 17:43:35 +05:30
Shrikant Sharat Kandula
d3d1f8bbf9
Clear sessions on password reset (#9955)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>

Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>
Co-authored-by: Nayan <nayan@appsmith.com>
2022-01-28 16:49:00 +05:30
Shrikant Sharat Kandula
cc3ab115b5
Remove CORS config as it's unused now (#10312)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-01-28 16:48:04 +05:30
Abhijeet
07082f6bde
fix: Copy evaluation version for cloned application from the source application to fix dynamic binding evaluation to support escaped characters without double escapes (#10702) 2022-01-28 08:07:59 +00:00
Abhijeet
8d93d06317
feat: Add reference doc url for error responses for git APIs (#10620)
* Added reference doc urls for pull conflicts

* Update TCs
2022-01-27 13:08:21 +05:30
Anagh Hegde
e0e4a73650
fix: Logic to delete stale git branch which are not in db (#10647) 2022-01-26 21:29:00 +05:30
Anagh Hegde
c83f7fb3c1
feat: Git import api (#10282)
* 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>
2022-01-26 21:26:22 +05:30
Abhijeet
0183897d5a
chore: Update mongo indexes to improve the query performance (#10658)
* Add index for JScollection, action and userData

* Refactor
2022-01-26 21:24:56 +05:30
Abhijeet
231c3aaeb7
fix: Bugfix for curl import when the request is made from the child branch for git-connected application (#10638)
* Fix for curl import in sub-branch

* Added comment
2022-01-26 18:20:49 +05:30
Anagh Hegde
341bc61e8c
feat: Add logic to sync the repo if the path is not updated in env file (#10478)
* 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
2022-01-26 12:55:07 +05:30
Shrikant Sharat Kandula
6accb9e364
fix: Use CDN for all assets (#10417)
Co-authored-by: Nayan <nayan@appsmith.com>
Co-authored-by: Arpit Mohan <arpit@appsmith.com>
2022-01-26 02:19:43 +05:30
Nayan
bb9010d875
fix: fetch user by case insensitive email for oauth login (#10350)
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.
2022-01-25 13:54:50 +00:00
Nidhi
44f5e353fa
fix: Fix typo in default resources ids for actions within collections while creating new collection (#10349)
* fix: Small fix in default resources for actions within collections

* Added tests
2022-01-20 18:17:34 +00:00
Leo Thomas
58b376fa9b
fix: Fix 10463 js object cloning issue (#10523)
* 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>
2022-01-20 22:02:11 +05:30
Rishabh Rathod
10e64df1e5
chore: S3 Template (#10461)
* Updated Template

* Updated Template

Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2022-01-20 14:07:05 +00:00
Abhijeet
62b720ab00
feat: Add documentation URL alongwith the error response to offer more info about the exception (#10325)
* Add doc url param in error response

* Modify TCs

* Update error codes to follow the sequence
2022-01-20 02:48:43 +00:00
Abhijeet
0ec6875b47
fix: Fix clone JSObject issue where cloned JSObject gets attached to both parent and cloned page and fix race condition for delete action when trying to delete page with JSObject (#10455)
* 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
2022-01-19 17:06:27 +00:00
Abhijeet
a48aa9c72b
feat: Remove action and actionCollection ids in exported application JSON (#10430)
* Export action and actionCollection without actual ids

* Added TC

* Comments
2022-01-19 11:46:32 +05:30
Abhijeet
3471de90cd
fix: Gracefully handle defaultResourceIds exception (#10454)
* Gracefully handle defaultResourceIds exception

* Added TCs

* Remove sentry logs
2022-01-19 10:45:36 +05:30
Abhijeet
1ed1bf0e5d
feat: Apply JSON schema migration while importing the application using JSON file (#10339)
* Json schema version check added before importing an application

* Added TC

* Fieldname refactor to make it more relevant
2022-01-18 07:11:23 +00:00
Shrikant Sharat Kandula
f2d26db290
Use CDN for plugin icons (#10393)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-01-15 12:54:30 +05:30
Abhijeet
0b71b3840c
Fix error for import curl when app is connected to git (#10355) 2022-01-14 08:59:56 +05:30
Abhijeet
c1e2a1ed59
Revert "chore: Don't take client subscription into account for fork application (#10220)" (#10375)
This reverts commit 814a7d57f9.
2022-01-13 19:00:04 +05:30
Nayan
02be902fdc
feat: add page slug in the get pages API (#10345)
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.
2022-01-13 17:29:09 +06:00
Anagh Hegde
f660c0696d
fix: Fix issue with current branch not deleted exeception (#10334) 2022-01-13 14:07:01 +05:30
Anagh Hegde
7718e03b76
fix: Change SSH key generation protocol for git (#10307)
* 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
2022-01-12 12:05:35 +05:30
Sumit Kumar
7306967d0b
fix: fix page load action execution order (#10252)
* 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.
2022-01-11 16:13:54 +00:00
Shrikant Sharat Kandula
a0aa41145b
chore: Re-run the fakeapi DB migration (#10310) 2022-01-11 13:38:07 +00:00
Abhijeet
814a7d57f9
chore: Don't take client subscription into account for fork application (#10220) 2022-01-11 16:20:40 +05:30
Abhijeet
5f14dcc798
chore: Add migration to update indexes for DB collection to include branchName param for git enabled apps(#10295)
* Add migration to insert index to include branch param for newAction, newPage, application and actionCollection
2022-01-11 16:10:07 +05:30
Rishabh Rathod
034aadf835
fix: Update crud template (#10281) 2022-01-11 04:11:31 +05:30
Sumit Kumar
f045af8bfc
feat: Mongo plugin: add limit field to aggregate command to allow users to define batchSize (#10257)
* 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/
2022-01-10 16:42:30 +00:00
Rishabh Rathod
b4a5540b60
chore: Revert "Updated Template (#10146)" (#10248)
This reverts commit 28d05e29fc.
2022-01-10 13:23:50 +05:30
Anagh Hegde
2469d21c51
fix: ssh to http url conversion (#10173)
* fix ssh to http url conversion

* fix sync branch issue

* changes per review

* changes per review

* fix error message
2022-01-10 11:00:36 +05:30
Rishabh Rathod
28d05e29fc
Updated Template (#10146)
Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2022-01-07 10:12:14 +00:00
Abhijeet
92a5cbf7f2
chore: Don't take client cancellation for git flows into account to keep the repo and DB in sane state even when client cancels subscription (#10036)
* 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
2022-01-06 20:04:35 +05:30
Anagh Hegde
ed490304d9
feat: Git import - generate and save SSH Keys (#9129)
* 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
2022-01-06 15:16:33 +05:30
Nayan
758d6d6725
fix: Fixed error due to string to instant serialization (#10074)
Fixes the serialization exception when exported application has deleted JSObject.

Fixes #9807
2022-01-06 11:13:25 +06:00
Anagh Hegde
48af7ea0df
fix: Merge and pull branch analytics NPE (#10117)
* Fix merge and pull branch issue

* fix detach remote API

* changes per review

* changes per review
2022-01-04 13:25:58 +05:30
Anagh Hegde
4718f519a3
fix: sync branch issues (#9918)
* 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
2022-01-03 11:42:58 +05:30
Nayan
50fd155d2f
fix: Unable to add comment to public apps (#10103)
Commenting on a public app fails if the user is not not part of the corresponding organization. This PR fixes that issue.
2022-01-03 11:59:35 +06:00
Nayan
abd4de1cd9
fix: Application is not publishable when imported without theme (#10009)
When we import an application from a JSON file where themes are not present, publishing the application fails. This PR fixes this issue.
2021-12-30 12:32:54 +06:00
Abhijeet
9cba2986f3
fix: Fix npe while importing application when JSObject contains only variables and no action (#10044) 2021-12-29 15:48:04 +00:00
Abhijeet
d24703cdea
feat: Introduce version field for git JSON files structure (#9800)
* Introduce version field for applicationJson

* Update TC to check the version
2021-12-29 15:29:53 +05:30
Anagh Hegde
f921305e95
feat: Add analytics for BE git events (#9899)
* Add analytics for connect flow

* Add analytics for commit flow

* Add analytics events for git flows

* changes per review

* add reference to constructor

* Add error events to git analytics

* changes per review

* resolve conflicts
2021-12-29 07:23:03 +00:00
Abhijeet
3bf43dc73a
fix: Filter the action and collection with no pageIds to fix server error while importing the application (#10024)
* Filter the action and collection with no pageIds to fix npe

* Added TC
2021-12-29 04:59:47 +00:00
Abhijeet
4c5241bc93
fix: JS objects not getting copied over when app is duplicated while retaining the JS objects in original app (#10011)
* Create new action collection instead of updating the original collection 

* Update TC
2021-12-28 12:00:41 +00:00
Abhijeet
b72ac43bd7
fix: Update defaultResourceIds with resource ids after the disconnect event (#9990)
* Update defaultResourceIds with resource ids after the disconnect event

* Update TC to check the applicationPage updates correctly

* Added TC
2021-12-28 10:57:50 +05:30
Nidhi
3426d70b28
chore: Fixed dot replacement policy for mongo (#9961) 2021-12-25 21:29:05 +05:30
Abhijeet
904b05abaa
chore: Update git error codes to log only useful errors in sentry (#9994) 2021-12-25 09:55:01 +00:00
Nayan
e3f8040265
fix: Set auth db name in MongoDB properties (#9997) 2021-12-24 20:45:18 +05:30
Anagh Hegde
74f0d7400f
add tests and fix tests failures (#9981) 2021-12-24 14:54:47 +00:00
Nayan
cd3a2ac1c4
Set a default color to application when application has no color set from FE (#9919) 2021-12-24 15:51:42 +06:00
balajisoundar
1fad719dbe
Add API for application themes (#9449) 2021-12-24 12:14:59 +05:30
Nidhi
9af1f4c9f4
fix: Switched reference from package name to plugin name (#9916) 2021-12-23 14:16:30 +00:00
Nidhi
b2855ccf77
fix: Do not return JS actions when fetching page actions (#9960) 2021-12-23 14:16:16 +00:00
Sumit Kumar
4a075628d7
fix: add work around to handle bad data in Firestore UQI migration (#9966)
* add another migration for those Firestore actions that could not be migrated.
* handle ClassCastException via try catch and assigning default empty value.
2021-12-23 15:59:53 +05:30
Abhijeet
0e0b4d0d1e
Check for layoutOnLoadAction during clone application (#9947) 2021-12-22 21:40:19 +05:30
Anagh Hegde
4f4d0fd7df
fix: Clear the cache - git limit number of repos (#9874)
* 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
2021-12-21 14:17:26 +00:00
Nikhil Nandagopal
0b0b978245
chore: Updated Template for CRUD DB template (#9913) 2021-12-21 19:34:37 +05:30
Shrikant Sharat Kandula
2dec964e21
Add migration for new MongoDB mock endpoint (#9909)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2021-12-21 18:04:12 +05:30
Abhijeet
20649ccb0a
fix: Fixes issues related to git profile and use appsmith user profile as a fallback value (#9891)
* Fixes related to git profile

* Added a TC for connect application with empty git profile and null default git profile
2021-12-21 16:45:56 +05:30
Sumit Kumar
b8cfc18f7f
fix: fix firestore pagination cyclic dependency error (#9892)
* fix firestore pagination cyclic dependency error
fix firestore UQI migration error

* fix TC
2021-12-21 11:27:05 +05:30
Abhijeet
95869517f6
fix: Replace default IDs for forked application with destination resource IDs (#9886) 2021-12-21 11:19:00 +05:30
Nayan
a447c6ee5d
Hide updated date when application was not updated manually (#9493)
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.
2021-12-20 22:54:02 +00:00
Anagh Hegde
8a75928c2f
fix: Fix the wrong CS url for private repo limit check (#9865) 2021-12-20 15:16:57 +05:30
arunvjn
99a12be018
feat: add option to delete org (#9287)
Co-authored-by: Nayan <nayan@appsmith.com>
2021-12-20 05:58:01 +00:00
Anagh Hegde
1b30c58617
feat: Limit private git repos which can be connected within organization (#9803)
* 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>
2021-12-18 17:40:46 +00:00
Abhijeet
5e6e6caedb
fix: Use Appsmith user profile as a fallback git profile (#9821)
* 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
2021-12-18 21:36:25 +05:30
Nayan
68a9584fd9
fix: removed sentry reposrting when application not found (#9839) 2021-12-17 20:16:49 +05:30
Nidhi
ab4add4b83
fix: Install plugin to existing organizations after approval (#9840) 2021-12-17 12:35:19 +05:30
Shrikant Sharat Kandula
8a336d3caa Fix OOM in insertDefaultResources migration
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2021-12-16 22:39:48 +05:30
Shrikant Sharat Kandula
1247864893
Fix migration OOM in firestore action migration (#9830)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2021-12-16 21:03:35 +05:30
balajisoundar
3c1edbeb3a
feat: Admin settings page to tinker with env variables (#9687) 2021-12-16 19:47:16 +05:30
Nidhi
508865f1dc
fix: Added handling for refactor of default list elements (#9774) 2021-12-16 11:33:40 +00:00
Abhijeet
52782c6088
fix: Resolve issues related to disconnect git repo flow (#9760)
* Fixed issues related to git disconnect

* Update TC
2021-12-16 08:50:11 +00:00
Abhijeet
c51c0036af
fix: Fix action collection not being deleted when the deleted collection in edit mode is published (#9785) 2021-12-16 13:48:14 +05:30
Sumit Kumar
7909ae8680
feat: port Firestore plugin to UQI (#9393)
* 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.
2021-12-16 13:31:09 +05:30
Nidhi
8d53c16e25
fix: Added check for self references in layout (#9756) 2021-12-16 13:30:19 +05:30
Trisha Anand
11603e0d24
chore: Backend code split (#9610)
* 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!
2021-12-15 22:59:46 +05:30
Nayan
f0a2cbd73f
chore: Added DB migration to flush redis (#9772) 2021-12-15 13:54:27 +05:30
Anagh Hegde
e216dad15b
feat: Refactor APIs to include branch name in the request header (#9679)
* 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>
2021-12-14 15:09:30 +00:00
Nidhi
b0900d1c22
fix: Added collection id and clientsideexecution to layout on page load DTO (#9683) 2021-12-14 16:34:45 +05:30
Nayan
28c181b59c
feat: [Feature] Upgrade spring boot version to 2.5.5 (#8932)
Upgrades spring boot version to 2.5.5
2021-12-14 16:22:37 +06:00
Nayan
c126786e98
fix: application is added to recent list if duplicated (#9549)
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.
2021-12-14 16:21:50 +06:00
Nidhi
861ee2c46e
fix: Added handling for action collections during duplicate app flow (#9637) 2021-12-14 13:40:25 +05:30
Abhijeet
e6c323a2ec
fix: Update crud template for failing S3 list file action (#9691)
* Updated Template

* Update TC

Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2021-12-12 18:23:59 +05:30
Abhijeet
f12b97b9d8
fix: When the SQL table provided by user have less number of columns than template columns for generate CRUD page (#8810) 2021-12-10 09:11:57 +05:30
Trisha Anand
3a21d91a57
fix: PageLoad - action.data implicitly depends on action.actionConfiguration. Added this relationship to dag (#9178)
* 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
2021-12-09 20:04:55 +05:30
Nayan
15ca54e43f
Custom domain should be configured from admin UI (#9633) 2021-12-09 14:40:08 +05:30
Arpit Mohan
7dfd8ac6f5
chore: Making smtp default install true for new all organizations (#9654) 2021-12-08 16:33:31 +05:30
Shrikant Sharat Kandula
4b7b9b698b
Migration to update mockdb endpoint (#9562)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2021-12-08 11:35:16 +05:30
Nayan
092b78bbc4
Send test mail by config (#9478)
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.
2021-12-08 09:56:49 +05:30
haojin111
d701f8dfb1
fix: misc git sync fixes / ui polish (#9229)
Co-authored-by: Rishabh Saxena <rishabh@appsmith.com>
Co-authored-by: Rishabh-Rathod <rishabh.rathod@appsmith.com>
2021-12-07 07:59:32 +00:00
Arpit Mohan
b5e27aaa57
feat: Adding a SMTP plugin (#8927) 2021-12-07 09:15:15 +05:30
Shrikant Sharat Kandula
77caf4c536
chore: Send telemetry option in user profile to client (#9535)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>

Co-authored-by: sbalaji1192 <balaji@appsmith.com>
2021-12-03 01:56:16 +05:30
Shrikant Sharat Kandula
cd624982b8
Handle telemetry disabled (#9517)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2021-12-02 16:58:26 +05:30
Nidhi
2653c7828f
feat: authentication for SaaS (#9352)
* initial commit

* fix: Added migration gor google sheets plugin name
2021-12-02 14:46:51 +05:30
Nidhi
5434d25735
fix: Added client side execution logic and on page load logic for js (#9392)
* 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
2021-12-01 22:02:43 +05:30
Nayan
06656eca5d
feat: [Feature] Show recently accessed apps first (#9017)
Most recently apps will be displayed under each organization in user homepage. Earlier, the applications were sorted based on application names.
2021-11-30 15:43:30 +06:00
Trisha Anand
4512c86d87
feat: Trigger framework with default implementation for entity selector for UQI (#9142)
* 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
2021-11-25 12:35:43 +05:30
Nidhi
9283e258e1
fix: Add null check for unpublished collections in view mode (#9254) 2021-11-19 15:46:59 +05:30
Nikhil Nandagopal
dc510161d9 Updated Template 2021-11-19 14:02:11 +05:30
Nayan
a0ea8c21ba
fix: [Fix] Set user email to lowercase before creating the user and in reset password (#9179) 2021-11-19 09:49:33 +05:30
Nayan
c696b369eb
fix: add migration for application going public event it has isPublic false set (#9166) 2021-11-15 16:11:14 +00:00
Shrikant Sharat Kandula
255b6bf940
Fix sending email when from address is empty string (#9126) 2021-11-12 16:25:04 +05:30
Anagh Hegde
a7b1902afd
feat: handle error messages for merge action (#9030)
* Handle merge conflicts

* Fix test failures

* Move branch name from request params to body for merge operation

* Use request body for branchNames
2021-11-12 10:04:29 +00:00
Nidhi
8474806aad
chore: Enabling JS editor for all users (#9074) 2021-11-12 12:11:00 +05:30
Nayan
b44f555a7f
fix: application edit date is updated when an user is added or removed from org (#8984)
Last edit time of an application was updated when a new user is added or existing user is removed from the corresponding organization.
2021-11-11 17:30:57 +06:00
Nidhi
c14b0ac1bf
fix: Update crud template for S3 to support content type (#9095)
* Updated Template

* Updated Template

* Updated Template

Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2021-11-10 19:26:49 +05:30
Nayan
ef4f5d9c47
fix: app is publicly accessible event if it's not public (#9035)
When a public app is edited by someone, isPublic=false is set to it even the app is not public. This PR fixes that issue.
2021-11-10 13:44:28 +00:00
Nidhi
9eec2a4173
fix: Updated Template for S3 to support content type changes (#9072)
* Updated Template

* Updated Template

Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2021-11-10 17:50:55 +05:30
Nidhi
54cc5b8ff4
fix: Add support for content type in create file for S3 plugin (#9021) 2021-11-10 07:44:36 +05:30
Anagh Hegde
2ad6a382ea
feat: checkout remote branch (#8827)
* 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
2021-11-09 14:04:00 +00:00
Trisha Anand
4380d38a84
chore: Removes incorrect trigger paths from list widget via database migrations (#8989)
* 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.
2021-11-09 16:02:47 +05:30
Sumit Kumar
3c8583210f
feat: remove region requirement from s3 plugin (#8829)
* 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
2021-11-03 16:23:53 +05:30
Trisha Anand
9d97f2322f
Adding field evaluation version in application (#8993) 2021-11-03 15:38:48 +05:30
Nidhi
81f0bff6f3
fix: Make organization plugins unique (#8987) 2021-11-03 09:56:52 +00:00
Nayan
3e3f97f1ee
feat: [Feature] Add isConfigurable property in profile response for the super admins (#8616)
Added a new property to the response of `/me` API. This property will indicate whether super user can edit the configuration or not.
2021-11-03 11:19:05 +06:00
Nayan
4722ff153d
feat: [Feature] Add API to send test email (#8856)
Added an API for super users to send test email
2021-11-03 11:17:53 +06:00
Shrikant Sharat Kandula
d5ec98f7cb
Fix allowed domains breaking OAuth (#8953)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2021-11-02 10:57:41 +05:30
Shrikant Sharat Kandula
507ce6581b
Fixed migration causing OOM (#8952)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2021-11-01 18:09:37 +05:30
Nayan
8e568d6056
feat: [Feature] Add slug for applications and pages (#8860)
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.
2021-11-01 14:18:21 +06:00
Nayan
5637b4dfa4
fix: [Bugfix] Delete comments when unpublished page is deleted (#8698)
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.
2021-11-01 14:17:42 +06:00
Nayan
2181f47632
fix: Update admin settings API for changes in UI (#8818)
Set a default name as Appsmith to new instances. Also adds super user's email to admin email configuration.
2021-11-01 14:16:56 +06:00
Rishabh Rathod
19be98bd46
Updated Template (#8920)
Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2021-10-29 15:36:31 +05:30
Anagh Hegde
b951d8db21
Get default branch from DB instead of remote to save time (#8844) 2021-10-29 09:32:02 +00:00
Anagh Hegde
ebb9665d42
fix: check for repoName while deleting apps (#8866)
* check for repoName while deleting apps

* Added tests
2021-10-29 07:21:31 +00:00
Nidhi
6b0ef6e236
fix: Added JS collection body to view mode (#8899) 2021-10-29 07:02:28 +00:00
Arpit Mohan
86ad475e30 Revert "chore: Updated Template (#8813)"
This reverts commit f72d6b5777.
2021-10-29 11:21:32 +05:30
Rishabh Rathod
f72d6b5777
chore: Updated Template (#8813)
Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
Co-authored-by: Arpit Mohan <arpit@appsmith.com>
2021-10-29 10:16:56 +05:30
Shrikant Sharat Kandula
10bff6d80e
Update identify data with role and goal (#8809) 2021-10-28 16:38:30 +05:30
balajisoundar
1b596be6f5
chore: Fix misc admin settings issues (#8838) 2021-10-28 10:17:02 +05:30
Anagh Hegde
338e8ba8d0
fix: git push relevent error messages (#8769)
* 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
2021-10-27 14:15:46 +00:00
Nidhi
295f8b9631
fix: Forking with JS collections (#8799) 2021-10-26 11:04:04 +05:30
Shrikant Sharat Kandula
c82bb751e1
Fix deleting datasources with deleted actions (#8627) 2021-10-26 06:20:59 +05:30
Trisha Anand
b57e0c245d
fix: Get buckets in S3 plugin during generate CRUD page (#8781)
* Fix: Generate page fix for S3 plugin

* Fixed the replacement of template variables in form data failure for S3
2021-10-25 22:38:22 +05:30
Shrikant Sharat Kandula
47511640e5
Don't hash identify data points on cloud (#8790) 2021-10-25 18:57:24 +05:30
Rafael Baldasso Audibert
0e22f26621
fix: Change "Allow Horizontal Scroll" text to "Allow scroll" (#8085)
* chore: Change "Allow Horizontal Scroll" to "Allow Scroll"

* chore: Hide option to choose scroll for pie chart

* fix: Fix prettier errors

* feat: Add migration to allowScroll for `CHART_WIDGET`s

Closes #4227

* fix: Fix chart widget prop recursively

Per https://github.com/appsmithorg/appsmith/pull/8085#discussion_r733442011
Closes #4227
2021-10-25 17:09:39 +05:30
Trisha Anand
0300fa9486
feat: Migrating S3 plugin to UQI framework (#8575) 2021-10-25 11:19:22 +05:30
Nayan
5fc00a6cd0
fix: check with url path when redirecting to default application url (#8207)
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.
2021-10-25 11:43:02 +06:00
Trisha Anand
4a11a10ee0
fix: on page load actions take into account widget dependencies as well to compute correct order of action computaion on page load (#7829) 2021-10-25 08:03:08 +05:30
Shrikant Sharat Kandula
9f770ae871
Include role in first_login event (#8654) 2021-10-23 07:55:30 +05:30
Nidhi
03a92776f7
fix: Refactor with escape sequences (#8713)
* fix: Refactor with escape sequences

* Remove comments
2021-10-22 16:09:53 +00:00
Anagh Hegde
4717b4bcf0
feat: git merge status (#8692)
* git merge status
2021-10-22 12:31:13 +00:00
Nikhil Nandagopal
122d897617
Updated S3 CRUD Template (#8722) 2021-10-22 11:33:27 +00:00
Nayan
98ca448f9f
feat: [Feature] Add API to download docker config (#8587)
Added API to download docker config for super admin users
2021-10-20 15:58:31 +06:00
Anagh Hegde
6faaa33936
feat: Git version control functionality with connect to remote, commit, push flows (#8403)
* 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>
2021-10-20 09:47:34 +00:00
Sumit Kumar
c9172f8079
fix: data migration to set default value for permanent url toggle where none exists (#8507)
* 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.
2021-10-15 11:24:04 +05:30
Yyee
870dadd777
fix: Refresh current user in edit profile (#8267) 2021-10-15 11:07:27 +05:30
Nidhi
1cefa7e51b
fix: Expose actions with collections in view mode (#8509)
* fix: Expose actions with collections in view mode

* Dummy commit for tests to pass

* Test fixes
2021-10-14 06:53:46 +00:00
Sumit Kumar
d7411be855
fix: show hint message on using duplicate header or query parameters in API (#8263)
* show hint message on using duplicate headers or query parameters in API.
2021-10-13 18:02:16 +05:30
Nayan
c288df157b
Show profile picture from the uploaded photo id of the user (#8402)
Sends photoId in user profile response. Shows profile picture from the uploaded photo id instead of email address.
2021-10-11 18:28:08 +06:00
Shrikant Sharat Kandula
09c2875e4f
Server restart API, and restart detection API (#7480) 2021-10-11 16:29:39 +05:30
Nayan
72dd22d490
fix: added a check to address NPE in home page when user has no organization (#8259) 2021-10-08 19:27:16 +06:00
Shrikant Sharat Kandula
a4975c5bff
Add API for updating role and goal for users (#8242) 2021-10-08 09:40:19 +05:30
Shrikant Sharat Kandula
a13f674752
Make port customizable from env variable (#8288) 2021-10-07 17:02:49 +05:30
Nidhi
82dc82633f
fix: Make JS objects visible to anon users (#8260)
* Make JS objects visible to anon users

* Dummy commit
2021-10-07 00:30:16 +05:30
Nidhi
4498810cef
fix: Added graceful check for failure in mock data endpoint (#8211)
* fix: Added graceful check for failure in mock data endpoint

* Modified error type
2021-10-06 09:18:21 +05:30