@@ -25,8 +25,7 @@ type Usage = Omit<ChatInstanceUsage, 'chatInstance'> & {
25
25
chatInstance ?: ChatInstance
26
26
}
27
27
28
- const sortUsage = ( a : Usage , b : Usage ) =>
29
- a . user . username . localeCompare ( b . user . username )
28
+ const sortUsage = ( a : Usage , b : Usage ) => b . usageCount - a . usageCount
30
29
31
30
const handleLoginAs = ( user : User ) => ( ) => {
32
31
localStorage . setItem ( 'adminLoggedInAs' , user . id )
@@ -42,24 +41,22 @@ const UserTable = () => {
42
41
43
42
const [ searchedUsages , setSearchedUsages ] = useState < Usage [ ] > ( [ ] )
44
43
45
- const { t } = useTranslation ( )
44
+ const { t, i18n } = useTranslation ( )
46
45
47
- if ( isLoading || usersLoading ) return null
46
+ const { language } = i18n
48
47
49
- const filteredUsers = users . filter ( ( { usage } ) => usage !== 0 )
48
+ if ( isLoading || usersLoading ) return null
50
49
51
- const userUsages : Usage [ ] = filteredUsers . map ( ( user ) => ( {
50
+ const userUsages : Usage [ ] = users . map ( ( user ) => ( {
52
51
id : user . id ,
53
52
user,
54
53
usageCount : user . usage ,
55
54
} ) )
56
55
57
- const filteredUsage = chatInstanceUsage . filter (
58
- ( { usageCount } ) => usageCount !== 0
59
- )
60
- const sortedUsage = ( filteredUsage as Usage [ ] )
56
+ const sortedUsage = ( chatInstanceUsage as Usage [ ] )
61
57
. concat ( userUsages )
62
58
. sort ( sortUsage )
59
+ . slice ( 0 , 10 )
63
60
64
61
const onDeleteChatInstanceUsage = ( chatInstanceUsageId : string ) => {
65
62
try {
@@ -108,7 +105,7 @@ const UserTable = () => {
108
105
</ TableCell >
109
106
< TableCell align = "right" >
110
107
< Typography variant = "h5" >
111
- < b > { t ( 'admin:courseId' ) } </ b >
108
+ < b > Kurssin nimi </ b >
112
109
</ Typography >
113
110
</ TableCell >
114
111
</ TableRow >
@@ -126,7 +123,7 @@ const UserTable = () => {
126
123
</ TableCell >
127
124
< TableCell align = "right" >
128
125
< Typography variant = "overline" >
129
- < code > { chatInstance ?. courseId ?? '' } </ code >
126
+ < code > { chatInstance ?. name [ language ] ?? '' } </ code >
130
127
</ Typography >
131
128
</ TableCell >
132
129
< TableCell >
@@ -143,7 +140,7 @@ const UserTable = () => {
143
140
</ TableCell >
144
141
< TableCell >
145
142
< Button variant = "outlined" onClick = { handleLoginAs ( user ) } >
146
- Kirjaudu käyttäjällä
143
+ Kirjaudu käyttäjänä
147
144
</ Button >
148
145
</ TableCell >
149
146
</ TableRow >
0 commit comments