Fixed: Changes to Profiles, Languages, Manual Import

This commit is contained in:
Qstick
2019-06-18 22:50:17 -04:00
parent c76364a891
commit 9350f6a04c
97 changed files with 1217 additions and 428 deletions

View File

@@ -11,6 +11,7 @@ function ErrorPage(props) {
customFiltersError,
tagsError,
qualityProfilesError,
languagesError,
uiSettingsError,
systemStatusError
} = props;
@@ -27,6 +28,8 @@ function ErrorPage(props) {
errorMessage = getErrorMessage(tagsError, 'Failed to load tags from API');
} else if (qualityProfilesError) {
errorMessage = getErrorMessage(qualityProfilesError, 'Failed to load quality profiles from API');
} else if (languagesError) {
errorMessage = getErrorMessage(languagesError, 'Failed to load languages from API');
} else if (uiSettingsError) {
errorMessage = getErrorMessage(uiSettingsError, 'Failed to load UI settings from API');
} else if (systemStatusError) {
@@ -53,6 +56,7 @@ ErrorPage.propTypes = {
customFiltersError: PropTypes.object,
tagsError: PropTypes.object,
qualityProfilesError: PropTypes.object,
languagesError: PropTypes.object,
uiSettingsError: PropTypes.object,
systemStatusError: PropTypes.object
};

View File

@@ -15,8 +15,9 @@
padding-left: 20px;
}
.logoLink {
line-height: 0;
.logoFull {
width: 144px;
height: 48px;
}
.logo {

View File

@@ -45,19 +45,17 @@ class PageHeader extends Component {
render() {
const {
onSidebarToggle
onSidebarToggle,
isSmallScreen
} = this.props;
return (
<div className={styles.header}>
<div className={styles.logoContainer}>
<Link
className={styles.logoLink}
to={`${window.Radarr.urlBase}/`}
>
<Link to={`${window.Radarr.urlBase}/`}>
<img
className={styles.logo}
src={`${window.Radarr.urlBase}/Content/Images/logo.svg`}
className={isSmallScreen ? styles.logo : styles.logoFull}
src={isSmallScreen ? `${window.Radarr.urlBase}/Content/Images/logo.png` : `${window.Radarr.urlBase}/Content/Images/logo-full.png`}
/>
</Link>
</div>
@@ -95,6 +93,7 @@ class PageHeader extends Component {
PageHeader.propTypes = {
onSidebarToggle: PropTypes.func.isRequired,
isSmallScreen: PropTypes.bool.isRequired,
bindShortcut: PropTypes.func.isRequired
};

View File

@@ -86,6 +86,7 @@ class Page extends Component {
<PageHeader
onSidebarToggle={onSidebarToggle}
isSmallScreen={isSmallScreen}
/>
<div className={styles.main}>

View File

@@ -8,7 +8,7 @@ import { saveDimensions, setIsSidebarVisible } from 'Store/Actions/appActions';
import { fetchCustomFilters } from 'Store/Actions/customFilterActions';
import { fetchMovies } from 'Store/Actions/movieActions';
import { fetchTags } from 'Store/Actions/tagActions';
import { fetchQualityProfiles, fetchUISettings } from 'Store/Actions/settingsActions';
import { fetchQualityProfiles, fetchUISettings, fetchLanguages } from 'Store/Actions/settingsActions';
import { fetchStatus } from 'Store/Actions/systemActions';
import ErrorPage from './ErrorPage';
import LoadingPage from './LoadingPage';
@@ -48,6 +48,7 @@ const selectIsPopulated = createSelector(
(state) => state.tags.isPopulated,
(state) => state.settings.ui.isPopulated,
(state) => state.settings.qualityProfiles.isPopulated,
(state) => state.settings.languages.isPopulated,
(state) => state.system.status.isPopulated,
(
moviesIsPopulated,
@@ -55,6 +56,7 @@ const selectIsPopulated = createSelector(
tagsIsPopulated,
uiSettingsIsPopulated,
qualityProfilesIsPopulated,
languagesIsPopulated,
systemStatusIsPopulated
) => {
return (
@@ -63,6 +65,7 @@ const selectIsPopulated = createSelector(
tagsIsPopulated &&
uiSettingsIsPopulated &&
qualityProfilesIsPopulated &&
languagesIsPopulated &&
systemStatusIsPopulated
);
}
@@ -74,6 +77,7 @@ const selectErrors = createSelector(
(state) => state.tags.error,
(state) => state.settings.ui.error,
(state) => state.settings.qualityProfiles.error,
(state) => state.settings.languages.error,
(state) => state.system.status.error,
(
moviesError,
@@ -81,6 +85,7 @@ const selectErrors = createSelector(
tagsError,
uiSettingsError,
qualityProfilesError,
languagesError,
systemStatusError
) => {
const hasError = !!(
@@ -89,6 +94,7 @@ const selectErrors = createSelector(
tagsError ||
uiSettingsError ||
qualityProfilesError ||
languagesError ||
systemStatusError
);
@@ -99,6 +105,7 @@ const selectErrors = createSelector(
tagsError,
uiSettingsError,
qualityProfilesError,
languagesError,
systemStatusError
};
}
@@ -143,6 +150,9 @@ function createMapDispatchToProps(dispatch, props) {
dispatchFetchQualityProfiles() {
dispatch(fetchQualityProfiles());
},
dispatchFetchLanguages() {
dispatch(fetchLanguages());
},
dispatchFetchUISettings() {
dispatch(fetchUISettings());
},
@@ -177,6 +187,7 @@ class PageConnector extends Component {
this.props.dispatchFetchCustomFilters();
this.props.dispatchFetchTags();
this.props.dispatchFetchQualityProfiles();
this.props.dispatchFetchLanguages();
this.props.dispatchFetchUISettings();
this.props.dispatchFetchStatus();
}
@@ -199,6 +210,7 @@ class PageConnector extends Component {
dispatchFetchMovies,
dispatchFetchTags,
dispatchFetchQualityProfiles,
dispatchFetchLanguages,
dispatchFetchUISettings,
dispatchFetchStatus,
...otherProps
@@ -236,6 +248,7 @@ PageConnector.propTypes = {
dispatchFetchCustomFilters: PropTypes.func.isRequired,
dispatchFetchTags: PropTypes.func.isRequired,
dispatchFetchQualityProfiles: PropTypes.func.isRequired,
dispatchFetchLanguages: PropTypes.func.isRequired,
dispatchFetchUISettings: PropTypes.func.isRequired,
dispatchFetchStatus: PropTypes.func.isRequired,
onSidebarVisibleChange: PropTypes.func.isRequired