Merge branch 'unstable' into userconfig_disappearingmessage
William Grant
9 months ago
parent
9d8cca1970
commit
85f270b67a
@ -0,0 +1,4 @@
|
||||
#!/usr/bin/env sh
|
||||
. "$(dirname -- "$0")/_/husky.sh"
|
||||
|
||||
npx --no -- commitlint --edit "$1"
|
||||
@ -0,0 +1,4 @@
|
||||
#!/usr/bin/env sh
|
||||
. "$(dirname -- "$0")/_/husky.sh"
|
||||
|
||||
npx lint-staged
|
||||
@ -0,0 +1,29 @@
|
||||
const ignoredFiles = [
|
||||
'package.json',
|
||||
'yarn.lock',
|
||||
'tsconfig.json',
|
||||
'.lintstagedrc.js',
|
||||
'.eslintrc.js',
|
||||
];
|
||||
|
||||
const path = require('path');
|
||||
|
||||
const buildFormatCommand = filenames => {
|
||||
const results = filenames
|
||||
.map(f => path.relative(process.cwd(), f))
|
||||
.filter(f => !ignoredFiles.includes(f));
|
||||
|
||||
return results.length ? `prettier --list-different --write ${results.join(' ')}` : '';
|
||||
};
|
||||
|
||||
const buildLintCommand = filenames => {
|
||||
const results = filenames
|
||||
.map(f => path.relative(process.cwd(), f))
|
||||
.filter(f => !ignoredFiles.includes(f));
|
||||
|
||||
return results.length ? `eslint --cache ${results.join(' ')}` : '';
|
||||
};
|
||||
|
||||
module.exports = {
|
||||
'*.{js,ts,tsx}': [buildFormatCommand, buildLintCommand],
|
||||
};
|
||||
@ -0,0 +1 @@
|
||||
module.exports = { extends: ['@commitlint/config-conventional'] };
|
||||
@ -0,0 +1,164 @@
|
||||
import React, { useState } from 'react';
|
||||
import { useDispatch } from 'react-redux';
|
||||
import styled from 'styled-components';
|
||||
import { clearOurAvatar, uploadOurAvatar } from '../../interactions/conversationInteractions';
|
||||
import { ToastUtils } from '../../session/utils';
|
||||
import { editProfileModal, updateEditProfilePictureModel } from '../../state/ducks/modalDialog';
|
||||
import { pickFileForAvatar } from '../../types/attachments/VisualAttachment';
|
||||
import { SessionWrapperModal } from '../SessionWrapperModal';
|
||||
import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
|
||||
import { SessionSpinner } from '../basic/SessionSpinner';
|
||||
import { SpacerLG } from '../basic/Text';
|
||||
import { SessionIconButton } from '../icon';
|
||||
import { ProfileAvatar } from './EditProfileDialog';
|
||||
|
||||
const StyledAvatarContainer = styled.div`
|
||||
cursor: pointer;
|
||||
`;
|
||||
const UploadImageButton = () => {
|
||||
return (
|
||||
<div style={{ position: 'relative' }}>
|
||||
<div style={{ borderRadius: '50%', overflow: 'hidden' }}>
|
||||
<SessionIconButton
|
||||
iconType="thumbnail"
|
||||
iconSize="max"
|
||||
iconPadding="16px"
|
||||
backgroundColor="var(--chat-buttons-background-color)"
|
||||
/>
|
||||
</div>
|
||||
<SessionIconButton
|
||||
iconType="plusFat"
|
||||
iconSize="medium"
|
||||
iconColor="var(--modal-background-content-color)"
|
||||
iconPadding="4.5px"
|
||||
borderRadius="50%"
|
||||
backgroundColor="var(--primary-color)"
|
||||
style={{ position: 'absolute', bottom: 0, right: 0 }}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
const uploadProfileAvatar = async (scaledAvatarUrl: string | null) => {
|
||||
if (scaledAvatarUrl?.length) {
|
||||
try {
|
||||
const blobContent = await (await fetch(scaledAvatarUrl)).blob();
|
||||
if (!blobContent || !blobContent.size) {
|
||||
throw new Error('Failed to fetch blob content from scaled avatar');
|
||||
}
|
||||
await uploadOurAvatar(await blobContent.arrayBuffer());
|
||||
} catch (error) {
|
||||
if (error.message && error.message.length) {
|
||||
ToastUtils.pushToastError('edit-profile', error.message);
|
||||
}
|
||||
window.log.error(
|
||||
'showEditProfileDialog Error ensuring that image is properly sized:',
|
||||
error && error.stack ? error.stack : error
|
||||
);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
export type EditProfilePictureModalProps = {
|
||||
avatarPath: string | null;
|
||||
profileName: string | undefined;
|
||||
ourId: string;
|
||||
};
|
||||
|
||||
export const EditProfilePictureModal = (props: EditProfilePictureModalProps) => {
|
||||
const dispatch = useDispatch();
|
||||
|
||||
const [newAvatarObjectUrl, setNewAvatarObjectUrl] = useState<string | null>(props.avatarPath);
|
||||
const [loading, setLoading] = useState(false);
|
||||
|
||||
if (!props) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const { avatarPath, profileName, ourId } = props;
|
||||
|
||||
const closeDialog = () => {
|
||||
dispatch(updateEditProfilePictureModel(null));
|
||||
dispatch(editProfileModal({}));
|
||||
};
|
||||
|
||||
const handleAvatarClick = async () => {
|
||||
const updatedAvatarObjectUrl = await pickFileForAvatar();
|
||||
if (updatedAvatarObjectUrl) {
|
||||
setNewAvatarObjectUrl(updatedAvatarObjectUrl);
|
||||
}
|
||||
};
|
||||
|
||||
const handleUpload = async () => {
|
||||
setLoading(true);
|
||||
if (newAvatarObjectUrl === avatarPath) {
|
||||
window.log.debug('Avatar Object URL has not changed!');
|
||||
return;
|
||||
}
|
||||
|
||||
await uploadProfileAvatar(newAvatarObjectUrl);
|
||||
setLoading(false);
|
||||
dispatch(updateEditProfilePictureModel(null));
|
||||
};
|
||||
|
||||
const handleRemove = async () => {
|
||||
setLoading(true);
|
||||
await clearOurAvatar();
|
||||
setNewAvatarObjectUrl(null);
|
||||
setLoading(false);
|
||||
dispatch(updateEditProfilePictureModel(null));
|
||||
};
|
||||
|
||||
return (
|
||||
<SessionWrapperModal
|
||||
title={window.i18n('setDisplayPicture')}
|
||||
onClose={closeDialog}
|
||||
showHeader={true}
|
||||
showExitIcon={true}
|
||||
>
|
||||
<div
|
||||
className="avatar-center"
|
||||
role="button"
|
||||
onClick={() => void handleAvatarClick()}
|
||||
data-testid={'image-upload-click'}
|
||||
>
|
||||
<StyledAvatarContainer className="avatar-center-inner">
|
||||
{newAvatarObjectUrl || avatarPath ? (
|
||||
<ProfileAvatar
|
||||
newAvatarObjectUrl={newAvatarObjectUrl}
|
||||
avatarPath={avatarPath}
|
||||
profileName={profileName}
|
||||
ourId={ourId}
|
||||
/>
|
||||
) : (
|
||||
<UploadImageButton />
|
||||
)}
|
||||
</StyledAvatarContainer>
|
||||
</div>
|
||||
|
||||
{loading ? (
|
||||
<SessionSpinner loading={loading} />
|
||||
) : (
|
||||
<>
|
||||
<SpacerLG />
|
||||
<div className="session-modal__button-group">
|
||||
<SessionButton
|
||||
text={window.i18n('save')}
|
||||
buttonType={SessionButtonType.Simple}
|
||||
onClick={handleUpload}
|
||||
disabled={newAvatarObjectUrl === avatarPath}
|
||||
dataTestId="save-button-profile-update"
|
||||
/>
|
||||
<SessionButton
|
||||
text={window.i18n('remove')}
|
||||
buttonColor={SessionButtonColor.Danger}
|
||||
buttonType={SessionButtonType.Simple}
|
||||
onClick={handleRemove}
|
||||
disabled={!avatarPath}
|
||||
/>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
</SessionWrapperModal>
|
||||
);
|
||||
};
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue