π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[web][space] Add removal controls for covers and avatars
r4khul98ae877f3ec2
diff --git a/web/apps/space/src/components/ConfirmationActionSheet.tsx b/web/apps/space/src/components/ConfirmationActionSheet.tsxindex bb85e05481..b1cf7c149d 100644--- a/web/apps/space/src/components/ConfirmationActionSheet.tsx+++ b/web/apps/space/src/components/ConfirmationActionSheet.tsx@@ -6,6 +6,7 @@ import {import { SpaceBottomSheetTransition } from "components/BottomSheetTransition";import React from "react";import {+ spaceDanger,spaceDialogBackground,spaceOnAccent,spaceSurface,@@ -14,7 +15,6 @@ import {} from "styles/colors";const green = "#08C225";-const dangerColor = "#F63A3A";const textBase = spaceText;interface ConfirmationActionSheetProps {@@ -41,7 +41,7 @@ export const ConfirmationActionSheet: React.FC<title,description,confirmLabel,- confirmBackgroundColor = dangerColor,+ confirmBackgroundColor = spaceDanger,confirmClassName,confirmActionPhase = null,confirmDisabled = false,@@ -165,7 +165,7 @@ export const ConfirmationActionSheet: React.FC<<Boxrole="alert"sx={{- color: dangerColor,+ color: spaceDanger,fontFamily:'"Inter Variable", Inter, sans-serif',fontSize: 13,diff --git a/web/apps/space/src/components/ProfileImagePages.tsx b/web/apps/space/src/components/ProfileImagePages.tsxindex a8caaa85c2..72b90414f5 100644--- a/web/apps/space/src/components/ProfileImagePages.tsx+++ b/web/apps/space/src/components/ProfileImagePages.tsx@@ -7,7 +7,12 @@ import {EditProfilePhotoScreen,} from "screens/EditProfilePhotoScreen";import { ProfileImageViewerScreen } from "screens/ProfileImageViewerScreen";-import { saveSpaceProfile, spaceProfileErrorMessage } from "services/profile";+import {+ removeSpaceProfileAvatar,+ removeSpaceProfileCover,+ saveSpaceProfile,+ spaceProfileErrorMessage,+} from "services/profile";import { useSpaceAppState } from "state/app-state";import { spaceAppBackgroundColor } from "styles/colors";import { useSpaceRouter } from "utils/route-transitions";@@ -48,6 +53,7 @@ export const SpaceProfileImageViewerPage: React.FC<{profileLoadStatus,setPendingProfileAvatarFile,setPendingProfileCoverFile,+ setProfile,} = useSpaceAppState();const imageFlowSource = profileImageFlowSourceFromQuery(router.query.from);const backRoute = savedRouteFor(imageFlowSource);@@ -58,6 +64,29 @@ export const SpaceProfileImageViewerPage: React.FC<{}}, [profile, profileLoadStatus, router]);+ const removeProfileImage = async () => {+ if (!profile) return;+ try {+ const savedProfile =+ variant == "cover"+ ? await removeSpaceProfileCover(profile)+ : await removeSpaceProfileAvatar(profile);+ setProfile(savedProfile);+ } catch (error) {+ log.error("Space profile image removal failed", error);+ throw new Error(+ spaceProfileErrorMessage(+ error,+ `Couldn't remove your ${variant == "cover" ? "cover image" : "profile picture"}. Please try again.`,+ ),+ { cause: error },+ );+ }+ void router.push(backRoute).catch((error: unknown) => {+ log.error("Failed to return to Space profile", error);+ });+ };+if (profileLoadStatus != "ready" || !profile) {return (<SpaceRouteFallback@@ -74,6 +103,15 @@ export const SpaceProfileImageViewerPage: React.FC<{profile={profile}variant={variant}onBack={() => void router.push(backRoute)}+ onRemoveImage={+ (+ variant == "cover"+ ? profile.coverObjectID+ : profile.avatarObjectID+ )+ ? removeProfileImage+ : undefined+ }onSelectFile={(file) => {if (variant == "cover") {setPendingProfileCoverFile(file);diff --git a/web/apps/space/src/screens/ProfileImageViewerScreen.tsx b/web/apps/space/src/screens/ProfileImageViewerScreen.tsxindex 68c3354063..f322b71d54 100644--- a/web/apps/space/src/screens/ProfileImageViewerScreen.tsx+++ b/web/apps/space/src/screens/ProfileImageViewerScreen.tsx@@ -1,12 +1,15 @@import { ArrowLeft02Icon, Cancel01Icon } from "@hugeicons/core-free-icons";import { HugeiconsIcon } from "@hugeicons/react";import { Box, Skeleton } from "@mui/material";+import type { SpaceActionPhase } from "components/ActionFeedback";import { spaceAppAvatarCropSize } from "components/AvatarCropPage";import { SpaceAvatarImage } from "components/AvatarImage";+import { ConfirmationActionSheet } from "components/ConfirmationActionSheet";import React, { useEffect, useRef } from "react";import type { SetupProfile } from "screens/SetupProfileScreen";import {spaceAppBackground,+ spaceDanger,spaceOnAccent,spaceSurface,spaceText,@@ -130,6 +133,7 @@ export const FriendProfileImageViewerScreen: React.FC<interface ProfileImageViewerScreenProps {onBack: () => void;+ onRemoveImage?: () => Promise<void>;onSelectFile: (file: File) => void;profile: SetupProfile;variant: "avatar" | "cover";@@ -137,10 +141,19 @@ interface ProfileImageViewerScreenProps {export const ProfileImageViewerScreen: React.FC<ProfileImageViewerScreenProps-> = ({ onBack, onSelectFile, profile, variant }) => {+> = ({ onBack, onRemoveImage, onSelectFile, profile, variant }) => {const inputRef = useRef<HTMLInputElement | null>(null);+ const [isRemoveImageSheetOpen, setIsRemoveImageSheetOpen] =+ React.useState(false);+ const [removeImageActionPhase, setRemoveImageActionPhase] =+ React.useState<SpaceActionPhase | null>(null);+ const [removeImageErrorMessage, setRemoveImageErrorMessage] =+ React.useState<string | null>(null);const isCover = variant == "cover";const title = isCover ? "Cover image" : "Profile picture";+ const removeLabel = isCover+ ? "Remove cover image"+ : "Remove profile picture";const actionLabel = isCover? "Change cover image": "Change profile picture";@@ -163,6 +176,31 @@ export const ProfileImageViewerScreen: React.FC<if (file) onSelectFile(file);};+ const cancelRemoveImage = () => {+ if (removeImageActionPhase) return;+ setRemoveImageErrorMessage(null);+ setIsRemoveImageSheetOpen(false);+ };++ const confirmRemoveImage = async () => {+ if (!onRemoveImage || removeImageActionPhase) return;++ setRemoveImageActionPhase("busy");+ setRemoveImageErrorMessage(null);+ try {+ await onRemoveImage();+ setIsRemoveImageSheetOpen(false);+ setRemoveImageActionPhase(null);+ } catch (error) {+ setRemoveImageErrorMessage(+ error instanceof Error+ ? error.message+ : `Couldn't remove your ${isCover ? "cover image" : "profile picture"}. Please try again.`,+ );+ setRemoveImageActionPhase(null);+ }+ };+return (<Boxcomponent="main"@@ -372,8 +410,55 @@ export const ProfileImageViewerScreen: React.FC<>{actionLabel}</Box>+ {onRemoveImage && (+ <Box+ component="button"+ type="button"+ disabled={Boolean(removeImageActionPhase)}+ onClick={() => {+ setRemoveImageErrorMessage(null);+ setIsRemoveImageSheetOpen(true);+ }}+ sx={{+ bgcolor: "transparent",+ border: 0,+ color: spaceDanger,+ cursor: removeImageActionPhase+ ? "default"+ : "pointer",+ display: "block",+ fontFamily:+ '"Inter Variable", Inter, sans-serif',+ fontSize: 14,+ fontWeight: 500,+ height: 44,+ lineHeight: "20px",+ mt: 1,+ p: 0,+ width: "100%",+ "&:focus-visible": {+ outline: `2px solid ${spaceDanger}`,+ outlineOffset: 3,+ },+ }}+ >+ {removeLabel}+ </Box>+ )}</Box></Box>+ <ConfirmationActionSheet+ open={isRemoveImageSheetOpen}+ title={`${removeLabel}?`}+ description={`Your profile will use the default ${isCover ? "cover image" : "profile picture"}.`}+ confirmLabel={removeLabel}+ confirmActionPhase={removeImageActionPhase}+ confirmDisabled={Boolean(removeImageActionPhase)}+ errorMessage={removeImageErrorMessage}+ cancelDisabled={Boolean(removeImageActionPhase)}+ onCancel={cancelRemoveImage}+ onConfirm={() => void confirmRemoveImage()}+ /></Box>);};diff --git a/web/apps/space/src/services/profile.ts b/web/apps/space/src/services/profile.tsindex f95c60f913..4d2690e2a1 100644--- a/web/apps/space/src/services/profile.ts+++ b/web/apps/space/src/services/profile.ts@@ -446,6 +446,7 @@ export const spaceUsernameAvailability = async (export const saveSpaceProfile = async (profile: SetupProfileInput,referredBySpaceId?: string,+ options?: { removeImage?: "avatar" | "cover" },): Promise<SetupProfile> => {const username = normalizeSpaceUsername(profile.username);@@ -536,6 +537,18 @@ export const saveSpaceProfile = async (profile.coverFile,): URL.createObjectURL(profile.coverFile);+ } else if (options?.removeImage == "avatar" && existingSpace) {+ updateResponse = await ctx.removeSpaceProfileAvatar(+ spaceId,+ profilePayload,+ );+ avatarUrl = null;+ } else if (options?.removeImage == "cover" && existingSpace) {+ updateResponse = await ctx.removeSpaceProfileCover(+ spaceId,+ profilePayload,+ );+ coverUrl = null;} else if (existingSpace) {updateResponse = await ctx.updateSpaceProfile(spaceId,@@ -545,18 +558,36 @@ export const saveSpaceProfile = async (const savedProfile = {avatarKeyVersion:- updateResponse?.avatar?.keyVersion ?? profile.avatarKeyVersion,+ options?.removeImage == "avatar"+ ? undefined+ : (updateResponse?.avatar?.keyVersion ??+ profile.avatarKeyVersion),avatarObjectID:- updateResponse?.avatar?.objectID ?? profile.avatarObjectID,+ options?.removeImage == "avatar"+ ? undefined+ : (updateResponse?.avatar?.objectID ??+ profile.avatarObjectID),avatarUpdatedAt:- updateResponse?.avatar?.updatedAt ?? profile.avatarUpdatedAt,+ options?.removeImage == "avatar"+ ? undefined+ : (updateResponse?.avatar?.updatedAt ??+ profile.avatarUpdatedAt),avatarUrl,coverKeyVersion:- updateResponse?.cover?.keyVersion ?? profile.coverKeyVersion,+ options?.removeImage == "cover"+ ? undefined+ : (updateResponse?.cover?.keyVersion ??+ profile.coverKeyVersion),coverObjectID:- updateResponse?.cover?.objectID ?? profile.coverObjectID,+ options?.removeImage == "cover"+ ? undefined+ : (updateResponse?.cover?.objectID ??+ profile.coverObjectID),coverUpdatedAt:- updateResponse?.cover?.updatedAt ?? profile.coverUpdatedAt,+ options?.removeImage == "cover"+ ? undefined+ : (updateResponse?.cover?.updatedAt ??+ profile.coverUpdatedAt),coverUrl,fullName: profile.fullName.trim(),username: spaceSlug,@@ -572,9 +603,18 @@ export const saveSpaceProfile = async (}};-export const spaceProfileErrorMessage = (error: unknown) => {+export const removeSpaceProfileCover = async (profile: SetupProfile) =>+ await saveSpaceProfile(profile, undefined, { removeImage: "cover" });++export const removeSpaceProfileAvatar = async (profile: SetupProfile) =>+ await saveSpaceProfile(profile, undefined, { removeImage: "avatar" });++export const spaceProfileErrorMessage = (+ error: unknown,+ fallbackMessage = "Couldn't save your profile. Please try again.",+) => {if (!(error instanceof Error)) {- return "Couldn't save your profile. Please try again.";+ return fallbackMessage;}if (error.name == "space_slug_already_exists")return "This username is already taken.";@@ -592,5 +632,5 @@ export const spaceProfileErrorMessage = (error: unknown) => {if (error.name == "permission_denied") {return "You do not have access to update this profile.";}- return "Couldn't save your profile. Please try again.";+ return fallbackMessage;};diff --git a/web/apps/space/src/styles/colors.ts b/web/apps/space/src/styles/colors.tsindex 2bc6a65647..dc71dfd12d 100644--- a/web/apps/space/src/styles/colors.ts+++ b/web/apps/space/src/styles/colors.ts@@ -11,3 +11,4 @@ export const spaceControlBackgroundActive = "#484848";export const spaceText = "#F2F2F2";export const spaceTextMuted = "#B0B0B0";export const spaceOnAccent = "#FFFFFF";+export const spaceDanger = "#F63A3A";