Skip to content

Commit 4240202

Browse files
authored
feat(ABAC): Add icons (#6758)
1 parent dd0b6fa commit 4240202

File tree

26 files changed

+1662
-46
lines changed

26 files changed

+1662
-46
lines changed
1 KB
Binary file not shown.

app/containers/CustomIcon/mappedIcons.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ export const mappedIcons = {
106106
'google-monochromatic': 59657,
107107
'group-by-type': 59757,
108108
'hamburguer': 59758,
109+
'hash-shield': 59878,
109110
'history': 59759,
110111
'home': 59760,
111112
'ignore': 59740,
@@ -202,6 +203,7 @@ export const mappedIcons = {
202203
'sun': 59847,
203204
'support': 59848,
204205
'team': 59849,
206+
'team-shield': 59877,
205207
'teams': 59751,
206208
'teams-private': 59750,
207209
'text-format': 59839,

app/containers/CustomIcon/selection.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

app/containers/RoomHeader/RoomHeader.stories.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ export const Icons = () => (
5555
<HeaderExample title={() => <RoomHeader title='busy dm' type='d' status='busy' />} />
5656
<HeaderExample title={() => <RoomHeader title='loading dm' type='d' status='loading' />} />
5757
<HeaderExample title={() => <RoomHeader title='offline dm' type='d' />} />
58+
<HeaderExample title={() => <RoomHeader title='classified' type='p' abacAttributes={['Classified']} />} />
59+
<HeaderExample title={() => <RoomHeader title='classified' type='p' abacAttributes={['Classified']} teamMain />} />
5860
</>
5961
);
6062

app/containers/RoomHeader/RoomHeader.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import I18n from '../../i18n';
77
import sharedStyles from '../../views/Styles';
88
import { MarkdownPreview } from '../markdown';
99
import RoomTypeIcon from '../RoomTypeIcon';
10-
import { type TUserStatus, type IOmnichannelSource } from '../../definitions';
10+
import { type TUserStatus, type IOmnichannelSource, type ISubscription } from '../../definitions';
1111
import { useTheme } from '../../theme';
1212
import { useAppSelector } from '../../lib/hooks/useAppSelector';
1313
import useStatusAccessibilityLabel from '../../lib/hooks/useStatusAccessibilityLabel';
@@ -80,6 +80,7 @@ interface IRoomHeader {
8080
sourceType?: IOmnichannelSource;
8181
disabled?: boolean;
8282
rightButtonsWidth?: number;
83+
abacAttributes?: ISubscription['abacAttributes'];
8384
}
8485

8586
const SubTitle = React.memo(({ usersTyping, subtitle, renderFunc, scale }: TRoomHeaderSubTitle) => {
@@ -148,7 +149,8 @@ const Header = React.memo(
148149
testID,
149150
usersTyping = [],
150151
sourceType,
151-
disabled
152+
disabled,
153+
abacAttributes
152154
}: IRoomHeader) => {
153155
const statusAccessibilityLabel = useStatusAccessibilityLabel({
154156
isGroupChat,
@@ -182,6 +184,7 @@ const Header = React.memo(
182184
isGroupChat={isGroupChat}
183185
status={status}
184186
teamMain={teamMain}
187+
abacAttributes={abacAttributes}
185188
/>
186189
<Text style={[styles.subtitle, { color: colors.fontSecondaryInfo }]} numberOfLines={1}>
187190
{parentTitle}
@@ -208,6 +211,7 @@ const Header = React.memo(
208211
status={status}
209212
teamMain={teamMain}
210213
sourceType={sourceType}
214+
abacAttributes={abacAttributes}
211215
/>
212216
)}
213217
<HeaderTitle title={title} tmid={tmid} prid={prid} scale={scale} testID={testID} />

0 commit comments

Comments
 (0)