StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Get basic modal view for editing/creating a new subuser working

Browse source
This commit is contained in:
Dane Everitt 2020-03-25 21:58:37 -07:00
parent 8d52e2e1a7
commit 51c5cf4dbb
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
13 changed files with 293 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/scripts/api/getSystemPermissions.ts
View file

@ -1,7 +1,7 @@
import { SubuserPermission } from '@/state/server/subusers';
import { PanelPermissions } from '@/state/permissions';
import http from '@/api/http';
export default (): Promise<SubuserPermission[]> => {
export default (): Promise<PanelPermissions> => {
return new Promise((resolve, reject) => {
http.get(`/api/client/permissions`)
.then(({ data }) => resolve(data.attributes.permissions))

2
resources/scripts/components/dashboard/AccountApiContainer.tsx
View file

@ -95,7 +95,7 @@ export default () => {
>
<FontAwesomeIcon
icon={faTrashAlt}
className={'text-neutral-400 hover:text-red-400 transition-color duration-150'}
className={'text-neutral-400 hover:text-red-400 transition-colors duration-150'}
/>
</button>
</div>

5
resources/scripts/components/elements/ContentBox.tsx
View file

@ -1,14 +1,16 @@
import * as React from 'react';
import classNames from 'classnames';
import FlashMessageRender from '@/components/FlashMessageRender';
import SpinnerOverlay from '@/components/elements/SpinnerOverlay';
type Props = Readonly<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement> & {
title?: string;
borderColor?: string;
showFlashes?: string | boolean;
showLoadingOverlay?: boolean;
}>;
const ContentBox = ({ title, borderColor, showFlashes, children, ...props }: Props) => (
const ContentBox = ({ title, borderColor, showFlashes, showLoadingOverlay, children, ...props }: Props) => (
<div {...props}>
{title && <h2 className={'text-neutral-300 mb-4 px-4'}>{title}</h2>}
{showFlashes &&
@ -20,6 +22,7 @@ const ContentBox = ({ title, borderColor, showFlashes, children, ...props }: Pro
<div className={classNames('bg-neutral-700 p-4 rounded shadow-lg relative', borderColor, {
'border-t-4': !!borderColor,
})}>
<SpinnerOverlay visible={showLoadingOverlay || false}/>
{children}
</div>
</div>

12
resources/scripts/components/elements/TitledGreyBox.tsx
View file

@ -4,7 +4,7 @@ import { IconProp } from '@fortawesome/fontawesome-svg-core';
interface Props {
icon?: IconProp;
title: string;
title: string | React.ReactNode;
className?: string;
children: React.ReactNode;
}
@ -12,9 +12,13 @@ interface Props {
const TitledGreyBox = ({ icon, title, children, className }: Props) => (
<div className={`rounded shadow-md bg-neutral-700 ${className}`}>
<div className={'bg-neutral-900 rounded-t p-3 border-b border-black'}>
<p className={'text-sm uppercase'}>
{icon && <FontAwesomeIcon icon={icon} className={'mr-2 text-neutral-300'}/>}{title}
</p>
{typeof title === 'string' ?
<p className={'text-sm uppercase'}>
{icon && <FontAwesomeIcon icon={icon} className={'mr-2 text-neutral-300'}/>}{title}
</p>
:
title
}
</div>
<div className={'p-3'}>
{children}

4
resources/scripts/components/server/schedules/ScheduleTaskRow.tsx
View file

@ -78,7 +78,7 @@ export default ({ schedule, task, onTaskUpdated, onTaskRemoved }: Props) => {
<button
type={'button'}
aria-label={'Edit scheduled task'}
className={'block text-sm p-2 text-neutral-500 hover:text-neutral-100 transition-color duration-150 mr-4'}
className={'block text-sm p-2 text-neutral-500 hover:text-neutral-100 transition-colors duration-150 mr-4'}
onClick={() => setIsEditing(true)}
>
<FontAwesomeIcon icon={faPencilAlt}/>
@ -86,7 +86,7 @@ export default ({ schedule, task, onTaskUpdated, onTaskRemoved }: Props) => {
<button
type={'button'}
aria-label={'Delete scheduled task'}
className={'block text-sm p-2 text-neutral-500 hover:text-red-600 transition-color duration-150'}
className={'block text-sm p-2 text-neutral-500 hover:text-red-600 transition-colors duration-150'}
onClick={() => setVisible(true)}
>
<FontAwesomeIcon icon={faTrashAlt}/>

21
resources/scripts/components/server/users/AddSubuserButton.tsx Normal file
View file

@ -0,0 +1,21 @@
import React, { useState } from 'react';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { faUserPlus } from '@fortawesome/free-solid-svg-icons/faUserPlus';
import EditSubuserModal from '@/components/server/users/EditSubuserModal';
export default () => {
const [ visible, setVisible ] = useState(false);
return (
<>
{visible && <EditSubuserModal
appear={true}
visible={true}
onDismissed={() => setVisible(false)}
/>}
<button className={'btn btn-primary btn-sm'} onClick={() => setVisible(true)}>
<FontAwesomeIcon icon={faUserPlus} className={'mr-1'}/> New User
</button>
</>
);
};

139
resources/scripts/components/server/users/EditSubuserModal.tsx Normal file
View file

@ -0,0 +1,139 @@
import React from 'react';
import { Subuser } from '@/state/server/subusers';
import { Formik, FormikHelpers, useFormikContext } from 'formik';
import { array, object, string } from 'yup';
import Modal, { RequiredModalProps } from '@/components/elements/Modal';
import Field from '@/components/elements/Field';
import { useStoreState } from 'easy-peasy';
import { ApplicationStore } from '@/state';
import TitledGreyBox from '@/components/elements/TitledGreyBox';
import Checkbox from '@/components/elements/Checkbox';
import styled from 'styled-components';
import classNames from 'classnames';
type Props = {
subuser?: Subuser;
} & RequiredModalProps;
interface Values {
email: string;
permissions: string[];
}
const PermissionLabel = styled.label`
${tw`flex items-center border border-transparent rounded p-2 cursor-pointer`};
text-transform: none;
&:hover {
${tw`border-neutral-500 bg-neutral-800`};
}
`;
const EditSubuserModal = ({ subuser, ...props }: Props) => {
const { values, isSubmitting, setFieldValue } = useFormikContext<Values>();
const permissions = useStoreState((state: ApplicationStore) => state.permissions.data);
return (
<Modal {...props} showSpinnerOverlay={isSubmitting}>
<h3>{subuser ? 'Edit subuser' : 'Create new subuser'}</h3>
<div className={'mt-6'}>
<Field
name={'email'}
label={'User Email'}
description={'Enter the email address of the user you wish to invite as a subuser for this server.'}
/>
</div>
<div className={'mt-6'}>
{Object.keys(permissions).filter(key => key !== 'websocket').map((key, index) => (
<TitledGreyBox
key={key}
title={
<div className={'flex items-center'}>
<p className={'text-sm uppercase flex-1'}>{key}</p>
<input
type={'checkbox'}
onClick={e => {
if (e.currentTarget.checked) {
setFieldValue('permissions', [
...values.permissions,
...Object.keys(permissions[key].keys)
.map(pkey => `${key}.${pkey}`)
.filter(permission => values.permissions.indexOf(permission) === -1),
]);
} else {
setFieldValue('permissions', [
...values.permissions.filter(
permission => Object.keys(permissions[key].keys)
.map(pkey => `${key}.${pkey}`)
.indexOf(permission) < 0,
),
]);
}
}}
/>
</div>
}
className={index !== 0 ? 'mt-4' : undefined}
>
<p className={'text-sm text-neutral-400 mb-4'}>
{permissions[key].description}
</p>
{Object.keys(permissions[key].keys).map((pkey, index) => (
<PermissionLabel
htmlFor={`permission_${key}_${pkey}`}
className={classNames('transition-colors duration-75', {
'mt-2': index !== 0,
})}
>
<div className={'p-2'}>
<Checkbox
id={`permission_${key}_${pkey}`}
name={'permissions'}
value={`${key}.${pkey}`}
className={'w-5 h-5 mr-2'}
/>
</div>
<div className={'flex-1'}>
<span className={'input-dark-label font-medium'}>
{pkey}
</span>
{permissions[key].keys[pkey].length > 0 &&
<p className={'text-xs text-neutral-400 mt-1'}>
{permissions[key].keys[pkey]}
</p>
}
</div>
</PermissionLabel>
))}
</TitledGreyBox>
))}
</div>
<div className={'mt-6 pb-6 flex justify-end'}>
<button className={'btn btn-primary btn-sm'} type={'submit'}>
{subuser ? 'Save' : 'Invite User'}
</button>
</div>
</Modal>
);
};
export default (props: Props) => {
const submit = (values: Values, helpers: FormikHelpers<Values>) => {
};
return (
<Formik
onSubmit={submit}
initialValues={{
email: '',
permissions: [],
} as Values}
validationSchema={object().shape({
email: string().email('A valid email address must be provided.').required('A valid email address must be provided.'),
permissions: array().of(string()),
})}
>
<EditSubuserModal {...props}/>
</Formik>
);
};

124
resources/scripts/components/server/users/UsersContainer.tsx
View file

@ -1,19 +1,12 @@
import React, { useEffect, useState } from 'react';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { faUserPlus } from '@fortawesome/free-solid-svg-icons/faUserPlus';
import { ServerContext } from '@/state/server';
import Spinner from '@/components/elements/Spinner';
import { Subuser } from '@/state/server/subusers';
import { CSSTransition } from 'react-transition-group';
import classNames from 'classnames';
import PermissionEditor from '@/components/server/users/PermissionEditor';
import { Actions, useStoreActions, useStoreState } from 'easy-peasy';
import { ApplicationStore } from '@/state';
import { faArrowLeft } from '@fortawesome/free-solid-svg-icons/faArrowLeft';
import Spinner from '@/components/elements/Spinner';
import AddSubuserButton from '@/components/server/users/AddSubuserButton';
export default () => {
const [ loading, setLoading ] = useState(true);
const [ editSubuser, setEditSubuser ] = useState<Subuser | null>(null);
const uuid = ServerContext.useStoreState(state => state.server.data!.uuid);
const subusers = ServerContext.useStoreState(state => state.subusers.data);
@ -23,10 +16,8 @@ export default () => {
const getPermissions = useStoreActions((actions: Actions<ApplicationStore>) => actions.permissions.getPermissions);
useEffect(() => {
if (!permissions.length) {
getPermissions().catch(error => console.error(error));
}
}, [ permissions, getPermissions ]);
getPermissions().catch(error => console.error(error));
}, []);
useEffect(() => {
getSubusers(uuid)
@ -37,84 +28,47 @@ export default () => {
}, [ uuid, getSubusers ]);
useEffect(() => {
if (subusers.length > 0) {
setLoading(false);
}
setLoading(!subusers);
}, [ subusers ]);
if (loading || !Object.keys(permissions).length) {
return <Spinner size={'large'} centered={true}/>;
}
return (
<div className={'flex my-10'}>
<div className={'w-1/2'}>
<h2 className={'text-neutral-300 mb-4'}>Subusers</h2>
<div
className={classNames('border-t-4 grey-box mt-0', {
'border-cyan-400': editSubuser === null,
'border-neutral-400': editSubuser !== null,
})}
>
{(loading || !permissions.length) ?
<div className={'w-full'}>
<Spinner centered={true}/>
<div className={'my-10'}>
{!subusers.length ?
<p className={'text-center text-sm text-neutral-400'}>
It looks like you don't have any subusers.
</p>
:
subusers.map(subuser => (
<div key={subuser.uuid} className={'flex items-center w-full'}>
<img
className={'w-10 h-10 rounded-full bg-white border-2 border-inset border-neutral-800'}
src={`${subuser.image}?s=400`}
/>
<div className={'ml-4 flex-1'}>
<p className={'text-sm'}>{subuser.email}</p>
</div>
<div className={'ml-4'}>
<button
className={'btn btn-xs btn-primary'}
>
Edit
</button>
<button
className={'ml-2 btn btn-xs btn-red btn-secondary'}
>
Remove
</button>
</div>
:
!subusers.length ?
<p className={'text-sm'}>It looks like you don't have any subusers.</p>
:
subusers.map(subuser => (
<div key={subuser.uuid} className={'flex items-center w-full'}>
<img
className={'w-10 h-10 rounded-full bg-white border-2 border-inset border-neutral-800'}
src={`${subuser.image}?s=400`}
/>
<div className={'ml-4 flex-1'}>
<p className={'text-sm'}>{subuser.email}</p>
</div>
<div className={'ml-4'}>
<button
className={'btn btn-xs btn-primary'}
onClick={() => setEditSubuser(subuser)}
>
Edit
</button>
<button
className={'ml-2 btn btn-xs btn-red btn-secondary'}
onClick={() => setEditSubuser(null)}
>
Remove
</button>
</div>
</div>
))
}
</div>
<div className={'flex justify-end mt-6'}>
<button className={'btn btn-primary btn-sm'}>
<FontAwesomeIcon icon={faUserPlus} className={'mr-1'}/> New User
</button>
</div>
</div>
{editSubuser &&
<CSSTransition timeout={250} classNames={'fade'} appear={true} in={true}>
<div className={'flex-1 ml-6'}>
<h2 className={'flex items-center text-neutral-300 mb-4'}>
<span onClick={() => setEditSubuser(null)}>
<FontAwesomeIcon
icon={faArrowLeft}
className={'text-base mr-2 text-neutral-200 hover:text-neutral-100 cursor-pointer'}
/>
</span>
Edit {editSubuser.email}
</h2>
<div className={'border-t-4 border-cyan-400 grey-box mt-0 p-4'}>
<React.Suspense fallback={'Loading...'}>
<PermissionEditor
defaultPermissions={editSubuser.permissions}
/>
</React.Suspense>
</div>
</div>
</CSSTransition>
))
}
<div className={'flex justify-end mt-6'}>
<AddSubuserButton/>
</div>
</div>
);
};

5
resources/scripts/routers/ServerRouter.tsx
View file

@ -14,6 +14,7 @@ import FileEditContainer from '@/components/server/files/FileEditContainer';
import SettingsContainer from '@/components/server/settings/SettingsContainer';
import ScheduleContainer from '@/components/server/schedules/ScheduleContainer';
import ScheduleEditContainer from '@/components/server/schedules/ScheduleEditContainer';
import UsersContainer from '@/components/server/users/UsersContainer';
const ServerRouter = ({ match, location }: RouteComponentProps<{ id: string }>) => {
const server = ServerContext.useStoreState(state => state.server.data);
@ -35,8 +36,8 @@ const ServerRouter = ({ match, location }: RouteComponentProps<{ id: string }>)
<NavLink to={`${match.url}`} exact>Console</NavLink>
<NavLink to={`${match.url}/files`}>File Manager</NavLink>
<NavLink to={`${match.url}/databases`}>Databases</NavLink>
{/* <NavLink to={`${match.url}/users`}>User Management</NavLink> */}
<NavLink to={`${match.url}/schedules`}>Schedules</NavLink>
<NavLink to={`${match.url}/users`}>Users</NavLink>
<NavLink to={`${match.url}/settings`}>Settings</NavLink>
</div>
</div>
@ -62,9 +63,9 @@ const ServerRouter = ({ match, location }: RouteComponentProps<{ id: string }>)
exact
/>
<Route path={`${match.path}/databases`} component={DatabasesContainer} exact/>
{/* <Route path={`${match.path}/users`} component={UsersContainer} exact/> */}
<Route path={`${match.path}/schedules`} component={ScheduleContainer} exact/>
<Route path={`${match.path}/schedules/:id`} component={ScheduleEditContainer} exact/>
<Route path={`${match.path}/users`} component={UsersContainer} exact/>
<Route path={`${match.path}/settings`} component={SettingsContainer} exact/>
</Switch>
</React.Fragment>

14
resources/scripts/state/permissions.ts
View file

@ -1,15 +1,21 @@
import { SubuserPermission } from '@/state/server/subusers';
import { action, Action, thunk, Thunk } from 'easy-peasy';
import getSystemPermissions from '@/api/getSystemPermissions';
export interface PanelPermissions {
[key: string]: {
description: string;
keys: { [k: string]: string };
};
}
export interface GloablPermissionsStore {
data: SubuserPermission[];
setPermissions: Action<GloablPermissionsStore, SubuserPermission[]>;
data: PanelPermissions;
setPermissions: Action<GloablPermissionsStore, PanelPermissions>;
getPermissions: Thunk<GloablPermissionsStore, void, {}, any, Promise<void>>;
}
const permissions: GloablPermissionsStore = {
data: [],
data: {},
setPermissions: action((state, payload) => {
state.data = payload;

9
resources/styles/components/modal.css
View file

@ -6,9 +6,9 @@
& > .modal-container {
@apply .relative .w-full .max-w-md .m-auto .flex-col .flex;
&.top {
/*&.top {
margin-top: 10%;
}
}*/
& > .modal-close-icon {
@apply .absolute .pin-r .p-2 .text-white .cursor-pointer .opacity-50;
@ -22,7 +22,8 @@
}
& > .modal-content {
@apply .bg-neutral-800 .rounded .shadow-md;
@apply .bg-neutral-800 .rounded .shadow-md .overflow-y-scroll;
max-height: calc(100vh - 16rem);
transition: all 250ms ease;
}
@ -39,7 +40,7 @@
}
& > .modal-container.full-screen {
@apply .w-3/4 .mt-32;
@apply .w-3/4;
height: calc(100vh - 16rem);
max-width: none;
}