Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Chore: Convert useUpdateAvatar to TS and type avatar endpoints #25430

Merged
merged 1 commit into from
May 9, 2022
Merged

Chore: Convert useUpdateAvatar to TS and type avatar endpoints #25430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 25 additions & 5 deletions apps/meteor/client/hooks/useUpdateAvatar.js → apps/meteor/client/hooks/useUpdateAvatar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { IUser } from '@rocket.chat/core-typings';
import { useMemo, useCallback } from 'react';

import { useMethod } from '../contexts/ServerContext';
Expand All @@ -6,9 +7,28 @@ import { useTranslation } from '../contexts/TranslationContext';
import { useEndpointAction } from './useEndpointAction';
import { useEndpointUpload } from './useEndpointUpload';

export const useUpdateAvatar = (avatarObj, userId) => {
type AvatarUrlObj = {
avatarUrl: string;
};

type AvatarReset = 'reset';

type AvatarServiceObject = {
blob: Blob;
contentType: string;
service: string;
};

type AvatarObject = AvatarReset | AvatarUrlObj | FormData | AvatarServiceObject;

const isAvatarReset = (avatarObj: AvatarObject): avatarObj is AvatarReset => typeof avatarObj === 'string';
const isServiceObject = (avatarObj: AvatarObject): avatarObj is AvatarServiceObject => !isAvatarReset(avatarObj) && 'service' in avatarObj;
const isAvatarUrl = (avatarObj: AvatarObject): avatarObj is AvatarUrlObj =>
!isAvatarReset(avatarObj) && 'service' && 'avatarUrl' in avatarObj;

export const useUpdateAvatar = (avatarObj: AvatarObject, userId: IUser['_id']): (() => void) => {
const t = useTranslation();
const avatarUrl = avatarObj?.avatarUrl;
const avatarUrl = isAvatarUrl(avatarObj) ? avatarObj.avatarUrl : '';

const successText = t('Avatar_changed_successfully');
const setAvatarFromService = useMethod('setAvatarFromService');
Expand All @@ -35,13 +55,13 @@ export const useUpdateAvatar = (avatarObj, userId) => {
const resetAvatarAction = useEndpointAction('POST', 'users.resetAvatar', resetAvatarQuery, successText);

const updateAvatar = useCallback(async () => {
if (avatarObj === 'reset') {
if (isAvatarReset(avatarObj)) {
return resetAvatarAction();
}
if (avatarObj.avatarUrl) {
if (isAvatarUrl(avatarObj)) {
return saveAvatarUrlAction();
}
if (avatarObj.service) {
if (isServiceObject(avatarObj)) {
const { blob, contentType, service } = avatarObj;
try {
await setAvatarFromService(blob, contentType, service);
Expand Down
6 changes: 6 additions & 0 deletions packages/rest-typings/src/v1/users.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,10 @@ export type UsersEndpoints = {
'users.listTeams': {
GET: (params: { userId: IUser['_id'] }) => { teams: Array<ITeam> };
};
'users.setAvatar': {
POST: (params: { userId?: IUser['_id']; username?: IUser['username']; avatarUrl?: string }) => void;
};
'users.resetAvatar': {
POST: (params: { userId?: IUser['_id']; username?: IUser['username'] }) => void;
};
};