Moves group link management actions to redux

This commit is contained in:
Josh Perez 2022-06-13 14:42:19 -04:00 committed by GitHub
parent 5c8b4bca7e
commit 410bc52fd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 122 additions and 67 deletions

View File

@ -18,18 +18,18 @@ export type ActionSpec = {
}; };
export type OwnProps = Readonly<{ export type OwnProps = Readonly<{
moduleClassName?: string;
actions?: Array<ActionSpec>; actions?: Array<ActionSpec>;
cancelButtonVariant?: ButtonVariant;
cancelText?: string; cancelText?: string;
children?: React.ReactNode; children?: React.ReactNode;
hasXButton?: boolean;
i18n: LocalizerType; i18n: LocalizerType;
moduleClassName?: string;
onCancel?: () => unknown; onCancel?: () => unknown;
onClose: () => unknown; onClose: () => unknown;
title?: string | React.ReactNode;
theme?: Theme;
hasXButton?: boolean;
cancelButtonVariant?: ButtonVariant;
onTopOfEverything?: boolean; onTopOfEverything?: boolean;
theme?: Theme;
title?: string | React.ReactNode;
}>; }>;
export type Props = OwnProps; export type Props = OwnProps;

View File

@ -47,7 +47,6 @@ const createProps = (
): PropsType => ({ ): PropsType => ({
changeHasGroupLink: action('changeHasGroupLink'), changeHasGroupLink: action('changeHasGroupLink'),
conversation: conversation || getConversation(), conversation: conversation || getConversation(),
copyGroupLink: action('copyGroupLink'),
generateNewGroupLink: action('generateNewGroupLink'), generateNewGroupLink: action('generateNewGroupLink'),
i18n, i18n,
isAdmin, isAdmin,

View File

@ -1,35 +1,42 @@
// Copyright 2020-2022 Signal Messenger, LLC // Copyright 2020-2022 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only // SPDX-License-Identifier: AGPL-3.0-only
import React from 'react'; import React, { useState } from 'react';
import { ConversationDetailsIcon, IconType } from './ConversationDetailsIcon';
import { SignalService as Proto } from '../../../protobuf';
import type { ConversationType } from '../../../state/ducks/conversations'; import type { ConversationType } from '../../../state/ducks/conversations';
import type { LocalizerType } from '../../../types/Util'; import type { LocalizerType } from '../../../types/Util';
import { ConfirmationDialog } from '../../ConfirmationDialog';
import { ConversationDetailsIcon, IconType } from './ConversationDetailsIcon';
import { PanelRow } from './PanelRow'; import { PanelRow } from './PanelRow';
import { PanelSection } from './PanelSection'; import { PanelSection } from './PanelSection';
import { Select } from '../../Select'; import { Select } from '../../Select';
import { SignalService as Proto } from '../../../protobuf';
import { copyGroupLink } from '../../../util/copyGroupLink';
import { useDelayedRestoreFocus } from '../../../hooks/useRestoreFocus'; import { useDelayedRestoreFocus } from '../../../hooks/useRestoreFocus';
import { useUniqueId } from '../../../hooks/useUniqueId'; import { useUniqueId } from '../../../hooks/useUniqueId';
const AccessControlEnum = Proto.AccessControl.AccessRequired; const AccessControlEnum = Proto.AccessControl.AccessRequired;
export type PropsType = { export type PropsDataType = {
changeHasGroupLink: (value: boolean) => void;
conversation?: ConversationType; conversation?: ConversationType;
copyGroupLink: (groupLink: string) => void;
generateNewGroupLink: () => void;
i18n: LocalizerType; i18n: LocalizerType;
isAdmin: boolean; isAdmin: boolean;
setAccessControlAddFromInviteLinkSetting: (value: boolean) => void; };
export type PropsType = PropsDataType & {
changeHasGroupLink: (conversationId: string, value: boolean) => unknown;
generateNewGroupLink: (conversationId: string) => unknown;
setAccessControlAddFromInviteLinkSetting: (
conversationId: string,
value: boolean
) => unknown;
}; };
export const GroupLinkManagement: React.ComponentType<PropsType> = ({ export const GroupLinkManagement: React.ComponentType<PropsType> = ({
changeHasGroupLink, changeHasGroupLink,
conversation, conversation,
copyGroupLink,
generateNewGroupLink, generateNewGroupLink,
i18n, i18n,
isAdmin, isAdmin,
@ -44,9 +51,11 @@ export const GroupLinkManagement: React.ComponentType<PropsType> = ({
const [focusRef] = useDelayedRestoreFocus(); const [focusRef] = useDelayedRestoreFocus();
const createEventHandler = (handleEvent: (x: boolean) => void) => { const createEventHandler = (
handleEvent: (id: string, x: boolean) => unknown
) => {
return (value: string) => { return (value: string) => {
handleEvent(value === 'true'); handleEvent(conversation.id, value === 'true');
}; };
}; };
@ -60,8 +69,29 @@ export const GroupLinkManagement: React.ComponentType<PropsType> = ({
AccessControlEnum.UNSATISFIABLE; AccessControlEnum.UNSATISFIABLE;
const groupLinkInfo = hasGroupLink ? conversation.groupLink : ''; const groupLinkInfo = hasGroupLink ? conversation.groupLink : '';
const [hasGenerateNewLinkDialog, setHasGenerateNewLinkDialog] =
useState(false);
return ( return (
<> <>
{hasGenerateNewLinkDialog && (
<ConfirmationDialog
actions={[
{
action: () => {
generateNewGroupLink(conversation.id);
},
style: 'negative',
text: i18n('GroupLinkManagement--reset'),
},
]}
i18n={i18n}
onClose={() => {
setHasGenerateNewLinkDialog(false);
}}
title={i18n('GroupLinkManagement--confirm-reset')}
/>
)}
<PanelSection> <PanelSection>
<PanelRow <PanelRow
info={groupLinkInfo} info={groupLinkInfo}
@ -120,7 +150,7 @@ export const GroupLinkManagement: React.ComponentType<PropsType> = ({
/> />
} }
label={i18n('GroupLinkManagement--reset')} label={i18n('GroupLinkManagement--reset')}
onClick={generateNewGroupLink} onClick={() => setHasGenerateNewLinkDialog(true)}
/> />
) : null} ) : null}
</PanelSection> </PanelSection>

View File

@ -801,6 +801,7 @@ export type ConversationActionType =
export const actions = { export const actions = {
cancelConversationVerification, cancelConversationVerification,
changeHasGroupLink,
clearCancelledConversationVerification, clearCancelledConversationVerification,
clearGroupCreationError, clearGroupCreationError,
clearInvitedUuidsForNewlyCreatedGroup, clearInvitedUuidsForNewlyCreatedGroup,
@ -823,6 +824,7 @@ export const actions = {
deleteAvatarFromDisk, deleteAvatarFromDisk,
discardMessages, discardMessages,
doubleCheckMissingQuoteReference, doubleCheckMissingQuoteReference,
generateNewGroupLink,
messageChanged, messageChanged,
messageDeleted, messageDeleted,
messageExpanded, messageExpanded,
@ -844,6 +846,7 @@ export const actions = {
saveUsername, saveUsername,
scrollToMessage, scrollToMessage,
selectMessage, selectMessage,
setAccessControlAddFromInviteLinkSetting,
setComposeGroupAvatar, setComposeGroupAvatar,
setComposeGroupExpireTimer, setComposeGroupExpireTimer,
setComposeGroupName, setComposeGroupName,
@ -947,6 +950,74 @@ function deleteAvatarFromDisk(
}; };
} }
function changeHasGroupLink(
conversationId: string,
value: boolean
): ThunkAction<void, RootStateType, unknown, NoopActionType> {
return async dispatch => {
const conversation = window.ConversationController.get(conversationId);
if (!conversation) {
throw new Error('No conversation found');
}
await longRunningTaskWrapper({
name: 'toggleGroupLink',
idForLogging: conversation.idForLogging(),
task: async () => conversation.toggleGroupLink(value),
});
dispatch({
type: 'NOOP',
payload: null,
});
};
}
function generateNewGroupLink(
conversationId: string
): ThunkAction<void, RootStateType, unknown, NoopActionType> {
return async dispatch => {
const conversation = window.ConversationController.get(conversationId);
if (!conversation) {
throw new Error('No conversation found');
}
await longRunningTaskWrapper({
name: 'refreshGroupLink',
idForLogging: conversation.idForLogging(),
task: async () => conversation.refreshGroupLink(),
});
dispatch({
type: 'NOOP',
payload: null,
});
};
}
function setAccessControlAddFromInviteLinkSetting(
conversationId: string,
value: boolean
): ThunkAction<void, RootStateType, unknown, NoopActionType> {
return async dispatch => {
const conversation = window.ConversationController.get(conversationId);
if (!conversation) {
throw new Error('No conversation found');
}
await longRunningTaskWrapper({
idForLogging: conversation.idForLogging(),
name: 'updateAccessControlAddFromInviteLink',
task: async () =>
conversation.updateAccessControlAddFromInviteLink(value),
});
dispatch({
type: 'NOOP',
payload: null,
});
};
}
function discardMessages( function discardMessages(
payload: Readonly<DiscardMessagesActionType['payload']> payload: Readonly<DiscardMessagesActionType['payload']>
): DiscardMessagesActionType { ): DiscardMessagesActionType {

View File

@ -3,24 +3,21 @@
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import type { PropsDataType } from '../../components/conversation/conversation-details/GroupLinkManagement';
import type { StateType } from '../reducer'; import type { StateType } from '../reducer';
import type { PropsType } from '../../components/conversation/conversation-details/GroupLinkManagement';
import { GroupLinkManagement } from '../../components/conversation/conversation-details/GroupLinkManagement'; import { GroupLinkManagement } from '../../components/conversation/conversation-details/GroupLinkManagement';
import { getConversationSelector } from '../selectors/conversations'; import { getConversationSelector } from '../selectors/conversations';
import { getIntl } from '../selectors/user'; import { getIntl } from '../selectors/user';
import { mapDispatchToProps } from '../actions';
export type SmartGroupLinkManagementProps = { export type SmartGroupLinkManagementProps = {
changeHasGroupLink: (value: boolean) => void;
conversationId: string; conversationId: string;
copyGroupLink: (groupLink: string) => void;
generateNewGroupLink: () => void;
setAccessControlAddFromInviteLinkSetting: (value: boolean) => void;
}; };
const mapStateToProps = ( const mapStateToProps = (
state: StateType, state: StateType,
props: SmartGroupLinkManagementProps props: SmartGroupLinkManagementProps
): PropsType => { ): PropsDataType => {
const conversation = getConversationSelector(state)(props.conversationId); const conversation = getConversationSelector(state)(props.conversationId);
const isAdmin = Boolean(conversation?.areWeAdmin); const isAdmin = Boolean(conversation?.areWeAdmin);
@ -32,6 +29,6 @@ const mapStateToProps = (
}; };
}; };
const smart = connect(mapStateToProps); const smart = connect(mapStateToProps, mapDispatchToProps);
export const SmartGroupLinkManagement = smart(GroupLinkManagement); export const SmartGroupLinkManagement = smart(GroupLinkManagement);

View File

@ -101,7 +101,6 @@ import { ToastTapToViewExpiredOutgoing } from '../components/ToastTapToViewExpir
import { ToastUnableToLoadAttachment } from '../components/ToastUnableToLoadAttachment'; import { ToastUnableToLoadAttachment } from '../components/ToastUnableToLoadAttachment';
import { ToastCannotOpenGiftBadge } from '../components/ToastCannotOpenGiftBadge'; import { ToastCannotOpenGiftBadge } from '../components/ToastCannotOpenGiftBadge';
import { autoScale } from '../util/handleImageAttachment'; import { autoScale } from '../util/handleImageAttachment';
import { copyGroupLink } from '../util/copyGroupLink';
import { deleteDraftAttachment } from '../util/deleteDraftAttachment'; import { deleteDraftAttachment } from '../util/deleteDraftAttachment';
import { markAllAsApproved } from '../util/markAllAsApproved'; import { markAllAsApproved } from '../util/markAllAsApproved';
import { markAllAsVerifiedDefault } from '../util/markAllAsVerifiedDefault'; import { markAllAsVerifiedDefault } from '../util/markAllAsVerifiedDefault';
@ -2207,12 +2206,7 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
JSX: window.Signal.State.Roots.createGroupLinkManagement( JSX: window.Signal.State.Roots.createGroupLinkManagement(
window.reduxStore, window.reduxStore,
{ {
changeHasGroupLink: this.changeHasGroupLink.bind(this),
conversationId: this.model.id, conversationId: this.model.id,
copyGroupLink,
generateNewGroupLink: this.generateNewGroupLink.bind(this),
setAccessControlAddFromInviteLinkSetting:
this.setAccessControlAddFromInviteLinkSetting.bind(this),
} }
), ),
}); });
@ -2606,42 +2600,6 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
}); });
} }
async changeHasGroupLink(value: boolean): Promise<void> {
const { model }: { model: ConversationModel } = this;
await this.longRunningTaskWrapper({
name: 'toggleGroupLink',
task: async () => model.toggleGroupLink(value),
});
}
async generateNewGroupLink(): Promise<void> {
const { model }: { model: ConversationModel } = this;
window.showConfirmationDialog({
confirmStyle: 'negative',
message: window.i18n('GroupLinkManagement--confirm-reset'),
okText: window.i18n('GroupLinkManagement--reset'),
resolve: async () => {
await this.longRunningTaskWrapper({
name: 'refreshGroupLink',
task: async () => model.refreshGroupLink(),
});
},
});
}
async setAccessControlAddFromInviteLinkSetting(
value: boolean
): Promise<void> {
const { model }: { model: ConversationModel } = this;
await this.longRunningTaskWrapper({
name: 'updateAccessControlAddFromInviteLink',
task: async () => model.updateAccessControlAddFromInviteLink(value),
});
}
async setAccessControlAttributesSetting(value: number): Promise<void> { async setAccessControlAttributesSetting(value: number): Promise<void> {
const { model }: { model: ConversationModel } = this; const { model }: { model: ConversationModel } = this;