improved user context

[alttp.git] / resources / js / components / results / List.js

diff --git a/resources/js/components/results/List.js b/resources/js/components/results/List.js
index 3d1bdfa8f27c9ff0147832934ce81975a8bee2c0..911b6a53ba5526a70cb9073963190e6d0883949e 100644 (file)
--- a/resources/js/components/results/List.js
+++ b/resources/js/components/results/List.js
@@ -5,11 +5,16 @@ import Item from './Item';
 import { sortByFinished, sortByResult } from '../../helpers/Participant';
 import { maySeeResults } from '../../helpers/permissions';
 import { getRunners } from '../../helpers/Tournament';
-import { withUser } from '../../helpers/UserContext';
+import { compareResult } from '../../helpers/Result';
+import { useUser } from '../../hooks/user';
+
+const List = ({ round, tournament }) => {
+       const { user } = useUser();
 
-const List = ({ round, tournament, user }) => {
        if (tournament.type === 'open-async') {
-               const results = round.results || [];
+               const results = maySeeResults(user, tournament, round)
+                       ? (round.results || []).sort(compareResult)
+                       : round.results || [];
                return <div className="results d-flex flex-wrap">
                        {results.map(result =>
                                <Item
@@ -48,8 +53,6 @@ List.propTypes = {
                users: PropTypes.arrayOf(PropTypes.shape({
                })),
        }),
-       user: PropTypes.shape({
-       }),
 };
 
-export default withUser(List);
+export default List;