Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AnsibleRole{,Namespace}{Detail,List} - rename for consistency #4422

Merged
merged 2 commits into from
Oct 17, 2023
Merged

AnsibleRole{,Namespace}{Detail,List} - rename for consistency #4422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26eb429
AnsibleRole{,Namespace}{Detail,List} - rename for consistency
himdel Oct 17, 2023
73e8dbb
clean up props, state types; extra React.Fragment, context
himdel Oct 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,13 @@ export { PermissionChipSelector } from './rbac/permission-chip-selector';
export { PreviewRoles } from './rbac/preview-roles';
export { RoleForm } from './rbac/role-form';
export { RoleHeader } from './rbac/role-header';
export { RolePermissions } from './rbac/role-permissions';
export {
CheckboxRow,
ExpandableRow,
RadioRow,
RoleListTable,
} from './rbac/role-list-table';
export { RolePermissions } from './rbac/role-permissions';
export { SelectGroup } from './rbac/select-group';
export { SelectRoles } from './rbac/select-roles';
export { SelectUser } from './rbac/select-user';
Expand Down
88 changes: 41 additions & 47 deletions ...rs/legacy-namespaces/legacy-namespace.tsx → ...tainers/ansible-role/namespace-detail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,13 @@ import {
import { AppContext } from 'src/loaders/app-context';
import { Paths, formatPath } from 'src/paths';
import { RouteProps, getProviderInfo, withRouter } from 'src/utilities';
import './legacy-namespace.scss';
import './namespace.scss';

interface LegacyNamespaceRolesProps {
interface NamespaceRolesProps {
namespace: LegacyNamespaceListType;
}

interface LegacyNamespaceRolesState {
mounted: boolean;
interface NamespaceRolesState {
loading: boolean;
count: number;
namespace: LegacyNamespaceListType;
Expand All @@ -54,17 +53,16 @@ interface LegacyNamespaceRolesState {
};
}

class LegacyNamespaceRoles extends React.Component<
LegacyNamespaceRolesProps,
LegacyNamespaceRolesState
class NamespaceRoles extends React.Component<
NamespaceRolesProps,
NamespaceRolesState
> {
// This is the list of roles that is shown on
// the legacy namespace details page.

constructor(props) {
super(props);
this.state = {
mounted: false,
loading: true,
count: 0,
namespace: props.namespace,
Expand Down Expand Up @@ -92,7 +90,6 @@ class LegacyNamespaceRoles extends React.Component<
github_user: namespace.name,
}).then((response) => {
this.setState(() => ({
mounted: true,
loading: false,
params: {
page: page,
Expand All @@ -117,7 +114,6 @@ class LegacyNamespaceRoles extends React.Component<
github_user: namespace.name,
}).then((response) => {
this.setState(() => ({
mounted: true,
loading: false,
params: {
page: page,
Expand All @@ -137,40 +133,38 @@ class LegacyNamespaceRoles extends React.Component<

return (
<div>
<React.Fragment>
{loading ? (
<LoadingPageSpinner />
) : noData ? (
<EmptyStateNoData
title={t`No roles yet`}
description={t`Roles will appear once imported`}
/>
) : (
<div>
<DataList aria-label={t`List of Legacy Roles`}>
{this.state.roles.map((lrole, ix) => (
<LegacyRoleListItem
key={ix}
role={lrole}
show_thumbnail={false}
/>
))}
</DataList>
{loading ? (
<LoadingPageSpinner />
) : noData ? (
<EmptyStateNoData
title={t`No roles yet`}
description={t`Roles will appear once imported`}
/>
) : (
<div>
<DataList aria-label={t`List of Legacy Roles`}>
{this.state.roles.map((lrole, ix) => (
<LegacyRoleListItem
key={ix}
role={lrole}
show_thumbnail={false}
/>
))}
</DataList>

<Pagination
params={this.state.params}
updateParams={this.updateParams}
count={this.state.count}
/>
</div>
)}
</React.Fragment>
<Pagination
params={this.state.params}
updateParams={this.updateParams}
count={this.state.count}
/>
</div>
)}
</div>
);
}
}

interface LegacyNamespaceProps {
interface RoleNamespaceState {
loading: boolean;
namespaceid: number;
namespace: LegacyNamespaceListType;
Expand All @@ -188,10 +182,12 @@ interface LegacyNamespaceProps {
alerts: AlertType[];
}

class LegacyNamespace extends React.Component<
class AnsibleRoleNamespaceDetail extends React.Component<
RouteProps,
LegacyNamespaceProps
RoleNamespaceState
> {
static contextType = AppContext;

// This is the details page for a legacy namespace

constructor(props) {
Expand Down Expand Up @@ -296,7 +292,7 @@ class LegacyNamespace extends React.Component<
}

return (
<React.Fragment>
<>
{this.state.isOpenWisdomModal && (
<WisdomModal
addAlert={(alert) => this.addAlert(alert)}
Expand All @@ -313,19 +309,17 @@ class LegacyNamespace extends React.Component<
aria-label={t`Role namespace header`}
className='hub-legacy-namespace-page'
>
<DataListItem data-cy='LegacyNamespace'>
<DataListItem>
<DataListItemRow>
<DataListItemCells dataListCells={infocells} />
</DataListItemRow>
</DataListItem>
</DataList>

<LegacyNamespaceRoles namespace={this.state.namespace} />
</React.Fragment>
<NamespaceRoles namespace={this.state.namespace} />
</>
);
}
}

export default withRouter(LegacyNamespace);

LegacyNamespace.contextType = AppContext;
export default withRouter(AnsibleRoleNamespaceDetail);
88 changes: 40 additions & 48 deletions ...s/legacy-namespaces/legacy-namespaces.tsx → ...ontainers/ansible-role/namespace-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,11 @@ import {
WisdomModal,
closeAlertMixin,
} from 'src/components';
import { AppContext } from 'src/loaders/app-context';
import { RouteProps, withRouter } from 'src/utilities';

interface LegacyNamespacesProps {
interface RoleNamespacesState {
legacynamespaces: LegacyNamespaceListType[];
loading: boolean;
mounted: boolean;
count: number;
params: {
page?: number;
Expand All @@ -35,9 +33,9 @@ interface LegacyNamespacesProps {
alerts: AlertType[];
}

class LegacyNamespaces extends React.Component<
class AnsibleRoleNamespaceList extends React.Component<
RouteProps,
LegacyNamespacesProps
RoleNamespacesState
> {
constructor(props) {
super(props);
Expand All @@ -50,7 +48,6 @@ class LegacyNamespaces extends React.Component<
keywords: null,
},
loading: true,
mounted: false,
count: 0,
legacynamespaces: [],
isOpenWisdomModal: false,
Expand Down Expand Up @@ -80,7 +77,6 @@ class LegacyNamespaces extends React.Component<
keywords: keywords,
}).then((response) => {
this.setState(() => ({
mounted: true,
loading: false,
params: {
page: page,
Expand Down Expand Up @@ -151,52 +147,48 @@ class LegacyNamespaces extends React.Component<
/>
)}
<BaseHeader title={t`Role Namespaces`} />
<React.Fragment>
{loading ? (
<LoadingPageSpinner />
) : noData ? (
<EmptyStateNoData
title={t`No role namespaces yet`}
description={t`Role namespaces will appear once created or roles are imported`}
{loading ? (
<LoadingPageSpinner />
) : noData ? (
<EmptyStateNoData
title={t`No role namespaces yet`}
description={t`Role namespaces will appear once created or roles are imported`}
/>
) : (
<div>
<CollectionFilter
ignoredParams={ignoredParams}
params={cleanParams}
updateParams={this.updateParams}
/>
) : (
<div>
<CollectionFilter
ignoredParams={ignoredParams}
params={cleanParams}
updateParams={this.updateParams}
/>

<Pagination
params={this.state.params}
updateParams={this.updateParams}
count={this.state.count}
/>

<DataList aria-label={t`List of role namespaces`}>
{this.state.legacynamespaces &&
this.state.legacynamespaces.map((lnamespace) => (
<LegacyNamespaceListItem
key={lnamespace.id}
namespace={lnamespace}
openModal={(namespace) => this.openModal(namespace)}
/>
))}
</DataList>
<Pagination
params={this.state.params}
updateParams={this.updateParams}
count={this.state.count}
/>

<Pagination
params={this.state.params}
updateParams={this.updateParams}
count={this.state.count}
/>
</div>
)}
</React.Fragment>
<DataList aria-label={t`List of role namespaces`}>
{this.state.legacynamespaces &&
this.state.legacynamespaces.map((lnamespace) => (
<LegacyNamespaceListItem
key={lnamespace.id}
namespace={lnamespace}
openModal={(namespace) => this.openModal(namespace)}
/>
))}
</DataList>

<Pagination
params={this.state.params}
updateParams={this.updateParams}
count={this.state.count}
/>
</div>
)}
</div>
);
}
}

export default withRouter(LegacyNamespaces);

LegacyNamespaces.contextType = AppContext;
export default withRouter(AnsibleRoleNamespaceList);
0 ...s/legacy-namespaces/legacy-namespace.scss → src/containers/ansible-role/namespace.scss
View file
Open in desktop
File renamed without changes.
Loading