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
2 changes: 1 addition & 1 deletion web-ui/src/components/routes/Routes.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ export default function Routes() {
<Route path="/feedback/self-reviews">
<SelfReviewsPage />
</Route>
<Route exact path="/kudos">
<Route exact path="/kudos/:initialTab?">
<Header title="Kudos" />
<KudosPage />
</Route>
Expand Down
37 changes: 20 additions & 17 deletions web-ui/src/pages/KudosPage.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { useCallback, useContext, useEffect, useState } from "react";
import { useParams } from 'react-router-dom';
import { styled } from "@mui/material/styles";
import { Button, Tab, Typography } from "@mui/material";
import MenuItem from '@mui/material/MenuItem';
Expand Down Expand Up @@ -43,6 +44,18 @@ const Root = styled("div")({
},
});

const validTabName = (name) => {
switch (name) {
case "received":
case "sent":
break;
default:
name && console.warn(`Invalid tab: ${name}`);
name = "received";
}
return name;
}

const DateRange = {
THREE_MONTHS: '3mo',
SIX_MONTHS: '6mo',
Expand All @@ -51,13 +64,14 @@ const DateRange = {
};

const KudosPage = () => {
const { initialTab } = useParams();
const { state, dispatch } = useContext(AppContext);
const csrf = selectCsrfToken(state);

const currentUser = selectCurrentUser(state);

const [kudosDialogOpen, setKudosDialogOpen] = useState(false);
const [kudosTab, setKudosTab] = useState("RECEIVED");
const [kudosTab, setKudosTab] = useState(validTabName(initialTab));
const [receivedKudos, setReceivedKudos] = useState([]);
const [receivedKudosLoading, setReceivedKudosLoading] = useState(true);
const [sentKudos, setSentKudos] = useState([]);
Expand Down Expand Up @@ -134,18 +148,7 @@ const KudosPage = () => {

const handleTabChange = useCallback(
(event, newTab) => {
switch (newTab) {
case "RECEIVED":
setKudosTab("RECEIVED");
break;
case "SENT":
setKudosTab("SENT");
break;
default:
console.warn(`Invalid tab: ${newTab}`);
}

setKudosTab(newTab);
setKudosTab(validTabName(newTab));
},
// eslint-disable-next-line react-hooks/exhaustive-deps
[loadReceivedKudos, loadSentKudos]
Expand Down Expand Up @@ -189,19 +192,19 @@ const KudosPage = () => {
<TabList onChange={handleTabChange}>
<Tab
label="Received"
value="RECEIVED"
value="received"
icon={<ArchiveIcon />}
iconPosition="start"
/>
<Tab
label="Sent"
value="SENT"
value="sent"
icon={<UnarchiveIcon />}
iconPosition="start"
/>
</TabList>
</div>
<TabPanel value="RECEIVED" style={{ padding: "1rem 0" }}>
<TabPanel value="received" style={{ padding: "1rem 0" }}>
{receivedKudosLoading ? (
Array.from({ length: 5 }).map((_, index) => (
<SkeletonLoader key={index} type="kudos" />
Expand All @@ -228,7 +231,7 @@ const KudosPage = () => {
</div>
)}
</TabPanel>
<TabPanel value="SENT" style={{ padding: "1rem 0" }}>
<TabPanel value="sent" style={{ padding: "1rem 0" }}>
{sentKudosLoading ? (
Array.from({ length: 5 }).map((_, index) => (
<SkeletonLoader key={index} type="kudos" />
Expand Down
Loading