keejef
/
session-desktop
mirror of https://github.com/oxen-io/session-desktop
2
0
Fork 0
Code Issues 8 Projects Releases Wiki Activity

user details modal refactor functioning.

Browse Source
pull/1665/head^2
Warrick Corfe-Tan 4 years ago
parent e8d06e86b5
commit 7c82ccb3e9
8 changed files with 85 additions and 46 deletions
Show Stats Download Patch File Download Diff File

6
background.html
Unescape Escape View File

@ -139,10 +139,10 @@
<!-- DIALOGS--> <!-- DIALOGS-->
<!-- <script type='text/javascript' src='js/views/update_group_dialog_view.js'></script> --> <!-- <script type='text/javascript' src='js/views/update_group_dialog_view.js'></script> -->
<script type='text/javascript' src='js/views/invite_contacts_dialog_view.js'></script> <!-- <script type='text/javascript' src='js/views/invite_contacts_dialog_view.js'></script> -->
<script type='text/javascript' src='js/views/admin_leave_closed_group_dialog_view.js'></script> <!-- <script type='text/javascript' src='js/views/admin_leave_closed_group_dialog_view.js'></script> -->
<script type='text/javascript' src='js/views/user_details_dialog_view.js'></script> <!-- <script type='text/javascript' src='js/views/user_details_dialog_view.js'></script> -->
<script type='text/javascript' src='js/views/session_id_reset_view.js'></script> <script type='text/javascript' src='js/views/session_id_reset_view.js'></script>
<!-- CRYPTO --> <!-- CRYPTO -->

50
js/background.js
Unescape Escape View File

@ -448,11 +448,11 @@
// } // }
// }); // });
Whisper.events.on('leaveClosedGroup', async groupConvo => { // Whisper.events.on('leaveClosedGroup', async groupConvo => {
if (appView) { // if (appView) {
appView.showLeaveGroupDialog(groupConvo); // appView.showLeaveGroupDialog(groupConvo);
} // }
}); // });
Whisper.Notifications.on('click', (id, messageId) => { Whisper.Notifications.on('click', (id, messageId) => {
window.showWindow(); window.showWindow();
@ -471,28 +471,28 @@
}); });
}); });
Whisper.events.on('onShowUserDetails', async ({ userPubKey }) => { // Whisper.events.on('onShowUserDetails', async ({ userPubKey }) => {
const conversation = await window // const conversation = await window
.getConversationController() // .getConversationController()
.getOrCreateAndWait(userPubKey, 'private'); // .getOrCreateAndWait(userPubKey, 'private');
const avatarPath = conversation.getAvatarPath(); // const avatarPath = conversation.getAvatarPath();
const profile = conversation.getLokiProfile(); // const profile = conversation.getLokiProfile();
const displayName = profile && profile.displayName; // const displayName = profile && profile.displayName;
if (appView) { // if (appView) {
appView.showUserDetailsDialog({ // appView.showUserDetailsDialog({
profileName: displayName, // profileName: displayName,
pubkey: userPubKey, // pubkey: userPubKey,
avatarPath, // avatarPath,
onStartConversation: () => { // onStartConversation: () => {
window.inboxStore.dispatch( // window.inboxStore.dispatch(
window.actionsCreators.openConversationExternal(conversation.id) // window.actionsCreators.openConversationExternal(conversation.id)
); // );
}, // },
}); // });
} // }
}); // });
Whisper.events.on('password-updated', () => { Whisper.events.on('password-updated', () => {

12
js/views/app_view.js
Unescape Escape View File

@ -117,12 +117,12 @@
this.el.prepend(resetSessionIDDialog.el); this.el.prepend(resetSessionIDDialog.el);
}, },
showUserDetailsDialog(options) { // showUserDetailsDialog(options) {
// eslint-disable-next-line no-param-reassign // // eslint-disable-next-line no-param-reassign
options.theme = this.getThemeObject(); // options.theme = this.getThemeObject();
const dialog = new Whisper.UserDetailsDialogView(options); // const dialog = new Whisper.UserDetailsDialogView(options);
this.el.prepend(dialog.el); // this.el.prepend(dialog.el);
}, // },
getThemeObject() { getThemeObject() {
const themeSettings = storage.get('theme-setting') || 'light'; const themeSettings = storage.get('theme-setting') || 'light';
const theme = themeSettings === 'light' ? window.lightTheme : window.darkTheme; const theme = themeSettings === 'light' ? window.lightTheme : window.darkTheme;

22
ts/components/UserDetailsDialog.tsx
Unescape Escape View File

@ -5,6 +5,10 @@ import { SessionModal } from './session/SessionModal';
import { SessionButton, SessionButtonColor, SessionButtonType } from './session/SessionButton'; import { SessionButton, SessionButtonColor, SessionButtonType } from './session/SessionButton';
import { SessionIdEditable } from './session/SessionIdEditable'; import { SessionIdEditable } from './session/SessionIdEditable';
import { DefaultTheme } from 'styled-components'; import { DefaultTheme } from 'styled-components';
import { ConversationController } from '../session/conversations';
import { ConversationTypeEnum } from '../models/conversation';
import { Session } from 'electron';
import { SessionWrapperModal } from './session/SessionWrapperModal';
interface Props { interface Props {
i18n: any; i18n: any;
@ -12,7 +16,7 @@ interface Props {
avatarPath: string; avatarPath: string;
pubkey: string; pubkey: string;
onClose: any; onClose: any;
onStartConversation: any; // onStartConversation: any;
theme: DefaultTheme; theme: DefaultTheme;
} }
@ -35,7 +39,7 @@ export class UserDetailsDialog extends React.Component<Props, State> {
const { i18n } = this.props; const { i18n } = this.props;
return ( return (
<SessionModal <SessionWrapperModal
title={this.props.profileName} title={this.props.profileName}
onClose={this.closeDialog} onClose={this.closeDialog}
theme={this.props.theme} theme={this.props.theme}
@ -43,6 +47,8 @@ export class UserDetailsDialog extends React.Component<Props, State> {
<div className="avatar-center"> <div className="avatar-center">
<div className="avatar-center-inner">{this.renderAvatar()}</div> <div className="avatar-center-inner">{this.renderAvatar()}</div>
</div> </div>
<div className="spacer-md"></div>
<SessionIdEditable editable={false} text={this.props.pubkey} /> <SessionIdEditable editable={false} text={this.props.pubkey} />
<div className="session-modal__button-group__center"> <div className="session-modal__button-group__center">
@ -53,7 +59,7 @@ export class UserDetailsDialog extends React.Component<Props, State> {
onClick={this.onClickStartConversation} onClick={this.onClickStartConversation}
/> />
</div> </div>
</SessionModal> </SessionWrapperModal>
); );
} }
@ -95,8 +101,14 @@ export class UserDetailsDialog extends React.Component<Props, State> {
this.props.onClose(); this.props.onClose();
} }
private onClickStartConversation() { private async onClickStartConversation() {
this.props.onStartConversation(); // this.props.onStartConversation();
const conversation = await ConversationController.getInstance().getOrCreateAndWait(this.props.pubkey, ConversationTypeEnum.PRIVATE);
window.inboxStore?.dispatch(
window.actionsCreators.openConversationExternal(conversation.id)
);
this.closeDialog(); this.closeDialog();
} }
} }

19
ts/components/conversation/Message.tsx
Unescape Escape View File

@ -71,10 +71,10 @@ import { useTheme, withTheme } from 'styled-components';
import { MessageMetadata } from './message/MessageMetadata'; import { MessageMetadata } from './message/MessageMetadata';
import { PubKey } from '../../session/types'; import { PubKey } from '../../session/types';
import { ToastUtils, UserUtils } from '../../session/utils'; import { ToastUtils, UserUtils } from '../../session/utils';
import { ConversationController } from '../../session/conversations';
import { MessageRegularProps } from '../../models/messageType'; import { MessageRegularProps } from '../../models/messageType';
import { useEncryptedFileFetch } from '../../hooks/useEncryptedFileFetch'; import { useEncryptedFileFetch } from '../../hooks/useEncryptedFileFetch';
import { addSenderAsModerator, removeSenderFromModerator } from '../../interactions/message'; import { addSenderAsModerator, removeSenderFromModerator } from '../../interactions/message';
import { UserDetailsDialog } from '../UserDetailsDialog';
// Same as MIN_WIDTH in ImageGrid.tsx // Same as MIN_WIDTH in ImageGrid.tsx
const MINIMUM_LINK_PREVIEW_IMAGE_WIDTH = 200; const MINIMUM_LINK_PREVIEW_IMAGE_WIDTH = 200;
@ -467,8 +467,8 @@ class MessageInner extends React.PureComponent<MessageRegularProps, State> {
conversationType, conversationType,
direction, direction,
isPublic, isPublic,
onShowUserDetails,
firstMessageOfSeries, firstMessageOfSeries,
updateSessionConversationModal
} = this.props; } = this.props;
if (collapseMetadata || conversationType !== 'group' || direction === 'outgoing') { if (collapseMetadata || conversationType !== 'group' || direction === 'outgoing') {
@ -480,15 +480,24 @@ class MessageInner extends React.PureComponent<MessageRegularProps, State> {
return <div style={{ marginInlineEnd: '60px' }} />; return <div style={{ marginInlineEnd: '60px' }} />;
} }
const onAvatarClick = () => {
updateSessionConversationModal(<UserDetailsDialog
i18n={window.i18n}
profileName={userName}
avatarPath={authorAvatarPath || ''}
pubkey={authorPhoneNumber}
onClose={() => updateSessionConversationModal(null)}
theme={this.props.theme}
/>)
}
return ( return (
<div className="module-message__author-avatar"> <div className="module-message__author-avatar">
<Avatar <Avatar
avatarPath={authorAvatarPath} avatarPath={authorAvatarPath}
name={userName} name={userName}
size={AvatarSize.S} size={AvatarSize.S}
onAvatarClick={() => { onAvatarClick={onAvatarClick}
onShowUserDetails(authorPhoneNumber);
}}
pubkey={authorPhoneNumber} pubkey={authorPhoneNumber}
/> />
{isPublic && isAdmin && ( {isPublic && isAdmin && (

13
ts/components/session/conversation/SessionConversation.tsx
Unescape Escape View File

@ -451,9 +451,22 @@ export class SessionConversation extends React.Component<Props, State> {
onDownloadAttachment: this.saveAttachment, onDownloadAttachment: this.saveAttachment,
messageContainerRef: this.messageContainerRef, messageContainerRef: this.messageContainerRef,
onDeleteSelectedMessages: this.deleteSelectedMessages, onDeleteSelectedMessages: this.deleteSelectedMessages,
updateSessionConversationModal: this.updateSessionConversationModal
}; };
} }
/**
* Setting this to a JSX element that will be rendered if non-null.
* @param update Value to set the modal state to
*/
private updateSessionConversationModal (update: JSX.Element | null) {
this.setState({
...this.state,
modal: update
})
}
public getRightPanelProps() { public getRightPanelProps() {
const { selectedConversationKey } = this.props; const { selectedConversationKey } = this.props;
const conversation = ConversationController.getInstance().getOrThrow(selectedConversationKey); const conversation = ConversationController.getInstance().getOrThrow(selectedConversationKey);

3
ts/components/session/conversation/SessionMessagesList.tsx
Unescape Escape View File

@ -47,6 +47,7 @@ interface Props {
onClickAttachment: (attachment: any, message: any) => void; onClickAttachment: (attachment: any, message: any) => void;
onDownloadAttachment: ({ attachment }: { attachment: any }) => void; onDownloadAttachment: ({ attachment }: { attachment: any }) => void;
onDeleteSelectedMessages: () => Promise<void>; onDeleteSelectedMessages: () => Promise<void>;
updateSessionConversationModal: (modal: JSX.Element | null) => any;
} }
export class SessionMessagesList extends React.Component<Props, State> { export class SessionMessagesList extends React.Component<Props, State> {
@ -320,6 +321,8 @@ export class SessionMessagesList extends React.Component<Props, State> {
}; };
} }
messageProps.updateSessionConversationModal = this.props.updateSessionConversationModal
return <Message {...messageProps} key={messageProps.id} />; return <Message {...messageProps} key={messageProps.id} />;
} }

2
ts/models/messageType.ts
Unescape Escape View File

@ -228,6 +228,8 @@ export interface MessageRegularProps {
onCopyPubKey?: () => void; onCopyPubKey?: () => void;
onBanUser?: () => void; onBanUser?: () => void;
onUnbanUser?: () => void; onUnbanUser?: () => void;
// setModal?: any;
updateSessionConversationModal: (modal: JSX.Element | null) => any;
onShowDetail: () => void; onShowDetail: () => void;
onShowUserDetails: (userPubKey: string) => void; onShowUserDetails: (userPubKey: string) => void;

Write Preview
Loading…
Cancel
Save