Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

[28725] Add call button #5715

Merged
merged 28 commits into from
Sep 8, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
10cd5d7
Add Call dropdown for plugins
larkox Jun 12, 2020
91f6c7a
Update i18n
larkox Jun 12, 2020
01ea0de
Merge branch 'master' into AddCallButton
larkox Jun 18, 2020
4f9dcfa
Remove plugings channel header call and reuse channel header plug
larkox Jun 18, 2020
25c98a3
Fix tooltip and i18n error
larkox Jun 18, 2020
1233224
Merge branch 'master' into AddCallButton
larkox Jul 1, 2020
b4a2372
Add minimum required version and remove unneeded react fragment
larkox Jul 1, 2020
ab0dd85
Merge branch 'master' into AddCallButton
larkox Jul 7, 2020
2796a9f
Add call button to post
larkox Jul 7, 2020
2ab1847
Extract i18n
larkox Jul 7, 2020
8f88964
Change icon by camera icon
larkox Jul 14, 2020
7fe77e2
Remove header button for calls
larkox Aug 4, 2020
3000715
Merge branch 'master' into AddCallButton
larkox Aug 4, 2020
e18602e
Fix tests and remove changes from the header button
larkox Aug 4, 2020
55b44ce
Merge branch 'master' into AddCallButton
larkox Aug 4, 2020
5d5976d
Fix lint
larkox Aug 4, 2020
a25e3e3
Update i18n
larkox Aug 4, 2020
b8dbbec
Merge branch 'master' into AddCallButton
larkox Aug 7, 2020
8cad316
Remove unneeded divs, change CameraIcon to functional component, simp…
larkox Aug 7, 2020
1b4e814
Remove channel header references, fix lint and remove unused style
larkox Aug 7, 2020
89392ec
Fix bug
larkox Aug 7, 2020
3cbc470
Change callbutton to functional component
larkox Aug 10, 2020
eb237df
Merge branch 'master' into AddCallButton
larkox Aug 10, 2020
e4c2236
Merge branch 'master' into AddCallButton
larkox Aug 20, 2020
77534a7
Merge branch 'master' into AddCallButton
larkox Aug 25, 2020
01bc11a
Fix CSS
larkox Aug 28, 2020
746f5e3
Merge branch 'master' into AddCallButton
larkox Sep 2, 2020
a516b6c
Merge branch 'master' into AddCallButton
larkox Sep 8, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove plugings channel header call and reuse channel header plug
  • Loading branch information
larkox committed Jun 18, 2020
commit 4f9dcfa8565515e00ce37037c537db454ec18735
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,8 @@ exports[`components/ChannelHeader should render active flagged posts 1`] = `
}
}
/>
<Connect(ChannelHeaderCall)
<Connect(ChannelHeaderPlug)
callPlugins={true}
channel={
Object {
"delete_at": 0,
Expand All @@ -171,6 +172,8 @@ exports[`components/ChannelHeader should render active flagged posts 1`] = `
"user_id": "user_id",
}
}
dropdownIcon={[Function]}
elementsToCollapse={1}
/>
<HeaderIconWrapper
ariaLabel={true}
Expand Down Expand Up @@ -382,7 +385,8 @@ exports[`components/ChannelHeader should render active mentions posts 1`] = `
}
}
/>
<Connect(ChannelHeaderCall)
<Connect(ChannelHeaderPlug)
callPlugins={true}
channel={
Object {
"delete_at": 0,
Expand All @@ -397,6 +401,8 @@ exports[`components/ChannelHeader should render active mentions posts 1`] = `
"user_id": "user_id",
}
}
dropdownIcon={[Function]}
elementsToCollapse={1}
/>
<HeaderIconWrapper
ariaLabel={true}
Expand Down Expand Up @@ -608,7 +614,8 @@ exports[`components/ChannelHeader should render active pinned posts 1`] = `
}
}
/>
<Connect(ChannelHeaderCall)
<Connect(ChannelHeaderPlug)
callPlugins={true}
channel={
Object {
"delete_at": 0,
Expand All @@ -623,6 +630,8 @@ exports[`components/ChannelHeader should render active pinned posts 1`] = `
"user_id": "user_id",
}
}
dropdownIcon={[Function]}
elementsToCollapse={1}
/>
<HeaderIconWrapper
ariaLabel={true}
Expand Down Expand Up @@ -773,7 +782,8 @@ exports[`components/ChannelHeader should render archived view 1`] = `
}
}
/>
<Connect(ChannelHeaderCall)
<Connect(ChannelHeaderPlug)
callPlugins={true}
channel={
Object {
"delete_at": 1234,
Expand All @@ -788,6 +798,8 @@ exports[`components/ChannelHeader should render archived view 1`] = `
"user_id": "user_id",
}
}
dropdownIcon={[Function]}
elementsToCollapse={1}
/>
<HeaderIconWrapper
ariaLabel={true}
Expand Down Expand Up @@ -1034,7 +1046,8 @@ exports[`components/ChannelHeader should render correct menu when muted 1`] = `
}
}
/>
<Connect(ChannelHeaderCall)
<Connect(ChannelHeaderPlug)
callPlugins={true}
channel={
Object {
"delete_at": 0,
Expand All @@ -1049,6 +1062,8 @@ exports[`components/ChannelHeader should render correct menu when muted 1`] = `
"user_id": "user_id",
}
}
dropdownIcon={[Function]}
elementsToCollapse={1}
/>
<HeaderIconWrapper
ariaLabel={true}
Expand Down Expand Up @@ -1266,7 +1281,8 @@ exports[`components/ChannelHeader should render properly when populated 1`] = `
}
}
/>
<Connect(ChannelHeaderCall)
<Connect(ChannelHeaderPlug)
callPlugins={true}
channel={
Object {
"delete_at": 0,
Expand All @@ -1281,6 +1297,8 @@ exports[`components/ChannelHeader should render properly when populated 1`] = `
"user_id": "user_id",
}
}
dropdownIcon={[Function]}
elementsToCollapse={1}
/>
<HeaderIconWrapper
ariaLabel={true}
Expand Down Expand Up @@ -1530,7 +1548,8 @@ exports[`components/ChannelHeader should render properly when populated with cha
}
}
/>
<Connect(ChannelHeaderCall)
<Connect(ChannelHeaderPlug)
callPlugins={true}
channel={
Object {
"header": "See ~test",
Expand All @@ -1552,6 +1571,8 @@ exports[`components/ChannelHeader should render properly when populated with cha
"user_id": "user_id",
}
}
dropdownIcon={[Function]}
elementsToCollapse={1}
/>
<HeaderIconWrapper
ariaLabel={true}
Expand Down Expand Up @@ -1763,7 +1784,8 @@ exports[`components/ChannelHeader should render the pinned icon with the pinned
}
}
/>
<Connect(ChannelHeaderCall)
<Connect(ChannelHeaderPlug)
callPlugins={true}
channel={
Object {
"delete_at": 0,
Expand All @@ -1778,6 +1800,8 @@ exports[`components/ChannelHeader should render the pinned icon with the pinned
"user_id": "user_id",
}
}
dropdownIcon={[Function]}
elementsToCollapse={1}
/>
<HeaderIconWrapper
ariaLabel={true}
Expand Down
7 changes: 5 additions & 2 deletions components/channel_header/channel_header.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import {intlShape} from 'utils/react_intl';
import * as Utils from 'utils/utils';

import ChannelHeaderPlug from 'plugins/channel_header_plug';
import ChannelHeaderCall from 'plugins/channel_header_call';
import PluginChannelHeaderIcon from 'components/widgets/icons/plugin_channel_header_icon';

import HeaderIconWrapper from './components/header_icon_wrapper';

Expand Down Expand Up @@ -755,9 +755,12 @@ class ChannelHeader extends React.PureComponent {
channel={channel}
channelMember={channelMember}
/>
<ChannelHeaderCall
<ChannelHeaderPlug
channel={channel}
channelMember={channelMember}
dropdownIcon={PluginChannelHeaderIcon}
elementsToCollapse={1}
callPlugins={true}
/>
<HeaderIconWrapper
iconComponent={pinnedIcon}
Expand Down
11 changes: 10 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading