π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Block concurrent file count initialization
Neeraj Gupta08247236c90e
diff --git a/infra/staff/src/App.tsx b/infra/staff/src/App.tsxindex 7e7ebf0899..478a760925 100644--- a/infra/staff/src/App.tsx+++ b/infra/staff/src/App.tsx@@ -23,6 +23,7 @@ import duckieimage from "./components/duckie.png";import {getScheduledDeletions,getUser,+ initializeFileCounts,type ScheduledDeletion,type UserResponse,} from "./services/admin-user";@@ -55,6 +56,7 @@ export const App: React.FC = () => {useState(false);const [scheduledDeletionsLoaded, setScheduledDeletionsLoaded] =useState(false);+ const [fileCountInitPending, setFileCountInitPending] = useState(false);const searchRequestID = useRef(0);useEffect(() => {@@ -173,6 +175,30 @@ export const App: React.FC = () => {[authToken, selectedUserEmail],);const displayedRequestID = searchRequestID.current;+ const initializeDisplayedFileCounts = async (+ userID: number,+ requestID: number,+ ) => {+ setFileCountInitPending(true);+ try {+ const result = await initializeFileCounts(+ { token: authToken },+ userID,+ );+ if (result.reason) alert(result.reason);+ if (result.initialized && requestID === searchRequestID.current) {+ await fetchData(`${userID}`, authToken);+ }+ } catch (error) {+ alert(+ error instanceof Error+ ? error.message+ : "Failed to initialize file counts",+ );+ } finally {+ setFileCountInitPending(false);+ }+ };return (<StaffSessionProvider session={session}>@@ -287,14 +313,14 @@ export const App: React.FC = () => {{tabValue === 0 && (<UserDetailsuserData={userData}- onFileCountsInitialized={() =>- displayedRequestID ===- searchRequestID.current- ? fetchData(- selectedUserEmail,- authToken,- )- : Promise.resolve()+ fileCountInitPending={+ fileCountInitPending+ }+ onInitializeFileCounts={() =>+ initializeDisplayedFileCounts(+ userData.userID,+ displayedRequestID,+ )}/>)}diff --git a/infra/staff/src/components/UserDetails.tsx b/infra/staff/src/components/UserDetails.tsxindex 3ed4853c82..77d9e9b3de 100644--- a/infra/staff/src/components/UserDetails.tsx+++ b/infra/staff/src/components/UserDetails.tsx@@ -15,8 +15,6 @@ import {Typography,} from "@mui/material";import React, { useEffect, useState } from "react";-import { initializeFileCounts } from "../services/admin-user";-import { useStaffSession } from "../services/session";import { SUCCESS_COLOR } from "../utils";import { AddOTT } from "./AddOTT";import { ChangeEmail } from "./ChangeEmail";@@ -53,14 +51,15 @@ type UserSectionKey = "user" | "storage" | "subscription" | "security";interface UserDetailsProps {userData: UserDetailsData;- onFileCountsInitialized: () => Promise<void>;+ fileCountInitPending: boolean;+ onInitializeFileCounts: () => Promise<void>;}export const UserDetails: React.FC<UserDetailsProps> = ({userData,- onFileCountsInitialized,+ fileCountInitPending,+ onInitializeFileCounts,}) => {- const session = useStaffSession();const [deleteAccountOpen, setDeleteAccountOpen] = useState(false);const [emailMFAEnabled, setEmailMFAEnabled] = useState(userData.securityState.emailMFAEnabled,@@ -74,7 +73,6 @@ export const UserDetails: React.FC<UserDetailsProps> = ({const [changeEmailOpen, setChangeEmailOpen] = useState(false);const [disablePasskeysOpen, setDisablePasskeysOpen] = useState(false);const [addOTTOpen, setAddOTTOpen] = useState(false);- const [fileCountInitDisabled, setFileCountInitDisabled] = useState(false);const { canDisableEmailMFA } = userData.securityState;useEffect(() => {@@ -97,22 +95,6 @@ export const UserDetails: React.FC<UserDetailsProps> = ({setDisable2FAOpen(true);}};- const handleInitializeFileCounts = async () => {- setFileCountInitDisabled(true);- window.setTimeout(() => setFileCountInitDisabled(false), 30_000);- try {- const result = await initializeFileCounts(session, userData.userID);- if (result.reason) alert(result.reason);- if (result.initialized) await onFileCountsInitialized();- } catch (error) {- alert(- error instanceof Error- ? error.message- : "Failed to initialize file counts",- );- }- };-const sections: {key: UserSectionKey;title: string;@@ -158,11 +140,13 @@ export const UserDetails: React.FC<UserDetailsProps> = ({{userData.showFileCountInitializer && (<Buttonvariant="contained"- disabled={fileCountInitDisabled}- onClick={() => handleInitializeFileCounts()}+ disabled={fileCountInitPending}+ onClick={onInitializeFileCounts}sx={{ textTransform: "none" }}>- Initialize file counts+ {fileCountInitPending+ ? "Initializing..."+ : "Initialize file counts"}</Button>)}