* WIP - got one API test to pass yay * adds group update endpoint * added group policies * adds groups.list API * adds groups.info * remove comment * WIP * tests for delete * adds group membership list * adds tests for groups list * add and remove user endpoints for group * ask some questions * fix up some issues around primary keys * remove export from group permissions Co-Authored-By: Tom Moor <tom.moor@gmail.com> * remove random file * only create events on actual updates, add tests to ensure * adds uniqueness validation to group name * throw validation errors on model and let it pass through the controller * fix linting * WIP * WIP * WIP * WIP * WIP basic edit and delete * basic CRUD for groups and memberships in place * got member counts working * add member count and limit the number of users sent over teh wire to 6 * factor avatar with AvatarWithPresence into its own class * wip * WIP avatars in group lists * WIP collection groups * add and remove group endpoints * wip add collection groups * wip get group adding to collections to work * wip get updating collection group memberships to work * wip get new group modal working * add tests for collection index * include collection groups in the withmemberships scope * tie permissions to group memberships * remove unused import * Update app/components/GroupListItem.js update title copy Co-Authored-By: Tom Moor <tom.moor@gmail.com> * Update server/migrations/20191211044318-create-groups.js Co-Authored-By: Tom Moor <tom.moor@gmail.com> * Update server/api/groups.js Co-Authored-By: Tom Moor <tom.moor@gmail.com> * Update server/api/groups.js Co-Authored-By: Tom Moor <tom.moor@gmail.com> * Update app/menus/CollectionMenu.js Co-Authored-By: Tom Moor <tom.moor@gmail.com> * Update server/models/Group.js Co-Authored-By: Tom Moor <tom.moor@gmail.com> * minor fixes * Update app/scenes/CollectionMembers/AddGroupsToCollection.js Co-Authored-By: Tom Moor <tom.moor@gmail.com> * Update app/menus/GroupMenu.js Co-Authored-By: Tom Moor <tom.moor@gmail.com> * Update app/menus/GroupMenu.js Co-Authored-By: Tom Moor <tom.moor@gmail.com> * Update app/menus/GroupMenu.js Co-Authored-By: Tom Moor <tom.moor@gmail.com> * Update app/scenes/Collection.js Co-Authored-By: Tom Moor <tom.moor@gmail.com> * Update app/scenes/CollectionMembers/CollectionMembers.js Co-Authored-By: Tom Moor <tom.moor@gmail.com> * Update app/scenes/GroupNew.js Co-Authored-By: Tom Moor <tom.moor@gmail.com> * Update app/scenes/GroupNew.js Co-Authored-By: Tom Moor <tom.moor@gmail.com> * Update app/scenes/Settings/Groups.js Co-Authored-By: Tom Moor <tom.moor@gmail.com> * Update server/api/documents.js Co-Authored-By: Tom Moor <tom.moor@gmail.com> * Update app/scenes/CollectionMembers/components/CollectionGroupMemberListItem.js Co-Authored-By: Tom Moor <tom.moor@gmail.com> * address comments * WIP - getting websocket stuff up and running * socket event for group deletion * wrapped up cascading deletes * lint * flow * fix: UI feedback * fix: Facepile size * fix: Lots of missing await's * Allow clicking facepile on group list item to open members * remove unused route push, grammar * fix: Remove bad analytics events feat: Add group events to audit log * collection. -> collections. * Add groups to entity websocket events (sync create/update/delete) between clients * fix: Users should not be able to see groups they are not a member of * fix: Not caching errors in UI when changing group memberships * fix: Hide unusable UI * test * fix: Tweak language * feat: Automatically open 'add member' modal after creating group Co-authored-by: Tom Moor <tom.moor@gmail.com>
170 lines
3.4 KiB
JavaScript
170 lines
3.4 KiB
JavaScript
// @flow
|
|
import * as React from 'react';
|
|
import { observer } from 'mobx-react';
|
|
import styled, { createGlobalStyle } from 'styled-components';
|
|
import breakpoint from 'styled-components-breakpoint';
|
|
import ReactModal from 'react-modal';
|
|
import { transparentize } from 'polished';
|
|
import { CloseIcon, BackIcon } from 'outline-icons';
|
|
import NudeButton from 'components/NudeButton';
|
|
import { fadeAndScaleIn } from 'shared/styles/animations';
|
|
import Flex from 'shared/components/Flex';
|
|
|
|
ReactModal.setAppElement('#root');
|
|
|
|
type Props = {
|
|
children?: React.Node,
|
|
isOpen: boolean,
|
|
title?: string,
|
|
onRequestClose: () => void,
|
|
};
|
|
|
|
const GlobalStyles = createGlobalStyle`
|
|
.ReactModal__Overlay {
|
|
background-color: ${props =>
|
|
transparentize(0.25, props.theme.background)} !important;
|
|
z-index: 100;
|
|
}
|
|
|
|
${breakpoint('tablet')`
|
|
.ReactModalPortal + .ReactModalPortal {
|
|
.ReactModal__Overlay {
|
|
margin-left: 12px;
|
|
box-shadow: 0 -2px 10px ${props => props.theme.shadow};
|
|
border-radius: 8px 0 0 8px;
|
|
overflow: hidden;
|
|
}
|
|
}
|
|
|
|
.ReactModalPortal + .ReactModalPortal + .ReactModalPortal {
|
|
.ReactModal__Overlay {
|
|
margin-left: 24px;
|
|
}
|
|
}
|
|
|
|
.ReactModalPortal + .ReactModalPortal + .ReactModalPortal + .ReactModalPortal {
|
|
.ReactModal__Overlay {
|
|
margin-left: 36px;
|
|
}
|
|
}
|
|
`};
|
|
|
|
.ReactModal__Body--open {
|
|
overflow: hidden;
|
|
}
|
|
`;
|
|
|
|
const Modal = ({
|
|
children,
|
|
isOpen,
|
|
title = 'Untitled',
|
|
onRequestClose,
|
|
...rest
|
|
}: Props) => {
|
|
if (!isOpen) return null;
|
|
|
|
return (
|
|
<React.Fragment>
|
|
<GlobalStyles />
|
|
<StyledModal
|
|
contentLabel={title}
|
|
onRequestClose={onRequestClose}
|
|
isOpen={isOpen}
|
|
{...rest}
|
|
>
|
|
<Content onClick={ev => ev.stopPropagation()} column>
|
|
{title && <h1>{title}</h1>}
|
|
|
|
{children}
|
|
</Content>
|
|
<Back onClick={onRequestClose}>
|
|
<BackIcon size={32} color="currentColor" />
|
|
<Text>Back</Text>
|
|
</Back>
|
|
<Close onClick={onRequestClose}>
|
|
<CloseIcon size={32} color="currentColor" />
|
|
</Close>
|
|
</StyledModal>
|
|
</React.Fragment>
|
|
);
|
|
};
|
|
|
|
const Content = styled(Flex)`
|
|
width: 640px;
|
|
max-width: 100%;
|
|
position: relative;
|
|
`;
|
|
|
|
const StyledModal = styled(ReactModal)`
|
|
animation: ${fadeAndScaleIn} 250ms ease;
|
|
|
|
position: absolute;
|
|
top: 0;
|
|
left: 0;
|
|
bottom: 0;
|
|
right: 0;
|
|
z-index: 100;
|
|
display: flex;
|
|
justify-content: center;
|
|
align-items: flex-start;
|
|
overflow-x: hidden;
|
|
overflow-y: auto;
|
|
background: ${props => props.theme.background};
|
|
transition: ${props => props.theme.backgroundTransition};
|
|
padding: 8vh 2rem 2rem;
|
|
outline: none;
|
|
|
|
${breakpoint('tablet')`
|
|
padding-top: 13vh;
|
|
`};
|
|
`;
|
|
|
|
const Text = styled.span`
|
|
font-size: 16px;
|
|
font-weight: 500;
|
|
padding-right: 12px;
|
|
user-select: none;
|
|
`;
|
|
|
|
const Close = styled(NudeButton)`
|
|
position: absolute;
|
|
display: block;
|
|
top: 0;
|
|
right: 0;
|
|
margin: 12px;
|
|
opacity: 0.75;
|
|
color: ${props => props.theme.text};
|
|
width: auto;
|
|
height: auto;
|
|
|
|
&:hover {
|
|
opacity: 1;
|
|
}
|
|
|
|
${breakpoint('tablet')`
|
|
display: none;
|
|
`};
|
|
`;
|
|
|
|
const Back = styled(NudeButton)`
|
|
position: absolute;
|
|
display: none;
|
|
align-items: center;
|
|
top: 2rem;
|
|
left: 2rem;
|
|
opacity: 0.75;
|
|
color: ${props => props.theme.text};
|
|
width: auto;
|
|
height: auto;
|
|
|
|
&:hover {
|
|
opacity: 1;
|
|
}
|
|
|
|
${breakpoint('tablet')`
|
|
display: flex;
|
|
`};
|
|
`;
|
|
|
|
export default observer(Modal);
|