Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
Rocket.Chat
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
RocketChat
Rocket.Chat
Commits
02e21cf2
Unverified
Commit
02e21cf2
authored
3 years ago
by
Douglas Gubert
Committed by
GitHub
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Regression: Ensure room action buttons only appear inside menu (#24035)
parent
5d525ddf
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/ui-message/client/actionButtons/tabbar.ts
+1
-0
1 addition, 0 deletions
app/ui-message/client/actionButtons/tabbar.ts
with
1 addition
and
0 deletions
app/ui-message/client/actionButtons/tabbar.ts
+
1
−
0
View file @
02e21cf2
...
@@ -12,6 +12,7 @@ const getIdForActionButton = ({ appId, actionId }: IUIActionButton): string => `
...
@@ -12,6 +12,7 @@ const getIdForActionButton = ({ appId, actionId }: IUIActionButton): string => `
export
const
onAdded
=
(
button
:
IUIActionButton
):
void
=>
void
addAction
(
getIdForActionButton
(
button
),
({
room
})
=>
(
applyButtonFilters
(
button
,
room
)
?
{
export
const
onAdded
=
(
button
:
IUIActionButton
):
void
=>
void
addAction
(
getIdForActionButton
(
button
),
({
room
})
=>
(
applyButtonFilters
(
button
,
room
)
?
{
id
:
button
.
actionId
,
id
:
button
.
actionId
,
icon
:
''
,
// Apps won't provide icons for now
icon
:
''
,
// Apps won't provide icons for now
order
:
300
,
// Make sure the button only shows up inside the room toolbox
title
:
t
(
Utilities
.
getI18nKeyForApp
(
button
.
labelI18n
,
button
.
appId
))
as
any
,
title
:
t
(
Utilities
.
getI18nKeyForApp
(
button
.
labelI18n
,
button
.
appId
))
as
any
,
// Filters were applied in the applyButtonFilters function
// Filters were applied in the applyButtonFilters function
// if the code made it this far, the button should be shown
// if the code made it this far, the button should be shown
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment