move eventType logic from advance_create_ to global_actions and chang…

…e some parameters name
Infomaniak · Aug 7, 2024 · b6a5826 · b6a5826
1 parent 68a02f3
commit b6a5826
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 81 deletions.
diff --git a/webapp/channels/src/actions/global_actions.tsx b/webapp/channels/src/actions/global_actions.tsx
@@ -217,7 +217,8 @@ export function sendAddToChannelEphemeralPost(user: UserProfile, addedUsername:
 }
 
 let lastTimeTypingSent = 0;
-export function emitLocalUserTypingEvent(type = 'typing', channelId: string, parentPostId: string) {
+let recordingInterval: ReturnType<typeof setInterval> | null = null;
+export function emitLocalUserTypingEvent(eventType = 'typing', channelId: string, parentPostId: string) {
     const userTyping: ActionFuncAsync = async (actionDispatch, actionGetState) => {
         const state = actionGetState();
         const config = getConfig(state);
@@ -237,15 +238,23 @@ export function emitLocalUserTypingEvent(type = 'typing', channelId: string, par
         const timeBetweenUserTypingUpdatesMilliseconds = Utils.stringToNumber(config.TimeBetweenUserTypingUpdatesMilliseconds);
         const maxNotificationsPerChannel = Utils.stringToNumber(config.MaxNotificationsPerChannel);
 
-        if (type === 'typing') {
+        if (eventType === 'typing') {
             if (((t - lastTimeTypingSent) > timeBetweenUserTypingUpdatesMilliseconds) &&
                 (membersInChannel < maxNotificationsPerChannel) && (config.EnableUserTypingMessages === 'true')) {
                 WebSocketClient.userTyping(channelId, userId, parentPostId);
                 lastTimeTypingSent = t;
             }
-        } else if (type === 'recording') {
-            WebSocketClient.userRecording(channelId, userId, parentPostId);
+        } else if (eventType === 'recording') {
+            const TIMER = 1000;
+            recordingInterval = setInterval(() => {
+                WebSocketClient.userRecording(channelId, userId, parentPostId);
+            }, TIMER);
+        } else if (eventType === 'stop') {
+            if (recordingInterval !== null) {
+                clearInterval(recordingInterval);
+            }
         }
+
         return {data: true};
     };
 

diff --git a/webapp/channels/src/components/advanced_create_comment/advanced_create_comment.tsx b/webapp/channels/src/components/advanced_create_comment/advanced_create_comment.tsx
@@ -225,7 +225,6 @@ class AdvancedCreateComment extends React.PureComponent<Props, State> {
     private isDraftEdited = false;
     private isNonFormattedPaste = false;
     private timeoutId: number | null = null;
-    private recordingInterval: ReturnType<typeof setInterval> | null = null;
 
     private readonly textboxRef: React.RefObject<TextboxClass>;
     private readonly fileUploadRef: React.RefObject<FileUploadClass>;
@@ -315,7 +314,6 @@ class AdvancedCreateComment extends React.PureComponent<Props, State> {
         if (this.timeoutId !== null) {
             clearTimeout(this.timeoutId);
         }
-        this.stopRecordingEvent();
     }
 
     componentDidUpdate(prevProps: Props, prevState: State) {
@@ -768,36 +766,9 @@ class AdvancedCreateComment extends React.PureComponent<Props, State> {
         emitShortcutReactToLastPostFrom(Locations.RHS_ROOT);
     };
 
-    // infomaniak
-    emitTypingEvent = (type = 'typing') => {
+    emitTypingEvent = (eventType = 'typing') => {
         const {channelId, rootId} = this.props;
-        switch (type) {
-        case 'typing':
-            GlobalActions.emitLocalUserTypingEvent('typing', channelId, rootId);
-            break;
-        case 'recording':
-            this.emitRecordingEvent();
-            break;
-        case 'stop':
-            this.stopRecordingEvent();
-            break;
-        default:
-            break;
-        }
-    };
-
-    emitRecordingEvent = () => {
-        const TIMER = 1000;
-        this.recordingInterval = setInterval(() => {
-            const {channelId, rootId} = this.props;
-            GlobalActions.emitLocalUserTypingEvent('recording', channelId, rootId);
-        }, TIMER);
-    };
-
-    stopRecordingEvent = () => {
-        if (this.recordingInterval !== null) {
-            clearInterval(this.recordingInterval);
-        }
+        GlobalActions.emitLocalUserTypingEvent(eventType, channelId, rootId);
     };
 
     handleChange = (e: React.ChangeEvent<TextboxElement>) => {

diff --git a/webapp/channels/src/components/advanced_create_post/advanced_create_post.tsx b/webapp/channels/src/components/advanced_create_post/advanced_create_post.tsx
@@ -266,7 +266,6 @@ class AdvancedCreatePost extends React.PureComponent<Props, State> {
     private isDraftSubmitting = false;
     private isNonFormattedPaste = false;
     private timeoutId: number | null = null;
-    private recordingInterval: ReturnType<typeof setInterval> | null = null;
 
     private topDiv: React.RefObject<HTMLFormElement>;
     private textboxRef: React.RefObject<TextboxClass>;
@@ -366,7 +365,6 @@ class AdvancedCreatePost extends React.PureComponent<Props, State> {
         if (this.timeoutId !== null) {
             clearTimeout(this.timeoutId);
         }
-        this.stopRecordingEvent();
     }
 
     getChannelMemberCountsByGroup = () => {
@@ -903,36 +901,9 @@ class AdvancedCreatePost extends React.PureComponent<Props, State> {
         this.emitTypingEvent();
     };
 
-    // infomaniak
-    emitTypingEvent = (type = 'typing') => {
+    emitTypingEvent = (eventType = 'typing') => {
         const channelId = this.props.currentChannel.id;
-        switch (type) {
-        case 'typing':
-            GlobalActions.emitLocalUserTypingEvent('typing', channelId, '');
-            break;
-        case 'recording':
-            this.emitRecordingEvent();
-            break;
-        case 'stop':
-            this.stopRecordingEvent();
-            break;
-        default:
-            break;
-        }
-    };
-
-    emitRecordingEvent = () => {
-        const TIMER = 1000;
-        this.recordingInterval = setInterval(() => {
-            const channelId = this.props.currentChannel.id;
-            GlobalActions.emitLocalUserTypingEvent('recording', channelId, '');
-        }, TIMER);
-    };
-
-    stopRecordingEvent = () => {
-        if (this.recordingInterval !== null) {
-            clearInterval(this.recordingInterval);
-        }
+        GlobalActions.emitLocalUserTypingEvent(eventType, channelId, '');
     };
 
     setDraftAsPostType = (channelId: Channel['id'], draft: PostDraft, postType?: PostDraft['postType']) => {

diff --git a/webapp/channels/src/components/advanced_text_editor/advanced_text_editor.tsx b/webapp/channels/src/components/advanced_text_editor/advanced_text_editor.tsx
@@ -92,7 +92,7 @@ type Props = {
     enableGifPicker: boolean;
     handleBlur: () => void;
     handlePostError: (postError: React.ReactNode) => void;
-    emitTypingEvent: (type: string) => void;
+    emitTypingEvent: (eventType: string) => void;
     handleMouseUpKeyUp: (e: React.MouseEvent<TextboxElement> | React.KeyboardEvent<TextboxElement>) => void;
     postMsgKeyPress: (e: React.KeyboardEvent<TextboxElement>) => void;
     handleChange: (e: React.ChangeEvent<TextboxElement>) => void;

diff --git a/...ents/advanced_text_editor/voice_message_attachment/components/recording_started/index.tsx b/...ents/advanced_text_editor/voice_message_attachment/components/recording_started/index.tsx
@@ -25,9 +25,9 @@ import {convertSecondsToMSS} from 'utils/datetime';
 
 interface Props {
     theme: Theme;
-    onCancel: (type: string) => void;
-    onComplete: (audioFile: File, type: string) => Promise<void>;
-    onStarted: (type: string) => void;
+    onCancel: (eventType: string) => void;
+    onComplete: (audioFile: File, eventType: string) => Promise<void>;
+    onStarted: (eventType: string) => void;
 }
 
 function VoiceMessageRecordingStarted(props: Props) {

diff --git a/webapp/channels/src/components/advanced_text_editor/voice_message_attachment/index.tsx b/webapp/channels/src/components/advanced_text_editor/voice_message_attachment/index.tsx
@@ -48,9 +48,9 @@ interface Props {
     onUploadError: (err: string | ServerError, clientId?: string, channelId?: Channel['id'], rootId?: Post['id']) => void;
     onRemoveDraft: (fileInfoIdOrClientId: FileInfo['id'] | string) => void;
     onSubmit: (e: FormEvent<Element>) => void;
-    onComplete: (type: string) => void;
-    onCancel: (type: string) => void;
-    onStarted: (type: string) => void;
+    onComplete: (eventType: string) => void;
+    onCancel: (eventType: string) => void;
+    onStarted: (eventType: string) => void;
 }
 
 const VoiceMessageAttachment = (props: Props) => {

diff --git a/webapp/channels/src/components/msg_typing/msg_typing.tsx b/webapp/channels/src/components/msg_typing/msg_typing.tsx
@@ -37,7 +37,6 @@ export default function MsgTyping(props: Props) {
                     userStartedRecording(userId, channelId, rootId, Date.now());
                     break;
                 default:
-                    throw new Error('no SocketEvents found');
                     break;
                 }
             } else if (msg.event === SocketEvents.POSTED) {
@@ -56,12 +55,12 @@ export default function MsgTyping(props: Props) {
             userStoppedRecording]),
     });
 
-    const getInputText = (users: string[], type = 'typing') => {
+    const getInputText = (users: string[], eventType = 'typing') => {
         const numUsers = users.length;
         if (numUsers === 0) {
             return '';
         }
-        const {simpleMessage, multipleMessage, defaultSimpleMessage, defaultMultipleMessage} = getMessages(type);
+        const {simpleMessage, multipleMessage, defaultSimpleMessage, defaultMultipleMessage} = getMessages(eventType);
 
         if (numUsers === 1) {
             return (
@@ -87,8 +86,8 @@ export default function MsgTyping(props: Props) {
         );
     };
 
-    const getMessages = (type = 'typing') => {
-        switch (type) {
+    const getMessages = (eventType = 'typing') => {
+        switch (eventType) {
         case 'typing':
             return {
                 simpleMessage: 'msg_typing.isTyping',

diff --git a/webapp/channels/src/components/textbox/textbox.tsx b/webapp/channels/src/components/textbox/textbox.tsx
@@ -38,7 +38,7 @@ export type Props = {
     value: string;
     onChange: (e: ChangeEvent<TextboxElement>) => void;
     onKeyPress: (e: KeyboardEvent<any>) => void;
-    onComposition?: (type: 'typing' | 'recording' | 'stop') => void; // infomaniak
+    onComposition?: (eventType: 'typing' | 'recording' | 'stop') => void; // infomaniak
     onHeightChange?: (height: number, maxHeight: number) => void;
     onWidthChange?: (width: number) => void;
     createMessage: string;

diff --git a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/typing.ts b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/typing.ts
@@ -27,14 +27,14 @@ const getUsersTypingImpl = (profiles: IDMappedObjects<UserProfile>, teammateName
     return [];
 };
 
-export function makeGetUsersTypingByChannelAndPost(type: 'typing' | 'recording' = 'typing'): (state: GlobalState, props: {channelId: string; postId: string}) => string[] {
+export function makeGetUsersTypingByChannelAndPost(eventType: 'typing' | 'recording' = 'typing'): (state: GlobalState, props: {channelId: string; postId: string}) => string[] {
     return createSelector(
         'makeGetUsersTypingByChannelAndPost',
         getUsers,
         getTeammateNameDisplaySetting,
         (state: GlobalState, options: {channelId: string; postId: string}) => options.channelId,
         (state: GlobalState, options: {channelId: string; postId: string}) => options.postId,
-        (state: GlobalState) => state.entities[type],
+        (state: GlobalState) => state.entities[eventType],
         getUsersTypingImpl,
     );
 }