* 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>
* refactor admin settings feature
* separated save-restart bar to separate component
* created new CE dir to facilitate code split
* created separate ee dir and exporting everything we have in ce file.
* little mod
* minor fix
* splitting settings types config
* using object literals for category types instead of enums
* CE: support use of component for each category
* minor style fix
* authentication page UI changes implemented
* github signup doc url added back
* removed comments
* routing updates
* made subcategories listing in left pane optional
* added muted saml to auth listing
* added breadcrumbs and enabled button
* created separate component for auth page and auth config
* added callout and disconnect components
* updated breadcrumbs component
* minor updates to common components
* updated warning callout and added icon
* ce: test cases fixed
* updated test file name
* warning banner callout added on auth page
* updated callout banner for form login
* CE: Split config files
* CE: moved the window declaration in EE file as its dependency will be updated in EE
* CE: Splitting ApiConstants and SocialLogin constants
* CE: split login page
* CE: moved getSocialLoginButtonProps func to EE file as it's dependencies will be updated in EE
* added key icon
* CE: created a factory class to share social auths list
* Minor style fix for social btns
* Updated the third party auth styles
* Small fixes to styling
* ce: splitting forms constants
* breadcrumbs implemented for all pages in admin settings
* Settings breadcrumbs separated
* splitted settings breadcrumbs between ce and ee
* renamed default import
* minor style fix
* added login form config.
* updated login/signup pages to use form login disabled config
* removed common functionality outside
* implemented breadcrumb component from scratch without using blueprint
* removed unwanted code
* Small style update
* updated breadcrumb categories file name and breadcrumb icon
* added cypress tests for admin settings auth page
* added comments
* update locator for upgrade button
* added link for intercom on upgrade button
* removed unnecessary file
* minor style fix
* style fix for auth option cards
* split messages constant
* fixed imports for message constants splitting.
* added message constants
* updated unit test cases
* fixed messages import in cypress index
* fixed messages import again, cypress fails to read re-exported objs.
* added OIDC auth method on authentication page
* updated import statements from ee to @appsmith
* removed dead code
* updated read more link UI
* PR comments fixes
* some UI fixes
* used color and fonts from theme
* fixed some imports
* fixed some imports
* removed warning imports
* updated OIDC logo and auth method desc copies
* css changes
* css changes
* css changes
* updated cypress test for breadcrumb
* moved callout component to ads as calloutv2
* UI changes for form fields
* updated css for spacing between form fields
* added sub-text on auth pages
* added active class for breadcrumb item
* added config for disable signup toggle and fixed UI issues of restart banner
* fixed admin settings page bugs
* assigned true as default state for signup
* fixed messages import statements
* updated code for PR comments related suggestions
* reverted file path change in cypress support
* updated cypress test
* updated cypress test
Co-authored-by: Ankita Kinger <ankita@appsmith.com>
* added config to support code split
* splitting config
* moved the window declaration in EE file as its dependency will be updated in EE
* CE: Splitting ApiConstants and SocialLogin constants
* CE: split login page
* CE: moved getSocialLoginButtonProps func to EE file as it's dependencies will be updated in EE
* added key icon
* CE: created a factory class to share social auths list
* Minor style fix for social btns
* Updated the third party auth styles
* updated jest config
* updated third party login registry class
* updated product modal and invite user or application modal style
* added constant of invite button width
* added cypress on close button on update product modal
Co-authored-by: Albin <albin@appsmith.com>
* Added hover state to the black Launch button on Applications Page.
The black button didn't exhibit hover changes while the orange Edit button did
because the Button base component made the buttons darker, and the launch button
was already dark.
Custom CSS was included in Applications.tsx for hover state background-color
change.
* Fix: Added hover state to Launch button on Applications page
default: black background, white text
hover: transparent background, black text and border
* replaced harcoded colors with src/constants/Colors.tsx properties
* will show last saved app name if save app name action results in error
* handled duplicate appname update for editing cards
* fixed the app icon update bug
* updated list widget dsl
* Added permission export:applications for admin role
* Only admins are allowed to export applications
Co-authored-by: Pranav Kanade <pranav@appsmith.com>
* 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
* 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>
* [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>
* added basic function structure for creating organization
* added functionality for automatically creating an organization with 'Untitled organization 1' like applications. Need to add tests.
* added test for creating organizations with default names
* added tests for creating org with default name
* updated jest tests to not fill in the organization form
* remove unused imports
* deleted unnused files
* added more test to check invite users to application and check that the create application is visible
* updated share application tests according to the new workflow
* fix failing tests. TODO: fix tests with renameRandomOrg to rename specific org
* remove rename random org and rename specific orgs
* remove blocking code so the element can be scrolled into view
* fix tests
* try to fix flaky tests
* remove unused
* remove create organization tests as we are testing these components elsewhere
* fix failing tests by stubbing create org response
* update tests according to new workflow
* create basic button for forking
* added menu item for fork, opens a basic modal. TODO: Add functionality to fork
* clicking fork app enables organization select and forks across applications
* added close modal functionality. TODO: add tests, optimise code, remove duplicate and use exportswhere possible
* removed unused code
* Added cypress tests to check that fork app creates an app with same dsl. Tests Failing, needs fixing
* tests fixed, but needs unexpected login from cy
* Resolved bug with login by using correct cypress selectors
* Added tests to check that dsls match, added documentation and removed unused code
* remove unused fork function and directly dispatch from modal
* refactor code
* revert
* removed unused code and refactored tests
* feature/fork-apps-across-orgs-refactor
* make code prettier
* renamed components correctly
* refactored modal code into single file. TODO: fix warnings, test and remove unused code
* pass setModalClose to dialog component to maintain global modal state
* Added types for fork modal props
* update tests and remove unused code
* Removed isDeployedApp and instead passed trigger as a prop
* remove console logs and revert imports to small case
* rename files as components
* minor changes
* cleanup
* mock dispatch for jest
* move jest mocks to component tests
- Each column has more options and can be configured in the property pane instead of the table
- Table level styles can now be set in the property pane
- Property sections are collapsible
Co-authored-by: vicky-primathon.in <vicky.bansal@primathon.in>
Co-authored-by: nandan.anantharamu <nandan.anantharamu@thoughtspot.com>
Co-authored-by: Abhinav Jha <abhinav@appsmith.com>
Co-authored-by: hetunandu <hetu@appsmith.com>
* WIP: Performance improvements in entity explorer
* WIP: Achieve feature parity for entity explorer with release
* Update unit tests
* Add sentry profiling to current page entity properties component
* Fix page add/delete not showing up on entity explorer issue. Update memoization logic for pagegroup entity
* Deal with the ban-ts-ignore eslint issues
* Update unit tests
* Fix widget entity children visibility
* Fix tests and code
* Fix tests for scenarios where the collapsed entities are unmount, as this is a part of the performance optimization
* Filter undefined children when generating structureDSL
* Remove rule from eslintrc
Consolidate createPage test command
* Update CreatePage tests to remove redundant dsl updates
* Revert CreatePage test changes, as adding more checks within this command globally causes other tests to have issues.
* re-enable eslint rule, as without it CI tests fail
* Revert to ban-ts-comment
* Fix typescript ban-ts-ignore issue by upgrading react-scripts and fixing typescript issue across the application
* Typescript errors handled
Co-authored-by: vicky-primathon.in <vicky.bansal@primathon.in>
* EditableTextWrapper component implemented
* create new app flow implemented
* test cases for new create new app flow fixed
* role update element fixed
* before-all hooks fixed
* createOrg test cases fixed
* loading state test added
* editableText input unique identifier added in test-cases
* updateApplication API alias name corrected
* removed the second className prop on same component
* PR feedback implemented
* create new app flow
* uncontrolled component error fixed
* loader added when user is deleting or user role is updating
* home page loader and create-new-app loader added
* user role changing and use deleting state fixed
* PR feeback changes added
* orgname loader added
* warnings removed
* fixed create-new-app flow and delete app test cases
* beforeAll test case condition fixed
* Initial navigation condition fixed in createOrg test cases
* app card loading state fixed
* light and dark mode added in Invite modal
* warnings removed
* create org and invite user test cases fixed
* Application invite design implemented
* manage user icon added
* button width fixed
* PR feedback implemented
* test cases fixed
* used blueprint classes
* used calc for width distribution
* copy button width fixed
* prop passing fixed
* copy button size reduced
* readonly input field background color fixed
* input background theme name ordering changed
* TagInputComponent moved to ads
* created DropdownWrapper for select field in orgInviteForm
* Warnings created due to unique key and depdencies is fixed
* Warning fixed in dropdown component
* correct prop name used
Co-authored-by: Rohit Kumawat <rohit.kumawat@primathon.in>
* Fix for long org names on side menu.
Now ellipsizes with tooltip if Orgname is over the value set in ellipsize prop. Otherwise functions as before.
* added ellipsize prop to index. Fixes#735
20 seems to be a good value that stop org names running onto next line. Tested on Firefox and chrome. Linux debian stretch.
Co-authored-by: root <root@rutabaga.groudon>
* variables defined in light and dark constants in theme.
* warning message removed
* Fixing create app btn click opening form
* blackShades removed and icon color in application card fixed
* state change fixed
* type of light and dark constants added
Co-authored-by: Satbir Singh <satbir121@gmail.com>
* Updating homepage body color
* WIP: Fixing scrolls and adding anchors
* Removing divider from bottom of the page.
* Adding hover background color to app card
* Changing edit and launch icons.
* Fixing app name paddding in card.
* Fixing workspaces overflow
* Adding right padding to applications view
* Adding share icon to share btn
* Fixing Application card styles.
* Fixing text decoration in button.
* Adding new workspace button
* Fixing new workspace and new app styles.
* Adding icon sizes.
* Fixing Org Name and Org settings menu.
* Application menu working
* Fixing overlay visibility on app card
* Fixing settings page content width.
* Fixing workspace icon
* Changing app card colors.
* Removing debugger
* Adding app icon.
* Fixing the spaces in application card
* Adding storybook-static folder to gitignore.
* Adding other storybook files.
* Adding menu items for app
* Removing cypress selector from text.
* Menu width issue fixed
* Default app icon color added
* Removing hardcoded colors
* Removing hardcoded colors.
* Light Mode on!
* Showing correct icon and color in menu
* Update color working properly.
* Updating appIcon
* Editable text working.
* Adding validator
* Adding edit permissions to menu
* Removing box shadow on app card.
* Fixing context menu fill color
* Fixing Menu hover issues.
* Fixing menu open close hover issues.
* Fixing settings pages
* Changed Workspace to org.
* Fix: State management in EditableText Component (#540)
* Error state height is fixed as per design
* savingState prop condition fixed
* Fixing createnew.
* Fixing saving state for application card.
* Fixed application card editable text error.
* Fixing issue caused during merge.
* Fixing tests in create org.
* Removing commented code.
* Removing unwanted vars.
* Fixing delete duplicate tests.
* Latest color palette.
* Fixing form and table widget.
* Removing switcher from header
* Removing unused files
* Fixing app card context dropdown
* Show overlay fix
* Adding localStorage support to theme.
* Making dark mode the default.
Co-authored-by: Rohit Kumawat <rohit.kumawat@primathon.in>
* removed duplicate user object
removed id field which is never populated
added help modal in applications page and intercom to load in help modal
shutdown intercom on signout to clear existing chats
* added analytics to help modal and invite user
unescaped bindings before evaluation to prune newlines
* updated action confirmation text
* added a check to ignore old properties which are no longer dynamic
* fixed test case
* fix tests
Co-authored-by: Nikhil Nandagopal <nikhil@appsmith.com>
Co-authored-by: Hetu Nandu <hetunandu@gmail.com>
removed id field which is never populated
added help modal in applications page and intercom to load in help modal
shutdown intercom on signout to clear existing chats
Co-authored-by: Nikhil Nandagopal <nikhil@appsmith.com>
* Members and org settings page.
* Adding link back to applications
* Making UI look better.
* Fixing some more css
* Table dropdown onBlur, UI transparency, Popover issue fixed. Added sort arrow (#413)
* table dropdown ui issue and onblur click fixed
* position props value fixed
* tabs tripple click fixed
* Position props in table dropdown made optional
* tabs background color bug removed
* General settings page is bug free.
* Getting the manage users page to work.
* Moving general settings into its own file.
* Removing some unwanted URLs
* User cant change their role or remove themselves
* Changing onClick prop for Icon.
* Fixing tests
* Added loading states to text inputs.
* Added validators for text input
* Fixed border of skeleton for text input
* Adding a loader for Members screen
* Adding Noop to icon button
* Removing console.log
* Fixing imports.
* Moving org reducer to immer.
* Using utils email validator.
* Removing placeholder from text input props.
Co-authored-by: devrk96 <rohit.kumawat@primathon.in>
* fix: restructure code and show content based on permission
- Restructure Invite user forms into separate App and Org forms
- Show Modal content based on permissions.
* update: Permission handling.
* fix: Modify permission handling
* fix: check manage permission for manage users btn and show copy to clipboard always.
* Dummy commit to run the tests
* Fix: Test cases
* Another dummy commit to run the tests
Co-authored-by: Trisha Anand <trisha@appsmith.com>
* Fix UI Bugs
- Double search box width and change text to Search app name
- Half the space between the org icon and the org name on home page
- Make org name bold and increase font to 16px
- Remove manage users button from invite modal if modal is opened in organisation settings page
* fix: Review Comments and other minor changes
- Clear TagList on form submit
- Fix CSS for search widget width
- Fix table height
- Make org name text bold for admin access.
* fix: Test Cases
* feat: Add org share option to application share modal
* fix: Update design and implement copy to clipboard
* fix: Show share based on permission and update modal UI
- Update modal style
- show application share button only to admins.
* fix: refine code
* Added Button component in Table widget for actions
* Action button state loading added for Table widget
* Action button font-weight made as normal
* Table button loading state fixed. Table code refactored, rendering from props instead of state in ReactTableComponent
* Table widget action button alignment fixed
* Handled actions column changes
* added proper keys to useMemo for react table widget
* Code refactors and added dependency map with meta props and table data for computing columns
* Table UI breakages on scroll and empty cells fixed
* Handled empty rows in table widget
* Fixed last row cut issue
* Code review changes
* Added table widget component heights as enum
Co-authored-by: Arpit Mohan <me@arpitmohan.com>
* Feat: Implement page not found UI
* fix: check user login status and minor code refactoring
- Check if user is logged in or not in page header.
- Based on login status show relevant CTAs
- Fix ESLint errors
- Move RoleNameCell and DeleteActionCell as seperate components.
* fix: Add catch all for pagenotfound
* fix: Use constants and update css syntax.
Co-authored-by: Arpit Mohan <me@arpitmohan.com>
- Use manage:organizations permission to restrict users from managing apps
- Add loading indicators will changing role and deleting users
- Restrict user from deleting himself or changing his role.
- show organization title in invite form
- show form when clicking on share in dropdown
- show org name in org settings page
- remove the deleted application from the UI when delete is successful
- fix role update in user list table
- add ellipsis for the application title
- align org name, list of applications
- increase font size of org name
- increase size of create application icon
- add name for create application card
- remove create application button
- add ellipsis for the application title
- align org name, list of applications
- increase font size of org name
- increase size of create application icon
- add name for create application card
- remove create application button
- add ellipsis for the application title
- align org name, list of applications
- increase font size of org name
- increase size of create application icon
- add name for create application card
- remove create application button