monkeytypegame/monkeytype
1
1
Fork 0
mirror of https://github.com/monkeytypegame/monkeytype.git synced 2025-10-08 06:29:45 +08:00
Code Issues Projects Releases Packages Wiki Activity

remove friends indicator, disable buttons after click

Browse source
This commit is contained in:
Christian Fehmer 2025-09-12 12:02:08 +02:00 • committed by Christian Fehmer
parent fbffc242df
commit cc6d76c72f
4 changed files with 47 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
frontend/src/ts/db.ts
View file

@ -35,6 +35,7 @@ import {
configurationPromise,
get as getServerConfiguration,
} from "./ape/server-configuration";
import { Connection } from "@monkeytype/schemas/connections";
let dbSnapshot: Snapshot | undefined;
const firstDayOfTheWeek = getFirstDayOfTheWeek();
@ -268,19 +269,7 @@ export async function initSnapshot(): Promise<Snapshot | false> {
);
}
snap.connections = Object.fromEntries(
connectionsData.map((connection) => {
const isMyRequest =
getAuthenticatedUser()?.uid === connection.initiatorUid;
return [
isMyRequest ? connection.friendUid : connection.initiatorUid,
connection.status === "pending" && !isMyRequest
? "incoming"
: connection.status,
];
})
);
snap.connections = convertConnections(connectionsData);
dbSnapshot = snap;
return dbSnapshot;
@ -1116,6 +1105,32 @@ export async function getTestActivityCalendar(
return dbSnapshot.testActivityByYear[yearString];
}
export function updateConnections(connections: Connection[]): void {
const snapshot = getSnapshot();
if (!snapshot) return;
snapshot.connections = convertConnections(connections);
setSnapshot(snapshot);
}
function convertConnections(
connectionsData: Connection[]
): Snapshot["connections"] {
return Object.fromEntries(
connectionsData.map((connection) => {
const isMyRequest =
getAuthenticatedUser()?.uid === connection.initiatorUid;
return [
isMyRequest ? connection.friendUid : connection.initiatorUid,
connection.status === "pending" && !isMyRequest
? "incoming"
: connection.status,
];
})
);
}
// export async function DB.getLocalTagPB(tagId) {
// function cont() {
// let ret = 0;

2
frontend/src/ts/elements/account-button.ts
View file

@ -96,7 +96,7 @@ export function updateFriendRequestsIndicator(): void {
}
$("nav .view-account > .notificationBubble").addClass("hidden");
$("nav goToFriends > .notificationBubble").addClass("hidden");
$("nav .goToFriends > .notificationBubble").addClass("hidden");
}
const coarse = window.matchMedia("(pointer:coarse)")?.matches;

11
frontend/src/ts/elements/account-settings/blocked-user-table.ts
View file

@ -76,13 +76,15 @@ function refreshList(): void {
}
element.on("click", "table button.delete", async (e) => {
const id = (e.target as HTMLElement).parentElement?.parentElement?.dataset[
"id"
];
const row = (e.target as HTMLElement).closest("tr") as HTMLElement;
const id = row.dataset["id"];
if (id === undefined) {
throw new Error("Cannot find id of target.");
}
row.querySelectorAll("button").forEach((button) => (button.disabled = true));
const response = await Ape.connections.delete({ params: { id } });
if (response.status !== 200) {
Notifications.add(`Cannot unblock user: ${response.body.message}`, -1);
@ -92,8 +94,7 @@ element.on("click", "table button.delete", async (e) => {
const snapshot = DB.getSnapshot();
if (snapshot) {
const uid = (e.target as HTMLElement).parentElement?.parentElement
?.dataset["uid"];
const uid = row.dataset["uid"];
if (uid === undefined) {
throw new Error("Cannot find uid of target.");
}

24
frontend/src/ts/pages/friends.ts
View file

@ -138,6 +138,7 @@ async function fetchPendingConnections(): Promise<void> {
pendingRequests = undefined;
} else {
pendingRequests = result.body.data;
DB.updateConnections(pendingRequests);
}
}
@ -380,10 +381,12 @@ $(".pageFriends .pendingRequests table").on("click", async (e) => {
if (action === undefined) return;
const id = e.target.parentElement?.parentElement?.dataset["id"];
const row = e.target.closest("tr") as HTMLElement;
const id = row.dataset["id"];
if (id === undefined) {
throw new Error("Cannot find id of target.");
}
row.querySelectorAll("button").forEach((button) => (button.disabled = true));
const result =
action === "rejected"
@ -407,8 +410,7 @@ $(".pageFriends .pendingRequests table").on("click", async (e) => {
const snapshot = DB.getSnapshot();
if (snapshot) {
const friendUid =
e.target.parentElement?.parentElement?.dataset["friendUid"];
const friendUid = row.dataset["friendUid"];
if (friendUid === undefined) {
throw new Error("Cannot find friendUid of target.");
}
@ -435,16 +437,14 @@ $(".pageFriends .friends table").on("click", async (e) => {
if (action === undefined) return;
if (action === "remove") {
const connectionId =
e.target.parentElement?.parentElement?.dataset["connectionId"];
if (connectionId === undefined) {
throw new Error("Cannot find id of target.");
}
const row = e.target.closest("tr") as HTMLElement;
const connectionId = row.dataset["connectionId"];
if (connectionId === undefined) {
throw new Error("Cannot find id of target.");
}
const name =
e.target.parentElement?.parentElement?.querySelector("a.entryName")
?.textContent ?? "";
if (action === "remove") {
const name = row.querySelector("a.entryName")?.textContent ?? "";
removeFriendModal.show([connectionId, name], {});
}