External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-10-31 14:36:17 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9897 from AlexSCorey/9891-Plural

Browse Source 
Properly tags Plural-able strings for translation, and removes unnecessary i18n

SUMMARY
This resolves #9891.
It also begings the process of remove i18n._(t string) in places in favor of this syntax
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME

UI

AWX VERSION



ADDITIONAL INFORMATION

Reviewed-by: Keith Grant <keithjgrant@gmail.com>
Reviewed-by: Kersom <None>
Reviewed-by: Alex Corey <Alex.swansboro@gmail.com>
Reviewed-by: Tiago Góes <tiago.goes2009@gmail.com>
This commit is contained in:
softwarefactory-project-zuul[bot]
2021-04-23 17:12:04 +00:00
committed by GitHub
parent 555b25321e 2143b60ebf
commit a744f0d30f
21 changed files with 5367 additions and 3847 deletions
Download Patch File Download Diff File Expand all files Collapse all files
awx/ui_next/src/components/JobList/JobList.jsx
+43 -45
View File
@@ -1,7 +1,6 @@
import React, { useState, useEffect, useCallback } from 'react'; import React, { useState, useEffect, useCallback } from 'react';
import { useLocation } from 'react-router-dom'; import { useLocation } from 'react-router-dom';
import { withI18n } from '@lingui/react'; import { t, Plural } from '@lingui/macro';
import { t, plural } from '@lingui/macro';
import { Card } from '@patternfly/react-core'; import { Card } from '@patternfly/react-core';
import AlertModal from '../AlertModal'; import AlertModal from '../AlertModal';
@@ -20,7 +19,7 @@ import JobListCancelButton from './JobListCancelButton';
import useWsJobs from './useWsJobs'; import useWsJobs from './useWsJobs';
import { UnifiedJobsAPI } from '../../api'; import { UnifiedJobsAPI } from '../../api';
function JobList({ i18n, defaultParams, showTypeColumn = false }) { function JobList({ defaultParams, showTypeColumn = false }) {
const qsConfig = getQSConfig( const qsConfig = getQSConfig(
'job', 'job',
{ {
@@ -162,67 +161,65 @@ function JobList({ i18n, defaultParams, showTypeColumn = false }) {
hasContentLoading={isLoading || isDeleteLoading || isCancelLoading} hasContentLoading={isLoading || isDeleteLoading || isCancelLoading}
items={jobs} items={jobs}
itemCount={count} itemCount={count}
pluralizedItemName={i18n._(t`Jobs`)} pluralizedItemName={t`Jobs`}
qsConfig={qsConfig} qsConfig={qsConfig}
toolbarSearchColumns={[ toolbarSearchColumns={[
{ {
name: i18n._(t`Name`), name: t`Name`,
key: 'name__icontains', key: 'name__icontains',
isDefault: true, isDefault: true,
}, },
{ {
name: i18n._(t`ID`), name: t`ID`,
key: 'id', key: 'id',
}, },
{ {
name: i18n._(t`Label Name`), name: t`Label Name`,
key: 'labels__name__icontains', key: 'labels__name__icontains',
}, },
{ {
name: i18n._(t`Job Type`), name: t`Job Type`,
key: `or__type`, key: `or__type`,
options: [ options: [
[`project_update`, i18n._(t`Source Control Update`)], [`project_update`, t`Source Control Update`],
[`inventory_update`, i18n._(t`Inventory Sync`)], [`inventory_update`, t`Inventory Sync`],
[`job`, i18n._(t`Playbook Run`)], [`job`, t`Playbook Run`],
[`ad_hoc_command`, i18n._(t`Command`)], [`ad_hoc_command`, t`Command`],
[`system_job`, i18n._(t`Management Job`)], [`system_job`, t`Management Job`],
[`workflow_job`, i18n._(t`Workflow Job`)], [`workflow_job`, t`Workflow Job`],
], ],
}, },
{ {
name: i18n._(t`Launched By (Username)`), name: t`Launched By (Username)`,
key: 'created_by__username__icontains', key: 'created_by__username__icontains',
}, },
{ {
name: i18n._(t`Status`), name: t`Status`,
key: 'status', key: 'status',
options: [ options: [
[`new`, i18n._(t`New`)], [`new`, t`New`],
[`pending`, i18n._(t`Pending`)], [`pending`, t`Pending`],
[`waiting`, i18n._(t`Waiting`)], [`waiting`, t`Waiting`],
[`running`, i18n._(t`Running`)], [`running`, t`Running`],
[`successful`, i18n._(t`Successful`)], [`successful`, t`Successful`],
[`failed`, i18n._(t`Failed`)], [`failed`, t`Failed`],
[`error`, i18n._(t`Error`)], [`error`, t`Error`],
[`canceled`, i18n._(t`Canceled`)], [`canceled`, t`Canceled`],
], ],
}, },
{ {
name: i18n._(t`Limit`), name: t`Limit`,
key: 'job__limit', key: 'job__limit',
}, },
]} ]}
headerRow={ headerRow={
<HeaderRow qsConfig={qsConfig} isExpandable> <HeaderRow qsConfig={qsConfig} isExpandable>
<HeaderCell sortKey="name">{i18n._(t`Name`)}</HeaderCell> <HeaderCell sortKey="name">{t`Name`}</HeaderCell>
<HeaderCell sortKey="status">{i18n._(t`Status`)}</HeaderCell> <HeaderCell sortKey="status">{t`Status`}</HeaderCell>
{showTypeColumn && <HeaderCell>{i18n._(t`Type`)}</HeaderCell>} {showTypeColumn && <HeaderCell>{t`Type`}</HeaderCell>}
<HeaderCell sortKey="started">{i18n._(t`Start Time`)}</HeaderCell> <HeaderCell sortKey="started">{t`Start Time`}</HeaderCell>
<HeaderCell sortKey="finished"> <HeaderCell sortKey="finished">{t`Finish Time`}</HeaderCell>
{i18n._(t`Finish Time`)} <HeaderCell>{t`Actions`}</HeaderCell>
</HeaderCell>
<HeaderCell>{i18n._(t`Actions`)}</HeaderCell>
</HeaderRow> </HeaderRow>
} }
toolbarSearchableKeys={searchableKeys} toolbarSearchableKeys={searchableKeys}
@@ -239,17 +236,18 @@ function JobList({ i18n, defaultParams, showTypeColumn = false }) {
key="delete" key="delete"
onDelete={handleJobDelete} onDelete={handleJobDelete}
itemsToDelete={selected} itemsToDelete={selected}
pluralizedItemName={i18n._(t`Jobs`)} pluralizedItemName={t`Jobs`}
cannotDelete={item => cannotDelete={item =>
isJobRunning(item.status) || isJobRunning(item.status) ||
!item.summary_fields.user_capabilities.delete !item.summary_fields.user_capabilities.delete
} }
errorMessage={plural(cannotDeleteItems.length, { errorMessage={
one: <Plural
'The selected job cannot be deleted due to insufficient permission or a running job status', value={cannotDeleteItems.length}
other: one="The selected job cannot be deleted due to insufficient permission or a running job status"
'The selected jobs cannot be deleted due to insufficient permissions or a running job status', other="The selected jobs cannot be deleted due to insufficient permissions or a running job status"
})} />
}
/>, />,
<JobListCancelButton <JobListCancelButton
key="cancel" key="cancel"
@@ -275,10 +273,10 @@ function JobList({ i18n, defaultParams, showTypeColumn = false }) {
<AlertModal <AlertModal
isOpen isOpen
variant="error" variant="error"
title={i18n._(t`Error!`)} title={t`Error!`}
onClose={clearDeletionError} onClose={clearDeletionError}
> >
{i18n._(t`Failed to delete one or more jobs.`)} {t`Failed to delete one or more jobs.`}
<ErrorDetail error={deletionError} /> <ErrorDetail error={deletionError} />
</AlertModal> </AlertModal>
)} )}
@@ -286,10 +284,10 @@ function JobList({ i18n, defaultParams, showTypeColumn = false }) {
<AlertModal <AlertModal
isOpen isOpen
variant="error" variant="error"
title={i18n._(t`Error!`)} title={t`Error!`}
onClose={dismissCancelError} onClose={dismissCancelError}
> >
{i18n._(t`Failed to cancel one or more jobs.`)} {t`Failed to cancel one or more jobs.`}
<ErrorDetail error={cancelError} /> <ErrorDetail error={cancelError} />
</AlertModal> </AlertModal>
)} )}
@@ -297,4 +295,4 @@ function JobList({ i18n, defaultParams, showTypeColumn = false }) {
); );
} }
export default withI18n()(JobList); export default JobList;
awx/ui_next/src/components/JobList/JobList.test.jsx
+2 -4
View File
@@ -320,10 +320,8 @@ describe('<JobList />', () => {
wrapper.update(); wrapper.update();
const deleteButton = wrapper.find('ToolbarDeleteButton'); const deleteButton = wrapper.find('ToolbarDeleteButton').find('Button');
expect(deleteButton.find('Tooltip').prop('content').props.children).toEqual( expect(deleteButton.prop('isDisabled')).toBe(true);
'The selected jobs cannot be deleted due to insufficient permissions or a running job status: job 1, job 2'
);
jest.restoreAllMocks(); jest.restoreAllMocks();
}); });
awx/ui_next/src/components/PaginatedDataList/ToolbarDeleteButton.jsx
+21 -22
View File
@@ -17,7 +17,6 @@ import {
DropdownItem, DropdownItem,
Tooltip, Tooltip,
} from '@patternfly/react-core'; } from '@patternfly/react-core';
import { withI18n } from '@lingui/react';
import { t } from '@lingui/macro'; import { t } from '@lingui/macro';
import AlertModal from '../AlertModal'; import AlertModal from '../AlertModal';
import { KebabifiedContext } from '../../contexts/Kebabified'; import { KebabifiedContext } from '../../contexts/Kebabified';
@@ -95,7 +94,6 @@ function ToolbarDeleteButton({
deleteDetailsRequests, deleteDetailsRequests,
warningMessage, warningMessage,
deleteMessage, deleteMessage,
i18n,
cannotDelete, cannotDelete,
}) { }) {
const { isKebabified, onKebabModalChange } = useContext(KebabifiedContext); const { isKebabified, onKebabModalChange } = useContext(KebabifiedContext);
@@ -145,21 +143,24 @@ function ToolbarDeleteButton({
if (itemsToDelete.some(cannotDelete)) { if (itemsToDelete.some(cannotDelete)) {
return ( return (
<div> <div>
{errorMessage {errorMessage ? (
? `${errorMessage}: ${itemsUnableToDelete}` <>
: i18n._( <span>{errorMessage}</span>
t`You do not have permission to delete ${pluralizedItemName}: ${itemsUnableToDelete}` <span>{`: ${itemsUnableToDelete}`}</span>
)} </>
) : (
t`You do not have permission to delete ${pluralizedItemName}: ${itemsUnableToDelete}`
)}
</div> </div>
); );
} }
if (itemsToDelete.length) { if (itemsToDelete.length) {
return i18n._(t`Delete`); return t`Delete`;
} }
return i18n._(t`Select a row to delete`); return t`Select a row to delete`;
}; };
const modalTitle = i18n._(t`Delete ${pluralizedItemName}?`); const modalTitle = t`Delete ${pluralizedItemName}?`;
const isDisabled = const isDisabled =
itemsToDelete.length === 0 || itemsToDelete.some(cannotDelete); itemsToDelete.length === 0 || itemsToDelete.some(cannotDelete);
@@ -201,7 +202,7 @@ function ToolbarDeleteButton({
return ( return (
<AlertModal <AlertModal
isOpen={deleteMessageError} isOpen={deleteMessageError}
title={i18n._(t`Error!`)} title={t`Error!`}
onClose={() => { onClose={() => {
toggleModal(false); toggleModal(false);
setDeleteMessageError(); setDeleteMessageError();
@@ -230,7 +231,7 @@ function ToolbarDeleteButton({
toggleModal(true); toggleModal(true);
}} }}
> >
{i18n._(t`Delete`)} {t`Delete`}
</DropdownItem> </DropdownItem>
</Tooltip> </Tooltip>
) : ( ) : (
@@ -240,11 +241,11 @@ function ToolbarDeleteButton({
variant="secondary" variant="secondary"
isLoading={isLoading} isLoading={isLoading}
spinnerAriaValueText={isLoading ? 'Loading' : undefined} spinnerAriaValueText={isLoading ? 'Loading' : undefined}
aria-label={i18n._(t`Delete`)} aria-label={t`Delete`}
onClick={() => toggleModal(true)} onClick={() => toggleModal(true)}
isDisabled={isDisabled} isDisabled={isDisabled}
> >
{i18n._(t`Delete`)} {t`Delete`}
</Button> </Button>
</div> </div>
</Tooltip> </Tooltip>
@@ -261,25 +262,25 @@ function ToolbarDeleteButton({
ouiaId="delete-modal-confirm" ouiaId="delete-modal-confirm"
key="delete" key="delete"
variant="danger" variant="danger"
aria-label={i18n._(t`confirm delete`)} aria-label={t`confirm delete`}
isDisabled={Boolean( isDisabled={Boolean(
deleteDetails && itemsToDelete[0]?.type === 'credential_type' deleteDetails && itemsToDelete[0]?.type === 'credential_type'
)} )}
onClick={handleDelete} onClick={handleDelete}
> >
{i18n._(t`Delete`)} {t`Delete`}
</Button>, </Button>,
<Button <Button
key="cancel" key="cancel"
variant="link" variant="link"
aria-label={i18n._(t`cancel delete`)} aria-label={t`cancel delete`}
onClick={() => toggleModal(false)} onClick={() => toggleModal(false)}
> >
{i18n._(t`Cancel`)} {t`Cancel`}
</Button>, </Button>,
]} ]}
> >
<div>{i18n._(t`This action will delete the following:`)}</div> <div>{t`This action will delete the following:`}</div>
{itemsToDelete.map(item => ( {itemsToDelete.map(item => (
<span key={item.id}> <span key={item.id}>
<strong>{item.name || item.username || item.image}</strong> <strong>{item.name || item.username || item.image}</strong>
@@ -303,16 +304,14 @@ ToolbarDeleteButton.propTypes = {
onDelete: func.isRequired, onDelete: func.isRequired,
itemsToDelete: arrayOf(ItemToDelete).isRequired, itemsToDelete: arrayOf(ItemToDelete).isRequired,
pluralizedItemName: string, pluralizedItemName: string,
errorMessage: string,
warningMessage: node, warningMessage: node,
cannotDelete: func, cannotDelete: func,
}; };
ToolbarDeleteButton.defaultProps = { ToolbarDeleteButton.defaultProps = {
pluralizedItemName: 'Items', pluralizedItemName: 'Items',
errorMessage: '',
warningMessage: null, warningMessage: null,
cannotDelete: item => !item.summary_fields.user_capabilities.delete, cannotDelete: item => !item.summary_fields.user_capabilities.delete,
}; };
export default withI18n()(ToolbarDeleteButton); export default ToolbarDeleteButton;
awx/ui_next/src/components/PaginatedDataList/ToolbarDeleteButton.test.jsx
+1
View File
@@ -1,5 +1,6 @@
import React from 'react'; import React from 'react';
import { act } from 'react-dom/test-utils'; import { act } from 'react-dom/test-utils';
import { import {
mountWithContexts, mountWithContexts,
waitForElement, waitForElement,
awx/ui_next/src/components/TemplateList/TemplateList.jsx
+29 -29
View File
@@ -1,7 +1,6 @@
import React, { Fragment, useEffect, useState, useCallback } from 'react'; import React, { Fragment, useEffect, useState, useCallback } from 'react';
import { useLocation, Link } from 'react-router-dom'; import { useLocation, Link } from 'react-router-dom';
import { withI18n } from '@lingui/react'; import { t, Plural } from '@lingui/macro';
import { t } from '@lingui/macro';
import { Card, DropdownItem } from '@patternfly/react-core'; import { Card, DropdownItem } from '@patternfly/react-core';
import { import {
JobTemplatesAPI, JobTemplatesAPI,
@@ -20,7 +19,7 @@ import AddDropDownButton from '../AddDropDownButton';
import TemplateListItem from './TemplateListItem'; import TemplateListItem from './TemplateListItem';
import { relatedResourceDeleteRequests } from '../../util/getRelatedResourceDeleteDetails'; import { relatedResourceDeleteRequests } from '../../util/getRelatedResourceDeleteDetails';
function TemplateList({ defaultParams, i18n }) { function TemplateList({ defaultParams }) {
// The type value in const qsConfig below does not have a space between job_template and // The type value in const qsConfig below does not have a space between job_template and
// workflow_job_template so the params sent to the API match what the api expects. // workflow_job_template so the params sent to the API match what the api expects.
const qsConfig = getQSConfig( const qsConfig = getQSConfig(
@@ -138,8 +137,8 @@ function TemplateList({ defaultParams, i18n }) {
const canAddWFJT = const canAddWFJT =
wfjtActions && Object.prototype.hasOwnProperty.call(wfjtActions, 'POST'); wfjtActions && Object.prototype.hasOwnProperty.call(wfjtActions, 'POST');
const addTemplate = i18n._(t`Add job template`); const addTemplate = t`Add job template`;
const addWFTemplate = i18n._(t`Add workflow template`); const addWFTemplate = t`Add workflow template`;
const addDropDownButton = []; const addDropDownButton = [];
if (canAddJT) { if (canAddJT) {
addDropDownButton.push( addDropDownButton.push(
@@ -181,37 +180,37 @@ function TemplateList({ defaultParams, i18n }) {
hasContentLoading={isLoading || isDeleteLoading} hasContentLoading={isLoading || isDeleteLoading}
items={templates} items={templates}
itemCount={count} itemCount={count}
pluralizedItemName={i18n._(t`Templates`)} pluralizedItemName={t`Templates`}
qsConfig={qsConfig} qsConfig={qsConfig}
onRowClick={handleSelect} onRowClick={handleSelect}
toolbarSearchColumns={[ toolbarSearchColumns={[
{ {
name: i18n._(t`Name`), name: t`Name`,
key: 'name__icontains', key: 'name__icontains',
isDefault: true, isDefault: true,
}, },
{ {
name: i18n._(t`Description`), name: t`Description`,
key: 'description__icontains', key: 'description__icontains',
}, },
{ {
name: i18n._(t`Type`), name: t`Type`,
key: 'or__type', key: 'or__type',
options: [ options: [
[`job_template`, i18n._(t`Job Template`)], [`job_template`, t`Job Template`],
[`workflow_job_template`, i18n._(t`Workflow Template`)], [`workflow_job_template`, t`Workflow Template`],
], ],
}, },
{ {
name: i18n._(t`Playbook name`), name: t`Playbook name`,
key: 'job_template__playbook__icontains', key: 'job_template__playbook__icontains',
}, },
{ {
name: i18n._(t`Created By (Username)`), name: t`Created By (Username)`,
key: 'created_by__username__icontains', key: 'created_by__username__icontains',
}, },
{ {
name: i18n._(t`Modified By (Username)`), name: t`Modified By (Username)`,
key: 'modified_by__username__icontains', key: 'modified_by__username__icontains',
}, },
]} ]}
@@ -219,12 +218,10 @@ function TemplateList({ defaultParams, i18n }) {
toolbarRelatedSearchableKeys={relatedSearchableKeys} toolbarRelatedSearchableKeys={relatedSearchableKeys}
headerRow={ headerRow={
<HeaderRow qsConfig={qsConfig} isExpandable> <HeaderRow qsConfig={qsConfig} isExpandable>
<HeaderCell sortKey="name">{i18n._(t`Name`)}</HeaderCell> <HeaderCell sortKey="name">{t`Name`}</HeaderCell>
<HeaderCell sortKey="type">{i18n._(t`Type`)}</HeaderCell> <HeaderCell sortKey="type">{t`Type`}</HeaderCell>
<HeaderCell sortKey="last_job_run"> <HeaderCell sortKey="last_job_run">{t`Last Ran`}</HeaderCell>
{i18n._(t`Last Ran`)} <HeaderCell>{t`Actions`}</HeaderCell>
</HeaderCell>
<HeaderCell>{i18n._(t`Actions`)}</HeaderCell>
</HeaderRow> </HeaderRow>
} }
renderToolbar={props => ( renderToolbar={props => (
@@ -240,12 +237,15 @@ function TemplateList({ defaultParams, i18n }) {
key="delete" key="delete"
onDelete={handleTemplateDelete} onDelete={handleTemplateDelete}
itemsToDelete={selected} itemsToDelete={selected}
pluralizedItemName={i18n._(t`Templates`)} pluralizedItemName={t`Templates`}
deleteDetailsRequests={deleteDetailsRequests} deleteDetailsRequests={deleteDetailsRequests}
deleteMessage={i18n._( deleteMessage={
'{numItemsToDelete, plural, one {This template is currently being used by some workflow nodes. Are you sure you want to delete it?} other {Deleting these templates could impact some workflow nodes that rely on them. Are you sure you want to delete anyway?}}', <Plural
{ numItemsToDelete: selected.length } value={selected.length}
)} one="This template is currently being used by some workflow nodes. Are you sure you want to delete it?"
other="Deleting these templates could impact some workflow nodes that rely on them. Are you sure you want to delete anyway?"
/>
}
/>, />,
]} ]}
/> />
@@ -266,17 +266,17 @@ function TemplateList({ defaultParams, i18n }) {
/> />
</Card> </Card>
<AlertModal <AlertModal
aria-label={i18n._(t`Deletion Error`)} aria-label={t`Deletion Error`}
isOpen={deletionError} isOpen={deletionError}
variant="error" variant="error"
title={i18n._(t`Error!`)} title={t`Error!`}
onClose={clearDeletionError} onClose={clearDeletionError}
> >
{i18n._(t`Failed to delete one or more templates.`)} {t`Failed to delete one or more templates.`}
<ErrorDetail error={deletionError} /> <ErrorDetail error={deletionError} />
</AlertModal> </AlertModal>
</Fragment> </Fragment>
); );
} }
export default withI18n()(TemplateList); export default TemplateList;
awx/ui_next/src/locales/en/messages.po
+418 -358
View File
File diff suppressed because it is too large Load Diff
awx/ui_next/src/locales/es/messages.po
+414 -358
View File
File diff suppressed because it is too large Load Diff
awx/ui_next/src/locales/fr/messages.po
+1119 -702
View File
File diff suppressed because it is too large Load Diff
awx/ui_next/src/locales/ja/messages.po
+1145 -711
View File
File diff suppressed because it is too large Load Diff
awx/ui_next/src/locales/nl/messages.po
+414 -358
View File
File diff suppressed because it is too large Load Diff
awx/ui_next/src/locales/zh/messages.po
+1121 -700
View File
File diff suppressed because it is too large Load Diff
awx/ui_next/src/locales/zu/messages.po
+413 -357
View File
File diff suppressed because it is too large Load Diff
awx/ui_next/src/screens/Credential/CredentialList/CredentialList.jsx
+21 -19
View File
@@ -1,7 +1,6 @@
import React, { useEffect, useCallback } from 'react'; import React, { useEffect, useCallback } from 'react';
import { useLocation } from 'react-router-dom'; import { useLocation } from 'react-router-dom';
import { withI18n } from '@lingui/react'; import { t, Plural } from '@lingui/macro';
import { t } from '@lingui/macro';
import { Card, PageSection } from '@patternfly/react-core'; import { Card, PageSection } from '@patternfly/react-core';
import { CredentialsAPI } from '../../../api'; import { CredentialsAPI } from '../../../api';
import useSelected from '../../../util/useSelected'; import useSelected from '../../../util/useSelected';
@@ -27,7 +26,7 @@ const QS_CONFIG = getQSConfig('credential', {
order_by: 'name', order_by: 'name',
}); });
function CredentialList({ i18n }) { function CredentialList() {
const location = useLocation(); const location = useLocation();
const { const {
result: { result: {
@@ -121,28 +120,28 @@ function CredentialList({ i18n }) {
toolbarRelatedSearchableKeys={relatedSearchableKeys} toolbarRelatedSearchableKeys={relatedSearchableKeys}
toolbarSearchColumns={[ toolbarSearchColumns={[
{ {
name: i18n._(t`Name`), name: t`Name`,
key: 'name__icontains', key: 'name__icontains',
isDefault: true, isDefault: true,
}, },
{ {
name: i18n._(t`Description`), name: t`Description`,
key: 'description__icontains', key: 'description__icontains',
}, },
{ {
name: i18n._(t`Created By (Username)`), name: t`Created By (Username)`,
key: 'created_by__username__icontains', key: 'created_by__username__icontains',
}, },
{ {
name: i18n._(t`Modified By (Username)`), name: t`Modified By (Username)`,
key: 'modified_by__username__icontains', key: 'modified_by__username__icontains',
}, },
]} ]}
headerRow={ headerRow={
<HeaderRow qsConfig={QS_CONFIG}> <HeaderRow qsConfig={QS_CONFIG}>
<HeaderCell sortKey="name">{i18n._(t`Name`)}</HeaderCell> <HeaderCell sortKey="name">{t`Name`}</HeaderCell>
<HeaderCell>{i18n._(t`Type`)}</HeaderCell> <HeaderCell>{t`Type`}</HeaderCell>
<HeaderCell alignRight>{i18n._(t`Actions`)}</HeaderCell> <HeaderCell alignRight>{t`Actions`}</HeaderCell>
</HeaderRow> </HeaderRow>
} }
renderRow={(item, index) => ( renderRow={(item, index) => (
@@ -173,12 +172,15 @@ function CredentialList({ i18n }) {
key="delete" key="delete"
onDelete={handleDelete} onDelete={handleDelete}
itemsToDelete={selected} itemsToDelete={selected}
pluralizedItemName={i18n._(t`Credentials`)} pluralizedItemName={t`Credentials`}
deleteDetailsRequests={deleteDetailsRequests} deleteDetailsRequests={deleteDetailsRequests}
deleteMessage={i18n._( deleteMessage={
'{numItemsToDelete, plural, one {This credential is currently being used by other resources. Are you sure you want to delete it?} other {Deleting these credentials could impact other resources that rely on them. Are you sure you want to delete anyway?}}', <Plural
{ numItemsToDelete: selected.length } value={selected.length}
)} one="This credential is currently being used by other resources. Are you sure you want to delete it?"
other="Deleting these credentials could impact other resources that rely on them. Are you sure you want to delete anyway?"
/>
}
/>, />,
]} ]}
/> />
@@ -186,17 +188,17 @@ function CredentialList({ i18n }) {
/> />
</Card> </Card>
<AlertModal <AlertModal
aria-label={i18n._(t`Deletion Error`)} aria-label={t`Deletion Error`}
isOpen={deletionError} isOpen={deletionError}
variant="error" variant="error"
title={i18n._(t`Error!`)} title={t`Error!`}
onClose={clearDeletionError} onClose={clearDeletionError}
> >
{i18n._(t`Failed to delete one or more credentials.`)} {t`Failed to delete one or more credentials.`}
<ErrorDetail error={deletionError} /> <ErrorDetail error={deletionError} />
</AlertModal> </AlertModal>
</PageSection> </PageSection>
); );
} }
export default withI18n()(CredentialList); export default CredentialList;
awx/ui_next/src/screens/CredentialType/CredentialTypeList/CredentialTypeList.jsx
+22 -19
View File
@@ -1,7 +1,7 @@
import React, { useEffect, useCallback } from 'react'; import React, { useEffect, useCallback } from 'react';
import { useLocation, useRouteMatch } from 'react-router-dom'; import { useLocation, useRouteMatch } from 'react-router-dom';
import { withI18n } from '@lingui/react';
import { t } from '@lingui/macro'; import { t, Plural } from '@lingui/macro';
import { Card, PageSection } from '@patternfly/react-core'; import { Card, PageSection } from '@patternfly/react-core';
import { CredentialTypesAPI } from '../../../api'; import { CredentialTypesAPI } from '../../../api';
@@ -28,7 +28,7 @@ const QS_CONFIG = getQSConfig('credential-type', {
managed_by_tower: false, managed_by_tower: false,
}); });
function CredentialTypeList({ i18n }) { function CredentialTypeList() {
const location = useLocation(); const location = useLocation();
const match = useRouteMatch(); const match = useRouteMatch();
@@ -119,25 +119,25 @@ function CredentialTypeList({ i18n }) {
hasContentLoading={isLoading || deleteLoading} hasContentLoading={isLoading || deleteLoading}
items={credentialTypes} items={credentialTypes}
itemCount={credentialTypesCount} itemCount={credentialTypesCount}
pluralizedItemName={i18n._(t`Credential Types`)} pluralizedItemName={t`Credential Types`}
qsConfig={QS_CONFIG} qsConfig={QS_CONFIG}
onRowClick={handleSelect} onRowClick={handleSelect}
toolbarSearchColumns={[ toolbarSearchColumns={[
{ {
name: i18n._(t`Name`), name: t`Name`,
key: 'name__icontains', key: 'name__icontains',
isDefault: true, isDefault: true,
}, },
{ {
name: i18n._(t`Description`), name: t`Description`,
key: 'description__icontains', key: 'description__icontains',
}, },
{ {
name: i18n._(t`Created By (Username)`), name: t`Created By (Username)`,
key: 'created_by__username__icontains', key: 'created_by__username__icontains',
}, },
{ {
name: i18n._(t`Modified By (Username)`), name: t`Modified By (Username)`,
key: 'modified_by__username__icontains', key: 'modified_by__username__icontains',
}, },
]} ]}
@@ -165,20 +165,23 @@ function CredentialTypeList({ i18n }) {
key="delete" key="delete"
onDelete={handleDelete} onDelete={handleDelete}
itemsToDelete={selected} itemsToDelete={selected}
pluralizedItemName={i18n._(t`Credential Types`)} pluralizedItemName={t`Credential Types`}
deleteDetailsRequests={deleteDetailsRequests} deleteDetailsRequests={deleteDetailsRequests}
deleteMessage={i18n._( deleteMessage={
'{numItemsToDelete, plural, one {This credential type is currently being used by some credentials and cannot be deleted.} other {Credential types that are being used by credentials cannot be deleted. Are you sure you want to delete anyway?}}', <Plural
{ numItemsToDelete: selected.length } value={selected.length}
)} one="This credential type is currently being used by some credentials and cannot be deleted."
other="Credential types that are being used by credentials cannot be deleted. Are you sure you want to delete anyway?"
/>
}
/>, />,
]} ]}
/> />
)} )}
headerRow={ headerRow={
<HeaderRow qsConfig={QS_CONFIG}> <HeaderRow qsConfig={QS_CONFIG}>
<HeaderCell sortKey="name">{i18n._(t`Name`)}</HeaderCell> <HeaderCell sortKey="name">{t`Name`}</HeaderCell>
<HeaderCell>{i18n._(t`Actions`)}</HeaderCell> <HeaderCell>{t`Actions`}</HeaderCell>
</HeaderRow> </HeaderRow>
} }
renderRow={(credentialType, index) => ( renderRow={(credentialType, index) => (
@@ -201,17 +204,17 @@ function CredentialTypeList({ i18n }) {
</Card> </Card>
</PageSection> </PageSection>
<AlertModal <AlertModal
aria-label={i18n._(t`Deletion error`)} aria-label={t`Deletion error`}
isOpen={deletionError} isOpen={deletionError}
onClose={clearDeletionError} onClose={clearDeletionError}
title={i18n._(t`Error`)} title={t`Error`}
variant="error" variant="error"
> >
{i18n._(t`Failed to delete one or more credential types.`)} {t`Failed to delete one or more credential types.`}
<ErrorDetail error={deletionError} /> <ErrorDetail error={deletionError} />
</AlertModal> </AlertModal>
</> </>
); );
} }
export default withI18n()(CredentialTypeList); export default CredentialTypeList;
awx/ui_next/src/screens/ExecutionEnvironment/ExecutionEnvironmentList/ExecutionEnvironmentList.jsx
+25 -23
View File
@@ -1,7 +1,6 @@
import React, { useEffect, useCallback } from 'react'; import React, { useEffect, useCallback } from 'react';
import { useLocation, useRouteMatch } from 'react-router-dom'; import { useLocation, useRouteMatch } from 'react-router-dom';
import { withI18n } from '@lingui/react'; import { t, Plural } from '@lingui/macro';
import { t } from '@lingui/macro';
import { Card, PageSection } from '@patternfly/react-core'; import { Card, PageSection } from '@patternfly/react-core';
import { ExecutionEnvironmentsAPI } from '../../../api'; import { ExecutionEnvironmentsAPI } from '../../../api';
@@ -28,7 +27,7 @@ const QS_CONFIG = getQSConfig('execution_environments', {
order_by: 'name', order_by: 'name',
}); });
function ExecutionEnvironmentList({ i18n }) { function ExecutionEnvironmentList() {
const location = useLocation(); const location = useLocation();
const match = useRouteMatch(); const match = useRouteMatch();
@@ -118,46 +117,46 @@ function ExecutionEnvironmentList({ i18n }) {
hasContentLoading={isLoading || deleteLoading} hasContentLoading={isLoading || deleteLoading}
items={executionEnvironments} items={executionEnvironments}
itemCount={executionEnvironmentsCount} itemCount={executionEnvironmentsCount}
pluralizedItemName={i18n._(t`Execution Environments`)} pluralizedItemName={t`Execution Environments`}
qsConfig={QS_CONFIG} qsConfig={QS_CONFIG}
onRowClick={handleSelect} onRowClick={handleSelect}
toolbarSearchableKeys={searchableKeys} toolbarSearchableKeys={searchableKeys}
toolbarRelatedSearchableKeys={relatedSearchableKeys} toolbarRelatedSearchableKeys={relatedSearchableKeys}
toolbarSearchColumns={[ toolbarSearchColumns={[
{ {
name: i18n._(t`Name`), name: t`Name`,
key: 'name__icontains', key: 'name__icontains',
isDefault: true, isDefault: true,
}, },
{ {
name: i18n._(t`Image`), name: t`Image`,
key: 'image__icontains', key: 'image__icontains',
}, },
]} ]}
toolbarSortColumns={[ toolbarSortColumns={[
{ {
name: i18n._(t`Image`), name: t`Image`,
key: 'image', key: 'image',
}, },
{ {
name: i18n._(t`Created`), name: t`Created`,
key: 'created', key: 'created',
}, },
{ {
name: i18n._(t`Organization`), name: t`Organization`,
key: 'organization', key: 'organization',
}, },
{ {
name: i18n._(t`Description`), name: t`Description`,
key: 'description', key: 'description',
}, },
]} ]}
headerRow={ headerRow={
<HeaderRow qsConfig={QS_CONFIG}> <HeaderRow qsConfig={QS_CONFIG}>
<HeaderCell sortKey="name">{i18n._(t`Name`)}</HeaderCell> <HeaderCell sortKey="name">{t`Name`}</HeaderCell>
<HeaderCell>{i18n._(t`Image`)}</HeaderCell> <HeaderCell>{t`Image`}</HeaderCell>
<HeaderCell>{i18n._(t`Organization`)}</HeaderCell> <HeaderCell>{t`Organization`}</HeaderCell>
<HeaderCell>{i18n._(t`Actions`)}</HeaderCell> <HeaderCell>{t`Actions`}</HeaderCell>
</HeaderRow> </HeaderRow>
} }
renderToolbar={props => ( renderToolbar={props => (
@@ -182,12 +181,15 @@ function ExecutionEnvironmentList({ i18n }) {
key="delete" key="delete"
onDelete={handleDelete} onDelete={handleDelete}
itemsToDelete={selected} itemsToDelete={selected}
pluralizedItemName={i18n._(t`Execution Environments`)} pluralizedItemName={t`Execution Environments`}
deleteDetailsRequests={deleteDetailsRequests} deleteDetailsRequests={deleteDetailsRequests}
deleteMessage={i18n._( deleteMessage={
'{numItemsToDelete, plural, one {This execution environment is currently being used by other resources. Are you sure you want to delete it?} other {Deleting these execution environemnts could impact other resources that rely on them. Are you sure you want to delete anyway?}}', <Plural
{ numItemsToDelete: selected.length } value={selected.length}
)} one="This execution environment is currently being used by other resources. Are you sure you want to delete it?"
other="These execution environments could be in use by other resources that rely on them. Are you sure you want to delete them anyway?"
/>
}
/>, />,
]} ]}
/> />
@@ -214,17 +216,17 @@ function ExecutionEnvironmentList({ i18n }) {
</Card> </Card>
</PageSection> </PageSection>
<AlertModal <AlertModal
aria-label={i18n._(t`Deletion error`)} aria-label={t`Deletion error`}
isOpen={deletionError} isOpen={deletionError}
onClose={clearDeletionError} onClose={clearDeletionError}
title={i18n._(t`Error`)} title={t`Error`}
variant="error" variant="error"
> >
{i18n._(t`Failed to delete one or more execution environments`)} {t`Failed to delete one or more execution environments`}
<ErrorDetail error={deletionError} /> <ErrorDetail error={deletionError} />
</AlertModal> </AlertModal>
</> </>
); );
} }
export default withI18n()(ExecutionEnvironmentList); export default ExecutionEnvironmentList;
awx/ui_next/src/screens/InstanceGroup/InstanceGroupList/InstanceGroupList.jsx
+27 -26
View File
@@ -1,7 +1,7 @@
import React, { useEffect, useCallback } from 'react'; import React, { useEffect, useCallback } from 'react';
import { useLocation, useRouteMatch, Link } from 'react-router-dom'; import { useLocation, useRouteMatch, Link } from 'react-router-dom';
import { withI18n } from '@lingui/react';
import { t } from '@lingui/macro'; import { t, Plural } from '@lingui/macro';
import { Card, PageSection, DropdownItem } from '@patternfly/react-core'; import { Card, PageSection, DropdownItem } from '@patternfly/react-core';
import { InstanceGroupsAPI } from '../../../api'; import { InstanceGroupsAPI } from '../../../api';
@@ -43,7 +43,7 @@ function modifyInstanceGroups(items = []) {
}); });
} }
function InstanceGroupList({ i18n }) { function InstanceGroupList() {
const location = useLocation(); const location = useLocation();
const match = useRouteMatch(); const match = useRouteMatch();
@@ -127,7 +127,7 @@ function InstanceGroupList({ i18n }) {
return !item.summary_fields.user_capabilities.delete; return !item.summary_fields.user_capabilities.delete;
} }
const pluralizedItemName = i18n._(t`Instance Groups`); const pluralizedItemName = t`Instance Groups`;
let errorMessageDelete = ''; let errorMessageDelete = '';
@@ -140,9 +140,7 @@ function InstanceGroupList({ i18n }) {
if (itemsUnableToDelete) { if (itemsUnableToDelete) {
if (modifiedSelected.some(cannotDelete)) { if (modifiedSelected.some(cannotDelete)) {
errorMessageDelete = i18n._( errorMessageDelete = t`You do not have permission to delete ${pluralizedItemName}: ${itemsUnableToDelete}. `;
t`You do not have permission to delete ${pluralizedItemName}: ${itemsUnableToDelete}. `
);
} }
} }
@@ -150,12 +148,12 @@ function InstanceGroupList({ i18n }) {
errorMessageDelete = errorMessageDelete.concat('\n'); errorMessageDelete = errorMessageDelete.concat('\n');
} }
errorMessageDelete = errorMessageDelete.concat( errorMessageDelete = errorMessageDelete.concat(
i18n._(t`The tower instance group cannot be deleted.`) t`The tower instance group cannot be deleted.`
); );
} }
const addContainerGroup = i18n._(t`Add container group`); const addContainerGroup = t`Add container group`;
const addInstanceGroup = i18n._(t`Add instance group`); const addInstanceGroup = t`Add instance group`;
const addButton = ( const addButton = (
<AddDropDownButton <AddDropDownButton
@@ -218,26 +216,29 @@ function InstanceGroupList({ i18n }) {
key="delete" key="delete"
onDelete={handleDelete} onDelete={handleDelete}
itemsToDelete={modifiedSelected} itemsToDelete={modifiedSelected}
pluralizedItemName={i18n._(t`Instance Groups`)} pluralizedItemName={t`Instance Groups`}
errorMessage={errorMessageDelete} errorMessage={errorMessageDelete}
deleteDetailsRequests={deleteDetailsRequests} deleteDetailsRequests={deleteDetailsRequests}
deleteMessage={i18n._( deleteMessage={
'{numItemsToDelete, plural, one {This instance group is currently being by other resources. Are you sure you want to delete it?} other {Deleting these instance groups could impact other resources that rely on them. Are you sure you want to delete anyway?}}', <Plural
{ numItemsToDelete: selected.length } value={selected.length}
)} one="This instance group is currently being by other resources. Are you sure you want to delete it?"
other="Deleting these instance groups could impact other resources that rely on them. Are you sure you want to delete anyway?"
/>
}
/>, />,
]} ]}
/> />
)} )}
headerRow={ headerRow={
<HeaderRow qsConfig={QS_CONFIG}> <HeaderRow qsConfig={QS_CONFIG}>
<HeaderCell sortKey="name">{i18n._(t`Name`)}</HeaderCell> <HeaderCell sortKey="name">{t`Name`}</HeaderCell>
<HeaderCell>{i18n._(t`Type`)}</HeaderCell> <HeaderCell>{t`Type`}</HeaderCell>
<HeaderCell>{i18n._(t`Running Jobs`)}</HeaderCell> <HeaderCell>{t`Running Jobs`}</HeaderCell>
<HeaderCell>{i18n._(t`Total Jobs`)}</HeaderCell> <HeaderCell>{t`Total Jobs`}</HeaderCell>
<HeaderCell>{i18n._(t`Instances`)}</HeaderCell> <HeaderCell>{t`Instances`}</HeaderCell>
<HeaderCell>{i18n._(t`Capacity`)}</HeaderCell> <HeaderCell>{t`Capacity`}</HeaderCell>
<HeaderCell>{i18n._(t`Actions`)}</HeaderCell> <HeaderCell>{t`Actions`}</HeaderCell>
</HeaderRow> </HeaderRow>
} }
renderRow={(instanceGroup, index) => ( renderRow={(instanceGroup, index) => (
@@ -256,17 +257,17 @@ function InstanceGroupList({ i18n }) {
</Card> </Card>
</PageSection> </PageSection>
<AlertModal <AlertModal
aria-label={i18n._(t`Deletion error`)} aria-label={t`Deletion error`}
isOpen={deletionError} isOpen={deletionError}
onClose={clearDeletionError} onClose={clearDeletionError}
title={i18n._(t`Error`)} title={t`Error`}
variant="error" variant="error"
> >
{i18n._(t`Failed to delete one or more instance groups.`)} {t`Failed to delete one or more instance groups.`}
<ErrorDetail error={deletionError} /> <ErrorDetail error={deletionError} />
</AlertModal> </AlertModal>
</> </>
); );
} }
export default withI18n()(InstanceGroupList); export default InstanceGroupList;
awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.jsx
+34 -27
View File
@@ -1,7 +1,6 @@
import React, { useState, useCallback, useEffect } from 'react'; import React, { useState, useCallback, useEffect } from 'react';
import { useLocation, useRouteMatch, Link } from 'react-router-dom'; import { useLocation, useRouteMatch, Link } from 'react-router-dom';
import { withI18n } from '@lingui/react'; import { t, Plural } from '@lingui/macro';
import { t, plural } from '@lingui/macro';
import { Card, PageSection, DropdownItem } from '@patternfly/react-core'; import { Card, PageSection, DropdownItem } from '@patternfly/react-core';
import { InventoriesAPI } from '../../../api'; import { InventoriesAPI } from '../../../api';
import useRequest, { useDeleteItems } from '../../../util/useRequest'; import useRequest, { useDeleteItems } from '../../../util/useRequest';
@@ -25,7 +24,7 @@ const QS_CONFIG = getQSConfig('inventory', {
order_by: 'name', order_by: 'name',
}); });
function InventoryList({ i18n }) { function InventoryList() {
const location = useLocation(); const location = useLocation();
const match = useRouteMatch(); const match = useRouteMatch();
const [selected, setSelected] = useState([]); const [selected, setSelected] = useState([]);
@@ -132,8 +131,8 @@ function InventoryList({ i18n }) {
selected[0] selected[0]
); );
const addInventory = i18n._(t`Add inventory`); const addInventory = t`Add inventory`;
const addSmartInventory = i18n._(t`Add smart inventory`); const addSmartInventory = t`Add smart inventory`;
const addButton = ( const addButton = (
<AddDropDownButton <AddDropDownButton
key="add" key="add"
@@ -166,30 +165,30 @@ function InventoryList({ i18n }) {
hasContentLoading={hasContentLoading} hasContentLoading={hasContentLoading}
items={inventories} items={inventories}
itemCount={itemCount} itemCount={itemCount}
pluralizedItemName={i18n._(t`Inventories`)} pluralizedItemName={t`Inventories`}
qsConfig={QS_CONFIG} qsConfig={QS_CONFIG}
toolbarSearchColumns={[ toolbarSearchColumns={[
{ {
name: i18n._(t`Name`), name: t`Name`,
key: 'name__icontains', key: 'name__icontains',
isDefault: true, isDefault: true,
}, },
{ {
name: i18n._(t`Description`), name: t`Description`,
key: 'description__icontains', key: 'description__icontains',
}, },
{ {
name: i18n._(t`Created By (Username)`), name: t`Created By (Username)`,
key: 'created_by__username__icontains', key: 'created_by__username__icontains',
}, },
{ {
name: i18n._(t`Modified By (Username)`), name: t`Modified By (Username)`,
key: 'modified_by__username__icontains', key: 'modified_by__username__icontains',
}, },
]} ]}
toolbarSortColumns={[ toolbarSortColumns={[
{ {
name: i18n._(t`Name`), name: t`Name`,
key: 'name', key: 'name',
}, },
]} ]}
@@ -197,11 +196,11 @@ function InventoryList({ i18n }) {
toolbarRelatedSearchableKeys={relatedSearchableKeys} toolbarRelatedSearchableKeys={relatedSearchableKeys}
headerRow={ headerRow={
<HeaderRow qsConfig={QS_CONFIG}> <HeaderRow qsConfig={QS_CONFIG}>
<HeaderCell sortKey="name">{i18n._(t`Name`)}</HeaderCell> <HeaderCell sortKey="name">{t`Name`}</HeaderCell>
<HeaderCell>{i18n._(t`Status`)}</HeaderCell> <HeaderCell>{t`Status`}</HeaderCell>
<HeaderCell>{i18n._(t`Type`)}</HeaderCell> <HeaderCell>{t`Type`}</HeaderCell>
<HeaderCell>{i18n._(t`Organization`)}</HeaderCell> <HeaderCell>{t`Organization`}</HeaderCell>
<HeaderCell>{i18n._(t`Actions`)}</HeaderCell> <HeaderCell>{t`Actions`}</HeaderCell>
</HeaderRow> </HeaderRow>
} }
renderToolbar={props => ( renderToolbar={props => (
@@ -217,14 +216,22 @@ function InventoryList({ i18n }) {
key="delete" key="delete"
onDelete={handleInventoryDelete} onDelete={handleInventoryDelete}
itemsToDelete={selected} itemsToDelete={selected}
pluralizedItemName={i18n._(t`Inventories`)} pluralizedItemName={t`Inventories`}
deleteDetailsRequests={deleteDetailsRequests} deleteDetailsRequests={deleteDetailsRequests}
warningMessage={plural(selected.length, { deleteMessage={
one: <Plural
'The inventory will be in a pending status until the final delete is processed.', value={selected.length}
other: one="This invetory is currently being used by some temeplates. Are you sure you want to delete it?"
'The inventories will be in a pending status until the final delete is processed.', other="Deleting these inventories could impact some templates that rely on them. Are you sure you want to delete anyway?"
})} />
}
warningMessage={
<Plural
value={selected.length}
one="The inventory will be in a pending status until the final delete is processed."
other="The inventories will be in a pending status until the final delete is processed."
/>
}
/>, />,
]} ]}
/> />
@@ -251,15 +258,15 @@ function InventoryList({ i18n }) {
<AlertModal <AlertModal
isOpen={deletionError} isOpen={deletionError}
variant="error" variant="error"
aria-label={i18n._(t`Deletion Error`)} aria-label={t`Deletion Error`}
title={i18n._(t`Error!`)} title={t`Error!`}
onClose={clearDeletionError} onClose={clearDeletionError}
> >
{i18n._(t`Failed to delete one or more inventories.`)} {t`Failed to delete one or more inventories.`}
<ErrorDetail error={deletionError} /> <ErrorDetail error={deletionError} />
</AlertModal> </AlertModal>
</PageSection> </PageSection>
); );
} }
export default withI18n()(InventoryList); export default InventoryList;
awx/ui_next/src/screens/Inventory/InventorySources/InventorySourceList.jsx
+21 -19
View File
@@ -1,7 +1,6 @@
import React, { useCallback, useEffect } from 'react'; import React, { useCallback, useEffect } from 'react';
import { useParams, useLocation } from 'react-router-dom'; import { useParams, useLocation } from 'react-router-dom';
import { withI18n } from '@lingui/react'; import { t, Plural } from '@lingui/macro';
import { t } from '@lingui/macro';
import { Button, Tooltip } from '@patternfly/react-core'; import { Button, Tooltip } from '@patternfly/react-core';
import useRequest, { import useRequest, {
@@ -29,7 +28,7 @@ const QS_CONFIG = getQSConfig('inventory', {
order_by: 'name', order_by: 'name',
}); });
function InventorySourceList({ i18n }) { function InventorySourceList() {
const { inventoryType, id } = useParams(); const { inventoryType, id } = useParams();
const { search } = useLocation(); const { search } = useLocation();
@@ -159,7 +158,7 @@ function InventorySourceList({ i18n }) {
} }
items={sources} items={sources}
itemCount={sourceCount} itemCount={sourceCount}
pluralizedItemName={i18n._(t`Inventory Sources`)} pluralizedItemName={t`Inventory Sources`}
qsConfig={QS_CONFIG} qsConfig={QS_CONFIG}
renderToolbar={props => ( renderToolbar={props => (
<DatalistToolbar <DatalistToolbar
@@ -178,27 +177,30 @@ function InventorySourceList({ i18n }) {
key="delete" key="delete"
onDelete={handleDelete} onDelete={handleDelete}
itemsToDelete={selected} itemsToDelete={selected}
pluralizedItemName={i18n._(t`Inventory Sources`)} pluralizedItemName={t`Inventory Sources`}
deleteDetailsRequests={deleteDetailsRequests} deleteDetailsRequests={deleteDetailsRequests}
deleteMessage={i18n._( deleteMessage={
'{numItemsToDelete, plural, one {This inventory source is currently being used by other resources that rely on it. Are you sure you want to delete it?} other {Deleting these inventory sources could impact other resources that rely on them. Are you sure you want to delete anyway?}}', <Plural
{ numItemsToDelete: selected.length } value={selected.length}
)} one="This inventory source is currently being used by other resources that rely on it. Are you sure you want to delete it?"
other="Deleting these inventory sources could impact other resources that rely on them. Are you sure you want to delete anyway"
/>
}
/>, />,
...(canSyncSources ...(canSyncSources
? [ ? [
<Tooltip <Tooltip
key="update" key="update"
content={i18n._(t`Sync all sources`)} content={t`Sync all sources`}
position="top" position="top"
> >
<Button <Button
ouiaId="sync-all-button" ouiaId="sync-all-button"
onClick={syncAll} onClick={syncAll}
aria-label={i18n._(t`Sync all`)} aria-label={t`Sync all`}
variant="secondary" variant="secondary"
> >
{i18n._(t`Sync all`)} {t`Sync all`}
</Button> </Button>
</Tooltip>, </Tooltip>,
] ]
@@ -227,30 +229,30 @@ function InventorySourceList({ i18n }) {
/> />
{syncError && ( {syncError && (
<AlertModal <AlertModal
aria-label={i18n._(t`Sync error`)} aria-label={t`Sync error`}
isOpen={syncError} isOpen={syncError}
variant="error" variant="error"
title={i18n._(t`Error!`)} title={t`Error!`}
onClose={dismissError} onClose={dismissError}
> >
{i18n._(t`Failed to sync some or all inventory sources.`)} {t`Failed to sync some or all inventory sources.`}
<ErrorDetail error={syncError} /> <ErrorDetail error={syncError} />
</AlertModal> </AlertModal>
)} )}
{(deletionError || deleteRelatedResourcesError) && ( {(deletionError || deleteRelatedResourcesError) && (
<AlertModal <AlertModal
aria-label={i18n._(t`Delete error`)} aria-label={t`Delete error`}
isOpen={deletionError || deleteRelatedResourcesError} isOpen={deletionError || deleteRelatedResourcesError}
variant="error" variant="error"
title={i18n._(t`Error!`)} title={t`Error!`}
onClose={clearDeletionError} onClose={clearDeletionError}
> >
{i18n._(t`Failed to delete one or more inventory sources.`)} {t`Failed to delete one or more inventory sources.`}
<ErrorDetail error={deletionError || deleteRelatedResourcesError} /> <ErrorDetail error={deletionError || deleteRelatedResourcesError} />
</AlertModal> </AlertModal>
)} )}
</> </>
); );
} }
export default withI18n()(InventorySourceList); export default InventorySourceList;
awx/ui_next/src/screens/Organization/OrganizationList/OrganizationList.jsx
+22 -20
View File
@@ -1,7 +1,6 @@
import React, { useState, useEffect, useCallback } from 'react'; import React, { useState, useEffect, useCallback } from 'react';
import { useLocation, useRouteMatch } from 'react-router-dom'; import { useLocation, useRouteMatch } from 'react-router-dom';
import { withI18n } from '@lingui/react'; import { t, Plural } from '@lingui/macro';
import { t } from '@lingui/macro';
import { Card, PageSection } from '@patternfly/react-core'; import { Card, PageSection } from '@patternfly/react-core';
import { OrganizationsAPI } from '../../../api'; import { OrganizationsAPI } from '../../../api';
@@ -27,7 +26,7 @@ const QS_CONFIG = getQSConfig('organization', {
order_by: 'name', order_by: 'name',
}); });
function OrganizationsList({ i18n }) { function OrganizationsList() {
const location = useLocation(); const location = useLocation();
const match = useRouteMatch(); const match = useRouteMatch();
@@ -130,24 +129,24 @@ function OrganizationsList({ i18n }) {
hasContentLoading={hasContentLoading} hasContentLoading={hasContentLoading}
items={organizations} items={organizations}
itemCount={organizationCount} itemCount={organizationCount}
pluralizedItemName={i18n._(t`Organizations`)} pluralizedItemName={t`Organizations`}
qsConfig={QS_CONFIG} qsConfig={QS_CONFIG}
toolbarSearchColumns={[ toolbarSearchColumns={[
{ {
name: i18n._(t`Name`), name: t`Name`,
key: 'name__icontains', key: 'name__icontains',
isDefault: true, isDefault: true,
}, },
{ {
name: i18n._(t`Description`), name: t`Description`,
key: 'description__icontains', key: 'description__icontains',
}, },
{ {
name: i18n._(t`Created By (Username)`), name: t`Created By (Username)`,
key: 'created_by__username__icontains', key: 'created_by__username__icontains',
}, },
{ {
name: i18n._(t`Modified By (Username)`), name: t`Modified By (Username)`,
key: 'modified_by__username__icontains', key: 'modified_by__username__icontains',
}, },
]} ]}
@@ -155,10 +154,10 @@ function OrganizationsList({ i18n }) {
toolbarRelatedSearchableKeys={relatedSearchableKeys} toolbarRelatedSearchableKeys={relatedSearchableKeys}
headerRow={ headerRow={
<HeaderRow qsConfig={QS_CONFIG}> <HeaderRow qsConfig={QS_CONFIG}>
<HeaderCell sortKey="name">{i18n._(t`Name`)}</HeaderCell> <HeaderCell sortKey="name">{t`Name`}</HeaderCell>
<HeaderCell>{i18n._(t`Members`)}</HeaderCell> <HeaderCell>{t`Members`}</HeaderCell>
<HeaderCell>{i18n._(t`Teams`)}</HeaderCell> <HeaderCell>{t`Teams`}</HeaderCell>
<HeaderCell>{i18n._(t`Actions`)}</HeaderCell> <HeaderCell>{t`Actions`}</HeaderCell>
</HeaderRow> </HeaderRow>
} }
renderToolbar={props => ( renderToolbar={props => (
@@ -176,12 +175,15 @@ function OrganizationsList({ i18n }) {
key="delete" key="delete"
onDelete={handleOrgDelete} onDelete={handleOrgDelete}
itemsToDelete={selected} itemsToDelete={selected}
pluralizedItemName={i18n._(t`Organizations`)} pluralizedItemName={t`Organizations`}
deleteDetailsRequests={deleteDetailsRequests} deleteDetailsRequests={deleteDetailsRequests}
deleteMessage={i18n._( deleteMessage={
'{numItemsToDelete, plural, one {This organization is currently being by other resources. Are you sure you want to delete it?} other {Deleting these organizations could impact other resources that rely on them. Are you sure you want to delete anyway?}}', <Plural
{ numItemsToDelete: selected.length } value={selected.length}
)} one="This organization is currently being by other resources. Are you sure you want to delete it?"
other="Deleting these organizations could impact other resources that rely on them. Are you sure you want to delete anyway?"
/>
}
/>, />,
]} ]}
/> />
@@ -205,10 +207,10 @@ function OrganizationsList({ i18n }) {
<AlertModal <AlertModal
isOpen={deletionError} isOpen={deletionError}
variant="error" variant="error"
title={i18n._(t`Error!`)} title={t`Error!`}
onClose={clearDeletionError} onClose={clearDeletionError}
> >
{i18n._(t`Failed to delete one or more organizations.`)} {t`Failed to delete one or more organizations.`}
<ErrorDetail error={deletionError} /> <ErrorDetail error={deletionError} />
</AlertModal> </AlertModal>
</> </>
@@ -216,4 +218,4 @@ function OrganizationsList({ i18n }) {
} }
export { OrganizationsList as _OrganizationsList }; export { OrganizationsList as _OrganizationsList };
export default withI18n()(OrganizationsList); export default OrganizationsList;
awx/ui_next/src/screens/Project/ProjectList/ProjectList.jsx
+32 -30
View File
@@ -1,7 +1,6 @@
import React, { Fragment, useState, useEffect, useCallback } from 'react'; import React, { Fragment, useState, useEffect, useCallback } from 'react';
import { useLocation, useRouteMatch } from 'react-router-dom'; import { useLocation, useRouteMatch } from 'react-router-dom';
import { withI18n } from '@lingui/react'; import { t, Plural } from '@lingui/macro';
import { t } from '@lingui/macro';
import { Card, PageSection } from '@patternfly/react-core'; import { Card, PageSection } from '@patternfly/react-core';
import { ProjectsAPI } from '../../../api'; import { ProjectsAPI } from '../../../api';
@@ -29,7 +28,7 @@ const QS_CONFIG = getQSConfig('project', {
order_by: 'name', order_by: 'name',
}); });
function ProjectList({ i18n }) { function ProjectList() {
const location = useLocation(); const location = useLocation();
const match = useRouteMatch(); const match = useRouteMatch();
const [selected, setSelected] = useState([]); const [selected, setSelected] = useState([]);
@@ -130,52 +129,52 @@ function ProjectList({ i18n }) {
hasContentLoading={hasContentLoading} hasContentLoading={hasContentLoading}
items={projects} items={projects}
itemCount={itemCount} itemCount={itemCount}
pluralizedItemName={i18n._(t`Projects`)} pluralizedItemName={t`Projects`}
qsConfig={QS_CONFIG} qsConfig={QS_CONFIG}
onRowClick={handleSelect} onRowClick={handleSelect}
toolbarSearchColumns={[ toolbarSearchColumns={[
{ {
name: i18n._(t`Name`), name: t`Name`,
key: 'name__icontains', key: 'name__icontains',
isDefault: true, isDefault: true,
}, },
{ {
name: i18n._(t`Description`), name: t`Description`,
key: 'description__icontains', key: 'description__icontains',
}, },
{ {
name: i18n._(t`Type`), name: t`Type`,
key: 'or__scm_type', key: 'or__scm_type',
options: [ options: [
[``, i18n._(t`Manual`)], [``, t`Manual`],
[`git`, i18n._(t`Git`)], [`git`, t`Git`],
[`svn`, i18n._(t`Subversion`)], [`svn`, t`Subversion`],
[`archive`, i18n._(t`Remote Archive`)], [`archive`, t`Remote Archive`],
[`insights`, i18n._(t`Red Hat Insights`)], [`insights`, t`Red Hat Insights`],
], ],
}, },
{ {
name: i18n._(t`Source Control URL`), name: t`Source Control URL`,
key: 'scm_url__icontains', key: 'scm_url__icontains',
}, },
{ {
name: i18n._(t`Modified By (Username)`), name: t`Modified By (Username)`,
key: 'modified_by__username__icontains', key: 'modified_by__username__icontains',
}, },
{ {
name: i18n._(t`Created By (Username)`), name: t`Created By (Username)`,
key: 'created_by__username__icontains', key: 'created_by__username__icontains',
}, },
]} ]}
toolbarSearchableKeys={searchableKeys} toolbarSearchableKeys={searchableKeys}
toolbarRelatedSearchableKeys={relatedSearchableKeys} toolbarRelatedSearchableKeys={relatedSearchableKeys}
headerRow={ headerRow={
<HeaderRow qsConfig={QS_CONFIG} isExpandable> <HeaderRow qsConfig={QS_CONFIG}>
<HeaderCell sortKey="name">{i18n._(t`Name`)}</HeaderCell> <HeaderCell sortKey="name">{t`Name`}</HeaderCell>
<HeaderCell>{i18n._(t`Status`)}</HeaderCell> <HeaderCell>{t`Status`}</HeaderCell>
<HeaderCell>{i18n._(t`Type`)}</HeaderCell> <HeaderCell>{t`Type`}</HeaderCell>
<HeaderCell>{i18n._(t`Revision`)}</HeaderCell> <HeaderCell>{t`Revision`}</HeaderCell>
<HeaderCell>{i18n._(t`Actions`)}</HeaderCell> <HeaderCell>{t`Actions`}</HeaderCell>
</HeaderRow> </HeaderRow>
} }
renderToolbar={props => ( renderToolbar={props => (
@@ -198,12 +197,15 @@ function ProjectList({ i18n }) {
key="delete" key="delete"
onDelete={handleProjectDelete} onDelete={handleProjectDelete}
itemsToDelete={selected} itemsToDelete={selected}
pluralizedItemName={i18n._(t`Projects`)} pluralizedItemName={t`Projects`}
deleteDetailsRequests={deleteDetailsRequests} deleteDetailsRequests={deleteDetailsRequests}
deleteMessage={i18n._( deleteMessage={
'{numItemsToDelete, plural, one {This project is currently being used by other resources. Are you sure you want to delete it?} other {Deleting these projects could impact other resources that rely on them. Are you sure you want to delete anyway?}}', <Plural
{ numItemsToDelete: selected.length } value={selected.length}
)} one="This project is currently being used by other resources. Are you sure you want to delete it?"
other="Deleting these projects could impact other resources that rely on them. Are you sure you want to delete anyway?"
/>
}
/>, />,
]} ]}
/> />
@@ -230,15 +232,15 @@ function ProjectList({ i18n }) {
<AlertModal <AlertModal
isOpen={deletionError} isOpen={deletionError}
variant="error" variant="error"
aria-label={i18n._(t`Deletion Error`)} aria-label={t`Deletion Error`}
title={i18n._(t`Error!`)} title={t`Error!`}
onClose={clearDeletionError} onClose={clearDeletionError}
> >
{i18n._(t`Failed to delete one or more projects.`)} {t`Failed to delete one or more projects.`}
<ErrorDetail error={deletionError} /> <ErrorDetail error={deletionError} />
</AlertModal> </AlertModal>
</Fragment> </Fragment>
); );
} }
export default withI18n()(ProjectList); export default ProjectList;
awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalList.jsx
+23 -20
View File
@@ -1,7 +1,6 @@
import React, { useCallback, useEffect } from 'react'; import React, { useCallback, useEffect } from 'react';
import { useLocation, useRouteMatch } from 'react-router-dom'; import { useLocation, useRouteMatch } from 'react-router-dom';
import { withI18n } from '@lingui/react'; import { t, Plural } from '@lingui/macro';
import { t } from '@lingui/macro';
import { Card, PageSection } from '@patternfly/react-core'; import { Card, PageSection } from '@patternfly/react-core';
import { WorkflowApprovalsAPI } from '../../../api'; import { WorkflowApprovalsAPI } from '../../../api';
import PaginatedTable, { import PaginatedTable, {
@@ -29,7 +28,7 @@ const QS_CONFIG = getQSConfig('workflow_approvals', {
order_by: '-started', order_by: '-started',
}); });
function WorkflowApprovalsList({ i18n }) { function WorkflowApprovalsList() {
const location = useLocation(); const location = useLocation();
const match = useRouteMatch(); const match = useRouteMatch();
@@ -167,17 +166,17 @@ function WorkflowApprovalsList({ i18n }) {
} }
items={workflowApprovals} items={workflowApprovals}
itemCount={count} itemCount={count}
pluralizedItemName={i18n._(t`Workflow Approvals`)} pluralizedItemName={t`Workflow Approvals`}
qsConfig={QS_CONFIG} qsConfig={QS_CONFIG}
onRowClick={handleSelect} onRowClick={handleSelect}
toolbarSearchColumns={[ toolbarSearchColumns={[
{ {
name: i18n._(t`Name`), name: t`Name`,
key: 'name__icontains', key: 'name__icontains',
isDefault: true, isDefault: true,
}, },
{ {
name: i18n._(t`Description`), name: t`Description`,
key: 'description__icontains', key: 'description__icontains',
}, },
]} ]}
@@ -207,24 +206,28 @@ function WorkflowApprovalsList({ i18n }) {
key="delete" key="delete"
onDelete={handleDelete} onDelete={handleDelete}
itemsToDelete={selected} itemsToDelete={selected}
pluralizedItemName={i18n._(t`Workflow Approvals`)} pluralizedItemName={t`Workflow Approvals`}
cannotDelete={item => cannotDelete={item =>
item.status === 'pending' || item.status === 'pending' ||
!item.summary_fields.user_capabilities.delete !item.summary_fields.user_capabilities.delete
} }
errorMessage={i18n._( errorMessage={
t`These approvals cannot be deleted due to insufficient permissions or a pending job status` <Plural
)} value={selected.length}
one="This approval cannot be deleted due to insufficient permissions or a pending job status"
other="These approvals cannot be deleted due to insufficient permissions or a pending job status"
/>
}
/>, />,
]} ]}
/> />
)} )}
headerRow={ headerRow={
<HeaderRow qsConfig={QS_CONFIG}> <HeaderRow qsConfig={QS_CONFIG}>
<HeaderCell sortKey="name">{i18n._(t`Name`)}</HeaderCell> <HeaderCell sortKey="name">{t`Name`}</HeaderCell>
<HeaderCell>{i18n._(t`Job`)}</HeaderCell> <HeaderCell>{t`Job`}</HeaderCell>
<HeaderCell sortKey="started">{i18n._(t`Started`)}</HeaderCell> <HeaderCell sortKey="started">{t`Started`}</HeaderCell>
<HeaderCell>{i18n._(t`Status`)}</HeaderCell> <HeaderCell>{t`Status`}</HeaderCell>
</HeaderRow> </HeaderRow>
} }
renderRow={(workflowApproval, index) => ( renderRow={(workflowApproval, index) => (
@@ -247,10 +250,10 @@ function WorkflowApprovalsList({ i18n }) {
<AlertModal <AlertModal
isOpen={deletionError} isOpen={deletionError}
variant="error" variant="error"
title={i18n._(t`Error!`)} title={t`Error!`}
onClose={clearDeletionError} onClose={clearDeletionError}
> >
{i18n._(t`Failed to delete one or more workflow approval.`)} {t`Failed to delete one or more workflow approval.`}
<ErrorDetail error={deletionError} /> <ErrorDetail error={deletionError} />
</AlertModal> </AlertModal>
)} )}
@@ -258,12 +261,12 @@ function WorkflowApprovalsList({ i18n }) {
<AlertModal <AlertModal
isOpen={actionError} isOpen={actionError}
variant="error" variant="error"
title={i18n._(t`Error!`)} title={t`Error!`}
onClose={dismissActionError} onClose={dismissActionError}
> >
{approveApprovalError {approveApprovalError
? i18n._(t`Failed to approve one or more workflow approval.`) ? t`Failed to approve one or more workflow approval.`
: i18n._(t`Failed to deny one or more workflow approval.`)} : t`Failed to deny one or more workflow approval.`}
<ErrorDetail error={actionError} /> <ErrorDetail error={actionError} />
</AlertModal> </AlertModal>
)} )}
@@ -271,4 +274,4 @@ function WorkflowApprovalsList({ i18n }) {
); );
} }
export default withI18n()(WorkflowApprovalsList); export default WorkflowApprovalsList;