@@ -43,8 +43,8 @@ import { RouteProps, handleHttpError, withRouter } from 'src/utilities';
43
43
44
44
interface RoleMeta {
45
45
addAlert : ( alert : AlertType ) => void ;
46
- github_user : string ;
47
46
name : string ;
47
+ namespace : string ;
48
48
role : LegacyRoleDetailType ;
49
49
}
50
50
@@ -54,7 +54,7 @@ interface RoleMetaReadme {
54
54
55
55
class RoleInstall extends React . Component < RoleMeta > {
56
56
render ( ) {
57
- const installCMD = `ansible-galaxy role install ${ this . props . github_user } .${ this . props . name } ` ;
57
+ const installCMD = `ansible-galaxy role install ${ this . props . namespace } .${ this . props . name } ` ;
58
58
return (
59
59
< >
60
60
< h1 >
@@ -191,31 +191,33 @@ class RoleVersions extends React.Component<RoleMeta, RoleVersionsState> {
191
191
interface RoleState {
192
192
activeItem : string ;
193
193
alerts : AlertType [ ] ;
194
- github_user : string ;
195
194
loading : boolean ;
196
195
name : string ;
196
+ namespace : string ;
197
197
role : LegacyRoleDetailType ;
198
198
}
199
199
200
200
class AnsibleRoleDetail extends React . Component < RouteProps , RoleState > {
201
201
constructor ( props ) {
202
202
super ( props ) ;
203
203
204
- const { username, name } = props . routeParams ;
204
+ const { username : namespace , name } = props . routeParams ;
205
205
this . state = {
206
206
activeItem : 'install' ,
207
207
alerts : [ ] ,
208
- github_user : username ,
209
208
loading : true ,
210
209
name,
210
+ namespace,
211
211
role : null ,
212
212
} ;
213
213
}
214
214
215
215
componentDidMount ( ) {
216
+ const { name, namespace } = this . state ;
217
+
216
218
LegacyRoleAPI . list ( {
217
- github_user : this . state . github_user ,
218
- name : this . state . name ,
219
+ name ,
220
+ namespace ,
219
221
page_size : 1 ,
220
222
} )
221
223
. then ( ( { data : { results } } ) =>
@@ -241,7 +243,14 @@ class AnsibleRoleDetail extends React.Component<RouteProps, RoleState> {
241
243
}
242
244
243
245
render ( ) {
244
- const { activeItem, alerts, github_user, loading, name, role } = this . state ;
246
+ const {
247
+ activeItem,
248
+ alerts,
249
+ loading,
250
+ name,
251
+ namespace : namespaceName ,
252
+ role,
253
+ } = this . state ;
245
254
if ( loading ) {
246
255
return < LoadingPageWithHeader /> ;
247
256
}
@@ -281,7 +290,7 @@ class AnsibleRoleDetail extends React.Component<RouteProps, RoleState> {
281
290
const header_cells = [
282
291
< DataListCell isFilled = { false } alignRight = { false } key = 'ns' >
283
292
< Logo
284
- alt = { t `${ role . github_user } logo` }
293
+ alt = { t `${ namespace . name } logo` }
285
294
fallbackToDefault
286
295
image = { role . summary_fields . namespace . avatar_url }
287
296
size = '70px'
@@ -339,26 +348,26 @@ class AnsibleRoleDetail extends React.Component<RouteProps, RoleState> {
339
348
return (
340
349
< RoleInstall
341
350
addAlert = { addAlert }
342
- github_user = { github_user }
343
351
name = { name }
352
+ namespace = { namespace . name }
344
353
role = { role }
345
354
/>
346
355
) ;
347
356
} else if ( activeItem === 'documentation' ) {
348
357
return (
349
358
< RoleDocs
350
359
addAlert = { addAlert }
351
- github_user = { github_user }
352
360
name = { name }
361
+ namespace = { namespace . name }
353
362
role = { role }
354
363
/>
355
364
) ;
356
365
} else if ( activeItem === 'versions' ) {
357
366
return (
358
367
< RoleVersions
359
368
addAlert = { addAlert }
360
- github_user = { github_user }
361
369
name = { name }
370
+ namespace = { namespace . name }
362
371
role = { role }
363
372
/>
364
373
) ;
@@ -373,13 +382,13 @@ class AnsibleRoleDetail extends React.Component<RouteProps, RoleState> {
373
382
url : formatPath ( Paths . legacyRoles ) ,
374
383
} ,
375
384
{
376
- name : github_user ,
385
+ name : namespace . name ,
377
386
url : formatPath ( Paths . legacyNamespace , { namespaceid : namespace . id } ) ,
378
387
} ,
379
388
{
380
389
name,
381
390
url : formatPath ( Paths . legacyRole , {
382
- username : github_user ,
391
+ username : namespace . name ,
383
392
name,
384
393
} ) ,
385
394
} ,
0 commit comments