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 10:33:51 +00:00
|
|
|
import React, { useCallback, useMemo, useState } from "react";
|
|
|
|
|
import Icon, { IconSize, IconName } from "components/ads/Icon";
|
|
|
|
|
import styled from "styled-components";
|
|
|
|
|
import {
|
|
|
|
|
PIN_COMMENT,
|
|
|
|
|
COPY_LINK,
|
|
|
|
|
DELETE_COMMENT,
|
|
|
|
|
createMessage,
|
|
|
|
|
} from "constants/messages";
|
|
|
|
|
import { noop } from "lodash";
|
|
|
|
|
|
|
|
|
|
import "@blueprintjs/popover2/lib/css/blueprint-popover2.css";
|
|
|
|
|
|
|
|
|
|
import { Popover2 } from "@blueprintjs/popover2";
|
|
|
|
|
|
|
|
|
|
// render over popover portals
|
|
|
|
|
const Container = styled.div`
|
|
|
|
|
z-index: 11;
|
|
|
|
|
`;
|
|
|
|
|
|
|
|
|
|
const MenuItem = styled.div`
|
|
|
|
|
display: flex;
|
|
|
|
|
width: 180px;
|
|
|
|
|
cursor: pointer;
|
|
|
|
|
&:hover {
|
|
|
|
|
background-color: ${(props) =>
|
|
|
|
|
props.theme.colors.comments.contextMenuItemHover};
|
|
|
|
|
}
|
|
|
|
|
`;
|
|
|
|
|
|
|
|
|
|
const StyledIcon = styled(Icon)`
|
|
|
|
|
&& path {
|
|
|
|
|
stroke: ${(props) => props.theme.colors.comments.contextMenuIcon};
|
|
|
|
|
fill: ${(props) => props.theme.colors.comments.contextMenuIcon};
|
|
|
|
|
}
|
|
|
|
|
${MenuItem}:hover & path {
|
|
|
|
|
stroke: ${(props) =>
|
|
|
|
|
props.theme.colors.comments.contextMenuIconStrokeHover};
|
|
|
|
|
}
|
|
|
|
|
`;
|
|
|
|
|
|
|
|
|
|
const MenuIcon = styled.div`
|
|
|
|
|
padding: ${(props) =>
|
|
|
|
|
`${props.theme.spaces[4]}px ${props.theme.spaces[5]}px`};
|
|
|
|
|
`;
|
|
|
|
|
|
|
|
|
|
const MenuTitle = styled.div`
|
|
|
|
|
padding: ${(props) => props.theme.spaces[4]}px 0px;
|
|
|
|
|
color: ${(props) => props.theme.colors.comments.contextMenuTitle};
|
|
|
|
|
${MenuItem}:hover & {
|
|
|
|
|
color: ${(props) => props.theme.colors.comments.contextMenuTitleHover};
|
|
|
|
|
}
|
|
|
|
|
`;
|
|
|
|
|
|
|
|
|
|
type Props = {
|
|
|
|
|
pin: typeof noop;
|
|
|
|
|
copyCommentLink: typeof noop;
|
|
|
|
|
deleteComment: typeof noop;
|
|
|
|
|
};
|
|
|
|
|
|
2021-05-13 08:35:39 +00:00
|
|
|
function CommentContextMenu({ copyCommentLink, deleteComment, pin }: Props) {
|
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 10:33:51 +00:00
|
|
|
const [isOpen, setIsOpen] = useState(false);
|
|
|
|
|
|
|
|
|
|
const options = useMemo(
|
|
|
|
|
() => [
|
|
|
|
|
{
|
|
|
|
|
icon: "pin-2",
|
|
|
|
|
display: createMessage(PIN_COMMENT),
|
|
|
|
|
onClick: pin,
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
icon: "link-2",
|
|
|
|
|
display: createMessage(COPY_LINK),
|
|
|
|
|
onClick: copyCommentLink,
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
icon: "trash",
|
|
|
|
|
display: createMessage(DELETE_COMMENT),
|
|
|
|
|
onClick: deleteComment,
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
[],
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
const handleInteraction = useCallback((isOpen) => {
|
|
|
|
|
setIsOpen(isOpen);
|
|
|
|
|
}, []);
|
|
|
|
|
|
|
|
|
|
const handleClick = useCallback((option) => {
|
|
|
|
|
setIsOpen(false);
|
|
|
|
|
option.onClick();
|
|
|
|
|
}, []);
|
|
|
|
|
|
|
|
|
|
return (
|
|
|
|
|
<Popover2
|
|
|
|
|
content={
|
|
|
|
|
<Container>
|
|
|
|
|
{options.map((option) => (
|
|
|
|
|
<MenuItem key={option.icon} onClick={() => handleClick(option)}>
|
|
|
|
|
<MenuIcon>
|
|
|
|
|
<StyledIcon name={option.icon as IconName} size={IconSize.XL} />
|
|
|
|
|
</MenuIcon>
|
|
|
|
|
<MenuTitle>{option.display}</MenuTitle>
|
|
|
|
|
</MenuItem>
|
|
|
|
|
))}
|
|
|
|
|
</Container>
|
|
|
|
|
}
|
|
|
|
|
isOpen={isOpen}
|
|
|
|
|
minimal
|
|
|
|
|
onInteraction={handleInteraction}
|
|
|
|
|
placement={"bottom-end"}
|
|
|
|
|
portalClassName="comment-context-menu"
|
|
|
|
|
>
|
|
|
|
|
<StyledIcon name="context-menu" size={IconSize.LARGE} />
|
|
|
|
|
</Popover2>
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
export default CommentContextMenu;
|