Commit Graph

578 Commits

Author SHA1 Message Date
Rishabh Saxena
cf7fe8d6a8
Collab minor fixes (#5457) 2021-07-02 11:34:36 +05:30
Pranav Kanade
1647815d24
[Fix] revert new nav (#5533)
* Revert "[Bug] Mock data section is missing (#5517)"

This reverts commit be48f2f5

* Revert "[Feature #4542] : simple nav unify api/datasource (#4987)"

This reverts commit 8d8b9ed2
2021-07-01 18:14:41 +05:30
Pranav Kanade
8d8b9ed203
[Feature #4542] : simple nav unify api/datasource (#4987)
* temp commit

* using onsubmit to continue using action on form

* added recaptcha site key to env example file

* moved the recaptcha lib loading logic to signup page

* removed unnecessary edit

* handle the case where the recaptcha token is not provided as env var

* added proper env var config for client

* recaptcha config for ansible

* recaptcha config for heroku

* recaptcha config for k8s

* updated app.json

* fixed the typos

* added more description for env vars

* removed api key

* minor typo fix

* added new integration button

* updated the add int default link

* added active and create new tabs

* added the empty components to tabs. will control the section manually.

* added proper grid for integrations page

* added vertical tabs

* Added secondary tabs to integrations page

* added separate page for new apis

* classname changes

* added new components for active queries, new queries etc.

* added a separate component for data source list

* adding screen component conditionally, to be showing upon user's choice

* 1. Added grid styling to datasource home
2. Added connect buttons to em

* fixed data source security banner

* updated the styling for new api page

* added tertiary menu for active integrations

* updated styling for active connections

* updated collapse component to work properly

* added show more option to active data sources

* removed apis/db tabs and replaced em with integrations tab

* removed the unnecessary + integrations btn

* Ordered the action entries under integrations

* updated the getURL with proper params

* updated the link of create datasource btn

* updated the back btn link from data source editor

* added scrollable content to create new

* added on click scroll to create new page

* fixed a bug, creating new datasource twice

* added new action creator for integrations.

* updated the query editor to match the over all theme

* updated the query editor tabs

* Added the run btn to empty response screens

* minor fix

* updated the bg color of api type drop down

* updated the url being visited after delete api/query

* removed log

* removed unnecessary junk from integrations editor index

* clean up, removed unnecessary files

* removed useless routes

* for debugger only checking if integrations editor

* Removed all the links for api/query home pages

* not routing to integrations on create query/api

* removed the query/datasource/api home pages

* fixed scrolling issue

* will show a list of queries and apis for action picker

* showing icons for each action under integrations

* added a way to list data sources in action creators

* cam show icons for datasources

* linked integration tab movement to URL

* fixed the create new query bug

* removed search

* added the auto redirection mode

* added new mode to support showing mock data bases

* on click show more works properly

* removed extra padding

* removed height

* showing all the data sources on active tab

* fixed the creation of google sheet

* updated the proper routing for curl

* fixed page height

* removed loader

* added a spinner for creating a new api

* will be showing edit/add query permanantly

* updated the redirection on save and delete datasource

* fixed the redirection logic on delete

* will not show security banner

* added empty state for active data sources

* updated the hover state

* minor fix to redirect on delete from entity pane

* fixed a cy command to create new api

* fixed a command to select api/query from lightning menu

* updated the navigate to data source editor

* removed add btns for new int creation

* updated the testSaveDeleteDatasource command

* fixed bind table text pagination spec

* more test case fixes for deleting a query using context menu

* update curl test

* updated curl post import spec

* fixed click from apis to integrations

* updated execute db query command + updated delete query mech

* updated CreationOfUniqueAPIcheck command

* updated query datasource spec

* fixed an action creator bug.

* fixed curl api creation bug

* removed irrelavent part of the test

* fixed the button colors

* updated back link from datasource page

* Revert url validation changes for the debugger since this is used to check whether we are on a query or an api and show its dependencies

* updated a test case to open integrations option in action selectors

* Update app/client/src/pages/Editor/IntegrationEditor/DatasourceCard.tsx

Co-authored-by: Rishabh Saxena  <rishabh.robben@gmail.com>

* separated msg

* styling fixes for collapse component

* renamed a file

* declared a new const in theme

* updated border

* removed a faint line from collapse card

* removed unnecessary condition

* updated component name

* log removed

* split action creator file

* updated the icon usage in action creators

* can properly fetch mock data sources

* can show mock databases in create new

* can use mock db sources

* fixed the scrollbars

* updated the api icon for both global search + action creator

* updated integrations name in datasources

* added a back to canvas ribbon

* updated query and api editor to show back to canvas ribbon

* added a ribbon to go back

* updated button styles

* updated the action creator and test commands/classes

* updates to show the proper mock databases

* added proper type for mock datasources

* removed unnecessary log

* updated a test case to work with new nav

* minor updates for tests

* updated a command to properly delete a datasource

* minor redirection fix

* made the mock db api call unblocking

* fixed scroll bars all over

* fixed bg colors for back ribbons

* declared a constant for thin scrollbar

* removed unnecessary action.

Co-authored-by: Akash N <akash@codemonk.in>
Co-authored-by: Rishabh Saxena  <rishabh.robben@gmail.com>
2021-06-30 23:51:52 +05:30
Ayush Pahwa
56bf480f0a
Added a variable to props to display the placeholder text (#5082)
The default text shown when the error tab or logs tab is empty in the debugger is the same. This fix changes that text by adding a variable in the props of the BlankState component.
2021-06-30 16:33:35 +05:30
Ashok Kumar M
cf19b8e44d
[Feature] Widget Grouping Phase - 3 (Cut Copy Paste) (#5083)
* Cut copy paste first cut

* removed different parent groups logic

* mouseup on the outer canvas removes selections.

* bug fix

* remove unwanted dead code.

* Adding tests

* build fix

* min height fixes

* fixing specs.

* fixing specs.
2021-06-28 12:41:47 +05:30
Rishabh Saxena
b24dd8f8b2
Minor collab fixes (#5271) 2021-06-24 14:34:27 +05:30
akash-codemonk
3747d41c30
Show the associated page name subtly in the omnibar (#5120) 2021-06-24 11:14:36 +05:30
Rishabh Saxena
c351643f57
Notification updates (#5239) 2021-06-23 21:12:07 +05:30
Satish Gandham
47bc5aa032
Merge pull request #5026 from appsmithorg/feature/1726-iframe-widget
Adding iframe widget
2021-06-23 13:01:40 +05:30
Somangshu Goswami
3c8944cc1c
Merge pull request #4341 from appsmithorg/fix/dropdown-overlap-modal
fix: Dropdown option gets overlapped on the ModalComponent
2021-06-22 15:37:44 +05:30
arunvjn
469d7f0e14
Fix to enable scroll in sql query results. (#5091)
* Dynamically adjust table virtualizer's height according to resizer
2021-06-22 09:23:53 +05:30
Paul Li
9bc1cd4899 Merge branch 'release' into feature/1726-iframe-widget 2021-06-21 06:54:20 -04:00
Paul Li
96c273cc22 FEATURE-1726 : Iframe Widget
-- Set default source url to wikipedia.org
-- Fix typo on the tooltip of onURLChanged, url to URL
-- Fix the issue which is related to reduced iframe in its deploy mode
-- Fix the issue which is related to the inclusion of nearby widgets in deploy mode
-- Add Expected Data Type fields with regard to borderOpacity and borderWidth
2021-06-21 06:48:00 -04:00
akash-codemonk
e7f6598231
Fix: Log dependent property values in debugger when a property is updated (#4865) 2021-06-21 13:50:25 +05:30
Pawan Kumar
91bf527bea
List Widget Phase 2 (#4189)
* update  meta properties + default properties map

* update widget registery

* update get meta property

* update metahoc + widgetfactory + data tree evaluator

* try sending function as string to worker

* revert data tree evaluator update

* pass default props map from dataTreeWidget file

* wip

* save child meta properties

* remove console.log

* save meta and default map in list

* update listwidget

* remove console.log + unused variables

* revert getMetaPropertiesMap function

* fix data tree test

* fix list widget test

* fix entity definition test

* fix overriting of item in updatedItems

* remove todo comments

* fix meta prop issue

* revert making meta properties from undefiend to "" & fix filepicker bug

* fix test case

* change items to listData and updatedItems to items

* remove console.log

* fix test

* extract derived properties to dervied.js

* disabled top, left, right resize handler list widget container

* add test for dervied js

* add test for selectedItem

* fix background color bug on hover

* remove console.log

* fix chart widget inside list widget

* fix checkbox issue + points raised by yogesh

* revert the createImmerReducer usage

* fix parse derived properties

* remove internal props object that fails the test

* fix import typo

* allow bottom resize handler

* fix template height check

* fix template height check

* update template size check

* fix the is visible invalid prop issue

* fix migration of list widget phase 2

* fix migration

* remove unused import

* fix migration

* fix migration

* remove console.log

* hide delete option for container in entity explorer

* fix testcases

* remove unused import

* fix switch widget meta prop

Co-authored-by: root <root@DESKTOP-9GENCK0.localdomain>
Co-authored-by: Pawan Kumar <pawankumar@Pawans-MacBook-Pro.local>
2021-06-18 13:12:57 +05:30
Tolulope Adetula
9b39cdbb45 Merge branch 'release' into fix/dropdown-overlap-modal 2021-06-18 07:07:35 +01:00
Ashok Kumar M
a76b8cad9b
Feature: Widget Grouping Phase II (#4825)
* dip

* dip

* Cleaning up grid density positioning.

* dip

* dip

* dip

* dip

* code clean up

* dip

* dip(restructuring widget selection)

* Deselect parents and children of a widget when user multi selects.

* dip

* dip

* dip

* dip

* dip

* fixing a bad merge

* fixing tests

* adding jest tests.

* common util

* dip

* dip

* fixes

* restrict in deploy mode.

* fixing dynamic layout.

* fixing tests.

* on paste fix.

* fixing specs.

* addressing code review comments

* dip

* dip

* dip

* fixing specs.
2021-06-17 18:56:54 +05:30
Rishabh Saxena
9c99f36bd6
Comments feature fixes (view mode) (#5081) 2021-06-17 13:07:27 +05:30
Rishabh Saxena
1b2f01ed2a
Profile image updates (#4783) 2021-06-17 00:06:34 +05:30
Rishabh Saxena
f7405f9004
Reset the user in store on 401s (#5153) 2021-06-16 22:39:25 +05:30
Rishabh Saxena
10b3f7e790
Feature/signup success url (#5124) 2021-06-16 21:21:18 +05:30
Ashok Kumar M
e8152ce198
Fix: updating basic dsl for fork and duplicate feature cypress specs (#5152)
* dip

* dip
2021-06-16 17:21:00 +05:30
Tolulope Adetula
47bda1d736 Merge branch 'release' into fix/dropdown-overlap-modal 2021-06-15 10:18:19 +01:00
Hetu Nandu
123fc4bc1d
Fix incorrect action type reference (#5121) 2021-06-15 12:39:27 +05:30
Somangshu Goswami
ca9324c60a
Merge pull request #4580 from appsmithorg/feature/2111-toggle-header-options
Feature/2111 toggle header options
2021-06-15 11:26:55 +05:30
Paul Li
59bf649131 Merge branch 'release' into feature/1726-iframe-widget 2021-06-12 12:12:28 -04:00
Paul Li
31177efc18 FEATURE-1726 : Iframe Widget
-- Remove the spread operator in IframeWidget
-- Connect the widget help with the correct documentation path
-- Expose source and title for autocomplete
-- Remove the redundant wrapping with meta from the widget
2021-06-12 12:08:10 -04:00
Rishabh Saxena
50e5807e8d
Minor comment tour updates (#5024) 2021-06-11 20:31:32 +05:30
Paul Li
809416ab21 Merge branch 'release' into feature/2111-toggle-header-options 2021-06-11 09:25:12 -04:00
Paul Li
4d9ea51baa Merge branch 'release' into feature/1726-iframe-widget 2021-06-11 09:21:38 -04:00
Trisha Anand
06cafb6066
Getting Prepared Statement for Postgres, MySQL, and MS-SQL and Smart Substitution for Rest API plugins out of beta (#5019)
* Correcting text for Mongo Form Insert command

* Getting Prepared Statement for Postgres, MySQL, and MS-SQL and Smart Substitution for Rest API plugins out of beta

* Fixed failing test case

* Fixed Ms-sql plugin test failure
2021-06-10 13:55:56 +05:30
Paul Li
e2168f70d8 Merge branch 'release' into feature/1726-iframe-widget 2021-06-10 04:18:56 -04:00
Rishabh Saxena
9c75596957
Init notifications (#4839) 2021-06-09 20:02:17 +05:30
akash-codemonk
6996e6eab4
Feature: Show entity dependencies in debugger (#4356) 2021-06-09 18:15:41 +05:30
Rishabh Saxena
07a292328a
Comments feature fixes (#4738) 2021-06-09 16:05:10 +05:30
Paul Li
a54b0ffc16 Merge branch 'release' into feature/2111-toggle-header-options 2021-06-09 06:19:41 -04:00
Paul Li
8cef35cecf FEATURE-2111 : Show/Hide Table Controls
-- Add a migration for the header options visibilities
2021-06-09 06:16:48 -04:00
Paul Li
a5cdf32590 FEATURE-1726 : iframe widget
-- Scaffold the widget
-- Bind properties
2021-06-09 05:39:17 -04:00
Somangshu Goswami
ebacb9e11d
Merge pull request #4844 from appsmithorg/FIX/3899-typeerror-in-custom-chart
FIX #3899 : added supported custom chart types list, validate chart t…
2021-06-08 18:12:00 +05:30
Somangshu Goswami
d37c7a97a4
Merge pull request #4834 from appsmithorg/feature/modal-onClose
added onclose property and handlers on ModalWidget
2021-06-08 12:43:50 +05:30
Tolulope Adetula
210e65a668 Merge branch 'release' into fix/dropdown-overlap-modal 2021-06-07 07:28:42 +01:00
Pranav Kanade
42bbc1edf1
[Feature #4903] Show warning text for choosing choosing to leave organisation. (#4915)
* added the isOpen and onClose pros to context menu component

* added a warning shown before letting a user leave org

* added confirmation modal for removing members from table

* Added warning modal to be showing on member deletion

* updated cypress tests

* fixed typo

* removed log
2021-06-04 16:26:58 +05:30
somangshu
d794cbbef9 Merge branch 'release' into fix/dropdown-overlap-modal 2021-06-03 11:53:31 +05:30
Kaushik Varanasi
3a6da2d797
Feature/import applications (#4483)
* Added export option to app menu. TODO: call api to download app file

* Added checkbox component and removed unused code

* Added import app without filepicker. Opens modal

* added ability to fetch the exported app

* can download exported application as a json file

* Updated the file picker component to accept other file formats

* WIP import app

* Added functionality to import application json file

* minor fixes

* Made the file type prop mandatory for file picker

* added a test suite for export app

* Test added to check if on import application click, it open a modal

* added a dummy application file for cypress testing

* Added end to end integration test suite
to verify import app feature

* added test to verify the export api status and download file.

* added a linked btn to carry exporting.
- according to latest BE changes

* Removed old redux and saga mechanism for app export

* updated cypress test to validate new flow

* fixed minor linting errors

* updated test case title

* updated the test cases for import/export app feat

* review changes

* added prop to facilitate delayed upload

* added new application file to fixtures. Minor fix to take care of loading state.

* Removed export app modal. Added one click action, to download the file.

* Updated File picker to work with all other files acc to the design.

* Updated the import modal

* updated the import application test

* Added remove upload tooltip

* updated the icons for import/export actions

* removed unused logs

* added hard coded feature flag to hide/show import export feature

Co-authored-by: Pranav Kanade <pranav@appsmith.com>
2021-06-03 11:48:08 +05:30
Nayan
78915301e3
[Issue #4572]-Allow users to leave an organization (#4634)
* [Issue #4572]-Added API to leave organisation by any user

[Issue #4572]-Add option for organization admins to leave an organization

* -add option to leave organization in frontend for non-admin users

* -updated the leave org endpoint path and HTTP method as per PR review

* Update app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserOrganizationServiceImpl.java

Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>

* Update app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserOrganizationServiceImpl.java

Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>

* -add cypress test and some minor changes as per PR comment

Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2021-06-02 15:56:22 +06:00
Yash
23bfcc706d FIX #3899 : added supported custom chart types list, validate chart type and fix type error by fusioncharts 2021-06-01 20:27:58 +05:30
Somangshu Goswami
771cf4a34f
Merge pull request #4805 from appsmithorg/fix/table-pagesize-migrations
Fix for pageSize calculation in table widget
2021-06-01 16:44:23 +05:30
bhavin
53598e8027 added onclose property and handlers on ModalWidget 2021-06-01 14:50:13 +05:30
Tolulope Adetula
59738c5019 Merge branch 'release' into fix/dropdown-overlap-modal 2021-06-01 07:11:52 +01:00
Hetu Nandu
ae28731947
Enable smart substitution for widgets (#4801) 2021-06-01 10:29:45 +05:30