Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(dashboard): person list #1682

Merged
merged 2 commits into from
Oct 10, 2023
Merged

feat(dashboard): person list #1682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74fc2dc
feat(dashboard): person list
Sep 28, 2023
e485567
fix: test
Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added dashboard/public/icon_1024.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dashboard/public/icon_512.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions dashboard/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<link rel="manifest" href="mano.webmanifest" />
<meta name="theme-color" content="#008e7f" />
<link rel="shortcut icon" href="/favicon.png" />
<title>Mano - Admin</title>
Expand Down
21 changes: 21 additions & 0 deletions dashboard/public/mano.webmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"name": "Mano",
"short_name": "Mano",
"theme_color": "#008e7f",
"background_color": "#008e7f",
"display": "fullscreen",
"scope": "./",
"start_url": "./",
"icons": [
{
"src": "icon_1024.png",
"type": "image/png",
"sizes": "1024x1024"
},
{
"src": "icon_512.png",
"type": "image/png",
"sizes": "512x512"
}
]
}
2 changes: 1 addition & 1 deletion dashboard/src/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ const RestrictedRoute = ({ component: Component, _isLoggedIn, ...rest }) => {
padding: 0 !important;
overflow: initial;
*/}
<main className="tw-relative tw-flex tw-grow tw-basis-full tw-flex-col tw-overflow-auto tw-overflow-y-scroll tw-px-2 print:!tw-ml-0 print:tw-h-auto print:tw-max-w-full print:tw-overflow-visible print:tw-p-0 sm:tw-px-12 sm:tw-pt-4 sm:tw-pb-12">
<main className="tw-relative tw-flex tw-grow tw-basis-full tw-flex-col tw-overflow-auto tw-overflow-x-hidden tw-overflow-y-scroll tw-px-2 print:!tw-ml-0 print:tw-h-auto print:tw-max-w-full print:tw-overflow-visible print:tw-p-0 sm:tw-px-12 sm:tw-pt-4 sm:tw-pb-12">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Je pense qu'on pourra simplifier. Pas hyper fan d'avoir des overflow en dur sur toute la page, d'habitude on n'en a pas besoin, je suis pas sûr de voir ici ? (et pourquoi on est en relative ici).
Mon commentaire est ignorable on peut en reparler plus tard.

<SentryRoute {...rest} render={(props) => (user ? <Component {...props} /> : <Redirect to={{ pathname: '/auth' }} />)} />
</main>
</div>
Expand Down
167 changes: 91 additions & 76 deletions dashboard/src/components/table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import React, { useCallback, useEffect, useRef } from 'react';
import Sortable from 'sortablejs';
import useMinimumWidth from '../services/useMinimumWidth';

const Table = ({
columns = [],
data = [],
renderCellSmallDevices,
rowKey,
dataTestId = null,
onRowClick,
Expand Down Expand Up @@ -33,6 +35,8 @@ const Table = ({
}
}, [onListChange, isSortable, data.length]);

const isDesktop = useMinimumWidth('sm');

if (!data.length && noData) {
return (
<table className={[className, 'table-selego'].join(' ')}>
Expand All @@ -51,84 +55,95 @@ const Table = ({
</table>
);
}
return (
<table className={[className, 'table-selego'].join(' ')}>
<thead>
{!!title && (

if (isDesktop || !renderCellSmallDevices) {
return (
<table className={[className, 'table-selego'].join(' ')}>
<thead className="tw-hidden sm:tw-table-header-group">
{!!title && (
<tr>
<td tabIndex={0} aria-label={title} className="title" colSpan={columns.length}>
{title}
</td>
</tr>
)}
<tr>
<td tabIndex={0} aria-label={title} className="title" colSpan={columns.length}>
{title}
</td>
</tr>
)}
<tr>
{columns.map((column) => {
const { onSortBy, onSortOrder, sortBy, sortOrder, sortableKey, dataKey } = column;
const onNameClick = () => {
if (sortBy === sortableKey || sortBy === dataKey) {
onSortOrder(sortOrder === 'ASC' ? 'DESC' : 'ASC');
return;
}
onSortBy(sortableKey || dataKey);
};
return (
<td
className={[column.className || '', !!onSortBy ? 'tw-cursor-pointer' : 'tw-cursor-default'].join(' ')}
style={column.style || {}}
key={String(dataKey) + String(column.title)}>
<button aria-label="Changer l'ordre de tri" type="button" onClick={!!onSortBy ? onNameClick : null}>
{column.title}
</button>
{column.help && <>{column.help}</>}
{!!onSortBy && (sortBy === sortableKey || sortBy === dataKey) && (
<button onClick={!!onSortBy ? onNameClick : null} type="button" aria-label="Changer l'ordre de tri">
{sortOrder === 'ASC' && <span className="tw-mx-4" onClick={() => onSortOrder('DESC')}>{`\u00A0\u2193`}</span>}
{sortOrder === 'DESC' && <span className="tw-mx-4" onClick={() => onSortOrder('ASC')}>{`\u00A0\u2191`}</span>}
{columns.map((column) => {
const { onSortBy, onSortOrder, sortBy, sortOrder, sortableKey, dataKey } = column;
const onNameClick = () => {
if (sortBy === sortableKey || sortBy === dataKey) {
onSortOrder(sortOrder === 'ASC' ? 'DESC' : 'ASC');
return;
}
onSortBy(sortableKey || dataKey);
};
return (
<td
className={[column.className || '', !!onSortBy ? 'tw-cursor-pointer' : 'tw-cursor-default'].join(' ')}
style={column.style || {}}
key={String(dataKey) + String(column.title)}>
<button aria-label="Changer l'ordre de tri" type="button" onClick={!!onSortBy ? onNameClick : null}>
{column.title}
</button>
)}
</td>
);
})}
</tr>
</thead>
<tbody ref={gridRef}>
{data
.filter((e) => e)
.map((item) => {
return (
<tr
onClick={() => (!rowDisabled(item) && onRowClick ? onRowClick(item) : null)}
onKeyUp={(event) => {
if (event.key === 'Enter')
if (!rowDisabled(item) && onRowClick) {
onRowClick(item);
}
}}
key={item[rowKey] || item._id}
data-key={item[rowKey] || item._id}
data-test-id={item[dataTestId] || item[rowKey] || item._id}
tabIndex={0}
className={[
rowDisabled(item)
? 'tw-cursor-not-allowed'
: isSortable
? 'tw-cursor-move'
: Boolean(onRowClick)
? 'tw-cursor-pointer'
: 'tw-cursor-auto',
].join(' ')}
style={item.style || {}}>
{columns.map((column) => {
return (
<td className={([column.className || ''].join(' '), !!column.small ? 'small' : 'not-small')} key={item[rowKey] + column.dataKey}>
{column.render ? column.render(item) : item[column.dataKey] || nullDisplay}
</td>
);
})}
</tr>
);
})}
</tbody>
{column.help && <>{column.help}</>}
{!!onSortBy && (sortBy === sortableKey || sortBy === dataKey) && (
<button onClick={!!onSortBy ? onNameClick : null} type="button" aria-label="Changer l'ordre de tri">
{sortOrder === 'ASC' && <span className="tw-mx-4" onClick={() => onSortOrder('DESC')}>{`\u00A0\u2193`}</span>}
{sortOrder === 'DESC' && <span className="tw-mx-4" onClick={() => onSortOrder('ASC')}>{`\u00A0\u2191`}</span>}
</button>
)}
</td>
);
})}
</tr>
</thead>
<tbody ref={gridRef}>
{data
.filter((e) => e)
.map((item) => {
return (
<tr
onClick={() => (!rowDisabled(item) && onRowClick ? onRowClick(item) : null)}
onKeyUp={(event) => {
if (event.key === 'Enter')
if (!rowDisabled(item) && onRowClick) {
onRowClick(item);
}
}}
key={item[rowKey] || item._id}
data-key={item[rowKey] || item._id}
data-test-id={item[dataTestId] || item[rowKey] || item._id}
tabIndex={0}
className={[
rowDisabled(item)
? 'tw-cursor-not-allowed'
: isSortable
? 'tw-cursor-move'
: Boolean(onRowClick)
? 'tw-cursor-pointer'
: 'tw-cursor-auto',
].join(' ')}
style={item.style || {}}>
{columns.map((column) => {
return (
<td
className={([column.className || ''].join(' '), !!column.small ? 'small' : 'not-small')}
key={item[rowKey] + column.dataKey}>
{column.render ? column.render(item) : item[column.dataKey] || nullDisplay}
</td>
);
})}
</tr>
);
})}
</tbody>
</table>
);
}

return (
<table>
<tbody ref={gridRef}>{data.filter((e) => e).map(renderCellSmallDevices)}</tbody>
</table>
);
};
Expand Down
4 changes: 0 additions & 4 deletions dashboard/src/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,6 @@ table.table-selego {
background: #fff;
-fs-table-paginate: paginate;

thead {
display: table-header-group;
}

thead tr {
height: 2.5rem;
}
Expand Down
Loading
Loading