open-source-mirrors
/
Lidarr
mirror of https://github.com/Lidarr/Lidarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed: Rotating mobile device when modal is open won't reset modal

Browse Source
pull/1689/head
Qstick 4 years ago
parent a29ee22167
commit 1f752e7bb7
36 changed files with 113 additions and 122 deletions
Show Stats Download Patch File Download Diff File

6
frontend/src/Activity/Blacklist/Blacklist.js
Unescape View File

@ -7,7 +7,7 @@ import TableBody from 'Components/Table/TableBody';
import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper'; import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper';
import TablePager from 'Components/Table/TablePager'; import TablePager from 'Components/Table/TablePager';
import PageContent from 'Components/Page/PageContent'; import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector'; import PageContentBody from 'Components/Page/PageContentBody';
import PageToolbar from 'Components/Page/Toolbar/PageToolbar'; import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton'; import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
@ -56,7 +56,7 @@ class Blacklist extends Component {
</PageToolbarSection> </PageToolbarSection>
</PageToolbar> </PageToolbar>
<PageContentBodyConnector> <PageContentBody>
{ {
isFetching && !isPopulated && isFetching && !isPopulated &&
<LoadingIndicator /> <LoadingIndicator />
@ -103,7 +103,7 @@ class Blacklist extends Component {
/> />
</div> </div>
} }
</PageContentBodyConnector> </PageContentBody>
</PageContent> </PageContent>
); );
} }

6
frontend/src/Activity/History/History.js
Unescape View File

@ -8,7 +8,7 @@ import TableBody from 'Components/Table/TableBody';
import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper'; import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper';
import TablePager from 'Components/Table/TablePager'; import TablePager from 'Components/Table/TablePager';
import PageContent from 'Components/Page/PageContent'; import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector'; import PageContentBody from 'Components/Page/PageContentBody';
import PageToolbar from 'Components/Page/Toolbar/PageToolbar'; import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton'; import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
@ -96,7 +96,7 @@ class History extends Component {
</PageToolbarSection> </PageToolbarSection>
</PageToolbar> </PageToolbar>
<PageContentBodyConnector> <PageContentBody>
{ {
isFetchingAny && !isAllPopulated && isFetchingAny && !isAllPopulated &&
<LoadingIndicator /> <LoadingIndicator />
@ -147,7 +147,7 @@ class History extends Component {
/> />
</div> </div>
} }
</PageContentBodyConnector> </PageContentBody>
</PageContent> </PageContent>
); );
} }

6
frontend/src/Activity/Queue/Queue.js
Unescape View File

@ -12,7 +12,7 @@ import Table from 'Components/Table/Table';
import TableBody from 'Components/Table/TableBody'; import TableBody from 'Components/Table/TableBody';
import TablePager from 'Components/Table/TablePager'; import TablePager from 'Components/Table/TablePager';
import PageContent from 'Components/Page/PageContent'; import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector'; import PageContentBody from 'Components/Page/PageContentBody';
import PageToolbar from 'Components/Page/Toolbar/PageToolbar'; import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton'; import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
@ -197,7 +197,7 @@ class Queue extends Component {
</PageToolbarSection> </PageToolbarSection>
</PageToolbar> </PageToolbar>
<PageContentBodyConnector> <PageContentBody>
{ {
isRefreshing && !isAllPopulated && isRefreshing && !isAllPopulated &&
<LoadingIndicator /> <LoadingIndicator />
@ -254,7 +254,7 @@ class Queue extends Component {
/> />
</div> </div>
} }
</PageContentBodyConnector> </PageContentBody>
<RemoveQueueItemsModal <RemoveQueueItemsModal
isOpen={isConfirmRemoveModalOpen} isOpen={isConfirmRemoveModalOpen}

6
frontend/src/Album/Details/AlbumDetails.js
Unescape View File

@ -21,7 +21,7 @@ import EditAlbumModalConnector from 'Album/Edit/EditAlbumModalConnector';
import DeleteAlbumModal from 'Album/Delete/DeleteAlbumModal'; import DeleteAlbumModal from 'Album/Delete/DeleteAlbumModal';
import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import LoadingIndicator from 'Components/Loading/LoadingIndicator';
import PageContent from 'Components/Page/PageContent'; import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector'; import PageContentBody from 'Components/Page/PageContentBody';
import PageToolbar from 'Components/Page/Toolbar/PageToolbar'; import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator'; import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator';
@ -306,7 +306,7 @@ class AlbumDetails extends Component {
</PageToolbarSection> </PageToolbarSection>
</PageToolbar> </PageToolbar>
<PageContentBodyConnector innerClassName={styles.innerContentBody}> <PageContentBody innerClassName={styles.innerContentBody}>
<div className={styles.header}> <div className={styles.header}>
<div <div
className={styles.backdrop} className={styles.backdrop}
@ -579,7 +579,7 @@ class AlbumDetails extends Component {
onModalClose={this.onDeleteAlbumModalClose} onModalClose={this.onDeleteAlbumModalClose}
/> />
</PageContentBodyConnector> </PageContentBody>
</PageContent> </PageContent>
); );
} }

6
frontend/src/Album/Details/AlbumDetailsPageConnector.js
Unescape View File

@ -7,7 +7,7 @@ import { push } from 'connected-react-router';
import NotFound from 'Components/NotFound'; import NotFound from 'Components/NotFound';
import { fetchAlbums, clearAlbums } from 'Store/Actions/albumActions'; import { fetchAlbums, clearAlbums } from 'Store/Actions/albumActions';
import PageContent from 'Components/Page/PageContent'; import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector'; import PageContentBody from 'Components/Page/PageContentBody';
import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import LoadingIndicator from 'Components/Loading/LoadingIndicator';
import AlbumDetailsConnector from './AlbumDetailsConnector'; import AlbumDetailsConnector from './AlbumDetailsConnector';
@ -103,9 +103,9 @@ class AlbumDetailsPageConnector extends Component {
(!isFetching && !isPopulated)) { (!isFetching && !isPopulated)) {
return ( return (
<PageContent title='loading'> <PageContent title='loading'>
<PageContentBodyConnector> <PageContentBody>
<LoadingIndicator /> <LoadingIndicator />
</PageContentBodyConnector> </PageContentBody>
</PageContent> </PageContent>
); );
} }

6
frontend/src/AlbumStudio/AlbumStudio.js
Unescape View File

@ -7,7 +7,7 @@ import toggleSelected from 'Utilities/Table/toggleSelected';
import { align, sortDirections } from 'Helpers/Props'; import { align, sortDirections } from 'Helpers/Props';
import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import LoadingIndicator from 'Components/Loading/LoadingIndicator';
import PageContent from 'Components/Page/PageContent'; import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector'; import PageContentBody from 'Components/Page/PageContentBody';
import PageToolbar from 'Components/Page/Toolbar/PageToolbar'; import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
import FilterMenu from 'Components/Menu/FilterMenu'; import FilterMenu from 'Components/Menu/FilterMenu';
@ -138,7 +138,7 @@ class AlbumStudio extends Component {
</PageToolbarSection> </PageToolbarSection>
</PageToolbar> </PageToolbar>
<PageContentBodyConnector> <PageContentBody>
{ {
isFetching && !isPopulated && isFetching && !isPopulated &&
<LoadingIndicator /> <LoadingIndicator />
@ -184,7 +184,7 @@ class AlbumStudio extends Component {
!error && isPopulated && !items.length && !error && isPopulated && !items.length &&
<NoArtist totalItems={totalItems} /> <NoArtist totalItems={totalItems} />
} }
</PageContentBodyConnector> </PageContentBody>
<AlbumStudioFooter <AlbumStudioFooter
selectedCount={this.getSelectedIds().length} selectedCount={this.getSelectedIds().length}

6
frontend/src/Artist/Details/ArtistDetails.js
Unescape View File

@ -14,7 +14,7 @@ import Label from 'Components/Label';
import MonitorToggleButton from 'Components/MonitorToggleButton'; import MonitorToggleButton from 'Components/MonitorToggleButton';
import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import LoadingIndicator from 'Components/Loading/LoadingIndicator';
import PageContent from 'Components/Page/PageContent'; import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector'; import PageContentBody from 'Components/Page/PageContentBody';
import PageToolbar from 'Components/Page/Toolbar/PageToolbar'; import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator'; import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator';
@ -340,7 +340,7 @@ class ArtistDetails extends Component {
</PageToolbarSection> </PageToolbarSection>
</PageToolbar> </PageToolbar>
<PageContentBodyConnector innerClassName={styles.innerContentBody}> <PageContentBody innerClassName={styles.innerContentBody}>
<div className={styles.header}> <div className={styles.header}>
<div <div
className={styles.backdrop} className={styles.backdrop}
@ -670,7 +670,7 @@ class ArtistDetails extends Component {
artistId={id} artistId={id}
onModalClose={this.onInteractiveSearchModalClose} onModalClose={this.onInteractiveSearchModalClose}
/> />
</PageContentBodyConnector> </PageContentBody>
</PageContent> </PageContent>
); );
} }

6
frontend/src/Artist/Details/ArtistDetailsPageConnector.js
Unescape View File

@ -6,7 +6,7 @@ import { createSelector } from 'reselect';
import { push } from 'connected-react-router'; import { push } from 'connected-react-router';
import getErrorMessage from 'Utilities/Object/getErrorMessage'; import getErrorMessage from 'Utilities/Object/getErrorMessage';
import PageContent from 'Components/Page/PageContent'; import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector'; import PageContentBody from 'Components/Page/PageContentBody';
import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import LoadingIndicator from 'Components/Loading/LoadingIndicator';
import NotFound from 'Components/NotFound'; import NotFound from 'Components/NotFound';
import ArtistDetailsConnector from './ArtistDetailsConnector'; import ArtistDetailsConnector from './ArtistDetailsConnector';
@ -74,9 +74,9 @@ class ArtistDetailsPageConnector extends Component {
if (isFetching && !isPopulated) { if (isFetching && !isPopulated) {
return ( return (
<PageContent title='loading'> <PageContent title='loading'>
<PageContentBodyConnector> <PageContentBody>
<LoadingIndicator /> <LoadingIndicator />
</PageContentBodyConnector> </PageContentBody>
</PageContent> </PageContent>
); );
} }

6
frontend/src/Artist/Editor/ArtistEditor.js
Unescape View File

@ -7,7 +7,7 @@ import toggleSelected from 'Utilities/Table/toggleSelected';
import { align, sortDirections } from 'Helpers/Props'; import { align, sortDirections } from 'Helpers/Props';
import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import LoadingIndicator from 'Components/Loading/LoadingIndicator';
import PageContent from 'Components/Page/PageContent'; import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector'; import PageContentBody from 'Components/Page/PageContentBody';
import PageToolbar from 'Components/Page/Toolbar/PageToolbar'; import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
import FilterMenu from 'Components/Menu/FilterMenu'; import FilterMenu from 'Components/Menu/FilterMenu';
@ -202,7 +202,7 @@ class ArtistEditor extends Component {
</PageToolbarSection> </PageToolbarSection>
</PageToolbar> </PageToolbar>
<PageContentBodyConnector> <PageContentBody>
{ {
isFetching && !isPopulated && isFetching && !isPopulated &&
<LoadingIndicator /> <LoadingIndicator />
@ -249,7 +249,7 @@ class ArtistEditor extends Component {
!error && isPopulated && !items.length && !error && isPopulated && !items.length &&
<NoArtist totalItems={totalItems} /> <NoArtist totalItems={totalItems} />
} }
</PageContentBodyConnector> </PageContentBody>
<ArtistEditorFooter <ArtistEditorFooter
artistIds={selectedArtistIds} artistIds={selectedArtistIds}

6
frontend/src/Artist/Index/ArtistIndex.js
Unescape View File

@ -6,7 +6,7 @@ import getErrorMessage from 'Utilities/Object/getErrorMessage';
import { align, icons, sortDirections } from 'Helpers/Props'; import { align, icons, sortDirections } from 'Helpers/Props';
import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import LoadingIndicator from 'Components/Loading/LoadingIndicator';
import PageContent from 'Components/Page/PageContent'; import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector'; import PageContentBody from 'Components/Page/PageContentBody';
import PageJumpBar from 'Components/Page/PageJumpBar'; import PageJumpBar from 'Components/Page/PageJumpBar';
import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper'; import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper';
import PageToolbar from 'Components/Page/Toolbar/PageToolbar'; import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
@ -308,7 +308,7 @@ class ArtistIndex extends Component {
</PageToolbar> </PageToolbar>
<div className={styles.pageContentBodyWrapper}> <div className={styles.pageContentBodyWrapper}>
<PageContentBodyConnector <PageContentBody
registerScroller={this.setScrollerRef} registerScroller={this.setScrollerRef}
className={styles.contentBody} className={styles.contentBody}
innerClassName={styles[`${view}InnerContentBody`]} innerClassName={styles[`${view}InnerContentBody`]}
@ -347,7 +347,7 @@ class ArtistIndex extends Component {
!error && isPopulated && !items.length && !error && isPopulated && !items.length &&
<NoArtist totalItems={totalItems} /> <NoArtist totalItems={totalItems} />
} }
</PageContentBodyConnector> </PageContentBody>
{ {
isLoaded && !!jumpBarItems.order.length && isLoaded && !!jumpBarItems.order.length &&

6
frontend/src/Calendar/CalendarPage.js
Unescape View File

@ -4,7 +4,7 @@ import getErrorMessage from 'Utilities/Object/getErrorMessage';
import { align, icons } from 'Helpers/Props'; import { align, icons } from 'Helpers/Props';
import PageContent from 'Components/Page/PageContent'; import PageContent from 'Components/Page/PageContent';
import Measure from 'Components/Measure'; import Measure from 'Components/Measure';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector'; import PageContentBody from 'Components/Page/PageContentBody';
import PageToolbar from 'Components/Page/Toolbar/PageToolbar'; import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton'; import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
@ -129,7 +129,7 @@ class CalendarPage extends Component {
</PageToolbarSection> </PageToolbarSection>
</PageToolbar> </PageToolbar>
<PageContentBodyConnector <PageContentBody
className={styles.calendarPageBody} className={styles.calendarPageBody}
innerClassName={styles.calendarInnerPageBody} innerClassName={styles.calendarInnerPageBody}
> >
@ -160,7 +160,7 @@ class CalendarPage extends Component {
hasArtist && !!artistError && hasArtist && !!artistError &&
<LegendConnector /> <LegendConnector />
} }
</PageContentBodyConnector> </PageContentBody>
<CalendarLinkModal <CalendarLinkModal
isOpen={isCalendarLinkModalOpen} isOpen={isCalendarLinkModalOpen}

14
frontend/src/Components/Page/PageContentBody.js
Unescape View File

@ -1,5 +1,6 @@
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import React, { Component } from 'react'; import React, { Component } from 'react';
import { isMobile as isMobileUtil } from 'Utilities/mobile';
import { isLocked } from 'Utilities/scrollLock'; import { isLocked } from 'Utilities/scrollLock';
import { scrollDirections } from 'Helpers/Props'; import { scrollDirections } from 'Helpers/Props';
import OverlayScroller from 'Components/Scroller/OverlayScroller'; import OverlayScroller from 'Components/Scroller/OverlayScroller';
@ -8,6 +9,15 @@ import styles from './PageContentBody.css';
class PageContentBody extends Component { class PageContentBody extends Component {
//
// Lifecycle
constructor(props, context) {
super(props, context);
this._isMobile = isMobileUtil();
}
// //
// Listeners // Listeners
@ -26,13 +36,12 @@ class PageContentBody extends Component {
const { const {
className, className,
innerClassName, innerClassName,
isSmallScreen,
children, children,
dispatch, dispatch,
...otherProps ...otherProps
} = this.props; } = this.props;
const ScrollerComponent = isSmallScreen ? Scroller : OverlayScroller; const ScrollerComponent = this._isMobile ? Scroller : OverlayScroller;
return ( return (
<ScrollerComponent <ScrollerComponent
@ -52,7 +61,6 @@ class PageContentBody extends Component {
PageContentBody.propTypes = { PageContentBody.propTypes = {
className: PropTypes.string, className: PropTypes.string,
innerClassName: PropTypes.string, innerClassName: PropTypes.string,
isSmallScreen: PropTypes.bool.isRequired,
children: PropTypes.node.isRequired, children: PropTypes.node.isRequired,
onScroll: PropTypes.func, onScroll: PropTypes.func,
dispatch: PropTypes.func dispatch: PropTypes.func

17
frontend/src/Components/Page/PageContentBodyConnector.js
Unescape View File

@ -1,17 +0,0 @@
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector';
import PageContentBody from './PageContentBody';
function createMapStateToProps() {
return createSelector(
createDimensionsSelector(),
(dimensions) => {
return {
isSmallScreen: dimensions.isSmallScreen
};
}
);
}
export default connect(createMapStateToProps, null, null, { forwardRef: true })(PageContentBody);

6
frontend/src/Components/Page/PageContentError.js
Unescape View File

@ -1,17 +1,17 @@
import React from 'react'; import React from 'react';
import ErrorBoundaryError from 'Components/Error/ErrorBoundaryError'; import ErrorBoundaryError from 'Components/Error/ErrorBoundaryError';
import PageContentBodyConnector from './PageContentBodyConnector'; import PageContentBody from './PageContentBody';
import styles from './PageContentError.css'; import styles from './PageContentError.css';
function PageContentError(props) { function PageContentError(props) {
return ( return (
<div className={styles.content}> <div className={styles.content}>
<PageContentBodyConnector> <PageContentBody>
<ErrorBoundaryError <ErrorBoundaryError
{...props} {...props}
message='There was an error loading this page' message='There was an error loading this page'
/> />
</PageContentBodyConnector> </PageContentBody>
</div> </div>
); );
} }

6
frontend/src/Search/AddNewItem.js
Unescape View File

@ -7,7 +7,7 @@ import Icon from 'Components/Icon';
import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import LoadingIndicator from 'Components/Loading/LoadingIndicator';
import TextInput from 'Components/Form/TextInput'; import TextInput from 'Components/Form/TextInput';
import PageContent from 'Components/Page/PageContent'; import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector'; import PageContentBody from 'Components/Page/PageContentBody';
import AddNewArtistSearchResultConnector from './Artist/AddNewArtistSearchResultConnector'; import AddNewArtistSearchResultConnector from './Artist/AddNewArtistSearchResultConnector';
import AddNewAlbumSearchResultConnector from './Album/AddNewAlbumSearchResultConnector'; import AddNewAlbumSearchResultConnector from './Album/AddNewAlbumSearchResultConnector';
import styles from './AddNewItem.css'; import styles from './AddNewItem.css';
@ -87,7 +87,7 @@ class AddNewItem extends Component {
return ( return (
<PageContent title="Add New Item"> <PageContent title="Add New Item">
<PageContentBodyConnector> <PageContentBody>
<div className={styles.searchContainer}> <div className={styles.searchContainer}>
<div className={styles.searchIconContainer}> <div className={styles.searchIconContainer}>
<Icon <Icon
@ -181,7 +181,7 @@ class AddNewItem extends Component {
} }
<div /> <div />
</PageContentBodyConnector> </PageContentBody>
</PageContent> </PageContent>
); );
} }

6
frontend/src/Settings/DownloadClients/DownloadClientSettings.js
Unescape View File

@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
import React, { Component, Fragment } from 'react'; import React, { Component, Fragment } from 'react';
import { icons } from 'Helpers/Props'; import { icons } from 'Helpers/Props';
import PageContent from 'Components/Page/PageContent'; import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector'; import PageContentBody from 'Components/Page/PageContentBody';
import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton'; import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator'; import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator';
import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector'; import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
@ -77,7 +77,7 @@ class DownloadClientSettings extends Component {
onSavePress={this.onSavePress} onSavePress={this.onSavePress}
/> />
<PageContentBodyConnector> <PageContentBody>
<DownloadClientsConnector /> <DownloadClientsConnector />
<DownloadClientOptionsConnector <DownloadClientOptionsConnector
@ -86,7 +86,7 @@ class DownloadClientSettings extends Component {
/> />
<RemotePathMappingsConnector /> <RemotePathMappingsConnector />
</PageContentBodyConnector> </PageContentBody>
</PageContent> </PageContent>
); );
} }

6
frontend/src/Settings/General/GeneralSettings.js
Unescape View File

@ -4,7 +4,7 @@ import React, { Component } from 'react';
import { kinds } from 'Helpers/Props'; import { kinds } from 'Helpers/Props';
import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import LoadingIndicator from 'Components/Loading/LoadingIndicator';
import PageContent from 'Components/Page/PageContent'; import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector'; import PageContentBody from 'Components/Page/PageContentBody';
import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector'; import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
import Form from 'Components/Form/Form'; import Form from 'Components/Form/Form';
import ConfirmModal from 'Components/Modal/ConfirmModal'; import ConfirmModal from 'Components/Modal/ConfirmModal';
@ -113,7 +113,7 @@ class GeneralSettings extends Component {
{...otherProps} {...otherProps}
/> />
<PageContentBodyConnector> <PageContentBody>
{ {
isFetching && !isPopulated && isFetching && !isPopulated &&
<LoadingIndicator /> <LoadingIndicator />
@ -176,7 +176,7 @@ class GeneralSettings extends Component {
/> />
</Form> </Form>
} }
</PageContentBodyConnector> </PageContentBody>
<ConfirmModal <ConfirmModal
isOpen={this.state.isRestartRequiredModalOpen} isOpen={this.state.isRestartRequiredModalOpen}

6
frontend/src/Settings/ImportLists/ImportListSettings.js
Unescape View File

@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
import React, { Component, Fragment } from 'react'; import React, { Component, Fragment } from 'react';
import { icons } from 'Helpers/Props'; import { icons } from 'Helpers/Props';
import PageContent from 'Components/Page/PageContent'; import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector'; import PageContentBody from 'Components/Page/PageContentBody';
import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton'; import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator'; import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator';
import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector'; import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
@ -73,10 +73,10 @@ class ImportListSettings extends Component {
onSavePress={this.onSavePress} onSavePress={this.onSavePress}
/> />
<PageContentBodyConnector> <PageContentBody>
<ImportListsConnector /> <ImportListsConnector />
<ImportListsExclusionsConnector /> <ImportListsExclusionsConnector />
</PageContentBodyConnector> </PageContentBody>
</PageContent> </PageContent>
); );
} }

6
frontend/src/Settings/Indexers/IndexerSettings.js
Unescape View File

@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
import React, { Component, Fragment } from 'react'; import React, { Component, Fragment } from 'react';
import { icons } from 'Helpers/Props'; import { icons } from 'Helpers/Props';
import PageContent from 'Components/Page/PageContent'; import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector'; import PageContentBody from 'Components/Page/PageContentBody';
import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton'; import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator'; import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator';
import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector'; import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
@ -76,14 +76,14 @@ class IndexerSettings extends Component {
onSavePress={this.onSavePress} onSavePress={this.onSavePress}
/> />
<PageContentBodyConnector> <PageContentBody>
<IndexersConnector /> <IndexersConnector />
<IndexerOptionsConnector <IndexerOptionsConnector
onChildMounted={this.onChildMounted} onChildMounted={this.onChildMounted}
onChildStateChange={this.onChildStateChange} onChildStateChange={this.onChildStateChange}
/> />
</PageContentBodyConnector> </PageContentBody>
</PageContent> </PageContent>
); );
} }

6
frontend/src/Settings/MediaManagement/MediaManagement.js
Unescape View File

@ -4,7 +4,7 @@ import { inputTypes, sizes } from 'Helpers/Props';
import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import LoadingIndicator from 'Components/Loading/LoadingIndicator';
import FieldSet from 'Components/FieldSet'; import FieldSet from 'Components/FieldSet';
import PageContent from 'Components/Page/PageContent'; import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector'; import PageContentBody from 'Components/Page/PageContentBody';
import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector'; import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
import Form from 'Components/Form/Form'; import Form from 'Components/Form/Form';
import FormGroup from 'Components/Form/FormGroup'; import FormGroup from 'Components/Form/FormGroup';
@ -62,7 +62,7 @@ class MediaManagement extends Component {
onSavePress={onSavePress} onSavePress={onSavePress}
/> />
<PageContentBodyConnector> <PageContentBody>
<RootFoldersConnector /> <RootFoldersConnector />
<NamingConnector /> <NamingConnector />
@ -443,7 +443,7 @@ class MediaManagement extends Component {
} }
</Form> </Form>
} }
</PageContentBodyConnector> </PageContentBody>
</PageContent> </PageContent>
); );
} }

6
frontend/src/Settings/Metadata/MetadataSettings.js
Unescape View File

@ -1,6 +1,6 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import PageContent from 'Components/Page/PageContent'; import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector'; import PageContentBody from 'Components/Page/PageContentBody';
import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector'; import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
import MetadatasConnector from './Metadata/MetadatasConnector'; import MetadatasConnector from './Metadata/MetadatasConnector';
import MetadataProviderConnector from './MetadataProvider/MetadataProviderConnector'; import MetadataProviderConnector from './MetadataProvider/MetadataProviderConnector';
@ -54,13 +54,13 @@ class MetadataSettings extends Component {
onSavePress={this.onSavePress} onSavePress={this.onSavePress}
/> />
<PageContentBodyConnector> <PageContentBody>
<MetadataProviderConnector <MetadataProviderConnector
onChildMounted={this.onChildMounted} onChildMounted={this.onChildMounted}
onChildStateChange={this.onChildStateChange} onChildStateChange={this.onChildStateChange}
/> />
<MetadatasConnector /> <MetadatasConnector />
</PageContentBodyConnector> </PageContentBody>
</PageContent> </PageContent>
); );
} }

6
frontend/src/Settings/Notifications/NotificationSettings.js
Unescape View File

@ -1,6 +1,6 @@
import React from 'react'; import React from 'react';
import PageContent from 'Components/Page/PageContent'; import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector'; import PageContentBody from 'Components/Page/PageContentBody';
import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector'; import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
import NotificationsConnector from './Notifications/NotificationsConnector'; import NotificationsConnector from './Notifications/NotificationsConnector';
@ -11,9 +11,9 @@ function NotificationSettings() {
showSave={false} showSave={false}
/> />
<PageContentBodyConnector> <PageContentBody>
<NotificationsConnector /> <NotificationsConnector />
</PageContentBodyConnector> </PageContentBody>
</PageContent> </PageContent>
); );
} }

6
frontend/src/Settings/Profiles/Profiles.js
Unescape View File

@ -2,7 +2,7 @@ import React, { Component } from 'react';
import { DndProvider } from 'react-dnd'; import { DndProvider } from 'react-dnd';
import HTML5Backend from 'react-dnd-html5-backend'; import HTML5Backend from 'react-dnd-html5-backend';
import PageContent from 'Components/Page/PageContent'; import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector'; import PageContentBody from 'Components/Page/PageContentBody';
import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector'; import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
import QualityProfilesConnector from './Quality/QualityProfilesConnector'; import QualityProfilesConnector from './Quality/QualityProfilesConnector';
import MetadataProfilesConnector from './Metadata/MetadataProfilesConnector'; import MetadataProfilesConnector from './Metadata/MetadataProfilesConnector';
@ -24,14 +24,14 @@ class Profiles extends Component {
showSave={false} showSave={false}
/> />
<PageContentBodyConnector> <PageContentBody>
<DndProvider backend={HTML5Backend}> <DndProvider backend={HTML5Backend}>
<QualityProfilesConnector /> <QualityProfilesConnector />
<MetadataProfilesConnector /> <MetadataProfilesConnector />
<DelayProfilesConnector /> <DelayProfilesConnector />
<ReleaseProfilesConnector /> <ReleaseProfilesConnector />
</DndProvider> </DndProvider>
</PageContentBodyConnector> </PageContentBody>
</PageContent> </PageContent>
); );
} }

6
frontend/src/Settings/Quality/Quality.js
Unescape View File

@ -1,6 +1,6 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import PageContent from 'Components/Page/PageContent'; import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector'; import PageContentBody from 'Components/Page/PageContentBody';
import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector'; import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
import QualityDefinitionsConnector from './Definition/QualityDefinitionsConnector'; import QualityDefinitionsConnector from './Definition/QualityDefinitionsConnector';
@ -54,12 +54,12 @@ class Quality extends Component {
onSavePress={this.onSavePress} onSavePress={this.onSavePress}
/> />
<PageContentBodyConnector> <PageContentBody>
<QualityDefinitionsConnector <QualityDefinitionsConnector
onChildMounted={this.onChildMounted} onChildMounted={this.onChildMounted}
onChildStateChange={this.onChildStateChange} onChildStateChange={this.onChildStateChange}
/> />
</PageContentBodyConnector> </PageContentBody>
</PageContent> </PageContent>
); );
} }

6
frontend/src/Settings/Settings.js
Unescape View File

@ -1,7 +1,7 @@
import React from 'react'; import React from 'react';
import Link from 'Components/Link/Link'; import Link from 'Components/Link/Link';
import PageContent from 'Components/Page/PageContent'; import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector'; import PageContentBody from 'Components/Page/PageContentBody';
import SettingsToolbarConnector from './SettingsToolbarConnector'; import SettingsToolbarConnector from './SettingsToolbarConnector';
import styles from './Settings.css'; import styles from './Settings.css';
@ -12,7 +12,7 @@ function Settings() {
hasPendingChanges={false} hasPendingChanges={false}
/> />
<PageContentBodyConnector> <PageContentBody>
<Link <Link
className={styles.link} className={styles.link}
to="/settings/mediamanagement" to="/settings/mediamanagement"
@ -133,7 +133,7 @@ function Settings() {
<div className={styles.summary}> <div className={styles.summary}>
Calendar, date and color impaired options Calendar, date and color impaired options
</div> </div>
</PageContentBodyConnector> </PageContentBody>
</PageContent> </PageContent>
); );
} }

6
frontend/src/Settings/Tags/TagSettings.js
Unescape View File

@ -1,6 +1,6 @@
import React from 'react'; import React from 'react';
import PageContent from 'Components/Page/PageContent'; import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector'; import PageContentBody from 'Components/Page/PageContentBody';
import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector'; import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
import TagsConnector from './TagsConnector'; import TagsConnector from './TagsConnector';
@ -11,9 +11,9 @@ function TagSettings() {
showSave={false} showSave={false}
/> />
<PageContentBodyConnector> <PageContentBody>
<TagsConnector /> <TagsConnector />
</PageContentBodyConnector> </PageContentBody>
</PageContent> </PageContent>
); );
} }

6
frontend/src/Settings/UI/UISettings.js
Unescape View File

@ -4,7 +4,7 @@ import { inputTypes } from 'Helpers/Props';
import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import LoadingIndicator from 'Components/Loading/LoadingIndicator';
import FieldSet from 'Components/FieldSet'; import FieldSet from 'Components/FieldSet';
import PageContent from 'Components/Page/PageContent'; import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector'; import PageContentBody from 'Components/Page/PageContentBody';
import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector'; import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
import Form from 'Components/Form/Form'; import Form from 'Components/Form/Form';
import FormGroup from 'Components/Form/FormGroup'; import FormGroup from 'Components/Form/FormGroup';
@ -66,7 +66,7 @@ class UISettings extends Component {
onSavePress={onSavePress} onSavePress={onSavePress}
/> />
<PageContentBodyConnector> <PageContentBody>
{ {
isFetching && isFetching &&
<LoadingIndicator /> <LoadingIndicator />
@ -222,7 +222,7 @@ class UISettings extends Component {
</FieldSet> </FieldSet>
</Form> </Form>
} }
</PageContentBodyConnector> </PageContentBody>
</PageContent> </PageContent>
); );
} }

6
frontend/src/System/Backup/Backups.js
Unescape View File

@ -5,7 +5,7 @@ import LoadingIndicator from 'Components/Loading/LoadingIndicator';
import Table from 'Components/Table/Table'; import Table from 'Components/Table/Table';
import TableBody from 'Components/Table/TableBody'; import TableBody from 'Components/Table/TableBody';
import PageContent from 'Components/Page/PageContent'; import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector'; import PageContentBody from 'Components/Page/PageContentBody';
import PageToolbar from 'Components/Page/Toolbar/PageToolbar'; import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton'; import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
@ -93,7 +93,7 @@ class Backups extends Component {
</PageToolbarSection> </PageToolbarSection>
</PageToolbar> </PageToolbar>
<PageContentBodyConnector> <PageContentBody>
{ {
isFetching && !isPopulated && isFetching && !isPopulated &&
<LoadingIndicator /> <LoadingIndicator />
@ -141,7 +141,7 @@ class Backups extends Component {
</TableBody> </TableBody>
</Table> </Table>
} }
</PageContentBodyConnector> </PageContentBody>
<RestoreBackupModalConnector <RestoreBackupModalConnector
isOpen={this.state.isRestoreModalOpen} isOpen={this.state.isRestoreModalOpen}

6
frontend/src/System/Events/LogsTable.js
Unescape View File

@ -7,7 +7,7 @@ import TableBody from 'Components/Table/TableBody';
import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper'; import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper';
import TablePager from 'Components/Table/TablePager'; import TablePager from 'Components/Table/TablePager';
import PageContent from 'Components/Page/PageContent'; import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector'; import PageContentBody from 'Components/Page/PageContentBody';
import PageToolbar from 'Components/Page/Toolbar/PageToolbar'; import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton'; import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
@ -73,7 +73,7 @@ function LogsTable(props) {
</PageToolbarSection> </PageToolbarSection>
</PageToolbar> </PageToolbar>
<PageContentBodyConnector> <PageContentBody>
{ {
isFetching && !isPopulated && isFetching && !isPopulated &&
<LoadingIndicator /> <LoadingIndicator />
@ -116,7 +116,7 @@ function LogsTable(props) {
/> />
</div> </div>
} }
</PageContentBodyConnector> </PageContentBody>
</PageContent> </PageContent>
); );
} }

6
frontend/src/System/Logs/Files/LogFiles.js
Unescape View File

@ -6,7 +6,7 @@ import Link from 'Components/Link/Link';
import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import LoadingIndicator from 'Components/Loading/LoadingIndicator';
import Table from 'Components/Table/Table'; import Table from 'Components/Table/Table';
import PageContent from 'Components/Page/PageContent'; import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector'; import PageContentBody from 'Components/Page/PageContentBody';
import PageToolbar from 'Components/Page/Toolbar/PageToolbar'; import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator'; import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator';
@ -73,7 +73,7 @@ class LogFiles extends Component {
/> />
</PageToolbarSection> </PageToolbarSection>
</PageToolbar> </PageToolbar>
<PageContentBodyConnector> <PageContentBody>
<Alert> <Alert>
<div> <div>
Log files are located in: {location} Log files are located in: {location}
@ -119,7 +119,7 @@ class LogFiles extends Component {
!isFetching && !items.length && !isFetching && !items.length &&
<div>No log files</div> <div>No log files</div>
} }
</PageContentBodyConnector> </PageContentBody>
</PageContent> </PageContent>
); );
} }

6
frontend/src/System/Status/Status.js
Unescape View File

@ -1,6 +1,6 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import PageContent from 'Components/Page/PageContent'; import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector'; import PageContentBody from 'Components/Page/PageContentBody';
import HealthConnector from './Health/HealthConnector'; import HealthConnector from './Health/HealthConnector';
import DiskSpaceConnector from './DiskSpace/DiskSpaceConnector'; import DiskSpaceConnector from './DiskSpace/DiskSpaceConnector';
import AboutConnector from './About/AboutConnector'; import AboutConnector from './About/AboutConnector';
@ -14,12 +14,12 @@ class Status extends Component {
render() { render() {
return ( return (
<PageContent title="Status"> <PageContent title="Status">
<PageContentBodyConnector> <PageContentBody>
<HealthConnector /> <HealthConnector />
<DiskSpaceConnector /> <DiskSpaceConnector />
<AboutConnector /> <AboutConnector />
<MoreInfo /> <MoreInfo />
</PageContentBodyConnector> </PageContentBody>
</PageContent> </PageContent>
); );
} }

6
frontend/src/System/Tasks/Tasks.js
Unescape View File

@ -1,16 +1,16 @@
import React from 'react'; import React from 'react';
import PageContent from 'Components/Page/PageContent'; import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector'; import PageContentBody from 'Components/Page/PageContentBody';
import ScheduledTasksConnector from './Scheduled/ScheduledTasksConnector'; import ScheduledTasksConnector from './Scheduled/ScheduledTasksConnector';
import QueuedTasksConnector from './Queued/QueuedTasksConnector'; import QueuedTasksConnector from './Queued/QueuedTasksConnector';
function Tasks() { function Tasks() {
return ( return (
<PageContent title="Tasks"> <PageContent title="Tasks">
<PageContentBodyConnector> <PageContentBody>
<ScheduledTasksConnector /> <ScheduledTasksConnector />
<QueuedTasksConnector /> <QueuedTasksConnector />
</PageContentBodyConnector> </PageContentBody>
</PageContent> </PageContent>
); );
} }

6
frontend/src/System/Updates/Updates.js
Unescape View File

@ -9,7 +9,7 @@ import InlineMarkdown from 'Components/Markdown/InlineMarkdown';
import Icon from 'Components/Icon'; import Icon from 'Components/Icon';
import Label from 'Components/Label'; import Label from 'Components/Label';
import PageContent from 'Components/Page/PageContent'; import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector'; import PageContentBody from 'Components/Page/PageContentBody';
import UpdateChanges from './UpdateChanges'; import UpdateChanges from './UpdateChanges';
import styles from './Updates.css'; import styles from './Updates.css';
@ -49,7 +49,7 @@ class Updates extends Component {
return ( return (
<PageContent title="Updates"> <PageContent title="Updates">
<PageContentBodyConnector> <PageContentBody>
{ {
!isPopulated && !hasError && !isPopulated && !hasError &&
<LoadingIndicator /> <LoadingIndicator />
@ -197,7 +197,7 @@ class Updates extends Component {
Failed to update settings Failed to update settings
</div> </div>
} }
</PageContentBodyConnector> </PageContentBody>
</PageContent> </PageContent>
); );
} }

6
frontend/src/UnmappedFiles/UnmappedFilesTable.js
Unescape View File

@ -6,7 +6,7 @@ import VirtualTable from 'Components/Table/VirtualTable';
import VirtualTableRow from 'Components/Table/VirtualTableRow'; import VirtualTableRow from 'Components/Table/VirtualTableRow';
import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper'; import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper';
import PageContent from 'Components/Page/PageContent'; import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector'; import PageContentBody from 'Components/Page/PageContentBody';
import PageToolbar from 'Components/Page/Toolbar/PageToolbar'; import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton'; import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
@ -106,7 +106,7 @@ class UnmappedFilesTable extends Component {
</PageToolbarSection> </PageToolbarSection>
</PageToolbar> </PageToolbar>
<PageContentBodyConnector <PageContentBody
registerScroller={this.setScrollerRef} registerScroller={this.setScrollerRef}
> >
{ {
@ -143,7 +143,7 @@ class UnmappedFilesTable extends Component {
sortDirection={sortDirection} sortDirection={sortDirection}
/> />
} }
</PageContentBodyConnector> </PageContentBody>
</PageContent> </PageContent>
); );
} }

6
frontend/src/Wanted/CutoffUnmet/CutoffUnmet.js
Unescape View File

@ -12,7 +12,7 @@ import Table from 'Components/Table/Table';
import TableBody from 'Components/Table/TableBody'; import TableBody from 'Components/Table/TableBody';
import TablePager from 'Components/Table/TablePager'; import TablePager from 'Components/Table/TablePager';
import PageContent from 'Components/Page/PageContent'; import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector'; import PageContentBody from 'Components/Page/PageContentBody';
import PageToolbar from 'Components/Page/Toolbar/PageToolbar'; import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator'; import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator';
@ -176,7 +176,7 @@ class CutoffUnmet extends Component {
</PageToolbarSection> </PageToolbarSection>
</PageToolbar> </PageToolbar>
<PageContentBodyConnector> <PageContentBody>
{ {
isFetching && !isPopulated && isFetching && !isPopulated &&
<LoadingIndicator /> <LoadingIndicator />
@ -250,7 +250,7 @@ class CutoffUnmet extends Component {
/> />
</div> </div>
} }
</PageContentBodyConnector> </PageContentBody>
</PageContent> </PageContent>
); );
} }

6
frontend/src/Wanted/Missing/Missing.js
Unescape View File

@ -12,7 +12,7 @@ import Table from 'Components/Table/Table';
import TableBody from 'Components/Table/TableBody'; import TableBody from 'Components/Table/TableBody';
import TablePager from 'Components/Table/TablePager'; import TablePager from 'Components/Table/TablePager';
import PageContent from 'Components/Page/PageContent'; import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector'; import PageContentBody from 'Components/Page/PageContentBody';
import PageToolbar from 'Components/Page/Toolbar/PageToolbar'; import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator'; import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator';
@ -193,7 +193,7 @@ class Missing extends Component {
</PageToolbarSection> </PageToolbarSection>
</PageToolbar> </PageToolbar>
<PageContentBodyConnector> <PageContentBody>
{ {
isFetching && !isPopulated && isFetching && !isPopulated &&
<LoadingIndicator /> <LoadingIndicator />
@ -273,7 +273,7 @@ class Missing extends Component {
onModalClose={this.onInteractiveImportModalClose} onModalClose={this.onInteractiveImportModalClose}
showReplaceExistingFiles={true} showReplaceExistingFiles={true}
/> />
</PageContentBodyConnector> </PageContentBody>
</PageContent> </PageContent>
); );
} }

Write Preview
Loading…
Cancel
Save