Commit Graph

112 Commits

Author SHA1 Message Date
Parthvi
58c7f3d805
test: Update documentation URLs used in tests (#15419)
## Description

With the new documentation structure, updating the URLs which are being used in tests.

## Checklist:

- [ ] My code follows the style guidelines of this project
- [X] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my feature works
- [ ] New and existing unit tests pass locally with my changes

Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local>
2022-07-26 12:58:07 +05:30
Rimil Dey
9284c5e240
Auto-indent JS code in the editor (#13222)
This pull request:

    introduces a new option to the menu in the JS editor which lets users prettify/auto-indent code.
    introduces a new keyboard shortcut that lets users prettify/auto-indent code
    Fixes bug where pressing CMD + <- in Mac (Home in windows) shifts the cursor to the first indented column. If the cursor is present on the first indented column, the cursor shifts to the 0th column in the editor

Fixes #9268
2022-07-20 12:43:23 +05:30
f0c1s
58dac0213c
Regenerate SSH key in connect and import flow (#14383)
As of today, we were supporting only ECDSA keys for GitHub, GitLab, and BitBucket. For Azure, RSA key generation was not available. This PR allows users to generate RSA or ECDSA keys.

As of now we support following key types and version control service providers:

    Github: ECDSA
    Gitlab: RSA, ECDSA
    Bitbucket: RSA, ECDSA
    Azure: RSA

Fixes #14382, #14715, #14570
2022-07-20 12:30:11 +05:30
f0c1s
df4fca9b8f
fix: show conflict info properly (#15240)
## Description

ConflictInfo was showing up along side discard button. Moved it to a row of its own.

Fixes #15113 

## Type of change

- Bug fix (non-breaking change which fixes an issue)

## Checklist:

- [x] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my feature works
- [x] New and existing unit tests pass locally with my changes
2022-07-18 11:03:21 +05:30
f0c1s
654ae38e67
fix: break branch creation text, fix text casing (#15241)
## Description

During branch creation, a bit of text was clinging to each other. Put them as per the design.

Fixes #15014 

### Issue:

![image](https://user-images.githubusercontent.com/1573771/179294901-7820fe79-4f35-47fd-9f63-98a886f102b5.png)

### design:

![Screenshot 2022-07-16 at 12 40 39 AM](https://user-images.githubusercontent.com/1573771/179295031-bbb5ef67-8955-4901-997a-1f455bdf5bb0.png)

### fix:


https://user-images.githubusercontent.com/1573771/179295053-d5940ba7-2a9f-41a9-965d-596bff69ac71.mov

![Screenshot 2022-07-16 at 12 36 52 AM](https://user-images.githubusercontent.com/1573771/179295067-c82d3905-f325-47ed-9007-06b0c7104e86.png)


## Type of change

- Bug fix (non-breaking change which fixes an issue)

## Checklist:

- [x] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my feature works
- [x] New and existing unit tests pass locally with my changes
2022-07-18 11:02:54 +05:30
f0c1s
18a8937c5d
fix: accept non-empty commit messages (#15053) 2022-07-11 15:41:33 +05:30
f0c1s
7c77d3fb7c
chore: update messaging for Deploy tab (#14911)
* chore: update messaging for the Deploy tab
2022-07-11 15:40:43 +05:30
albinAppsmith
3d22d935d3
feat: Design System - Text component migration (#14994)
Removed Text component
Changed imports to design system
2022-07-11 10:25:28 +05:30
arunvjn
fd6faf85ea
chore: code changes to support clean urls v2 (#14757) 2022-07-11 09:36:29 +05:30
f0c1s
f4db8926f5
fix: pass remote url to ConflictInfo component (#14963)
## Description

During a refatoring, one of the location where the ConflictInfo component is invoked from was getting an empty string; that was making current app open up in new tab instead of git repo.

Fixes #14674 

## Type of change

- Bug fix (non-breaking change which fixes an issue)

## Checklist:

- [x] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my feature works
- [x] New and existing unit tests pass locally with my changes
2022-07-04 11:23:52 +05:30
f0c1s
a3cd34e9f6
fix: Adding deploy button on git deploy tab (#14597) 2022-06-29 18:03:53 +05:30
albinAppsmith
fcbcec751d
feat: Design System package & Tooltip integration (#14547)
* Added Appsmith Design System Package
* Removed tooltip from ADS folder
* Changed imports for Tooltip

* added alias for the @appsmithorg/design-system

* fix for npm aliasing in jest

* design system package version change to beta 1.0.1-beta.8

* Tooltip Position type changed to PopoverPosition

* design system package updated
2022-06-24 19:53:02 +05:30
f0c1s
b97042a38a
fix: disable branch dropdown until merge status returns (#14540) 2022-06-23 10:27:35 +05:30
Arsalan Yaldram
f58451aa5f
feat: upgrade to create react app 5 (#14000)
* Updated Typescript types.

* Typefixes after merge with release.

* chore: GenericApiResponse Removed alltogether.

* chore: resolved ApiResponse unknown errors removed PageListPayload.

* Added shouldBeDefined.

* fix: Resolved type errors.

* fix: Typescript upgrade to 4.5 and type fixes.

* feat: upgrade to cra 5

* feat: uncomment service worker registeration

* force secure websocket protocol

* jest test fixes

* fix: react function lint rule removed

* fix: klona test case.

* fix: typescirpt issues resolved

* fix: timeout for colorpicker test and change env.

* feat: update client-build.yml file

* fix: remove brotliplugin use compression plugin

* fix: build config fixed

* fix: upgrade webpack plugin

* fix: add branchbutton test to todo.

* fix: remove branch button test.

* fix: Add tailwind theme values, fix cypress tests

* fix: Typescript type fixes.

* feat: run jest tests in silent mode

* fix: cypress rgb values add branchbutton jest test

* fix: review comments, fixes for error.message

* fix: increase cache size for the workbox

* fix: remove OrgApi.ts file

* fix: cypress.json file remove credentials

* fix: downgrade react and react-dom packages

Co-authored-by: rahulramesha <rahul@appsmith.com>
2022-06-21 19:27:34 +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
f0c1s
3594cb3d24
Slowed down git commit and discard progress bar (#14196) 2022-06-10 08:28:57 +05:30
RakshaKShetty
221d9c0a7c
test: git delete branch tests (#14047)
* gitdeletebranchtests
2022-06-08 17:14:15 +05:30
f0c1s
84be23c490
chore: refactor git code (#13724) 2022-05-12 14:02:56 +05:30
Anubhav
e35f8dc897 fix: use modified instead of updated 2022-05-07 08:10:34 +05:30
Arpit Mohan
4934fc9066
Merge pull request #13644 from appsmithorg/fix-12164 2022-05-06 16:17:37 +02:00
f0c1s
1de19956e3
fix: add visual cue to SSH key regeneration (#13625) 2022-05-06 15:30:48 +05:30
Anubhav
03684fce97 fix: disable revoke button after first click 2022-05-06 15:21:33 +05:30
f0c1s
7a3985f962
feat: git discard changes (#11835)
* feat: git discard changes
* fixed cypress test in git connection
* feat: add discardDocUrl and update casing
* chore: update tests
* chore: fix review comment

Co-authored-by: haojin111 <haojin828@outlook.com>
2022-05-06 10:14:24 +05:30
f0c1s
9cc0cdd404
fix: remove horizontal scrollbar in git sync modal (#13514) 2022-05-04 17:10:32 +05:30
haojin111
0414c8823d
fix: 12456 - oauth redirection issue (#13511)
* fixed issue of gsheet authorization
* hidden cloudhost ip info on reconnect modal
2022-05-03 14:22:48 +05:30
haojin111
ecffa88684 updated label text of remote url 2022-04-30 21:18:53 +08:00
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
albinAppsmith
1d019d1376
fix: Modal padding and color fixes (#12189)
* * share modal fixes

* * modal ui fixes
2022-04-26 19:26:07 +05:30
f0c1s
d428262bf9
fix: Azure SSH url was not accepted for git connection (#12896) 2022-04-23 18:01:43 +05:30
arunvjn
bdcc99b53b
chore: Hides update button when there are no pending updates. (#13152) 2022-04-21 18:44:10 +05:30
f0c1s
736c2e024e
feat: git delete branch (#12681) 2022-04-13 15:33:23 +05:30
f0c1s
f5796bfa30
fix: git merge tab issues (#12576) 2022-04-13 08:47:33 +00:00
Ankita Kinger
c1e48f7486
feat: Refactor code for SAML integration (#12700)
* Implemented code splitting of some files for SAML integration

* Implemented code splitting of some more files for SAML integration

* updated redirect url component

* fixed an import statement

* fixed a unit test

* updated restart banner tooltip logic

* updated an import statement
2022-04-12 16:20:01 +05:30
haojin111
c32ca69a91
fix: 12456, 12420, 12422 on reconnect modal issues (#12569)
* fixed-12456 gsheet auth issue

* fixed - 12420 save button functionality failed

* fixed - 12422 datasource selection issue

* fixed issue of gsheet authentication

* fixed comments point

* fixed 12511: typo issue

* fixed cypress test import and export
2022-04-11 23:00:29 +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
arunvjn
fabfb65a4f
chore: Parallelise feature flags and user info API (#12263) 2022-04-07 23:27:32 +05:30
f0c1s
0ad66f27bd
fix: introduce new regexp for remote url validation (#12004)
* fix: introduce new regexp for remote url validation
* chore: add tests and refactor
* fix: failing cypress test
2022-04-07 16:19:28 +00:00
f0c1s
ecb6b4457e
feat - remove horizontal rule from git branch list (#12614) 2022-04-07 16:18:14 +00:00
f0c1s
057817d393
feat: migration changes hint (#12071)
* Initial changes

* feat: adding new icon and refactoring

* feat: add text and test ids

* chore: add tests
2022-04-04 17:11:49 +05:30
f0c1s
e69e6e0670
test: Fix failing git sync tests (#12488) 2022-04-01 16:55:56 +05:30
haojin111
8ded371162 fixed issue of redirecting with one oauth authentication 2022-03-30 14:37:34 +08:00
haojin111
b265ac2fd5
fixed redirection on google authorisation in reconnect modal (#12350)
Co-authored-by: arunvjn <arun@appsmith.com>
2022-03-29 22:24:30 +05:30
haojin111
d3265437e6
fix: 12248, 12249, 12252 - issues of reconnect datasource modal (#12287)
* fixed issue of test button function on reconnect modal

* fixed issue of scrolling hiden in authenticated api  on reconnect modal

* fixed issue of scrolling rest api datasource form
2022-03-29 17:26:29 +05:30
arunvjn
23c12f4afc
fix: URL slugs in duplicate, import and export operations. (#12283)
* Persists modal to show info when update is in progress
2022-03-28 18:30:05 +00:00
haojin111
a7934f78fa
fix: scrolling issue of git connection tab (#11813)
Creates a margin which allows scrollbar to appear on top of the content and fixes issue.
2022-03-28 09:05:11 +05:30
haojin111
e6466e1758
fix: OAuth authorization issue (#12183) 2022-03-28 09:03:32 +05:30
haojin111
a0b6ee5a5b Merge branch 'release' into feat/11780-add-scrolling-repo-limit-modal 2022-03-26 21:54:10 +08:00
Aishwarya UR
f8b66444e0 Merge branch 'release' into fix/12084-airtable-auth-issue-in-git-import 2022-03-26 09:28:06 +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
haojin111
884b203cf4 advanced of scrolling with latest release 2022-03-23 14:45:37 +08:00