Merge branch 'rm/359087_1' into 'master'

polls now does'nt appears anymore in all threads See merge request kchat/webapp!909
Infomaniak · Sep 3, 2024 · 1cb1e35 · 1cb1e35
2 parents 9978100 + faa6118
commit 1cb1e35
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 51 deletions.
diff --git a/...rc/components/advanced_create_comment/__snapshots__/advanced_create_comment.test.tsx.snap b/...rc/components/advanced_create_comment/__snapshots__/advanced_create_comment.test.tsx.snap
@@ -9,14 +9,7 @@ exports[`components/AdvancedCreateComment should match snapshot when cannot post
     type={1}
   />
   <AdvanceTextEditor
-    additionalControls={
-      Array [
-        <Memo(Connect(Component))
-          disabled={false}
-          rootId=""
-        />,
-      ]
-    }
+    additionalControls={Array []}
     applyMarkdown={[Function]}
     badConnection={false}
     canPost={false}
@@ -150,14 +143,7 @@ exports[`components/AdvancedCreateComment should match snapshot, comment with me
     type={1}
   />
   <AdvanceTextEditor
-    additionalControls={
-      Array [
-        <Memo(Connect(Component))
-          disabled={false}
-          rootId=""
-        />,
-      ]
-    }
+    additionalControls={Array []}
     applyMarkdown={[Function]}
     badConnection={false}
     canPost={true}
@@ -243,14 +229,7 @@ exports[`components/AdvancedCreateComment should match snapshot, emoji picker di
     type={1}
   />
   <AdvanceTextEditor
-    additionalControls={
-      Array [
-        <Memo(Connect(Component))
-          disabled={false}
-          rootId=""
-        />,
-      ]
-    }
+    additionalControls={Array []}
     applyMarkdown={[Function]}
     badConnection={false}
     canPost={true}
@@ -384,14 +363,7 @@ exports[`components/AdvancedCreateComment should match snapshot, empty comment 1
     type={1}
   />
   <AdvanceTextEditor
-    additionalControls={
-      Array [
-        <Memo(Connect(Component))
-          disabled={false}
-          rootId=""
-        />,
-      ]
-    }
+    additionalControls={Array []}
     applyMarkdown={[Function]}
     badConnection={false}
     canPost={true}
@@ -477,14 +449,7 @@ exports[`components/AdvancedCreateComment should match snapshot, non-empty messa
     type={1}
   />
   <AdvanceTextEditor
-    additionalControls={
-      Array [
-        <Memo(Connect(Component))
-          disabled={false}
-          rootId=""
-        />,
-      ]
-    }
+    additionalControls={Array []}
     applyMarkdown={[Function]}
     badConnection={false}
     canPost={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
@@ -1113,16 +1113,6 @@ class AdvancedCreateComment extends React.PureComponent<Props, State> {
                 );
             });
 
-        const additionalControls = [];
-        if (!this.props.isThreadView) {
-            additionalControls.push(
-                <Poll
-                    rootId={this.props.rootId}
-                    key='poll'
-                    disabled={this.props.shouldShowPreview}
-                />);
-        }
-        additionalControls.push(...(pluginItems || []).filter(Boolean));
         return (
             <form onSubmit={this.handleSubmit}>
                 {
@@ -1184,7 +1174,7 @@ class AdvancedCreateComment extends React.PureComponent<Props, State> {
                     setDraftAsPostType={this.setDraftAsPostType}
                     isSchedulable={true}
                     handleSchedulePost={this.handleSchedulePost}
-                    additionalControls={additionalControls}
+                    additionalControls={pluginItems.filter(Boolean)}
                     codeBlockOnCtrlEnter={this.props.codeBlockOnCtrlEnter}
                     ctrlSend={this.props.ctrlSend}
                     loadNextMessage={this.loadNextMessage}