Commit Graph

36 Commits

Author SHA1 Message Date
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
Pawan Kumar
065cb0e1ba
chore: code split for hiding branding badge (#14346)
* code split for hiding branding badge

* use selectors in branding badge
2022-06-08 15:11:53 +05:30
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
3b7653e3d9 updated position of comment pin along with container property 2022-03-25 17:11:23 +08:00
haojin111
e4148821f6 fixed position issue of comment on canvas 2022-03-24 17:27:01 +08:00
Ankita Kinger
c29c2f745e
fix: Comment icon gets hidden behind tabs on Tab widget (#11019)
* fix for z-index issue on comments icon

* css changes

* fixed failing cypress tests
2022-02-12 08:28:13 +05:30
Pranav Kanade
b778b83ac4
refactor: admin settings (#9906)
* 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>
2022-02-11 23:38:46 +05:30
Pranav Kanade
82cbf718d0
refactor: code splitting to support third party sso/oidc in EE (#10201)
* 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
2022-01-07 11:38:17 +05:30
Pranav Kanade
bffe28361a
fix: Show invite option for substring user emails of other shared users (#8962)
* show invitation option for overlapping email addr string if no exact match is found.

* added test case

Co-authored-by: Arpit Mohan <arpit@appsmith.com>
2021-11-22 10:33:43 +05:30
Rishabh Saxena
e944d005c1
fix: fixes related to switch branches (#8864) 2021-11-02 07:33:12 +00:00
Pranav Kanade
23078215df
fix: unread indicator behaviour (#8290)
* fix: unread indicator behaviour

* minor fixes

* no need to deep copy the state

* removed state update of show indicator

* refactor to handle delete & insert thread cases and getting rid of unnecessary state

* removing unnecessary updates to store

* with update event if the thread is not there we'll put it in

* fetching the comments when user starts to edit the app

* updated tests

* typo fixed

* using memo to get the unread comments flag

* removed dependency from global state

* storing last updated comment thread id for each application.

* updated a few test cases
2021-10-19 15:56:56 +05:30
Pranav Kanade
ab450e5cb9
fix: add support for self tagging (#7715)
* removed current user filtering for getting tagging suggestions in comment input.

* using map instead of for
2021-09-23 11:03:22 +05:30
Rishabh Saxena
594e0ef2e1
fix: ui polish comments (#7273) 2021-09-10 10:37:17 +05:30
Rishabh Saxena
b61be1eb66
fix: persist draft comments on clicking outside (#7156) 2021-09-07 20:53:40 +05:30
Pranav Kanade
b1a399b64a
fix: comment pins related issues (#7081)
* fix: the thread with the latest comment will be at the top.

* fixed the z index of unpublished pin

* making the layout control absolute

* removed comments

* reversed the ids order

* made sorting logic generic to work with list of ids

* minor refactor

* putting layout controller on top of canvas
2021-09-06 14:27:47 +05:30
Pranav Kanade
7ba60bdaff
fix: link for resolved comment does not show a comment thread (#7001)
* minor fix to show empty app banner in the middle of the screen

* enforce the resolved comments filter, when user tries to open resolved comment directly through shared link

* minor fix: changed var name

* small fix to properly show the comment card action btns

* fix: if thread not present will show a warning
2021-08-31 19:56:43 +05:30
Pranav Kanade
a1ba69adfc
feat: draggable comment pins (#6742)
* made inline comment pins draggable and added wrapper around overlay comments wrapper

* moved drag hook to pin

* can drag on canvas

* Properly updating the thread to be able to properly move the pin

* always passing the ref to container

* updating BE to save the new pins position

* minor fix

* changed a file name

* minor improvement to fix unit test

* fix, updated dragging reducer function to not expect appId

* removing unrelated change

* added drag and drop for comment pins without react dnd

* updated unit tests

* minor fix

* added a grab pointer and minor offset when user moves the pin

* removed unnecessary store states

* moved drop from onDragEnd to onDrop to reset everything.

* using state selector and dispatch hook

* removed use of anchor widget

* removed pointer change from comments wrapper

* verifying if current pin is being dragged

* updated action creator name

* moved dragging in comments reducer.

* using dragging thread id from store itself

* using relative positioning of pointer to predict the location of pin

* unit test cases fixed

* minor fix

* removed the dependency of off set from callback
2021-08-27 14:27:18 +05:30
Rishabh Saxena
1f1e70f473
[Fix] Minor comments feature fixes (#6490)
* Fix skip btn

* update sorting for mentions list
2021-08-10 12:05:08 +06:00
Rishabh Saxena
61820cc180
[Fix] Focus the comment thread when opened after dismissing (#6437) 2021-08-06 12:18:58 +00:00
Rishabh Saxena
d6c10b75f8
Update permission check for determining a user with dev access for comments intro (#6431) 2021-08-06 15:23:05 +05:30
Rishabh Saxena
e4255f6773
Minor fixes for comments on the modal widget (#6368) 2021-08-06 14:47:56 +05:30
Rishabh Saxena
ea5603920e
Cypress tests for commenting feature (#5505) 2021-08-06 14:47:02 +05:30
Rishabh Saxena
eb55385bc6
Fix jest test for comments by overriding isCommentMode selector (#6027) 2021-08-05 22:16:38 +05:30
Rishabh Saxena
6ee28950be
Minor comments feature fixes (#6245) 2021-08-02 12:57:20 +05:30
Pranav Kanade
109039c342
[Feature] Keep the scroll position into a widget when user switches to comment mode (#6132)
* updated the comment overlay to avoid widget re-rendering when user switches to comment mode

* removed duplicate code.
2021-07-26 18:43:20 +05:30
Rishabh Saxena
745927ffef
Set focused comment based on url and visible thread id (#5992) 2021-07-20 15:44:35 +05:30
Rishabh Saxena
25a6fd2240
Fixes related to the comments feature (#5904) 2021-07-19 20:58:41 +05:30
Rishabh Saxena
8f7165b5fe
Update comments onboarding tour (#5903) 2021-07-16 14:01:26 +05:30
Rishabh Saxena
b24dd8f8b2
Minor collab fixes (#5271) 2021-06-24 14:34:27 +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
07a292328a
Comments feature fixes (#4738) 2021-06-09 16:05:10 +05:30
Rishabh Saxena
9f76218306
Trigger invite flow via comments (#4602) 2021-05-27 11:51:36 +05:30
Rishabh Saxena
8964aea9df
[Feature] Comments feature updates (#4579) 2021-05-20 17:33:08 +05:30
Satish Gandham
8ad7eecdeb - Auto fix sort ddestructured props rule 2021-05-13 14:05:39 +05:30
Rishabh Saxena
a0d2e8533d
Initialise comments (#3328)
* Initial scaffolding for comments CRUD APIs

* add actions

* add assets

* state management for existing comments and creating new

* add ui components

* add overlay comments wrapper to baseWidget

* add toggle comment mode button at editor header

* trigger tests

* Disallow commenting as someone else

* Add applicationId for comments

* lint

* Add overlay blacklist to prevent component interaction while adding comments

* Comment thread style updates

* Placeholder comment context menu

* Controlled comment thread visibility for making new comments visible by default

* Update comment type description

* Reset input on save

* Resolve comment thread button ui

* fix close on esc key, dont create new comment on outside click

* Submit on enter

* add emoji picker

* Attempt at adding a websocket server in Java

* CRUD APIs for comment threads

* Add API for getting all threads in application

* Move types to a separate file

* Initial commit for real time server (RTS)

* Add script to start RTS

* Fix position property

* Use create comment thread API

* Use add comment to thread API

* Add custom cursor

* Dispatch logout init on 401 errors

* Allow CORS for real time connection

* Add more logs to RTS

* Fix construction of MongoClient

* WIP: Real time comments

* Enable comments

* Minor updates

* Read backend API base URL from environment

* Escape to reset comments mode

* Set popover position as auto and boundary as scroll parent

* Disable warning

* Added permissions for comment threads

* Add resolved API for comment threads

* Migration to set commenting permission on existing apps

* Fix updates bringing the RTS down

* Show view latest button, scroll to bottom on creating a new comment

* Cleanup comment reducer

* Move to typescript for RTS

* Add missing server.ts and tsconfig files

* Resolve / unresolve comment

* Scaffold app comments

* Minor fixes: comment on top of all widgets, add toggle button at viewer header

* Reconnect socket on creating a new app, set connected status in store

* Retry socket connection flow

* Integration tests for comments with api mocks using msw

* Fix circular depependency

* rm file

* Minor cleanup and comments

* Minor refactors: move isScrolledToBottom to common hooks, decouple prevent interactions overlay from comments wrapper

* Use policies when pushing updates in RTS

* ENV var to set if comments are enabled

* Fix: check if editor/viewer is initialised before waiting for init action

* Add tests for comments reducer

* Revert "ENV var to set if comments are enabled"

This reverts commit 988efeaa69d378d943a387e1e73510334958adc5.

* Enable comments for users with appsmith email

* lint

* fix

* Try running a socket.io server inside backend

* Update comment reducer tests

* Init mentions within comments

* Fix comment thread updates with email rooms

* Minor fixes

* Refactors / review suggestions

* lint

* increase cache limit for builds

* Comment out tests for feature that's under development

* Add Dockerfile for RTS

* Fix policies missing for first comment in threads

* Use draftJS for comments input with mentions support

* fix fixtures

* Use thread's policies when querying for threads

* Update socket.io to v4

* Add support for richer body with mentions

* Update comment body type to RawDraftContentState

* fix stale method

* Fix mentions search

* Minor cleanups

* Comment context menu and thread UI updates

* revert: Scaffold app comments

* Yarn dependencies

* Delete comment using id api added

* Init app comments

* Add test for creating thread

* Api for delete comment with id

* Test comment creation response and policies

* Copy comment links

* Fix reset editor state

* Delete valid comment testcase added

* Delete comment TC : code refactor

* Don't allow creating comments with an empty body

* Pin comments WIP[]

* Ignore dependency-reduced-pom.xml files from VCS

* Cleanup of some dev-only files, for review

* Delete comment

* Update socket.io to v4 in RTS

* Pin and resolve comment thread object added in commentThread

* Pin and resolve comment thread object added in commentThread

* Update comment thread API

* Added creationTime and updationTime in comment thread response

* Added creationTime and updationTime in comment thread response

* Added human readable id to comment threads, fallback to username for null name in user document

* Refactor

* lint

* fix test, rm duplicate selector

* comment out saga used for dev

* CommentThread viewed status, username fallback for getName=null, username field added in pin & resolve status

* lint

* trigger tests

Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
Co-authored-by: Abhijeet <abhi.nagarnaik@gmail.com>
2021-04-29 16:03:51 +05:30