diff --git a/client/src/components/tables/components/FilterDirectivesIndicator.tsx b/client/src/components/tables/components/FilterDirectivesIndicator.tsx
index 272c0a23c..5e4efa43b 100644
--- a/client/src/components/tables/components/FilterDirectivesIndicator.tsx
+++ b/client/src/components/tables/components/FilterDirectivesIndicator.tsx
@@ -147,7 +147,7 @@ export default function FilterDirectivesIndicator({
) : (
- Looks like this table has no data. We can't show anything about the
+ Looks like this table has no data. We can't show anything about the
directives.
)}
diff --git a/client/src/components/tables/components/TachiTable.tsx b/client/src/components/tables/components/TachiTable.tsx
index 0ee725bbc..21139b0cd 100644
--- a/client/src/components/tables/components/TachiTable.tsx
+++ b/client/src/components/tables/components/TachiTable.tsx
@@ -7,7 +7,7 @@ import NoDataWrapper from "./NoDataWrapper";
import PageSelector from "./PageSelector";
import SortableTH from "./SortableTH";
import FilterDirectivesIndicator from "./FilterDirectivesIndicator";
-import { ComposeSearchFunction, ValueGetter, ValueGetterOrHybrid } from "util/ztable/search";
+import { ComposeSearchFunction, ValueGetterOrHybrid } from "util/ztable/search";
export interface ZTableTHProps {
changeSort: (str: string) => void;
@@ -140,7 +140,11 @@ export default function TachiTable({
{headersRow}
- {window.map(rowFunction)}
+
+ {window.map((e, i) => (
+ {rowFunction(e)}
+ ))}
+
diff --git a/client/src/components/tables/pbs/dropdowns/IIDXPBDropdown.tsx b/client/src/components/tables/dropdowns/IIDXPBDropdown.tsx
similarity index 78%
rename from client/src/components/tables/pbs/dropdowns/IIDXPBDropdown.tsx
rename to client/src/components/tables/dropdowns/IIDXPBDropdown.tsx
index 0681e64f7..f30839036 100644
--- a/client/src/components/tables/pbs/dropdowns/IIDXPBDropdown.tsx
+++ b/client/src/components/tables/dropdowns/IIDXPBDropdown.tsx
@@ -1,33 +1,33 @@
-import IIDXLampChart from "components/charts/IIDXLampChart";
-import DeltaCell from "components/tables/cells/DeltaCell";
-import IIDXLampCell from "components/tables/cells/IIDXLampCell";
-import ScoreCell from "components/tables/cells/ScoreCell";
-import TimestampCell from "components/tables/cells/TimestampCell";
-import MiniTable from "components/tables/components/MiniTable";
-import ExternalLink from "components/util/ExternalLink";
import Icon from "components/util/Icon";
import Loading from "components/util/Loading";
import SelectButton from "components/util/SelectButton";
import React, { useMemo, useState } from "react";
import { useQuery } from "react-query";
-import { ChartDocument, PBScoreDocument, PublicUserDocument } from "tachi-common";
+import { ChartDocument, PublicUserDocument } from "tachi-common";
import { UGPTChartPBComposition } from "types/api-returns";
-import { GamePT } from "types/react";
+import { GamePT, SetState } from "types/react";
import { APIFetchV1 } from "util/api";
import { IsScore } from "util/asserts";
+import CommentContainer from "./components/CommentContainer";
import DropdownStructure from "./components/DropdownStructure";
import { IIDXGraphsComponent, ModsTable, ScoreInfo } from "./components/IIDXScoreDropdownParts";
import JudgementTable from "./components/JudgementTable";
import PBNote from "./components/PBNote";
+import ScoreEditButtons from "./components/ScoreEditButtons";
export default function IIDXPBDropdown({
game,
playtype,
reqUser,
chart,
+ scoreState,
}: {
reqUser: PublicUserDocument;
- chart: ChartDocument<"iidx:SP">;
+ chart: ChartDocument<"iidx:SP" | "iidx:DP">;
+ scoreState: {
+ highlight: boolean;
+ setHighlight: SetState;
+ };
} & GamePT) {
const [view, setView] = useState<"pb" | "scorePB" | "lampPB" | "bpPB" | "history">("pb");
@@ -81,7 +81,11 @@ export default function IIDXPBDropdown({
}
>
- {view === "history" ? <> : ;
+ };
}) {
const idMap = {
scorePB: pbData.pb.composedFrom.scorePB,
@@ -108,8 +117,7 @@ function DocumentDisplay({
return pbData.scores.filter(e => e.scoreID === idMap[view])[0];
}, [view]);
- // @ts-expect-error temp
- currentDoc.comment = "THIS IS AN EXAMPLE COMMENT.";
+ const [comment, setComment] = useState(IsScore(currentDoc) ? currentDoc.comment : null);
return (
<>
@@ -119,11 +127,11 @@ function DocumentDisplay({
{IsScore(currentDoc) ? (
<>
- "{currentDoc.comment}"
-
- )}
+
diff --git a/client/src/components/tables/pbs/dropdowns/IIDXScoreDropdown.tsx b/client/src/components/tables/dropdowns/IIDXScoreDropdown.tsx
similarity index 80%
rename from client/src/components/tables/pbs/dropdowns/IIDXScoreDropdown.tsx
rename to client/src/components/tables/dropdowns/IIDXScoreDropdown.tsx
index 5ec8f11ea..bfc27ab91 100644
--- a/client/src/components/tables/pbs/dropdowns/IIDXScoreDropdown.tsx
+++ b/client/src/components/tables/dropdowns/IIDXScoreDropdown.tsx
@@ -3,15 +3,16 @@ import Loading from "components/util/Loading";
import SelectButton from "components/util/SelectButton";
import React, { useState } from "react";
import { UGPTChartPBComposition } from "types/api-returns";
-import { GamePT } from "types/react";
+import { GamePT, SetState } from "types/react";
import { APIFetchV1 } from "util/api";
import DropdownStructure from "./components/DropdownStructure";
import { PublicUserDocument, ChartDocument, ScoreDocument } from "tachi-common";
import { useQuery } from "react-query";
import { IsScore } from "util/asserts";
-import { IIDXGraphsComponent, ScoreInfo, ModsTable } from "./components/IIDXScoreDropdownParts";
+import { IIDXGraphsComponent, ModsTable } from "./components/IIDXScoreDropdownParts";
import JudgementTable from "./components/JudgementTable";
-import PBNote from "./components/PBNote";
+import CommentContainer from "./components/CommentContainer";
+import ScoreEditButtons from "./components/ScoreEditButtons";
export default function IIDXScoreDropdown({
thisScore,
@@ -19,10 +20,17 @@ export default function IIDXScoreDropdown({
playtype,
reqUser,
chart,
+ scoreState,
}: {
thisScore: ScoreDocument<"iidx:SP" | "iidx:DP">;
reqUser: PublicUserDocument;
- chart: ChartDocument<"iidx:SP">;
+ chart: ChartDocument<"iidx:SP" | "iidx:DP">;
+ scoreState: {
+ highlight: boolean;
+ comment: string | null;
+ setHighlight: SetState
;
+ setComment: SetState;
+ };
} & GamePT) {
const [view, setView] = useState<"vsPB" | "moreInfo" | "history">("moreInfo");
@@ -55,19 +63,14 @@ export default function IIDXScoreDropdown({
let content = null;
- thisScore.comment = "THIS IS AN EXAMPLE COMMENT.";
-
if (view === "moreInfo") {
content = (
<>
- {thisScore.comment && (
-
- "{thisScore.comment}"
-
- )}
+
+
diff --git a/client/src/components/tables/dropdowns/components/CommentContainer.tsx b/client/src/components/tables/dropdowns/components/CommentContainer.tsx
new file mode 100644
index 000000000..2ff1b4894
--- /dev/null
+++ b/client/src/components/tables/dropdowns/components/CommentContainer.tsx
@@ -0,0 +1,13 @@
+import React from "react";
+
+export default function CommentContainer({ comment }: { comment: string | null }) {
+ if (!comment) {
+ return null;
+ }
+
+ return (
+
+ "{comment}"
+
+ );
+}
diff --git a/client/src/components/tables/pbs/dropdowns/components/DropdownStructure.tsx b/client/src/components/tables/dropdowns/components/DropdownStructure.tsx
similarity index 100%
rename from client/src/components/tables/pbs/dropdowns/components/DropdownStructure.tsx
rename to client/src/components/tables/dropdowns/components/DropdownStructure.tsx
diff --git a/client/src/components/tables/pbs/dropdowns/components/IIDXScoreDropdownParts.tsx b/client/src/components/tables/dropdowns/components/IIDXScoreDropdownParts.tsx
similarity index 100%
rename from client/src/components/tables/pbs/dropdowns/components/IIDXScoreDropdownParts.tsx
rename to client/src/components/tables/dropdowns/components/IIDXScoreDropdownParts.tsx
diff --git a/client/src/components/tables/pbs/dropdowns/components/JudgementTable.tsx b/client/src/components/tables/dropdowns/components/JudgementTable.tsx
similarity index 100%
rename from client/src/components/tables/pbs/dropdowns/components/JudgementTable.tsx
rename to client/src/components/tables/dropdowns/components/JudgementTable.tsx
diff --git a/client/src/components/tables/pbs/dropdowns/components/PBNote.tsx b/client/src/components/tables/dropdowns/components/PBNote.tsx
similarity index 100%
rename from client/src/components/tables/pbs/dropdowns/components/PBNote.tsx
rename to client/src/components/tables/dropdowns/components/PBNote.tsx
diff --git a/client/src/components/tables/dropdowns/components/ScoreEditButtons.tsx b/client/src/components/tables/dropdowns/components/ScoreEditButtons.tsx
new file mode 100644
index 000000000..69fbdd83e
--- /dev/null
+++ b/client/src/components/tables/dropdowns/components/ScoreEditButtons.tsx
@@ -0,0 +1,179 @@
+import QuickTooltip from "components/layout/misc/QuickTooltip";
+import Icon from "components/util/Icon";
+import { UserContext } from "context/UserContext";
+import React, { useContext, useState } from "react";
+import { ScoreDocument } from "tachi-common";
+import { Button, Modal, Form } from "react-bootstrap";
+import { SetState } from "types/react";
+import { APIFetchV1 } from "util/api";
+
+export default function ScoreEditButtons({
+ score,
+ scoreState,
+}: {
+ score: ScoreDocument;
+ scoreState: {
+ highlight: boolean;
+ comment: string | null;
+ setHighlight: SetState
;
+ setComment: SetState;
+ };
+}) {
+ const { user } = useContext(UserContext);
+
+ if (!user || user.id !== score.userID) {
+ return null;
+ }
+
+ const { highlight, setHighlight, comment, setComment } = scoreState;
+
+ const [show, setShow] = useState(false);
+
+ return (
+
+
+ {comment ? (
+ <>
+
+ setShow(true)}>
+
+
+
+ ) : (
+
+ setShow(true)}>
+
+
+ )}
+
+ {highlight ? (
+
+
+ ModifyScore(score.scoreID, { highlight: false }).then(
+ r => r && setHighlight(false)
+ )
+ }
+ >
+
+
+ ) : (
+
+
+ ModifyScore(score.scoreID, { highlight: true }).then(
+ r => r && setHighlight(true)
+ )
+ }
+ >
+
+
+ )}
+
+
+
;
+ comment: string | null;
+ setComment: SetState;
+ scoreID: string;
+}) {
+ const [innerComment, setInnerComment] = useState(comment ?? "");
+
+ return (
+ setShow(false)}>
+
+ Edit Comment
+
+
+
+
+
+ );
+}
diff --git a/client/src/components/tables/pbs/IIDXPBTable.tsx b/client/src/components/tables/pbs/IIDXPBTable.tsx
index 309d3e240..12eefcf29 100644
--- a/client/src/components/tables/pbs/IIDXPBTable.tsx
+++ b/client/src/components/tables/pbs/IIDXPBTable.tsx
@@ -3,11 +3,15 @@ import { FormatDifficulty } from "tachi-common/js/utils/util";
import TitleCell from "../cells/TitleCell";
import RankingCell from "../cells/RankingCell";
import TimestampCell from "../cells/TimestampCell";
-import { ChangeOpacity } from "util/color-opacity";
import { NumericSOV, StrSOV } from "util/sorts";
import SelectableRating from "../components/SelectableRating";
import { PBDataset } from "types/tables";
-import { GetGamePTConfig, PublicUserDocument, ScoreCalculatedDataLookup } from "tachi-common";
+import {
+ GetGamePTConfig,
+ PublicUserDocument,
+ ScoreCalculatedDataLookup,
+ PBScoreDocument,
+} from "tachi-common";
import TachiTable, { Header, ZTableTHProps } from "../components/TachiTable";
import DifficultyCell from "../cells/DifficultyCell";
import ScoreCell from "../cells/ScoreCell";
@@ -16,25 +20,28 @@ import DeltaCell from "../cells/DeltaCell";
import { HumanFriendlyStrToGradeIndex, HumanFriendlyStrToLampIndex } from "util/str-to-num";
import { nanoid } from "nanoid";
import DropdownRow from "../components/DropdownRow";
-import IIDXPBDropdown from "./dropdowns/IIDXPBDropdown";
+import IIDXPBDropdown from "../dropdowns/IIDXPBDropdown";
import IIDXLampCell from "../cells/IIDXLampCell";
+import { IsNullish } from "util/misc";
export default function IIDXPBTable({
dataset,
indexCol = true,
reqUser,
+ playtype,
}: {
- dataset: PBDataset<"iidx:SP">;
+ dataset: PBDataset<"iidx:SP" | "iidx:DP">;
indexCol?: boolean;
reqUser: PublicUserDocument;
+ playtype: "SP" | "DP";
}) {
- const gptConfig = GetGamePTConfig<"iidx:SP">("iidx", "SP");
+ const gptConfig = GetGamePTConfig<"iidx:SP" | "iidx:DP">("iidx", playtype);
- const [rating, setRating] = useState(
+ const [rating, setRating] = useState(
gptConfig.defaultScoreRatingAlg
);
- const headers: Header[0]>[] = [
+ const headers: Header[0]>[] = [
["Chart", "Ch.", NumericSOV(x => x.__related.chart.levelNum)],
["Song", "Song", StrSOV(x => x.__related.song.title)],
["Score", "Score", NumericSOV(x => x.scoreData.percent)],
@@ -45,7 +52,7 @@ export default function IIDXPBTable({
"Rating",
NumericSOV(x => x.calculatedData[rating] ?? 0),
(thProps: ZTableTHProps) => (
-
+
key={nanoid()}
game="iidx"
playtype="SP"
@@ -78,47 +85,69 @@ export default function IIDXPBTable({
ranking: x => x.rankingData.rank,
lamp: {
valueGetter: x => [x.scoreData.lamp, x.scoreData.lampIndex],
- strToNum: HumanFriendlyStrToLampIndex("iidx", "SP"),
+ strToNum: HumanFriendlyStrToLampIndex("iidx", playtype),
},
grade: {
valueGetter: x => [x.scoreData.grade, x.scoreData.gradeIndex],
- strToNum: HumanFriendlyStrToGradeIndex("iidx", "SP"),
+ strToNum: HumanFriendlyStrToGradeIndex("iidx", playtype),
},
}}
defaultSortMode={indexCol ? "#" : undefined}
rowFunction={pb => (
-
- {pb.calculatedData[rating]
- ? pb.calculatedData[rating]!.toFixed(2)
- : "No Data."}
-
- |
)}
/>
);
}
+
+function Row({
+ pb,
+ indexCol,
+ reqUser,
+ rating,
+}: {
+ pb: PBDataset<"iidx:SP" | "iidx:DP">[0];
+ indexCol: boolean;
+ reqUser: PublicUserDocument;
+ rating: ScoreCalculatedDataLookup["iidx:SP"];
+}) {
+ const [highlight, setHighlight] = useState(pb.highlight);
+
+ const scoreState = { highlight, setHighlight };
+
+ return (
+
+ {!IsNullish(pb.calculatedData[rating])
+ ? pb.calculatedData[rating]!.toFixed(2)
+ : "No Data."}
+
+
- {sc.calculatedData[rating]
- ? sc.calculatedData[rating]!.toFixed(2)
- : "No Data."}
-
- )}
- |
}
/>
);
}
+
+function Row({
+ sc,
+ reqUser,
+ rating,
+}: {
+ sc: ScoreDataset<"iidx:SP" | "iidx:DP">[0];
+ reqUser: PublicUserDocument;
+ rating: ScoreCalculatedDataLookup["iidx:SP"];
+}) {
+ const [highlight, setHighlight] = useState(sc.highlight);
+ const [comment, setComment] = useState(sc.comment);
+
+ const scoreState = { highlight, comment, setHighlight, setComment };
+
+ return (
+
+ {IsNullish(sc.calculatedData[rating])
+ ? sc.calculatedData[rating]!.toFixed(2)
+ : "No Data."}
+
+
- {reqUser.username}'s {gameConfig.name} {playtype} Profile
+ {reqUser.username}'s {gameConfig.name} {playtype} Profile
diff --git a/client/src/components/util/AsyncLoader.tsx b/client/src/components/util/AsyncLoader.tsx
index e574ff023..52161f57b 100644
--- a/client/src/components/util/AsyncLoader.tsx
+++ b/client/src/components/util/AsyncLoader.tsx
@@ -20,7 +20,7 @@ export default function AsyncLoader
({
{error => (
- Fatal Error: {error.message}. That's not good!
+ Fatal Error: {error.message}. That's not good!
)}
diff --git a/client/src/components/util/Icon.tsx b/client/src/components/util/Icon.tsx
index dd81595b7..9e0ed9137 100644
--- a/client/src/components/util/Icon.tsx
+++ b/client/src/components/util/Icon.tsx
@@ -1,5 +1,5 @@
import React from "react";
-export default function Icon({ type }: { type: string }) {
- return