From 475b73389098c495c109c46bc9186e11ba0cfdc0 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Tue, 9 Jun 2020 14:17:12 -0400 Subject: [PATCH] first pass of tweaks needed to compile pf v4 branch --- .../src/components/AlertModal/AlertModal.jsx | 2 +- .../src/components/Background/Background.jsx | 12 +-- .../components/ContentEmpty/ContentEmpty.jsx | 2 +- .../components/ContentError/ContentError.jsx | 2 +- .../DataListToolbar/DataListToolbar.jsx | 62 ++++++++-------- .../components/ErrorDetail/ErrorDetail.jsx | 2 +- .../src/components/ListHeader/ListHeader.jsx | 14 ++-- .../Schedule/shared/ScheduleForm.jsx | 2 +- awx/ui_next/src/components/Search/Search.jsx | 20 +++-- .../src/components/Search/Search.test.jsx | 74 +++++++++---------- .../src/screens/AuthSetting/AuthSettings.jsx | 2 +- .../src/screens/Dashboard/Dashboard.jsx | 2 +- .../screens/InstanceGroup/InstanceGroups.jsx | 2 +- .../InventoryGroupsList.test.jsx | 4 +- .../Inventory/shared/InventorySourceForm.jsx | 2 +- .../InventoryScript/InventoryScripts.jsx | 2 +- .../src/screens/JobsSetting/JobsSettings.jsx | 2 +- awx/ui_next/src/screens/License/License.jsx | 2 +- .../screens/ManagementJob/ManagementJobs.jsx | 2 +- .../NotificationTemplates.jsx | 2 +- awx/ui_next/src/screens/Portal/Portal.jsx | 2 +- .../screens/Project/shared/ProjectForm.jsx | 2 +- .../shared/ProjectSubForms/SharedFields.jsx | 2 +- .../screens/SystemSetting/SystemSettings.jsx | 2 +- .../Template/Survey/SurveyList.test.jsx | 2 +- .../screens/Template/Survey/SurveyToolbar.jsx | 44 +++++------ .../Template/Survey/SurveyToolbar.test.jsx | 2 +- .../Modals/LinkModals/LinkAddModal.jsx | 4 +- .../Modals/LinkModals/LinkEditModal.jsx | 4 +- .../src/screens/UISetting/UISettings.jsx | 2 +- 30 files changed, 136 insertions(+), 144 deletions(-) diff --git a/awx/ui_next/src/components/AlertModal/AlertModal.jsx b/awx/ui_next/src/components/AlertModal/AlertModal.jsx index 06b6853220..b18b3e3285 100644 --- a/awx/ui_next/src/components/AlertModal/AlertModal.jsx +++ b/awx/ui_next/src/components/AlertModal/AlertModal.jsx @@ -60,7 +60,7 @@ export default function AlertModal({ const customHeader = (
{variant ? variantIcons[variant] : null} - {title} + {title}
); diff --git a/awx/ui_next/src/components/Background/Background.jsx b/awx/ui_next/src/components/Background/Background.jsx index 7857a1ed54..755393712c 100644 --- a/awx/ui_next/src/components/Background/Background.jsx +++ b/awx/ui_next/src/components/Background/Background.jsx @@ -1,18 +1,10 @@ import React, { Fragment } from 'react'; -import { BackgroundImage, BackgroundImageSrc } from '@patternfly/react-core'; - -const backgroundImageConfig = { - [BackgroundImageSrc.xs]: './images/pfbg_576.jpg', - [BackgroundImageSrc.xs2x]: './images/pfbg_576@2x.jpg', - [BackgroundImageSrc.sm]: './images/pfbg_768.jpg', - [BackgroundImageSrc.sm2x]: './images/pfbg_768@2x.jpg', - [BackgroundImageSrc.lg]: './images/pfbg_2000.jpg', -}; +import { BackgroundImage } from '@patternfly/react-core'; export default ({ children }) => ( - + {children} ); diff --git a/awx/ui_next/src/components/ContentEmpty/ContentEmpty.jsx b/awx/ui_next/src/components/ContentEmpty/ContentEmpty.jsx index f01c8468ec..3c03463788 100644 --- a/awx/ui_next/src/components/ContentEmpty/ContentEmpty.jsx +++ b/awx/ui_next/src/components/ContentEmpty/ContentEmpty.jsx @@ -12,7 +12,7 @@ import { CubesIcon } from '@patternfly/react-icons'; const ContentEmpty = ({ i18n, title = '', message = '' }) => ( - {title || i18n._(t`No items found.`)} + {title || i18n._(t`No items found.`)} {message} ); diff --git a/awx/ui_next/src/components/ContentError/ContentError.jsx b/awx/ui_next/src/components/ContentError/ContentError.jsx index f0d4f80a1d..3c56a2630d 100644 --- a/awx/ui_next/src/components/ContentError/ContentError.jsx +++ b/awx/ui_next/src/components/ContentError/ContentError.jsx @@ -35,7 +35,7 @@ function ContentError({ error, children, isNotFound, i18n }) { ) : ( - + <Title size="lg" headingLevel="h3"> {is404 ? i18n._(t`Not Found`) : i18n._(t`Something went wrong...`)} diff --git a/awx/ui_next/src/components/DataListToolbar/DataListToolbar.jsx b/awx/ui_next/src/components/DataListToolbar/DataListToolbar.jsx index f8b7adfa8a..01dbf2fccd 100644 --- a/awx/ui_next/src/components/DataListToolbar/DataListToolbar.jsx +++ b/awx/ui_next/src/components/DataListToolbar/DataListToolbar.jsx @@ -2,27 +2,27 @@ import React, { Fragment } from 'react'; import PropTypes from 'prop-types'; import { withI18n } from '@lingui/react'; import { t } from '@lingui/macro'; -import { Checkbox } from '@patternfly/react-core'; +import { + Checkbox, + Toolbar, + ToolbarContent as _ToolbarContent, + ToolbarGroup as _ToolbarGroup, + ToolbarItem, + ToolbarToggleGroup, + } from '@patternfly/react-core'; import styled from 'styled-components'; import { SearchIcon } from '@patternfly/react-icons'; -import { - DataToolbar, - DataToolbarContent as _DataToolbarContent, - DataToolbarGroup as _DataToolbarGroup, - DataToolbarItem, - DataToolbarToggleGroup, -} from '@patternfly/react-core/dist/umd/experimental'; import ExpandCollapse from '../ExpandCollapse'; import Search from '../Search'; import Sort from '../Sort'; import { SearchColumns, SortColumns, QSConfig } from '../../types'; -const DataToolbarContent = styled(_DataToolbarContent)` +const ToolbarContent = styled(_ToolbarContent)` --pf-c-data-toolbar__content--PaddingLeft: 24px; --pf-c-data-toolbar__content--PaddingRight: 8px; `; -const DataToolbarGroup = styled(_DataToolbarGroup)` +const ToolbarGroup = styled(_ToolbarGroup)` --pf-c-data-toolbar__group--spacer: 24px; `; @@ -49,26 +49,26 @@ class DataListToolbar extends React.Component { const showExpandCollapse = onCompact && onExpand; return ( - - + {showSelectAll && ( - - + + - - + + )} - } breakpoint="lg"> - + } breakpoint="lg"> + - - + + - - + + {showExpandCollapse && ( - + - + - + - + )} - + {additionalControls.map(control => ( - {control} + {control} ))} - - - + + + ); } } diff --git a/awx/ui_next/src/components/ErrorDetail/ErrorDetail.jsx b/awx/ui_next/src/components/ErrorDetail/ErrorDetail.jsx index 898eef3609..cef7bf885a 100644 --- a/awx/ui_next/src/components/ErrorDetail/ErrorDetail.jsx +++ b/awx/ui_next/src/components/ErrorDetail/ErrorDetail.jsx @@ -7,7 +7,7 @@ import { t } from '@lingui/macro'; import { Card as PFCard, CardBody as PFCardBody, - Expandable as PFExpandable, + ExpandableSection as PFExpandable, } from '@patternfly/react-core'; import getErrorMessage from './getErrorMessage'; diff --git a/awx/ui_next/src/components/ListHeader/ListHeader.jsx b/awx/ui_next/src/components/ListHeader/ListHeader.jsx index ebc745174d..79899acb8c 100644 --- a/awx/ui_next/src/components/ListHeader/ListHeader.jsx +++ b/awx/ui_next/src/components/ListHeader/ListHeader.jsx @@ -3,9 +3,9 @@ import PropTypes from 'prop-types'; import { withRouter } from 'react-router-dom'; import styled from 'styled-components'; import { - DataToolbar, - DataToolbarContent, -} from '@patternfly/react-core/dist/umd/experimental'; + Toolbar, + ToolbarContent, +} from '@patternfly/react-core'; import DataListToolbar from '../DataListToolbar'; import { @@ -107,17 +107,17 @@ class ListHeader extends React.Component { return ( {isEmpty ? ( - - + {emptyStateControls} - - + + ) : ( {renderToolbar({ diff --git a/awx/ui_next/src/components/Schedule/shared/ScheduleForm.jsx b/awx/ui_next/src/components/Schedule/shared/ScheduleForm.jsx index 795af0035a..6597e27ec4 100644 --- a/awx/ui_next/src/components/Schedule/shared/ScheduleForm.jsx +++ b/awx/ui_next/src/components/Schedule/shared/ScheduleForm.jsx @@ -153,7 +153,7 @@ function ScheduleFormFields({ i18n, zoneOptions }) { {frequency.value !== 'none' && ( - {i18n._(t`Frequency Details`)} + {i18n._(t`Frequency Details`)} diff --git a/awx/ui_next/src/components/Search/Search.jsx b/awx/ui_next/src/components/Search/Search.jsx index 91c3987cea..287c9c11da 100644 --- a/awx/ui_next/src/components/Search/Search.jsx +++ b/awx/ui_next/src/components/Search/Search.jsx @@ -16,12 +16,10 @@ import { SelectOption, SelectVariant, TextInput, + ToolbarGroup, + ToolbarItem, + ToolbarFilter, } from '@patternfly/react-core'; -import { - DataToolbarGroup, - DataToolbarItem, - DataToolbarFilter, -} from '@patternfly/react-core/dist/umd/experimental'; import { SearchIcon } from '@patternfly/react-icons'; import styled from 'styled-components'; import { parseQueryString } from '../../util/qs'; @@ -205,8 +203,8 @@ class Search extends React.Component { const chipsByKey = getChipsByKey(); return ( - - + + {searchDropdownItems.length > 0 ? ( {searchColumnName} )} - + {columns.map( ({ key, name, options, isBoolean, booleanLabels = {} }) => ( - { const [columnKey, ...value] = chip.key.split(':'); @@ -311,10 +309,10 @@ class Search extends React.Component { )} - + ) )} - + ); } } diff --git a/awx/ui_next/src/components/Search/Search.test.jsx b/awx/ui_next/src/components/Search/Search.test.jsx index 503fa9ec58..3163aa8032 100644 --- a/awx/ui_next/src/components/Search/Search.test.jsx +++ b/awx/ui_next/src/components/Search/Search.test.jsx @@ -1,8 +1,8 @@ import React from 'react'; import { - DataToolbar, - DataToolbarContent, -} from '@patternfly/react-core/dist/umd/experimental'; + Toolbar, + ToolbarContent, +} from '@patternfly/react-core'; import { createMemoryHistory } from 'history'; import { act } from 'react-dom/test-utils'; import { mountWithContexts } from '../../../testUtils/enzymeHelpers'; @@ -33,15 +33,15 @@ describe('', () => { const onSearch = jest.fn(); search = mountWithContexts( - {}} collapseListedFiltersBreakpoint="md" > - + - - + + ); search.find(searchTextInput).instance().value = 'test-321'; @@ -56,15 +56,15 @@ describe('', () => { const columns = [{ name: 'Name', key: 'name', isDefault: true }]; const onSearch = jest.fn(); const wrapper = mountWithContexts( - {}} collapseListedFiltersBreakpoint="md" > - + - - + + ).find('Search'); expect(wrapper.state('isSearchDropdownOpen')).toEqual(false); wrapper.instance().handleDropdownToggle(true); @@ -78,15 +78,15 @@ describe('', () => { ]; const onSearch = jest.fn(); const wrapper = mountWithContexts( - {}} collapseListedFiltersBreakpoint="md" > - + - - + + ).find('Search'); expect(wrapper.state('searchKey')).toEqual('name'); wrapper @@ -101,15 +101,15 @@ describe('', () => { const columns = [{ name: 'Name', key: 'name', isDefault: true }]; const onSearch = jest.fn(); const wrapper = mountWithContexts( - {}} collapseListedFiltersBreakpoint="md" > - + - - + + ); wrapper.find(searchTextInput).instance().value = ''; @@ -125,15 +125,15 @@ describe('', () => { const columns = [{ name: 'Name', key: 'name', isDefault: true }]; const onSearch = jest.fn(); const wrapper = mountWithContexts( - {}} collapseListedFiltersBreakpoint="md" > - + - - + + ); wrapper.find(searchTextInput).instance().value = 'test-321'; @@ -156,23 +156,23 @@ describe('', () => { initialEntries: [`/organizations/${query}`], }); const wrapper = mountWithContexts( - {}} collapseListedFiltersBreakpoint="md" > - + - - , + + , { context: { router: { history } } } ); const typeFilterWrapper = wrapper.find( - 'DataToolbarFilter[categoryName="Type"]' + 'ToolbarFilter[categoryName="Type"]' ); expect(typeFilterWrapper.prop('chips')[0].key).toEqual('or__type:foo'); const nameFilterWrapper = wrapper.find( - 'DataToolbarFilter[categoryName="Name"]' + 'ToolbarFilter[categoryName="Name"]' ); expect(nameFilterWrapper.prop('chips')[0].key).toEqual('name:bar'); }); @@ -197,19 +197,19 @@ describe('', () => { }); const onRemove = jest.fn(); const wrapper = mountWithContexts( - {}} collapseListedFiltersBreakpoint="md" > - + - - , + + , { context: { router: { history } } } ); expect(history.location.search).toEqual(query); @@ -243,19 +243,19 @@ describe('', () => { }); const onRemove = jest.fn(); const wrapper = mountWithContexts( - {}} collapseListedFiltersBreakpoint="md" > - + - - , + + , { context: { router: { history } } } ); expect(history.location.search).toEqual(query); diff --git a/awx/ui_next/src/screens/AuthSetting/AuthSettings.jsx b/awx/ui_next/src/screens/AuthSetting/AuthSettings.jsx index a0fc4b5f73..26652113bb 100644 --- a/awx/ui_next/src/screens/AuthSetting/AuthSettings.jsx +++ b/awx/ui_next/src/screens/AuthSetting/AuthSettings.jsx @@ -15,7 +15,7 @@ class AuthSettings extends Component { return ( - {i18n._(t`Authentication Settings`)} + {i18n._(t`Authentication Settings`)} diff --git a/awx/ui_next/src/screens/Dashboard/Dashboard.jsx b/awx/ui_next/src/screens/Dashboard/Dashboard.jsx index 0f2a7ceb79..4c45f6724a 100644 --- a/awx/ui_next/src/screens/Dashboard/Dashboard.jsx +++ b/awx/ui_next/src/screens/Dashboard/Dashboard.jsx @@ -15,7 +15,7 @@ class Dashboard extends Component { return ( - {i18n._(t`Dashboard`)} + {i18n._(t`Dashboard`)} diff --git a/awx/ui_next/src/screens/InstanceGroup/InstanceGroups.jsx b/awx/ui_next/src/screens/InstanceGroup/InstanceGroups.jsx index 022247193e..80f5b942cb 100644 --- a/awx/ui_next/src/screens/InstanceGroup/InstanceGroups.jsx +++ b/awx/ui_next/src/screens/InstanceGroup/InstanceGroups.jsx @@ -15,7 +15,7 @@ class InstanceGroups extends Component { return ( - {i18n._(t`Instance Groups`)} + {i18n._(t`Instance Groups`)} diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.test.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.test.jsx index fbd02a9ad4..8d3ccf9c68 100644 --- a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.test.jsx +++ b/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.test.jsx @@ -164,7 +164,7 @@ describe('', () => { wrapper.update(); await act(async () => { wrapper - .find('DataToolbar Button[aria-label="Delete"]') + .find('Toolbar Button[aria-label="Delete"]') .invoke('onClick')(); }); await waitForElement( @@ -198,7 +198,7 @@ describe('', () => { wrapper.update(); await act(async () => { wrapper - .find('DataToolbar Button[aria-label="Delete"]') + .find('Toolbar Button[aria-label="Delete"]') .invoke('onClick')(); }); await waitForElement( diff --git a/awx/ui_next/src/screens/Inventory/shared/InventorySourceForm.jsx b/awx/ui_next/src/screens/Inventory/shared/InventorySourceForm.jsx index ffcab9f148..6d367aa40c 100644 --- a/awx/ui_next/src/screens/Inventory/shared/InventorySourceForm.jsx +++ b/awx/ui_next/src/screens/Inventory/shared/InventorySourceForm.jsx @@ -161,7 +161,7 @@ const InventorySourceFormFields = ({ sourceOptions, i18n }) => { )} {sourceField.value !== '' && ( - {i18n._(t`Source details`)} + {i18n._(t`Source details`)} { { diff --git a/awx/ui_next/src/screens/InventoryScript/InventoryScripts.jsx b/awx/ui_next/src/screens/InventoryScript/InventoryScripts.jsx index 9fe0aea136..e95e062ebd 100644 --- a/awx/ui_next/src/screens/InventoryScript/InventoryScripts.jsx +++ b/awx/ui_next/src/screens/InventoryScript/InventoryScripts.jsx @@ -15,7 +15,7 @@ class InventoryScripts extends Component { return ( - {i18n._(t`Inventory Scripts`)} + {i18n._(t`Inventory Scripts`)} diff --git a/awx/ui_next/src/screens/JobsSetting/JobsSettings.jsx b/awx/ui_next/src/screens/JobsSetting/JobsSettings.jsx index ded44676f6..325579f1ea 100644 --- a/awx/ui_next/src/screens/JobsSetting/JobsSettings.jsx +++ b/awx/ui_next/src/screens/JobsSetting/JobsSettings.jsx @@ -15,7 +15,7 @@ class JobsSettings extends Component { return ( - {i18n._(t`Jobs Settings`)} + {i18n._(t`Jobs Settings`)} diff --git a/awx/ui_next/src/screens/License/License.jsx b/awx/ui_next/src/screens/License/License.jsx index cebf2a4734..ceb3cbe722 100644 --- a/awx/ui_next/src/screens/License/License.jsx +++ b/awx/ui_next/src/screens/License/License.jsx @@ -15,7 +15,7 @@ class License extends Component { return ( - {i18n._(t`License`)} + {i18n._(t`License`)} diff --git a/awx/ui_next/src/screens/ManagementJob/ManagementJobs.jsx b/awx/ui_next/src/screens/ManagementJob/ManagementJobs.jsx index f86e9b3040..125df4429d 100644 --- a/awx/ui_next/src/screens/ManagementJob/ManagementJobs.jsx +++ b/awx/ui_next/src/screens/ManagementJob/ManagementJobs.jsx @@ -15,7 +15,7 @@ class ManagementJobs extends Component { return ( - {i18n._(t`Management Jobs`)} + {i18n._(t`Management Jobs`)} diff --git a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplates.jsx b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplates.jsx index abcf1ab511..fd217d5c99 100644 --- a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplates.jsx +++ b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplates.jsx @@ -15,7 +15,7 @@ class NotificationTemplates extends Component { return ( - {i18n._(t`Notification Templates`)} + {i18n._(t`Notification Templates`)} diff --git a/awx/ui_next/src/screens/Portal/Portal.jsx b/awx/ui_next/src/screens/Portal/Portal.jsx index d5f6cbecec..e668e8b115 100644 --- a/awx/ui_next/src/screens/Portal/Portal.jsx +++ b/awx/ui_next/src/screens/Portal/Portal.jsx @@ -15,7 +15,7 @@ class Portal extends Component { return ( - {i18n._(t`My View`)} + {i18n._(t`My View`)} diff --git a/awx/ui_next/src/screens/Project/shared/ProjectForm.jsx b/awx/ui_next/src/screens/Project/shared/ProjectForm.jsx index eee485d646..ac90aeaee2 100644 --- a/awx/ui_next/src/screens/Project/shared/ProjectForm.jsx +++ b/awx/ui_next/src/screens/Project/shared/ProjectForm.jsx @@ -204,7 +204,7 @@ function ProjectFormFields({ {formik.values.scm_type !== '' && ( - {i18n._(t`Type Details`)} + {i18n._(t`Type Details`)} { { diff --git a/awx/ui_next/src/screens/Project/shared/ProjectSubForms/SharedFields.jsx b/awx/ui_next/src/screens/Project/shared/ProjectSubForms/SharedFields.jsx index 0833c9e49d..99a71718cc 100644 --- a/awx/ui_next/src/screens/Project/shared/ProjectSubForms/SharedFields.jsx +++ b/awx/ui_next/src/screens/Project/shared/ProjectSubForms/SharedFields.jsx @@ -104,7 +104,7 @@ export const ScmTypeOptions = withI18n()( {scmUpdateOnLaunch && ( <> - {i18n._(t`Option Details`)} + {i18n._(t`Option Details`)} - {i18n._(t`System Settings`)} + {i18n._(t`System Settings`)} diff --git a/awx/ui_next/src/screens/Template/Survey/SurveyList.test.jsx b/awx/ui_next/src/screens/Template/Survey/SurveyList.test.jsx index 755956a5f4..bdc70c4fff 100644 --- a/awx/ui_next/src/screens/Template/Survey/SurveyList.test.jsx +++ b/awx/ui_next/src/screens/Template/Survey/SurveyList.test.jsx @@ -142,7 +142,7 @@ describe('', () => { expect( wrapper - .find('DataToolbar') + .find('Toolbar') .find('Checkbox') .prop('isDisabled') ).toBe(true); diff --git a/awx/ui_next/src/screens/Template/Survey/SurveyToolbar.jsx b/awx/ui_next/src/screens/Template/Survey/SurveyToolbar.jsx index af6144025a..16eac2be70 100644 --- a/awx/ui_next/src/screens/Template/Survey/SurveyToolbar.jsx +++ b/awx/ui_next/src/screens/Template/Survey/SurveyToolbar.jsx @@ -5,15 +5,17 @@ import { withI18n } from '@lingui/react'; import styled from 'styled-components'; import { - DataToolbar as _DataToolbar, - DataToolbarContent, - DataToolbarGroup, - DataToolbarItem, -} from '@patternfly/react-core/dist/umd/experimental'; -import { Switch, Checkbox, Button } from '@patternfly/react-core'; + Switch, + Checkbox, + Button, + Toolbar as _Toolbar, + ToolbarContent, + ToolbarGroup, + ToolbarItem, +} from '@patternfly/react-core'; import { ToolbarAddButton } from '../../../components/PaginatedDataList'; -const DataToolbar = styled(_DataToolbar)` +const Toolbar = styled(_Toolbar)` margin-left: 52px; `; @@ -30,9 +32,9 @@ function SurveyToolbar({ isDeleteDisabled = !canEdit || isDeleteDisabled; const match = useRouteMatch(); return ( - - - + + + - - + + onToggleSurvey(!surveyEnabled)} /> - - - + + + - - + + - - - - + + + + ); } diff --git a/awx/ui_next/src/screens/Template/Survey/SurveyToolbar.test.jsx b/awx/ui_next/src/screens/Template/Survey/SurveyToolbar.test.jsx index 8fb4857525..2311f1d443 100644 --- a/awx/ui_next/src/screens/Template/Survey/SurveyToolbar.test.jsx +++ b/awx/ui_next/src/screens/Template/Survey/SurveyToolbar.test.jsx @@ -102,7 +102,7 @@ describe('', () => { }); expect( wrapper - .find('DataToolbar') + .find('Toolbar') .find('Checkbox') .prop('isDisabled') ).toBe(true); diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkAddModal.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkAddModal.jsx index 97a941755e..af976cc38f 100644 --- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkAddModal.jsx +++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkAddModal.jsx @@ -1,5 +1,5 @@ import React, { useContext } from 'react'; -import { BaseSizes, Title, TitleLevel } from '@patternfly/react-core'; +import { BaseSizes, Title } from '@patternfly/react-core'; import { withI18n } from '@lingui/react'; import { t } from '@lingui/macro'; import { WorkflowDispatchContext } from '../../../../../contexts/Workflow'; @@ -10,7 +10,7 @@ function LinkAddModal({ i18n }) { return ( + {i18n._(t`Add Link`)} } diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkEditModal.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkEditModal.jsx index 177e11bb32..d98496487b 100644 --- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkEditModal.jsx +++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkEditModal.jsx @@ -1,5 +1,5 @@ import React, { useContext } from 'react'; -import { BaseSizes, Title, TitleLevel } from '@patternfly/react-core'; +import { BaseSizes, Title } from '@patternfly/react-core'; import { withI18n } from '@lingui/react'; import { t } from '@lingui/macro'; import { WorkflowDispatchContext } from '../../../../../contexts/Workflow'; @@ -10,7 +10,7 @@ function LinkEditModal({ i18n }) { return ( + {i18n._(t`Edit Link`)} } diff --git a/awx/ui_next/src/screens/UISetting/UISettings.jsx b/awx/ui_next/src/screens/UISetting/UISettings.jsx index 1905463cd2..bb1007fedc 100644 --- a/awx/ui_next/src/screens/UISetting/UISettings.jsx +++ b/awx/ui_next/src/screens/UISetting/UISettings.jsx @@ -15,7 +15,7 @@ class UISettings extends Component { return ( - {i18n._(t`User Interface Settings`)} + {i18n._(t`User Interface Settings`)}