improved user context

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

diff --git a/resources/js/components/results/Item.js b/resources/js/components/results/Item.js
index a2ee8e392b82a392b76236b8bab92e4e7806d6f7..2e29d752afd2bd6938e82a5123c3b607bdea7308 100644 (file)
--- a/resources/js/components/results/Item.js
+++ b/resources/js/components/results/Item.js
@@ -1,13 +1,15 @@
 import PropTypes from 'prop-types';
 import React, { useState } from 'react';
 import { Button } from 'react-bootstrap';
+import { useTranslation } from 'react-i18next';
 
 import DetailDialog from './DetailDialog';
+import Icon from '../common/Icon';
 import Box from '../users/Box';
 import { getIcon, getTime } from '../../helpers/Result';
-import { findResult } from '../../helpers/Participant';
 import { maySeeResults } from '../../helpers/permissions';
-import { withUser } from '../../helpers/UserContext';
+import { findResult } from '../../helpers/User';
+import { useUser } from '../../hooks/user';
 
 const getClassName = result => {
        const classNames = ['status'];
@@ -22,42 +24,87 @@ const getClassName = result => {
        return classNames.join(' ');
 };
 
+const twitchReg = /^https?:\/\/(www\.)?twitch\.tv/;
+const youtubeReg = /^https?:\/\/(www\.)?youtu(\.be|be\.)/;
+
+const getVoDVariant = result => {
+       if (!result || !result.vod) return 'outline-secondary';
+       if (twitchReg.test(result.vod)) {
+               return 'twitch';
+       }
+       if (youtubeReg.test(result.vod)) {
+               return 'outline-youtube';
+       }
+       return 'outline-secondary';
+};
+
+const getVoDIcon = result => {
+       const variant = getVoDVariant(result);
+       if (variant === 'twitch') {
+               return <Icon.TWITCH title="" />;
+       }
+       if (variant === 'outline-youtube') {
+               return <Icon.YOUTUBE title="" />;
+       }
+       return <Icon.VIDEO title="" />;
+};
+
 const Item = ({
-       participant,
        round,
        tournament,
        user,
 }) => {
        const [showDialog, setShowDialog] = useState(false);
-       const result = findResult(participant, round);
-       const maySee = maySeeResults(user, tournament, round);
+
+       const { t } = useTranslation();
+       const { user: authUser } = useUser();
+
+       const result = React.useMemo(
+               () => findResult(user, round),
+               [round, user],
+       );
+       const maySee = React.useMemo(
+               () => maySeeResults(authUser, tournament, round),
+               [authUser, round, tournament],
+       );
+
        return <div className="result">
-               <Box user={participant.user} />
-               <Button
-                       className={getClassName(result)}
-                       onClick={() => setShowDialog(true)}
-                       title={maySee && result && result.comment ? result.comment : null}
-               >
-                       <span className="time">
-                               {getTime(result, maySee)}
-                       </span>
-                       {getIcon(result, maySee)}
-               </Button>
+               <Box user={user} />
+               <div className="d-flex align-items-center justify-content-between">
+                       <Button
+                               className={getClassName(result)}
+                               onClick={() => setShowDialog(true)}
+                               title={maySee && result && result.comment ? result.comment : null}
+                       >
+                               <span className="time">
+                                       {getTime(result, maySee)}
+                               </span>
+                               {getIcon(result, maySee)}
+                       </Button>
+                       {maySee && result && result.vod ?
+                               <Button
+                                       className="vod-link"
+                                       href={result.vod}
+                                       size="sm"
+                                       target="_blank"
+                                       title={t('results.vod')}
+                                       variant={getVoDVariant(result)}
+                               >
+                                       {getVoDIcon(result)}
+                               </Button>
+                       : null}
+               </div>
                <DetailDialog
                        onHide={() => setShowDialog(false)}
-                       participant={participant}
                        round={round}
                        show={showDialog}
                        tournament={tournament}
+                       user={user}
                />
        </div>;
 };
 
 Item.propTypes = {
-       participant: PropTypes.shape({
-               user: PropTypes.shape({
-               }),
-       }),
        round: PropTypes.shape({
        }),
        tournament: PropTypes.shape({
@@ -66,4 +113,4 @@ Item.propTypes = {
        }),
 };
 
-export default withUser(Item);
+export default Item;