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
fd23913a
"git@gitlab.ow2.org:RocketChat/Rocket.Chat.git" did not exist on "8e10dd4e2d309ad2548ff40ebcd5483114099048"
Unverified
Commit
fd23913a
authored
1 year ago
by
Aleksander Nicacio da Silva
Committed by
GitHub
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
chore: NBJ watermark support for new licenses (#30469)
parent
ef12ac5b
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
apps/meteor/ee/client/sidebar/footer/SidebarFooterWatermark.tsx
+12
-4
12 additions, 4 deletions
...eteor/ee/client/sidebar/footer/SidebarFooterWatermark.tsx
ee/packages/license/src/definition/LicenseModule.ts
+2
-1
2 additions, 1 deletion
ee/packages/license/src/definition/LicenseModule.ts
with
14 additions
and
5 deletions
apps/meteor/ee/client/sidebar/footer/SidebarFooterWatermark.tsx
+
12
−
4
View file @
fd23913a
...
...
@@ -3,17 +3,25 @@ import { useTranslation } from '@rocket.chat/ui-contexts';
import
type
{
ReactElement
}
from
'
react
'
;
import
React
from
'
react
'
;
import
{
use
IsEnterpri
se
}
from
'
../../../../client/hooks/use
IsEnterpri
se
'
;
import
{
use
Licen
se
}
from
'
../../../../client/hooks/use
Licen
se
'
;
export
const
SidebarFooterWatermark
=
():
ReactElement
|
null
=>
{
const
t
=
useTranslation
();
const
{
isLoading
,
isError
,
data
}
=
useIsEnterpri
se
();
const
response
=
useLicen
se
();
if
(
isError
||
isLoading
||
data
?.
isEnterprise
)
{
if
(
response
.
isLoading
||
response
.
isError
)
{
return
null
;
}
const
license
=
response
.
data
;
if
(
license
.
activeModules
.
includes
(
'
hide-watermark
'
)
&&
!
license
.
trial
)
{
return
null
;
}
const
[{
name
:
planName
}
=
{
name
:
'
Community
'
}]
=
license
.
tags
??
[];
return
(
<
Box
pi
=
{
16
}
pbe
=
{
8
}
>
<
Box
is
=
'a'
href
=
'https://rocket.chat/'
target
=
'_blank'
rel
=
'noopener noreferrer'
>
...
...
@@ -21,7 +29,7 @@ export const SidebarFooterWatermark = (): ReactElement | null => {
{
t
(
'
Powered_by_RocketChat
'
)
}
</
Box
>
<
Box
fontScale
=
'micro'
color
=
'pure-white'
pbe
=
{
4
}
>
{
t
(
'
Free_Edition
'
)
}
{
[
planName
,
license
.
trial
?
'
trial
'
:
''
].
filter
(
Boolean
).
join
(
'
'
)
}
</
Box
>
</
Box
>
</
Box
>
...
...
This diff is collapsed.
Click to expand it.
ee/packages/license/src/definition/LicenseModule.ts
+
2
−
1
View file @
fd23913a
...
...
@@ -15,4 +15,5 @@ export type LicenseModule =
|
'
federation
'
|
'
videoconference-enterprise
'
|
'
message-read-receipt
'
|
'
outlook-calendar
'
;
|
'
outlook-calendar
'
|
'
hide-watermark
'
;
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