Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 18 additions & 0 deletions client/src/api/quadcoachApi/tacticboardApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@ export type ShareLinkResponse = {
shareLink: string;
};

export type DuplicateTacticBoardResponse = {
message: string;
_id: string;
};

export const tacticBoardApiSlice = quadcoachApi.injectEndpoints({
endpoints: (builder) => ({
getTacticBoard: builder.query<TacticBoard, string>({
Expand Down Expand Up @@ -123,6 +128,18 @@ export const tacticBoardApiSlice = quadcoachApi.injectEndpoints({
TagType.tacticboardTag,
],
}),
duplicateTacticBoard: builder.mutation<
DuplicateTacticBoardResponse,
string
>({
query(tacticboardId) {
return {
url: `/api/tacticboards/${tacticboardId}/duplicate`,
method: "post",
};
},
invalidatesTags: [TagType.tacticboard],
}),
addTacticBoard: builder.mutation<
{ message: string; _id: string },
TacticBoardWithOutIds
Expand Down Expand Up @@ -430,6 +447,7 @@ export const {
useGetSharedTacticBoardQuery,
useLazyGetTacticBoardsQuery,
useDeleteTacticBoardMutation,
useDuplicateTacticBoardMutation,
useUpdateTacticBoardMutation,
useUpdateTacticBoardMetaMutation,
useUpdateTacticBoardPageMutation,
Expand Down
90 changes: 90 additions & 0 deletions client/src/components/HeaderOverflowMenu.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
import MoreVertIcon from "@mui/icons-material/MoreVert";
import {
IconButton,
ListItemIcon,
ListItemText,
Menu,
MenuItem,
Tooltip,
} from "@mui/material";
import { MouseEvent, ReactNode, useState } from "react";

export type HeaderOverflowAction = {
key: string;
label: string;
onClick: () => void;
icon?: ReactNode;
disabled?: boolean;
color?: "error" | "inherit";
};

type HeaderOverflowMenuProps = {
actions: HeaderOverflowAction[];
tooltip: string;
disabled?: boolean;
};

const HeaderOverflowMenu = ({
actions,
tooltip,
disabled = false,
}: HeaderOverflowMenuProps): JSX.Element | null => {
const [anchorEl, setAnchorEl] = useState<HTMLElement | null>(null);

if (actions.length === 0) {
return null;
}

const handleOpen = (event: MouseEvent<HTMLButtonElement>) => {
setAnchorEl(event.currentTarget);
};

const handleClose = () => {
setAnchorEl(null);
};

const handleActionClick = (action: HeaderOverflowAction) => () => {
handleClose();
action.onClick();
};

return (
<>
<Tooltip title={tooltip}>
<span>
<IconButton onClick={handleOpen} disabled={disabled}>
<MoreVertIcon />
</IconButton>
</span>
</Tooltip>
<Menu
anchorEl={anchorEl}
open={Boolean(anchorEl)}
onClose={handleClose}
anchorOrigin={{ vertical: "bottom", horizontal: "right" }}
transformOrigin={{ vertical: "top", horizontal: "right" }}
>
{actions.map((action) => {
const actionColor =
action.color === "error" ? { color: "error.main" } : undefined;

return (
<MenuItem
key={action.key}
onClick={handleActionClick(action)}
disabled={action.disabled}
sx={actionColor}
>
{action.icon && (
<ListItemIcon sx={actionColor}>{action.icon}</ListItemIcon>
)}
<ListItemText>{action.label}</ListItemText>
</MenuItem>
);
})}
</Menu>
</>
);
};

export default HeaderOverflowMenu;
2 changes: 2 additions & 0 deletions client/src/components/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ export { default as NotificationItem } from "./NotificationItem";
export { default as SettingsMenu } from "./SettingsMenu";
export { default as Collapsible } from "./Collapsible";
export { default as FabricJsCanvas } from "./FabricJsCanvas";
export { default as HeaderOverflowMenu } from "./HeaderOverflowMenu";
export type { HeaderOverflowAction } from "./HeaderOverflowMenu";
export { CanvasErrorBoundary } from "./CanvasErrorBoundary";
export { default as TacticsBoardToolBar } from "./TacticsBoardToolBar";
export { default as AddTacticBoardDialog } from "./AddTacticBoardDialog";
Expand Down
58 changes: 32 additions & 26 deletions client/src/pages/Exercises/Exercise/ViewExercise/Exercise.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@ import { useParams, useNavigate, useLocation } from "react-router-dom";
import { useEffect, useState, useRef } from "react";
import {
Alert,
Box,
Button,
Card,
List,
ListItem,
ListItemText,
Skeleton,
useMediaQuery,
IconButton,
Tooltip,
Theme,
Expand All @@ -14,11 +18,7 @@ import {
AccordionSummary,
AccordionDetails,
TextField,
Box,
List,
ListItem,
ListItemText,
Button,
useMediaQuery,
} from "@mui/material";
import {
useDeleteExerciseMutation,
Expand Down Expand Up @@ -58,7 +58,13 @@ import {
FieldArrayRenderProps,
} from "formik";
import * as Yup from "yup";
import { SoftButton, SoftBox, SoftInput } from "../../../../components";
import {
HeaderOverflowMenu,
SoftButton,
SoftBox,
SoftInput,
} from "../../../../components";
import type { HeaderOverflowAction } from "../../../../components";

const Exercise = () => {
const location = useLocation();
Expand Down Expand Up @@ -446,6 +452,19 @@ const Exercise = () => {
);
}

const exerciseMenuActions: HeaderOverflowAction[] = [];

if (isPrivileged) {
exerciseMenuActions.push({
key: "delete",
label: t("Exercise:menu.delete"),
onClick: onDeleteExerciseClick,
icon: <DeleteIcon fontSize="small" />,
disabled: !exercise || isDeleteExerciseLoading,
color: "error",
});
}

return (
<ProfileLayout
title={
Expand Down Expand Up @@ -510,16 +529,12 @@ const Exercise = () => {
</IconButton>
</Tooltip>
)}
{isPrivileged && (
<Tooltip title={t("Exercise:deleteExercise")}>
<IconButton
onClick={onDeleteExerciseClick}
color="error"
disabled={!exercise || isDeleteExerciseLoading}
>
<DeleteIcon />
</IconButton>
</Tooltip>
{exerciseMenuActions.length > 0 && (
<HeaderOverflowMenu
actions={exerciseMenuActions}
tooltip={t("Exercise:menu.more")}
disabled={exerciseMenuActions.every((action) => action.disabled)}
/>
)}
</SoftBox>
}
Expand Down Expand Up @@ -564,15 +579,6 @@ const Exercise = () => {
/>
</Tooltip>
),
isPrivileged && (
<Tooltip key="delete" title={t("Exercise:deleteExercise")}>
<BottomNavigationAction
icon={<DeleteIcon />}
onClick={onDeleteExerciseClick}
disabled={!exercise || isDeleteExerciseLoading}
/>
</Tooltip>
),
]
}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,16 @@
"errorDeletingExercise": "Es ist ein Fehler beim Löschen der Übung aufgetreten.",
"errorLoadingRelatedExercises": "Es ist ein Fehler beim Laden der zugehörigen Übungen aufgetreten.",
"favoriteExercise": "Favorisiere Übung",
"menu": {
"more": "Weitere Aktionen",
"share": "Teilen",
"delete": "Löschen"
},
"shareDialog": {
"title": "Übung teilen",
"close": "Schließen",
"noUsers": "Noch keine geteilten Benutzer"
},
"info": {
"title": "Info",
"personNumber": "Personen",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,16 @@
"errorDeletingExercise": "An error occurred while deleting exercise.",
"errorLoadingRelatedExercises": "An error occurred while loading related exercises.",
"favoriteExercise": "Favorite exercise",
"menu": {
"more": "More actions",
"share": "Share",
"delete": "Delete"
},
"shareDialog": {
"title": "Share exercise",
"close": "Close",
"noUsers": "No shared users yet"
},
"info": {
"title": "Info",
"personNumber": "Persons",
Expand Down
64 changes: 33 additions & 31 deletions client/src/pages/PracticePlanner/PracticePlanner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,13 @@ import {
import { useAuth } from "../../store/hooks";
import { useEffect, useRef, useState } from "react";
import {
HeaderOverflowMenu,
SoftBox,
SoftButton,
SoftInput,
SoftTypography,
} from "../../components";
import type { HeaderOverflowAction } from "../../components";
import EditIcon from "@mui/icons-material/Edit";
import SaveIcon from "@mui/icons-material/Save";
import DeleteIcon from "@mui/icons-material/Delete";
Expand Down Expand Up @@ -518,6 +520,29 @@ const PracticePlanner = ({
);
}

const practicePlanMenuActions: HeaderOverflowAction[] = [];

if (isPrivileged && plan.isPrivate) {
practicePlanMenuActions.push({
key: "share",
label: t(plan.shareToken ? "menu.unshare" : "menu.share"),
onClick: onShareClick,
icon: <ShareIcon fontSize="small" />,
disabled: isCreateShareLinkLoading || isDeleteShareLinkLoading,
});
}

if (isPrivileged) {
practicePlanMenuActions.push({
key: "delete",
label: t("menu.delete"),
onClick: onDeletePlanClick,
icon: <DeleteIcon fontSize="small" />,
disabled: !plan || isDeletePlanLoading,
color: "error",
});
}

return (
<ProfileLayout
title={
Expand Down Expand Up @@ -563,18 +588,6 @@ const PracticePlanner = ({
</IconButton>
</Tooltip>
)}
{isPrivileged && plan.isPrivate && (
<Tooltip title={t("share.tooltip")}>
<IconButton
onClick={onShareClick}
disabled={isCreateShareLinkLoading || isDeleteShareLinkLoading}
>
<ShareIcon
sx={{ color: plan.shareToken ? "green" : "#000000" }}
/>
</IconButton>
</Tooltip>
)}
{isPrivileged && (
<Tooltip
title={t("updatePracticePlan", {
Expand All @@ -593,16 +606,14 @@ const PracticePlanner = ({
</IconButton>
</Tooltip>
)}
{isPrivileged && (
<Tooltip title={t("deletePracticePlan")}>
<IconButton
onClick={onDeletePlanClick}
color="error"
disabled={!plan || isDeletePlanLoading}
>
<DeleteIcon />
</IconButton>
</Tooltip>
{practicePlanMenuActions.length > 0 && (
<HeaderOverflowMenu
actions={practicePlanMenuActions}
tooltip={t("menu.more")}
disabled={practicePlanMenuActions.every(
(action) => action.disabled,
)}
/>
)}
</SoftBox>
}
Expand Down Expand Up @@ -646,15 +657,6 @@ const PracticePlanner = ({
/>
</Tooltip>
),
isPrivileged && (
<Tooltip key="delete" title={t("deletePracticePlan")}>
<BottomNavigationAction
icon={<DeleteIcon />}
onClick={onDeletePlanClick}
disabled={!plan || isDeletePlanLoading}
/>
</Tooltip>
),
]
}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@
"close": "Schließen"
}
},
"menu": {
"more": "Weitere Aktionen",
"share": "Teilen",
"unshare": "Freigabe aufheben",
"delete": "Löschen"
},
"validation": {
"fixValidationErrors": "Bitte beheben Sie die markierten Validierungsfehler:",
"name": {
Expand Down
Loading
Loading