@@ -54,15 +54,17 @@ export const IdpSyncPageView: FC<IdpSyncPageViewProps> = ({ oidcConfig }) => {
54
54
< h4 > Sync Field</ h4 >
55
55
< p css = { styles . secondary } >
56
56
{ groups_field || (
57
- < Stack
58
- style = { { color : theme . palette . text . secondary } }
59
- direction = "row"
60
- spacing = { 1 }
61
- alignItems = "center"
57
+ < div
58
+ css = { {
59
+ display : "flex" ,
60
+ alignItems : "center" ,
61
+ gap : "8px" ,
62
+ height : 0 ,
63
+ } }
62
64
>
63
65
< StatusIndicator color = "error" />
64
66
< p > disabled</ p >
65
- </ Stack >
67
+ </ div >
66
68
) }
67
69
</ p >
68
70
< h4 > Regex Filter</ h4 >
@@ -77,15 +79,17 @@ export const IdpSyncPageView: FC<IdpSyncPageViewProps> = ({ oidcConfig }) => {
77
79
< h4 > Sync Field</ h4 >
78
80
< p css = { styles . secondary } >
79
81
{ user_role_field || (
80
- < Stack
81
- style = { { color : theme . palette . text . secondary } }
82
- direction = "row"
83
- spacing = { 1 }
84
- alignItems = "center"
82
+ < div
83
+ css = { {
84
+ display : "flex" ,
85
+ alignItems : "center" ,
86
+ gap : "8px" ,
87
+ height : 0 ,
88
+ } }
85
89
>
86
90
< StatusIndicator color = "error" />
87
91
< p > disabled</ p >
88
- </ Stack >
92
+ </ div >
89
93
) }
90
94
</ p >
91
95
</ Stack >
@@ -96,45 +100,40 @@ export const IdpSyncPageView: FC<IdpSyncPageViewProps> = ({ oidcConfig }) => {
96
100
type = "Role"
97
101
isEmpty = { Boolean (
98
102
! oidcConfig ?. user_role_mapping ||
99
- ( oidcConfig ?. user_role_mapping &&
100
- Object . entries ( oidcConfig ?. user_role_mapping ) . length ===
101
- 0 ) ||
102
- false ,
103
+ Object . entries ( oidcConfig ?. user_role_mapping ) . length === 0 ,
103
104
) }
104
105
>
105
106
< >
106
107
{ oidcConfig ?. user_role_mapping &&
107
- Object . entries ( oidcConfig . user_role_mapping ) . map (
108
- ( [ idpRole , roles ] ) => (
108
+ Object . entries ( oidcConfig . user_role_mapping )
109
+ . sort ( )
110
+ . map ( ( [ idpRole , roles ] ) => (
109
111
< RoleRow
110
112
key = { idpRole }
111
113
idpRole = { idpRole }
112
114
coderRoles = { roles }
113
115
/>
114
- ) ,
115
- ) }
116
+ ) ) }
116
117
</ >
117
118
</ IdpMappingTable >
118
119
< IdpMappingTable
119
120
type = "Group"
120
121
isEmpty = { Boolean (
121
122
! oidcConfig ?. group_mapping ||
122
- ( oidcConfig ?. group_mapping &&
123
- Object . entries ( oidcConfig ?. group_mapping ) . length === 0 ) ||
124
- false ,
123
+ Object . entries ( oidcConfig ?. group_mapping ) . length === 0 ,
125
124
) }
126
125
>
127
126
< >
128
127
{ oidcConfig ?. user_role_mapping &&
129
- Object . entries ( oidcConfig . group_mapping ) . map (
130
- ( [ idpGroup , group ] ) => (
128
+ Object . entries ( oidcConfig . group_mapping )
129
+ . sort ( )
130
+ . map ( ( [ idpGroup , group ] ) => (
131
131
< GroupRow
132
132
key = { idpGroup }
133
133
idpGroup = { idpGroup }
134
134
coderGroup = { group }
135
135
/>
136
- ) ,
137
- ) }
136
+ ) ) }
138
137
</ >
139
138
</ IdpMappingTable >
140
139
</ Stack >
0 commit comments