PAUSED: Use git resume to continue working. [skip ci]

Author: himdel

src/components/legacy-role-list/legacy-role-item.tsx

@@ -29,7 +29,6 @@ interface LegacyRoleProps {
 export function LegacyRoleListItem({ role, show_thumbnail }: LegacyRoleProps) {
   const {
     description,
-    github_user,
     modified,
     name,
     summary_fields: { namespace, versions, tags },
@@ -49,7 +48,7 @@ export function LegacyRoleListItem({ role, show_thumbnail }: LegacyRoleProps) {
     cells.push(
       <DataListCell isFilled={false} alignRight={false} key='ns'>
         <Logo
-          alt={t`${github_user} logo`}
+          alt={t`${namespace.name} logo`}
           image={namespace.avatar_url}
           size='70px'
           unlockWidth

src/containers/ansible-role/namespace-detail.tsx

@@ -101,7 +101,7 @@ class NamespaceRoles extends React.Component<
     this.setState({ loading: true });
     LegacyRoleAPI.list({
       ...params,
-      github_user: namespace.name,
+      github_user: namespace.name, // TODO?
     })
       .then(({ data: { count, results } }) =>
         this.setState({

src/containers/ansible-role/role-detail.tsx

@@ -43,8 +43,8 @@ import { RouteProps, handleHttpError, withRouter } from 'src/utilities';
 
 interface RoleMeta {
   addAlert: (alert: AlertType) => void;
-  github_user: string;
   name: string;
+  namespace: string;
   role: LegacyRoleDetailType;
 }
 
@@ -54,7 +54,7 @@ interface RoleMetaReadme {
 
 class RoleInstall extends React.Component<RoleMeta> {
   render() {
-    const installCMD = `ansible-galaxy role install ${this.props.github_user}.${this.props.name}`;
+    const installCMD = `ansible-galaxy role install ${this.props.namespace}.${this.props.name}`;
     return (
       <>
         <h1>
@@ -191,31 +191,33 @@ class RoleVersions extends React.Component<RoleMeta, RoleVersionsState> {
 interface RoleState {
   activeItem: string;
   alerts: AlertType[];
-  github_user: string;
   loading: boolean;
   name: string;
+  namespace: string;
   role: LegacyRoleDetailType;
 }
 
 class AnsibleRoleDetail extends React.Component<RouteProps, RoleState> {
   constructor(props) {
     super(props);
 
-    const { username, name } = props.routeParams;
+    const { username: namespace, name } = props.routeParams;
     this.state = {
       activeItem: 'install',
       alerts: [],
-      github_user: username,
       loading: true,
       name,
+      namespace,
       role: null,
     };
   }
 
   componentDidMount() {
+    const { name, namespace } = this.state;
+
     LegacyRoleAPI.list({
-      github_user: this.state.github_user,
-      name: this.state.name,
+      github_user: namespace, // TODO?
+      name,
       page_size: 1,
     })
       .then(({ data: { results } }) =>
@@ -241,7 +243,14 @@ class AnsibleRoleDetail extends React.Component<RouteProps, RoleState> {
   }
 
   render() {
-    const { activeItem, alerts, github_user, loading, name, role } = this.state;
+    const {
+      activeItem,
+      alerts,
+      loading,
+      name,
+      namespace: namespaceName,
+      role,
+    } = this.state;
     if (loading) {
       return <LoadingPageWithHeader />;
     }
@@ -281,7 +290,7 @@ class AnsibleRoleDetail extends React.Component<RouteProps, RoleState> {
     const header_cells = [
       <DataListCell isFilled={false} alignRight={false} key='ns'>
         <Logo
-          alt={t`${role.github_user} logo`}
+          alt={t`${namespace.name} logo`}
           fallbackToDefault
           image={role.summary_fields.namespace.avatar_url}
           size='70px'
@@ -339,26 +348,26 @@ class AnsibleRoleDetail extends React.Component<RouteProps, RoleState> {
         return (
           <RoleInstall
             addAlert={addAlert}
-            github_user={github_user}
             name={name}
+            namespace={namespace.name}
             role={role}
           />
         );
       } else if (activeItem === 'documentation') {
         return (
           <RoleDocs
             addAlert={addAlert}
-            github_user={github_user}
             name={name}
+            namespace={namespace.name}
             role={role}
           />
         );
       } else if (activeItem === 'versions') {
         return (
           <RoleVersions
             addAlert={addAlert}
-            github_user={github_user}
             name={name}
+            namespace={namespace.name}
             role={role}
           />
         );
@@ -373,13 +382,13 @@ class AnsibleRoleDetail extends React.Component<RouteProps, RoleState> {
         url: formatPath(Paths.legacyRoles),
       },
       {
-        name: github_user,
+        name: namespace.name,
         url: formatPath(Paths.legacyNamespace, { namespaceid: namespace.id }),
       },
       {
         name,
         url: formatPath(Paths.legacyRole, {
-          username: github_user,
+          username: namespace.name,
           name,
         }),
       },

src/containers/not-found/dispatch.tsx

@@ -52,7 +52,7 @@ export const Dispatch = ({ location, navigate }: RouteProps) => {
 
     if (featureFlags.legacy_roles) {
       wait.push(
-        LegacyRoleAPI.list({ github_user: namespace, name })
+        LegacyRoleAPI.list({ github_user: namespace, name }) // TODO?
           .then(({ data: { results } }) => results || [])
           .catch(() => [])
           .then((r) => (setRoles(r), r)),