Commit Graph

50 Commits

Author SHA1 Message Date
arunvjn
fd6faf85ea
chore: code changes to support clean urls v2 (#14757) 2022-07-11 09:36:29 +05:30
Parthvi
1f7b923ad9
test: Automate JSObject app in cypress and fix few flaky tests (#14613)
* add tests for promises

* update dsl

* fix deleteBranch_spec

* fix ImportExportForkApplication_spec

* update test

Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local>
2022-07-08 16:18:20 +05:30
Nidhi
906a7298dc
feat: Simplified Google Sheets queries (#14869)
* Client changes 1

* add DSL functionality

* Temp commit for refactoring changes

* Do I even know what I'm doing here?

* chore: Second GS layout

* Update: Visibility conditional outputs for schemas

- Added the output from conditional outputs for schema children too

* Update: Entity selector visibility control

- Added logic for controlling visibility of sub components via the JS expressions system

* Update: Passing disabled prop to toggle button

* Update: Passing disabled prop to toggle btn

* Update: Styled component for toggle button

- Added disabled styles based on the disabled prop sent to the toggle form view JSON button

* Update: configProperty role in Entity Selector

- Removed dependance of the configProperty of the entity selector children to it's parent component

* Update: type of placeholder key

- Made placeholder key from form config JSON to accept either string or an object
- Earlier only string was accepted
- This is for pagination component

* Update: Added placeholder control for pagination

* Client changes 1

* add DSL functionality

* Do I even know what I'm doing here?

* fix: updated uqi forms ui, clubbed JS switch button to ads, updated tooltip design

* fix: updated tooltip component for wrong ui on entity explore

* temp triggers

* fix: updated uqi forms ui, clubbed JS switch button to ads, updated tooltip design (#12395)

* fix: updated uqi forms ui, clubbed JS switch button to ads, updated tooltip design

* fix: updated tooltip component for wrong ui on entity explore

* fix: updated tooltip ui, where condition placement, sort by ui

* temp form data access logic

* fix: updated sorting type width ui

* fix: updated ui for spacing, width and text issues

* Update: Type for tooltip of UQI forms

- Added option to send an object to the tooltipText object.
- This allows for composite components like pagination to have tooltips for each sub component

* Update: tooltip for pagination component

- Added handling to parse the tooltip for multiple components.
- This allows for composite components like pagination to have tooltips for each sub component

* Update: Type cast for tooltip component

- Made the content passed to tooltip component as a string only

* Update: Fixed tooltip component CSS

* Update: Dropdown option component

- Added a tooltip wrapper to each option
- This is to show on hover text like disabled state

* fix: updated ẇhere clause broken ui for condition

* Add: functions to check and extract expressions

- Loop through the formConfig and find any keys that have a value that is bindable
- Used pre defined regex to check if value is a moustache binding

* Add: Types for evaluated form configs

- Added types for the form configs to be evaluated and their output post eval

* Add: Flow to run the form config

- Run the form config and update the result to the redux state

* Update: Name of the type for formconfigs

- Updated since it was clashing with a component of the same name

* Add: Function to enforce config type checks

- This is done so that the improper configs can be weeded out and the rest of the form can be shown

* Add: Function to update evaluated config

- Added option to update the config if it's values needed evaluation

* Add: Type check for schema sections

* Update: Error handling for invalid control type

- We were throwing an exception till now, changed it to a warning text

* Add: Exposed tooltip for dropdown option disabled state

* Update: switch to json mode functionality

- Added logic to convert data to a string rather than an object when the first switch to JSON mode happens

* Update: Added key to tooltip for dropdown options

* Trigger API modification

* Add: function to fetch default trigger URL

* Update: Made URL optional in dynamic trigger config

* Update: Dynamic trigger API call

- Made the API call for dynamic triggers have URL as optional field
- Added type check to the response of the API call

* Update: resp type for trigger APIs

* Update: Moved code to utils folder

- Moved functions for UQI form eval processing to utils file

* Update: passing original controltype to JS switch

* Update: config for JSON editor mode

- Updated the config to have different options for JSON mode depending on the original control type

* Update: Connected line numbers flag to config

* Revert: CSS changes for tooltip

* Refactor: Removed consle

* Add: type for the config of dynamic values

* Add: Feature to evaluate config for triggers

* Refactor: fix type check errors

* fix: dropdown ui width with text alignment

* Update: fixed selector for dynamic values

* Update: selector call for fetchDynamicValues

* Add table header index prop for columns selector

* migration partial commit

* migration partial commit

* Refactor: removed unused import

* Update: reused function for checking dynamic value

* Update: removed unused import

* Fix format JSON issues

* Retrieve binding paths from entity selector components

* Fixes 6 remaining issues with UQI implementation

* Fix dropdown issues

* Fix dropdown height issues and fixes triggering of APIs when option is deselected

* Migration changes

* Fix QA generated UQI issues

* Fix projection component height and route change logic

* Fix multi select dropdown placeholder text issue and json stringify issue with switching view types

* Reset entity type value when command value changes

* Test changes

* Review comments

* Moved migrations around

* Corrected import statement

* Added JSON schema migration

* Updated schema version

* perf improvements and filter dropdown options feature

* Fix Code mirror component config for toggleComponentToJson input fields.

* Fix prettier issues

* fix prettier issues

* Fix style issues as a result of the merged conflicts

* Fix failing test case

* Fixed a few other flows (#14225)

* Fixed a few other flows

* Review comments

* Fix generate CRUD, fix evaluation of dynamic bindings and fix various styling issues.

* More fixes (#14367)

* Factor in the root formconfig parent key.

* Fix flickering issues, and evaluatedFormConfig issues

* fix: Teeny bugs (#14455)

* Teeny bugs

* Added previous functionality as is

* Improvements in the way we fetch dynamic values

* Fix stringiification issue and cyclic dependency issues

* Resolve projection component values deletion

* Resolve merge conflicts and fix prettier issues

* fix: Tsc issues

* Fix property pane connection navigation

* updating ee locator

* updating inputfield locator

* dropdown locator update

* Merge conflict not properly resolved.

* Fix s3 spec

* Fix Mongo Spec

* Fix some more tests

* fix: prevent cyclic dependency when switching to js mode (#14668)

* add delete events for change from array to string in diff

* add test to assert absence of cyclic dependency error when switching to js in switchgroup widget

* Assert that evaluation is not disabled when no cyclic dependency happens

* Cypress test preparations for google sheets and form controls

* Fixed a few test errors (#14874)

* Add: unit tests for uqi UI updates

- view type tests
- conditional output extraction
- processing conditional output to handle view/enabled state of the component

* Add: completed isValidFormConfig test

* Update: improved tests for update config

- These tests cover the functionality to update a section config after it's components are done evaluating

* Fix failing cypress tests and cyclic dependency issue

* Fixes some more tests

* Fixed migration of row objects (#14896)

* Bumped the version of design system package

* Update: reverted change to EE selector

* Fix deletion pointer

* Update: selector for js on load spec

- Synced with changes related to ADS dropdown

* Fix mongoDBShoppingCart spec

* Remove comments

* Fix: mongo shopping cart test failures

* fix: mongo shopping cart spec

* Dummy push to retrigger vercel

* fix: mongo shopping cart spec

* Update MongoDBShoppingCart_spec.js

* fix: removed unused click away

* dummy commit

* Update: moved helper functions to separate file

* Add: added tests for saga functions

- Worked on testing for
   - extractFetchDynamicValueFormConfigs
   - extractQueueOfValuesToBeFetched

* Add if check for queueOfValuesToBeFetched

* Resolve review comments

* Empty-Commit

Co-authored-by: Irongade <adeoluayangade@yahoo.com>
Co-authored-by: Ayush Pahwa <ayush@appsmith.com>
Co-authored-by: Aman Agarwal <aman@appsmith.com>
Co-authored-by: Ayangade Adeoluwa <37867493+Irongade@users.noreply.github.com>
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
Co-authored-by: Favour Ohanekwu <fohanekwu@gmail.com>
Co-authored-by: Albin <albin@appsmith.com>
2022-07-04 11:13:27 +05:30
Favour Ohanekwu
11f8684e7f
fix: prevent temporary update of sub-path value in store object (#14847)
* support paths as keys in storevalue

* add cypresstests

* StoreValue added deploy mode verification

* Adding array input [boolean, string, number]

* store number too

* Added bug id to title

* Added dot object array & SelectJSFunctionToExecute

* propPane.UpdateFieldValue() update

* updated UpdatePropertyFieldValue

* JS toasts handling

* JSOnload spec fix

* JsOnload toast appearances fix

* support paths as keys in storevalue

* add cypresstests

* StoreValue added deploy mode verification

* Adding array input [boolean, string, number]

* store number too

* Added bug id to title

* Added dot object array & SelectJSFunctionToExecute

* propPane.UpdateFieldValue() update

* updated UpdatePropertyFieldValue

* JS toasts handling

* JSOnload spec fix

* JsOnload toast appearances fix

* prevent modification of storeValue path in temporary store

* Add cypress tests for case where storeValue key is a path

* remove redundant import of lodash

* Modify cypress tests

* update cypress tests

* Store fix revert

* revert

* Actions revert

* revert redundant change

* removed additional button- from script

* JsOnPage load script fix

* validate toast fixes

Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
2022-07-01 06:26:57 +01:00
Aishwarya-U-R
3622bf924e
Automated tests for Postgres Datatype - Datetime (#14607) 2022-06-17 11:42:18 +05:30
Aishwarya-U-R
d7eb5c58fc
Automated tests for Postgres Datatype - Numeric, Character (#14481) 2022-06-16 12:20:02 +05:30
Ankita Kinger
9b7944e7ee
feat: migrate organisation to workspace (#13863)
* migration from organization to workspace on code level

* updated a few more files

* fixed runtime errors

* update org settings URL

* Renamed organizationId in domain objects

* changed field named from organization to workspace

* Reverted AppsmithRole changes

* fixed migrations

* recreating indexes

* migration update

* seed data runs before migration, undo changes

* mock commit

* seedmongo to populate upgraded data, datasource upgrade

* fixed two test cases

* updated migrations

* updated prop name

* Upgraded AclPermission

* comment

* migrated AppsmithRole

* more changes

* final set of changes

* variable name changes

* update cypress variable name

* Update app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ApplicationControllerCE.java

* Update app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Datasource.java

Co-authored-by: Trisha Anand <trisha@appsmith.com>

* reverting encryption handler change

* migrated a few missed out org to workspace

* migrated a few missed out org to workspace

* migration changes

* Removed Permission import

* fixed AppsmithRole

* mongodb version update

* fixed compile error

* fixed compile issue

* fixed some tests

* simplified embedded mongodb config

* updated a cypress test

Co-authored-by: Sidhant Goel <sidhant@appsmith.com>
Co-authored-by: Trisha Anand <trisha@appsmith.com>
Co-authored-by: Sidhant Goel <sidhant@hexcod.in>
2022-06-15 21:07:41 +05:30
Aishwarya-U-R
ad606ad3e2
Script fixes for flaky tests (#14494) 2022-06-14 11:02:37 +05:30
Aishwarya-U-R
43cba21013
test: Automated tests for improved CRUD with JSONFrom - Postgres Ds (#14271)
* Postgres CRUD

* MySQL CI run fix

* Added wait time to DeployApp()

* Helpers Enhancements

* ChangeTheme CRUD

* Postgres CRUD

* Postgres CRUD updated

* Postgres CRUD updates

* Postgres CRUD fix

* Postgres CRUD update

* postgres CRUD update

* Postgress CRUD fix

* setting cypress video false

* ExecuteAction spec fixed

* Postgres case #13 fix

* postgres CRUD fix

* Postgres CRUD fixes

* cypress video - true, reattempt - 1

* failure fixes

* Bug 11529 script added

* Bug 11529 scripted + failure fixes

* JSOnLoad_spec failure fix

* OnLoadActions failure fix

* Failure fixes

* ReadTable increased timeout

* JSFunctionExecution_spec failure fix

* Removed duplicate cases

* Mongo failure fixes + applying theme

* Mongo Spec - Added Deletion of DS also

* Deleting initial page

* Deleting DS Validation added

* tc desc updated

* failure point fixes
2022-06-10 19:00:59 +05:30
balajisoundar
265ed0dc25
fix: Improve cell overflow check logic when switching between table page (#14095)
* fix: Improve cell overflow check logic when switching between table page.

* Table locators update

* Migration spec - locators update

* Migration spec locators update

* MongoDBShoppingCart spec locators update

* POstgress Spec locator fix

* Adding wait!

* Mongo DBcart spec fix

* EchoApiCMS_spec locator update

* Table locators update

* updated locators

* Added delay

* Hidden column fix trial

* Adding refresh page

* Adding time

* Fix cypress xpaths

Co-authored-by: bhavin <techbhavin@gmail.com>
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
Co-authored-by: apple <nandan@thinkify.io>
Co-authored-by: NandanAnantharamu <67676905+NandanAnantharamu@users.noreply.github.com>
2022-06-08 21:59:31 -07:00
Aishwarya-U-R
6c1c5581e7
Automated tests for improved CRUD with JSONFrom - MySQL Ds (#14014) 2022-05-31 11:03:59 +05:30
haojin111
3c1b1a3628
Merge pull request #13864 from appsmithorg/feat/13412-improve-import-app-flow-ui
feat: 13412 - improve import app with progress bar
2022-05-26 16:49:47 +08:00
Rishabh Rathod
cbce8f8b8e
fix: trigger consuming previous evaluated values (#13084)
We are changing how we maintain meta values in our architecture,

Earlier metaHOC component state was used to store meta values that were debounced and pushed in batch to metaReducer and trigger evaluation.
We remove the metaHOC state and directly update values to metaReducer and trigger evaluation separately via a debouched function.
2022-05-25 15:16:14 +05:30
haojin111
7e5332ceb7 Merge branch 'release' into feat/13412-improve-import-app-flow-ui 2022-05-23 13:31:28 +08:00
Aishwarya-U-R
d0fed6bfe7
Automation script update to fix Community issues failure (#13968) 2022-05-23 10:50:27 +05:30
haojin111
82dcfeff21
Merge branch 'release' into feat/13412-improve-import-app-flow-ui 2022-05-20 04:17:18 +08:00
Aishwarya-U-R
04a8c3b037
Tests for JSObjects-onPageLoad (#13712)
Automated tests to improve coverage for JSObjects-onPageLoad
2022-05-18 16:09:42 +05:30
haojin111
27ebbfabe3 update full changes 2022-05-17 14:56:34 +08:00
haojin111
89990c2114 unstaging coverage-summary.json 2022-05-17 14:28:00 +08:00
haojin111
a3be2498e3 added import application progress bar when importing from json 2022-05-16 18:09:23 +08:00
Parthvi12
72e24b9a2a
test: update cypress tests as per added test data in TED (#13761)
* update data table
2022-05-11 17:50:12 +00:00
Aishwarya-U-R
f5cc98644f
Automated tests to TableFilterSpec for Bug #13334 + failure fixes (#13662) 2022-05-10 10:40:46 +05:30
Aishwarya-U-R
e8c9d1da3e
test: Automated tests to improve coverage for JSObjects-onPageLoad + Flaky fixes (#12904)
* Adding theming spec

* Removed theming spec

* Reverted cypress.json changes

* Adding more JSOnPage load validations

* Added Theming - comment spec

* Theming - new cases

* JSOnload fix

* JSOnPage load cases update

* Bind_tabWidget fix

* Name update to CommunityIssues

* Flaky fixes

* Flaky fix

* Reverting postgress index addition

* Failure fixes
2022-05-06 11:10:10 +05:30
haojin111
7b09976f52
feat: 12457 - added application import success modal (#12739)
* added application import success modal

* updated logic and added cypress test

* fixed cypress test

* added local storage for refresh

* fixed issue - 11721 git import issue

* fixed cypress test with new designd modal

* fixed cypress test failed issue
2022-04-27 12:07:04 +05:30
Parthvi12
0766f83cf0
test: Add tests for git bugs and git import (#12751)
* add tests for git bugs and git import

* add dsl file

* added test for git bug and commented git sync test for apps

* updated tests

* removed wait

* updated messages.test.ts

* updated git import tests

* added fix for onboarding_spec
2022-04-14 08:32:57 +05:30
Aishwarya-U-R
8f4756c1d1
test: Automated tests for AForce Migration scenarios + Improved TableFilter spec script coverage (#12534)
* Aforce spec- DefaultSearchText added

* Bug 12228 scripted

* Remove text added

* Aforce - Client Side Search added

* Aforce - adding new issue from modal

* Aforce spec - add new issue fixed

* Aforce spec - update/Delete issue added

* Aforce - multi widget selection fix

* aforce spec - multi select fix

* Aforce - multi select fix

* Aforce - multi select fix

* Removing Table_Filter_spec from ignore files

* MemberRoles locator fix

* member roles locator update

* Tablefilter spec fix

* Aforce spec type fix

* Aforce - search spec

* TableFilter spec fix

* Chartdatapoint fixed

* desc update

* Aforce - skipping table search again

* Removed duplicate spec

* GetNClick improved

* BindTable_api spec fix

* AForce spec fix

* CHartdatapoint spec fixed

* JSObjToListwidget spec fix

* OnPageLoad spec fix

* updates

* TableFilter.ts added

* TableFilter added more scenarios

* TableFilter added more scenarios

* Table_spec failure fix

* TableFilter spec - scenarios added

* AForce Filter case added

* AForce fix

* Aforce filter fix

* Aforce fix

* SelectFromMultiSelect added fix

* Picking msg from message.ts file

* Aforce spec - Added wait

* Aforce - filter spec fix

* JSONload messages update
2022-04-12 15:31:22 +05:30
haojin111
6e63290477
fix: 12338 - postgres datasource default configure on reconnect modal (#12503)
* updated logic of form initialization on reconnect datasource modal

* fixed cypress test

* fixed cypress test
2022-04-11 16:53:52 +05:30
Apeksha Bhosale
e7d4bdba6e
fix: removed promisification of confirmation (#12553)
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
2022-04-06 12:52:18 +05:30
Aishwarya-U-R
7a7169e8c3
test: Cypress tests to include Deploy mode verifications + few flaky fixes (#12444) 2022-04-03 18:43:20 +02:00
Aishwarya-U-R
9bbd671b3f
test: Automated few tests for AForce Migration scenarios + Flaky fixes (#12231) 2022-03-31 17:21:08 +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
Aishwarya-U-R
761e697da8
test: Automated tests improvements for Mongo CRUD cases + few flaky fix (#11985)
* Adding AForceMigration spec

* Merge from release

* Mongo CRUD data load check added

* Added bug id & adding to skip to checkin

* Unskipping MySQL_Spec to test TED

* Api-bugs spec fix

* Adding back MySQL_Spec to ignore

* EE_CopyQuery_RenameDatasource_spec revert to fix

* Skipping Git_sync flaky test

* Removing mySQl from ignore

* Unskipping Mongo cases as Bug12162 fixed

* Empty files moved due to Mocha update
2022-03-25 01:04:28 +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
Aishwarya-U-R
47fc1443f2
test: Script fixes for flaky tests + Unskipping few skipped tests + Cypress upgraded (#11724)
* AForceMigration started

* Table_GenralProp Background color failure fix

* Adding assertPageSave()

* Flaky fix

* Flake fix

* S3 - upload case uncomment

* Added click aft clear - Table_AddBtn spec

* Unskipping Promises scripts

* Promises fix

* Table_genral fix

* Separating Table_Color spec

* Failure fixes

* JObjtoInput flaky fix

* .wait to .Sleep

* Failure fix

* HSEditor complete replace fix

* small replace

* Update a user's name flaky fix

* EE_CopyQuery spec fix

* UNSkipping select widget test

* Flaky fixes

* viewportHeight updated

* Page Load spec - fixed & unskipping test

* Mongo cy.al failure fix

* Promises.any fix

* Promises.any fix

* List_Spec fix

* LIst_spec fix

* Promises.any fix

* Replay editor- flaky fix

* S3 flaky fix

* expandCollapse flaky click fix
2022-03-19 21:26:53 +05:30
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
Arsalan Yaldram
6496f84374
fix: Added Button Container for the firefox drag issue (#11627)
* fix: Added Button Container for the firefox drag issue

* fix: Removed un-necessary styles, added Container in Canvas mode.

* fix: Removed renderMode check from styled function.

* fix: Code refactor and handled Icon Button Component.

* fix: Added extensive comments.

* fix: handled menu button drag issues.

* fix: Fixed some failing tests.

* New Button locator (with drag-container) fix

* NewBtn container locator fix

* btn locator fix

* MongoShopping spec fix

* Mongo, Postgress fixes

* Stat box fix

* Testcase title update

Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
2022-03-13 22:51:04 +05:30
akash-codemonk
b3de51272c
fix: Templates UI polishing (#11567) 2022-03-10 20:09:05 +05:30
Aishwarya-U-R
ef20c1e341
test: Automated tests for Promises & related bugs in Typescript + Flaky fixes (#10378)
* Flaky fixes

* S3 CRUD intercept fix

* S3 CRUD script change revert

* S3 revert!

* .its(store) not present fix

* TS failure fixes

* ChartDataopoint js removed

* JSObject ts flaky fix

* Bugs 9789, 10150 scripted

* Bug 10284 & 9782 scripted

* Updated dsl file names

* Table_Widget case #7 flaky fix

* Bug 10150 scripting improved

* DocumentViewer spec flaky fix

* Input widget locator corrected

* MemberRoles cases script started in TS

* UpdateUserRoleInOrg() fix

* Skip JSObject_To_ListWidgetSpec.ts until #10284

* Add validation

* JSObject_To_ListWidgetSpec.ts timeout increase

* Skipping tests until bug 10284 is fixed

* Increased wait time

* UpdateUserRoleInOrg() updated

* MemberRoles_Spec.ts fixed

* JSObjToInput - updated

* Postgres flaky fix

* Member Roles aka CreateOrg test flaky fix

* JSObToListWidget_Spec.ts - commenting until bugfix

* COmmenting JSobjToInput spec

* Commonlocators added back

* Entity explorer name fix

* Locators fix

* Locator corrected

* Cypress.json removed files from ignoring list

* S3 & Postgress failures fix

* Postgress failure locator fix

* S3 upload script skipping until bug fix

* Params Bug 10784 script started

* Fixing Promises Spec

* Increased wait time!

* MigrationSpec - Image column,Cardformat,Pagestyles

* S3, Postgres, Promise - failures fix

* Canvas renamed

* Bug 11415 - Added Validations

* InputWidgets_navigateTo - flaky fix

* MigrationSpec - import change

* Locators files - Json to Js conversion

* DS plugnis name change

* Locators - Json to JS conversion

* Locators - Json to JS updations

* Select_Widget_Value flaky fix

* Adding timeout for execute calls to finish

* Migration spec - diff syntax+List.js flaky fix

* List & MIgration flaky fix
2022-03-02 16:54:43 +00:00
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
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
Aishwarya-U-R
67652287f2
test: Automated tests for Table Migration scenarios + Flaky fixes (#11360)
* Migration table script added

* Migration case & inputv2 flaky fix

* Added menu btn validations

* MigrationSpec - Added sorting valiation

* Flaky tests fix

* LIstWidget api.users count fix

* ListWidget api.users count validation fix

* Bind_ApI spec - added waituntil
2022-02-24 08:41:35 +05:30
yatinappsmith
bd7ae1f924
test: Added test event driver (#11222)
* Added test event driver

* changed port to 28017

* updated credentials

* updated password for postgres

* Update forkedApp.json

* fixing ImportExportForkApplication_spec

* fixing ImportExportFork_spec

* updating testdata

Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local>
2022-02-18 17:45:05 +05:30
albinAppsmith
5cfe12bcea
feat: Entity explorer UI redesign (#9811)
Co-authored-by: arunvjn <arun@appsmith.com>
2022-01-29 12:56:19 +05:30
Parthvi12
69fabb908b
Automated mongoDB app with CRUD operations (#10409) 2022-01-19 13:55:14 +05:30
Parthvi12
86a61edebb
test: added tests for import, export and fork application (#10202)
* added tests for import, export and fork application

* updating the forkedApp dsl
2022-01-06 19:12:13 +05:30
NandanAnantharamu
f1c4f03438
Updated test (#9616) 2021-12-07 12:58:27 +05:30
Parthvi12
af430d7049
test: testcases for content management system app using echo api (#9420)
* testcases for content management system app using echo api

* added response check method for API calls
2021-11-30 09:28:57 +05:30
Parthvi12
720806574f
test: PgAdminFix (#9313)
* commenting failing tcs for now

* resolving conflict and  fixing testcases

* Update PgAdmin_spec.js

* fixing testcases

Co-authored-by: yatinappsmith <yatin@appsmith.com>
2021-11-30 04:54:42 +05:30
Aishwarya-U-R
e5a28b3d9b
test: S3 QueryPane scripting along with possible CRUD flow coverage (#9278)
* S3 QueryPane scritping

* Postgress, S3 - failure fixes

* Postgres, S3 failure fixes

* S3 failure fixes

* Added scrollIntoView for Postgres CRUD failures

* S3 - Suggested&Snipeable widgets implemented

* S3 CRUD - failure fix

* Postgres, S3 CRUD failure fixes

* S3 field inputs corrected

* JQuery empty used to clear fields

* Commenting cases to unblock CI runs

* PgAdmin Spec - commenting failures to unblock CI

* S3, Postgres CRUD failure fixes

* Added Wait for Onboarding spec case failure

* typeValueNValidate - updated

* typeValueNValidate updated

* Reverted typeValueNValidate method trigger change

* Adding wait to typeValueNValidate

* Updated typeValueNValidate with updateCodeInput
2021-11-26 16:17:53 +05:30
Parthvi12
ff0222e270
test: PgAdminApp Intial (#9139)
* PgAdminApp Intial

* refactored spec file and adding PgAdminlocators.json file

* updated json file path

* updated locator file

* added comments to the spec file
2021-11-21 14:00:20 +00:00