File tree 4 files changed +27
-19
lines changed
ChannelSettings/components/ModerationPanel
CreateChannel/components/InviteUsers
4 files changed +27
-19
lines changed Original file line number Diff line number Diff line change 1
1
export const createDefaultUserListQuery = ( { sdk, userFilledApplicationUserListQuery = { } } ) => {
2
- const params = sdk . createApplicationUserListQuery ( ) ;
3
- if ( userFilledApplicationUserListQuery ) {
4
- Object . keys ( userFilledApplicationUserListQuery ) . forEach ( ( key ) => {
5
- params [ key ] = userFilledApplicationUserListQuery [ key ] ;
6
- } ) ;
2
+ if ( sdk ?. createApplicationUserListQuery ) {
3
+ const params = sdk ?. createApplicationUserListQuery ( ) ;
4
+ if ( userFilledApplicationUserListQuery ) {
5
+ Object . keys ( userFilledApplicationUserListQuery ) . forEach ( ( key ) => {
6
+ params [ key ] = userFilledApplicationUserListQuery [ key ] ;
7
+ } ) ;
8
+ }
9
+ return params ;
7
10
}
8
- return params ;
11
+ return null ;
9
12
} ;
10
13
11
14
const getApplicationAttributes = ( sdk = { } ) => {
Original file line number Diff line number Diff line change @@ -27,10 +27,12 @@ export default function InviteUsers({
27
27
28
28
useEffect ( ( ) => {
29
29
const userListQuery = globalUserListQuery ? globalUserListQuery ( ) : sdk ?. createApplicationUserListQuery ( ) ;
30
- userListQuery . next ( ) . then ( ( members ) => {
31
- setMembers ( members ) ;
32
- } ) ;
33
- setUserQuery ( userListQuery ) ;
30
+ if ( userListQuery ?. next ) {
31
+ userListQuery . next ( ) . then ( ( members ) => {
32
+ setMembers ( members ) ;
33
+ } ) ;
34
+ setUserQuery ( userListQuery ) ;
35
+ }
34
36
} , [ sdk ] )
35
37
return (
36
38
< div >
Original file line number Diff line number Diff line change @@ -27,11 +27,13 @@ type CreateDefaultUserListQueryType = {
27
27
export const createDefaultUserListQuery = (
28
28
{ sdk, userFilledApplicationUserListQuery } : CreateDefaultUserListQueryType
29
29
) : ApplicationUserListQuery => {
30
- const params = sdk . createApplicationUserListQuery ( ) ;
31
- if ( userFilledApplicationUserListQuery ) {
32
- Object . keys ( userFilledApplicationUserListQuery ) . forEach ( ( key ) => {
33
- params [ key ] = userFilledApplicationUserListQuery [ key ] ;
34
- } ) ;
30
+ if ( sdk ?. createApplicationUserListQuery ) {
31
+ const params = sdk ?. createApplicationUserListQuery ( ) ;
32
+ if ( userFilledApplicationUserListQuery ) {
33
+ Object . keys ( userFilledApplicationUserListQuery ) . forEach ( ( key ) => {
34
+ params [ key ] = userFilledApplicationUserListQuery [ key ] ;
35
+ } ) ;
36
+ }
37
+ return params ;
35
38
}
36
- return params ;
37
39
} ;
Original file line number Diff line number Diff line change @@ -37,18 +37,19 @@ export default function MentionLabel(props: MentionLabelProps): JSX.Element {
37
37
const [ user , setUser ] = useState < User | null > ( ) ;
38
38
const fetchUser = useCallback (
39
39
( toggleDropdown ) => {
40
- if ( user ) {
40
+ if ( user || ! sdk ?. createApplicationUserListQuery ) {
41
41
toggleDropdown ( ) ;
42
+ return ;
42
43
}
43
- const query = sdk . createApplicationUserListQuery ( {
44
+ const query = sdk ? .createApplicationUserListQuery ( {
44
45
userIdsFilter : [ mentionedUserId ] ,
45
46
} ) ;
46
47
query . next ( ) . then ( ( members ) => {
47
48
if ( members ?. length > 0 ) {
48
49
setUser ( members [ 0 ] ) ;
49
50
}
50
51
toggleDropdown ( ) ;
51
- } )
52
+ } ) ;
52
53
} ,
53
54
[ sdk , mentionedUserId ] ,
54
55
) ;
You can’t perform that action at this time.
0 commit comments