Commit Graph

11293 Commits

Author SHA1 Message Date
Preet
b3920abbe2 Merge remote-tracking branch 'origin/release' into fix-11468_dropdown_performance 2022-03-17 18:36:26 +05:30
Trisha Anand
21f474ca4f Updating it to 10s which was the initial configuration 2022-03-17 13:48:32 +01:00
Trisha Anand
89f654503c Update : On CE not waiting for backend to be marked as running 2022-03-17 13:48:31 +01:00
Trisha Anand
e2b11073a6 hotfix: Check if the backend is up within 30s to reduce the time it takes for editor to come up on restart 2022-03-17 13:48:31 +01:00
geekup-legodevops
4d7c9b7822
Add script to stop/start MongoDB and Redis if changed (#11894) 2022-03-17 17:58:48 +05:30
Arsalan
37d9fd22bb Merge branch 'release' into fix/button-group-undo 2022-03-17 17:45:25 +05:30
Apeksha Bhosale
79e165af96
feat: Settings js editor (#9984)
* POC

* Closing channels

* WIP

* v1

* get working with JS editor

* autocomplete

* added comments

* try removing an import

* different way of import

* dependency map added to body

* triggers can be part of js editor functions hence

* removed unwanted lines

* new flow chnages

* Resolve conflicts

* small css changes for empty state

* Fix prettier

* Fixes

* flow changes part 2

* Mock web worker for testing

* Throw errors during evaluation

* Action execution should be non blocking on the main thread to evaluation of further actions

* WIP

* Fix build issue

* Fix warnings

* Rename

* Refactor and add tests for worker util

* Fix response flow post refactor

* added settings icon for js editor

* WIP

* WIP

* WIP

* Tests for promises

* settings for each function of js object added

* Error handling

* Error handing action validation

* Update test

* Passing callback data in the eval trigger flow

* log triggers to be executed

* WIP

* confirm before execution

* Remove debugging

* Fix backwards compatibility

* Avoid passing trigger meta around

* fix button loading

* handle error callbacks

* fix tests

* tests

* fix console error when checking for async

* Fix async function check

* Fix async function check again

* fix bad commit

* Add some comments

* added clientSideExecution flag for js functions

* css changes for settings icon

* unsued code removed

* on page load PART 1

* onPageLoad rest iof changes

* corrected async badge

* removed duplicate test cases

* added confirm modal for js functions

* removed unused code

* small chnage

* dependency was not getting created

* Fix confirmation modal

* unused code removed

* replaced new confirmsaga

* confirmaton box changes

* Fixing JSEditor Run butn locator

* corrected property

* dependency map was failing

* changed key for confirmation box

Co-authored-by: hetunandu <hetu@appsmith.com>
Co-authored-by: Hetu Nandu <hetunandu@gmail.com>
Co-authored-by: Arpit Mohan <arpit@appsmith.com>
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
2022-03-17 17:35:17 +05:30
yatinappsmith
00570de1bc
Revert "test: Test add support for fat container in ci (#11836)" (#11942)
This reverts commit f1fcf93322.
2022-03-17 17:23:42 +05:30
Trisha Anand
0724463726
chore: Mark backend to be running after 10s on startup
chore: Mark backend to be running after 10s on startup
2022-03-17 17:21:24 +05:30
Trisha Anand
407d963aa5 Updating it to 10s which was the initial configuration 2022-03-17 17:18:45 +05:30
Trisha Anand
7d35f4b2b0 Update : On CE not waiting for backend to be marked as running 2022-03-17 17:00:47 +05:30
Paul Li
3e37914b01 Merge branch 'release' into feat/4182-form-detect-changes 2022-03-17 19:27:50 +08:00
Paul Li
dd49573d15 feat: 4182: Internal property to detect changes in a form
-- Eliminate unnecessary props
2022-03-17 19:26:24 +08:00
Trisha Anand
42b4a2849e hotfix: Check if the backend is up within 30s to reduce the time it takes for editor to come up on restart 2022-03-17 16:52:24 +05:30
Arsalan
0253019d34 fix: Tab Widget Sagas fixed. 2022-03-17 16:28:26 +05:30
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
Arsalan
87c4645a87 fix: Button Group, MenuButton, Tabs undo Redo fixed. 2022-03-17 15:49:17 +05:30
yatinappsmith
f1fcf93322
test: Test add support for fat container in ci (#11836)
* Added support for fat container in Push workflow

* Added support for fat container in pull request

* Added license support

* Add support for license
2022-03-17 15:40:25 +05:30
Preet
1a1efc3e80 Merge remote-tracking branch 'origin/release' into fix-11468_dropdown_performance 2022-03-17 15:05:30 +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
dependabot[bot]
cb016364ca
chore(deps): bump prismjs from 1.25.0 to 1.27.0 in /app/client (#11460)
Bumps [prismjs](https://github.com/PrismJS/prism) from 1.25.0 to 1.27.0.
- [Release notes](https://github.com/PrismJS/prism/releases)
- [Changelog](https://github.com/PrismJS/prism/blob/master/CHANGELOG.md)
- [Commits](https://github.com/PrismJS/prism/compare/v1.25.0...v1.27.0)

---
updated-dependencies:
- dependency-name: prismjs
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: hetunandu <hetunandu@gmail.com>
2022-03-17 14:29:43 +05:30
akash-codemonk
9a1fa8fa7f fix: wait for organisation list to be fetched before creating an application for welcome tour (#11907) 2022-03-17 13:19:38 +05:30
Ankita Kinger
0f5d5c4f42 show signup link even if signup toggle is off 2022-03-17 12:25:48 +05:30
Preet
53c8b18c79 Merge remote-tracking branch 'origin/release' into fix-11468_dropdown_performance 2022-03-17 11:56:44 +05:30
Preet
9003e6ddfb add unit test for Select Button 2022-03-17 11:49:35 +05:30
arunvjn
1e2b878ae2
Remove api calls to fetch default docs from github (#11856) 2022-03-17 07:00:42 +01:00
Arsalan Yaldram
9f51619b2c
Merge pull request #11865 from appsmithorg/fix/button-icon-alignment
fix: Button Icon Alignment on Icon Change
2022-03-17 11:12:15 +05:30
Preet
cd694540fd fix scroll behaviour on filtering 2022-03-17 11:10:22 +05:30
Preet
bceae2fb4e refactor select button 2022-03-17 10:57:39 +05:30
Bhavin K
ab9310bda8
fix: remove margin when no label (#11789) 2022-03-17 10:42:35 +05:30
Preet
1e5d7153ea add virtual list for select menu 2022-03-17 10:30:24 +05:30
Bhavin K
d8f843187f
fix: handle Centered component height (#11825) 2022-03-17 10:17:17 +05:30
Trisha Anand
d4483f4a5a
fix: Show signup link even if signup toggle is off 2022-03-17 09:57:33 +05:30
Ankita Kinger
7583c52e2a show signup link even if signup toggle is off 2022-03-16 21:56:37 +05:30
dependabot[bot]
9b62f037b6
chore(deps): bump lodash-es from 4.17.14 to 4.17.21 in /app/client (#11821)
Bumps [lodash-es](https://github.com/lodash/lodash) from 4.17.14 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.14...4.17.21)

---
updated-dependencies:
- dependency-name: lodash-es
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: hetunandu <hetunandu@gmail.com>
2022-03-16 21:06:54 +05:30
dependabot[bot]
624b88471e
chore(deps): bump url-parse from 1.5.3 to 1.5.10 in /app/client (#11467)
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.3 to 1.5.10.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.3...1.5.10)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-16 21:06:25 +05:30
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
Paul Li
7403449197 Merge branch 'release' into feat/4182-form-detect-changes 2022-03-16 22:51:09 +08:00
Leo Thomas
7a038400e5
fix: 10527 Google Sheet crud generation header issue v2 (#11664)
* fix: 9824 Google Sheet to filter empty condition ver.2

* Code review comments updated

* Updates as per review comments - Ver 3

* Resolved errors found during testing

* Code review comments fix

* fix:10527 Google Sheet Crud Generation header issue

* Code review comments implemented

* Updated review comments

* code review - resolve test cases issue

Co-authored-by: Leo Thomas <leoweb2010@gmail.com>
2022-03-16 20:20:10 +05:30
Paul Li
f9e30a1e15
fix: Input widget onSubmit gets triggered before evaluation (#11590)
* fix: onSubmit gets triggered before evaluation

-- Enforce to update text meta property before trigger the submit action

* fix: onSubmit gets triggered before evaluation

-- Add a comment and a Cypress test on the fix

* fix: onSubmit gets triggered before evaluation

-- Fix on the failed test case

* fix: onSubmit gets triggered before evaluation

-- Rewrite comments
-- Rewrite the test case to fail if we revert changes

* fix: Iput widget onSubmit gets triggered before evaluation

-- Update a common property, isDirty
2022-03-16 22:45:12 +08:00
Paul Li
097ab33b4c feat: Internal property to detect changes in a form
-- Complement Cypress test case by adding reset cases
-- Update isDirty reset logic for MultiSelectWidgetV2
2022-03-16 22:44:44 +08:00
akash-codemonk
36be2d213b
fix: wait for organisation list to be fetched before creating an application for welcome tour (#11907) 2022-03-16 20:08:50 +05:30
Favour Ohanekwu
3d43de4884
fix: convert blob urls in object type values (#11872) 2022-03-16 19:59:52 +05:30
Favour Ohanekwu
3f9e1a34eb
do not show errors for private widgets (#11883) 2022-03-16 15:27:22 +01:00
rashmi rai
f6ba19dcb7
fix set initial value of KeyValueArrayControl (#11756) 2022-03-16 14:26:57 +00:00
Aswath K
e86b169ead
fix: Icon Selector width on propety pane resize (#11736)
* fix: Icon Selector width on property pane resize
2022-03-16 14:26:40 +00:00
Ayangade Adeoluwa
ba99068425
feat: Add action name to confirmation modal (#11807)
* Add action name to confirmation modal

* Fix cypress tests and button size
2022-03-16 14:26:19 +00:00
Ayangade Adeoluwa
2f862ac8db
fix: properly render html responses (#11853)
* properly render html responses

* My empty commit with a message

* My empty commit with a message

* Remove package, use custom function

Co-authored-by: Adeoluwa Ayangade <adeoluwaayangade@Adeoluwas-MacBook-Pro.local>
2022-03-16 14:25:56 +00:00
Arpit Mohan
d2e00a9820
ci: Release v1.6.16 2022-03-16 15:19:35 +01:00