diff --git a/frontend/src/Author/Index/Table/AuthorIndexRow.js b/frontend/src/Author/Index/Table/AuthorIndexRow.js
index 66fe2ee39..476033217 100644
--- a/frontend/src/Author/Index/Table/AuthorIndexRow.js
+++ b/frontend/src/Author/Index/Table/AuthorIndexRow.js
@@ -82,7 +82,6 @@ class AuthorIndexRow extends Component {
status,
authorName,
titleSlug,
- authorType,
qualityProfile,
metadataProfile,
nextBook,
@@ -134,7 +133,6 @@ class AuthorIndexRow extends Component {
- {authorType}
-
- );
- }
-
if (name === 'qualityProfileId') {
return (
);
@@ -39,7 +36,6 @@ function AuthorStatusCell(props) {
AuthorStatusCell.propTypes = {
className: PropTypes.string.isRequired,
- authorType: PropTypes.string,
monitored: PropTypes.bool.isRequired,
status: PropTypes.string.isRequired,
component: PropTypes.elementType
diff --git a/frontend/src/Book/BookCover.js b/frontend/src/Book/BookCover.js
index 22fde5ae4..2d27302d2 100644
--- a/frontend/src/Book/BookCover.js
+++ b/frontend/src/Book/BookCover.js
@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import AuthorImage from 'Author/AuthorImage';
-const coverPlaceholder = 'data:image/png;base64,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';
+const coverPlaceholder = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAPcAAAD3AQMAAAD7QlAQAAAABlBMVEUnJychISEIs8G4AAAEFklEQVRYw+2YMdPOQBDH95KQDEVSMKOj1FFQJx9BQc0nkeuUvoLS+AQ6MQqlRu8xCjpUgsjK7iXz2t1LMsbo8i/ey5vfc3e7m7tk9+DQoUOHDpGe3bu7hS8BwJ117BoAOLfOb/Hf62s4EY1VNrcPVvjNua1WuJ/b8xqoeR3sqFkllx8+AYAra9PniDg1ydr07cT7FQMy6k7ycQMKgJr5F4BrhvI9ZA3xCDU8fJggs9gBXJ35acX8lil74CPmO5w1xhwoIMVFMQcqKCfynH3soLLuEfkB4O5TBArDPZlH05ZkYMxBigyJDEyseylHFjjK4CzPyS4IE3gTgIxuAyulHzbG/as0PYsifM24X8/TA19Vxn2efjagNwFoHE2/GDAKpm86HE2AfMrmLQbqADnI2bzFQPv8y7NlM7naORU+uid+62X4xJg0V6PC1+KfvvSghWMgnh0cVIArCO694Ib+qWR4HQ257F9oRxu+L2FpzK3h7D5vPwqA5k1OPOwA4iaAOYWnZM4XPhPYT3eWDXriX4sHROjpskF7cC2eBHfUdVjeDw6/4Uk9oHqEz18DH9se8IvgCdQDBS/oLUxcPcB24mnAv+jfXvCMOdwI9jNXDxiJp9w9DCd4Afgdz96fF5GGk3xSCFBHw+gF4PAz9SQCwE7K5UGculJHGuTdKPun+IYHrafAUPfPKJdP4OhL7ErDuf9jfnXn6Gu6+Kj654EPKQIG7iu5PMLacGPO7Qf0EOMvx3LhhRh/5l+GOsahnPkw4Mw7sXzLedzxV+DvscsMZ8X51W0Olp/+5P7qIPlLPMEWP+3z5G94rXinuen/RWzAbe6g7hVvRX/DO8FdjMPB9+O3yD5fwf1fc72+/jcfN/cHRPZPJva/7q/27z9zlPyVfL9Abrgv/oW/Nvyx5vL9rbl5f78R/I3iTnP7fRH83QjVDpfCb4Kr71uxz1FzkN9nxfX32XKVHyj+BfweV/mJkM5Pdnkpsc6PfK64BynDM8lTiU1+l+LPP2iLUJj8sj5z3uaXgMPZFDY/rQDHs/rLTRxMfkwx4mX4hPLjaza/TgIfI/l1xvl5y/wT5+dSCd8rmXf8W2/qgx5S5rRYvAMlri+Ic2MKME9FCdQT/wJ8Ga1vSnzE+Z3l06REJi7qI1VfOXw0xusrCPVZ+6aP12dFqO/qN6d4fZeF+rB804X6sInXl/lrT1vBFtAu1KcuCfWpi9e33VLfJjZAS33ckvlZpH4uedu2nOcWhleiPr9peLFT32fyfGD7fMGBlf/jfCLZOd8oIrw6q4/o2jogzlc2z2fAW8w2nwvd3eqp0YXxCcdiS1HzRC8fw2ezJjvHVtn2tPbhqnOzTgNp1/kdv6pV7ig4RQOruuDBCax1+94dOHTo0KFDk34DoJynpPus3GIAAAAASUVORK5CYII=';
function BookCover(props) {
return (
diff --git a/frontend/src/Book/Details/BookDetails.js b/frontend/src/Book/Details/BookDetails.js
index 0cb83f59c..4bddffd2c 100644
--- a/frontend/src/Book/Details/BookDetails.js
+++ b/frontend/src/Book/Details/BookDetails.js
@@ -7,6 +7,7 @@ import TextTruncate from 'react-text-truncate';
import formatBytes from 'Utilities/Number/formatBytes';
import selectAll from 'Utilities/Table/selectAll';
import toggleSelected from 'Utilities/Table/toggleSelected';
+import stripHtml from 'Utilities/String/stripHtml';
import { align, icons, kinds, sizes, tooltipPositions } from 'Helpers/Props';
import fonts from 'Styles/Variables/fonts';
import HeartRating from 'Components/HeartRating';
@@ -18,6 +19,7 @@ import Tooltip from 'Components/Tooltip/Tooltip';
import BookCover from 'Book/BookCover';
import OrganizePreviewModalConnector from 'Organize/OrganizePreviewModalConnector';
// import RetagPreviewModalConnector from 'Retag/RetagPreviewModalConnector';
+import EditBookModalConnector from 'Book/Edit/EditBookModalConnector';
import DeleteBookModal from 'Book/Delete/DeleteBookModal';
import LoadingIndicator from 'Components/Loading/LoadingIndicator';
import PageContent from 'Components/Page/PageContent';
@@ -44,28 +46,6 @@ function getFanartUrl(images) {
}
}
-function formatDuration(timeSpan) {
- const duration = moment.duration(timeSpan);
- const hours = duration.get('hours');
- const minutes = duration.get('minutes');
- let hoursText = 'Hours';
- let minText = 'Minutes';
-
- if (minutes === 1) {
- minText = 'Minute';
- }
-
- if (hours === 0) {
- return `${minutes} ${minText}`;
- }
-
- if (hours === 1) {
- hoursText = 'Hour';
- }
-
- return `${hours} ${hoursText} ${minutes} ${minText}`;
-}
-
function getExpandedState(newState) {
return {
allExpanded: newState.allSelected,
@@ -85,6 +65,7 @@ class BookDetails extends Component {
this.state = {
isOrganizeModalOpen: false,
isRetagModalOpen: false,
+ isEditBookModalOpen: false,
isDeleteBookModalOpen: false,
allExpanded: false,
allCollapsed: false,
@@ -112,8 +93,17 @@ class BookDetails extends Component {
this.setState({ isRetagModalOpen: false });
}
+ onEditBookPress = () => {
+ this.setState({ isEditBookModalOpen: true });
+ }
+
+ onEditBookModalClose = () => {
+ this.setState({ isEditBookModalOpen: false });
+ }
+
onDeleteBookPress = () => {
this.setState({
+ isEditBookModalOpen: false,
isDeleteBookModalOpen: true
});
}
@@ -153,8 +143,7 @@ class BookDetails extends Component {
id,
titleSlug,
title,
- disambiguation,
- duration,
+ pageCount,
overview,
statistics = {},
monitored,
@@ -179,6 +168,7 @@ class BookDetails extends Component {
const {
isOrganizeModalOpen,
// isRetagModalOpen,
+ isEditBookModalOpen,
isDeleteBookModalOpen,
allExpanded,
allCollapsed,
@@ -222,6 +212,12 @@ class BookDetails extends Component {
+
+
- {title}{disambiguation ? ` (${disambiguation})` : ''}
+ {title}
+
@@ -306,9 +303,9 @@ class BookDetails extends Component {
{
- !!duration &&
+ !!pageCount &&
- {formatDuration(duration)}
+ {`${pageCount} pages`}
}
@@ -397,7 +394,7 @@ class BookDetails extends Component {
]*>?/gm, '')}
+ text={stripHtml(overview)}
/>
@@ -488,6 +485,14 @@ class BookDetails extends Component {
{/* onModalClose={this.onRetagModalClose} */}
{/* /> */}
+
+
+
+
+ );
+}
+
+EditBookModal.propTypes = {
+ isOpen: PropTypes.bool.isRequired,
+ onModalClose: PropTypes.func.isRequired
+};
+
+export default EditBookModal;
diff --git a/frontend/src/Book/Edit/EditBookModalConnector.js b/frontend/src/Book/Edit/EditBookModalConnector.js
new file mode 100644
index 000000000..3f861dc66
--- /dev/null
+++ b/frontend/src/Book/Edit/EditBookModalConnector.js
@@ -0,0 +1,39 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { clearPendingChanges } from 'Store/Actions/baseActions';
+import EditBookModal from './EditBookModal';
+
+const mapDispatchToProps = {
+ clearPendingChanges
+};
+
+class EditBookModalConnector extends Component {
+
+ //
+ // Listeners
+
+ onModalClose = () => {
+ this.props.clearPendingChanges({ section: 'books' });
+ this.props.onModalClose();
+ }
+
+ //
+ // Render
+
+ render() {
+ return (
+
+ );
+ }
+}
+
+EditBookModalConnector.propTypes = {
+ onModalClose: PropTypes.func.isRequired,
+ clearPendingChanges: PropTypes.func.isRequired
+};
+
+export default connect(undefined, mapDispatchToProps)(EditBookModalConnector);
diff --git a/frontend/src/Book/Edit/EditBookModalContent.js b/frontend/src/Book/Edit/EditBookModalContent.js
new file mode 100644
index 000000000..97c21edc8
--- /dev/null
+++ b/frontend/src/Book/Edit/EditBookModalContent.js
@@ -0,0 +1,133 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { inputTypes } from 'Helpers/Props';
+import Button from 'Components/Link/Button';
+import SpinnerButton from 'Components/Link/SpinnerButton';
+import ModalContent from 'Components/Modal/ModalContent';
+import ModalHeader from 'Components/Modal/ModalHeader';
+import ModalBody from 'Components/Modal/ModalBody';
+import ModalFooter from 'Components/Modal/ModalFooter';
+import Form from 'Components/Form/Form';
+import FormGroup from 'Components/Form/FormGroup';
+import FormLabel from 'Components/Form/FormLabel';
+import FormInputGroup from 'Components/Form/FormInputGroup';
+
+class EditBookModalContent extends Component {
+
+ //
+ // Listeners
+
+ onSavePress = () => {
+ const {
+ onSavePress
+ } = this.props;
+
+ onSavePress(false);
+
+ }
+
+ //
+ // Render
+
+ render() {
+ const {
+ title,
+ authorName,
+ statistics,
+ item,
+ isSaving,
+ onInputChange,
+ onModalClose,
+ ...otherProps
+ } = this.props;
+
+ const {
+ monitored,
+ anyEditionOk,
+ editions
+ } = item;
+
+ const hasFile = statistics ? statistics.bookFileCount : 0;
+
+ return (
+
+
+ Edit - {authorName} - {title}
+
+
+
+
+
+
+
+
+
+ Save
+
+
+
+
+ );
+ }
+}
+
+EditBookModalContent.propTypes = {
+ bookId: PropTypes.number.isRequired,
+ title: PropTypes.string.isRequired,
+ authorName: PropTypes.string.isRequired,
+ statistics: PropTypes.object.isRequired,
+ item: PropTypes.object.isRequired,
+ isSaving: PropTypes.bool.isRequired,
+ onInputChange: PropTypes.func.isRequired,
+ onSavePress: PropTypes.func.isRequired,
+ onModalClose: PropTypes.func.isRequired
+};
+
+export default EditBookModalContent;
diff --git a/frontend/src/Book/Edit/EditBookModalContentConnector.js b/frontend/src/Book/Edit/EditBookModalContentConnector.js
new file mode 100644
index 000000000..39dc6b591
--- /dev/null
+++ b/frontend/src/Book/Edit/EditBookModalContentConnector.js
@@ -0,0 +1,98 @@
+import _ from 'lodash';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import selectSettings from 'Store/Selectors/selectSettings';
+import createBookSelector from 'Store/Selectors/createBookSelector';
+import createAuthorSelector from 'Store/Selectors/createAuthorSelector';
+import { setBookValue, saveBook } from 'Store/Actions/bookActions';
+import EditBookModalContent from './EditBookModalContent';
+
+function createMapStateToProps() {
+ return createSelector(
+ (state) => state.books,
+ createBookSelector(),
+ createAuthorSelector(),
+ (bookState, book, author) => {
+ const {
+ isSaving,
+ saveError,
+ pendingChanges
+ } = bookState;
+
+ const bookSettings = _.pick(book, [
+ 'monitored',
+ 'anyEditionOk',
+ 'editions'
+ ]);
+
+ const settings = selectSettings(bookSettings, pendingChanges, saveError);
+
+ return {
+ title: book.title,
+ authorName: author.authorName,
+ bookType: book.bookType,
+ statistics: book.statistics,
+ isSaving,
+ saveError,
+ item: settings.settings,
+ ...settings
+ };
+ }
+ );
+}
+
+const mapDispatchToProps = {
+ dispatchSetBookValue: setBookValue,
+ dispatchSaveBook: saveBook
+};
+
+class EditBookModalContentConnector extends Component {
+
+ //
+ // Lifecycle
+
+ componentDidUpdate(prevProps, prevState) {
+ if (prevProps.isSaving && !this.props.isSaving && !this.props.saveError) {
+ this.props.onModalClose();
+ }
+ }
+
+ //
+ // Listeners
+
+ onInputChange = ({ name, value }) => {
+ this.props.dispatchSetBookValue({ name, value });
+ }
+
+ onSavePress = () => {
+ this.props.dispatchSaveBook({
+ id: this.props.bookId
+ });
+ }
+
+ //
+ // Render
+
+ render() {
+ return (
+
+ );
+ }
+}
+
+EditBookModalContentConnector.propTypes = {
+ bookId: PropTypes.number,
+ isSaving: PropTypes.bool.isRequired,
+ saveError: PropTypes.object,
+ dispatchSetBookValue: PropTypes.func.isRequired,
+ dispatchSaveBook: PropTypes.func.isRequired,
+ onModalClose: PropTypes.func.isRequired
+};
+
+export default connect(createMapStateToProps, mapDispatchToProps)(EditBookModalContentConnector);
diff --git a/frontend/src/Components/Form/BookEditionSelectInputConnector.js b/frontend/src/Components/Form/BookEditionSelectInputConnector.js
new file mode 100644
index 000000000..fecede0c8
--- /dev/null
+++ b/frontend/src/Components/Form/BookEditionSelectInputConnector.js
@@ -0,0 +1,93 @@
+import _ from 'lodash';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import titleCase from 'Utilities/String/titleCase';
+import SelectInput from './SelectInput';
+
+function createMapStateToProps() {
+ return createSelector(
+ (state, { bookEditions }) => bookEditions,
+ (bookEditions) => {
+ const values = _.map(bookEditions.value, (bookEdition) => {
+
+ let value = `${bookEdition.title}`;
+
+ if (bookEdition.disambiguation) {
+ value = `${value} (${titleCase(bookEdition.disambiguation)})`;
+ }
+
+ const extras = [];
+ if (bookEdition.language) {
+ extras.push(bookEdition.language);
+ }
+ if (bookEdition.publisher) {
+ extras.push(bookEdition.publisher);
+ }
+ if (bookEdition.isbn13) {
+ extras.push(bookEdition.isbn13);
+ }
+ if (bookEdition.format) {
+ extras.push(bookEdition.format);
+ }
+ if (bookEdition.pageCount > 0) {
+ extras.push(`${bookEdition.pageCount}p`);
+ }
+
+ if (extras) {
+ value = `${value} [${extras.join(', ')}]`;
+ }
+
+ return {
+ key: bookEdition.foreignEditionId,
+ value
+ };
+ });
+
+ const sortedValues = _.orderBy(values, ['value']);
+
+ const value = _.find(bookEditions.value, { monitored: true }).foreignEditionId;
+
+ return {
+ values: sortedValues,
+ value
+ };
+ }
+ );
+}
+
+class BookEditionSelectInputConnector extends Component {
+
+ //
+ // Listeners
+
+ onChange = ({ name, value }) => {
+ const {
+ bookEditions
+ } = this.props;
+
+ const updatedEditions = _.map(bookEditions.value, (e) => ({ ...e, monitored: false }));
+ _.find(updatedEditions, { foreignEditionId: value }).monitored = true;
+
+ this.props.onChange({ name, value: updatedEditions });
+ }
+
+ render() {
+
+ return (
+
+ );
+ }
+}
+
+BookEditionSelectInputConnector.propTypes = {
+ name: PropTypes.string.isRequired,
+ onChange: PropTypes.func.isRequired,
+ bookEditions: PropTypes.object
+};
+
+export default connect(createMapStateToProps)(BookEditionSelectInputConnector);
diff --git a/frontend/src/Components/Form/BookReleaseSelectInputConnector.js b/frontend/src/Components/Form/BookReleaseSelectInputConnector.js
deleted file mode 100644
index 47219acf6..000000000
--- a/frontend/src/Components/Form/BookReleaseSelectInputConnector.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import _ from 'lodash';
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import titleCase from 'Utilities/String/titleCase';
-import SelectInput from './SelectInput';
-
-function createMapStateToProps() {
- return createSelector(
- (state, { bookReleases }) => bookReleases,
- (bookReleases) => {
- const values = _.map(bookReleases.value, (bookRelease) => {
-
- return {
- key: bookRelease.foreignReleaseId,
- value: `${bookRelease.title}` +
- `${bookRelease.disambiguation ? ' (' : ''}${titleCase(bookRelease.disambiguation)}${bookRelease.disambiguation ? ')' : ''}` +
- `, ${bookRelease.mediumCount} med, ${bookRelease.bookCount} books` +
- `${bookRelease.country.length > 0 ? ', ' : ''}${bookRelease.country}` +
- `${bookRelease.format ? ', [' : ''}${bookRelease.format}${bookRelease.format ? ']' : ''}`
- };
- });
-
- const sortedValues = _.orderBy(values, ['value']);
-
- const value = _.find(bookReleases.value, { monitored: true }).foreignReleaseId;
-
- return {
- values: sortedValues,
- value
- };
- }
- );
-}
-
-class BookReleaseSelectInputConnector extends Component {
-
- //
- // Listeners
-
- onChange = ({ name, value }) => {
- const {
- bookReleases
- } = this.props;
-
- const updatedReleases = _.map(bookReleases.value, (e) => ({ ...e, monitored: false }));
- _.find(updatedReleases, { foreignReleaseId: value }).monitored = true;
-
- this.props.onChange({ name, value: updatedReleases });
- }
-
- render() {
-
- return (
-
- );
- }
-}
-
-BookReleaseSelectInputConnector.propTypes = {
- name: PropTypes.string.isRequired,
- onChange: PropTypes.func.isRequired,
- bookReleases: PropTypes.object
-};
-
-export default connect(createMapStateToProps)(BookReleaseSelectInputConnector);
diff --git a/frontend/src/Components/Form/FormInputGroup.js b/frontend/src/Components/Form/FormInputGroup.js
index 73552bef1..c4711fc31 100644
--- a/frontend/src/Components/Form/FormInputGroup.js
+++ b/frontend/src/Components/Form/FormInputGroup.js
@@ -15,7 +15,7 @@ import PasswordInput from './PasswordInput';
import PathInputConnector from './PathInputConnector';
import QualityProfileSelectInputConnector from './QualityProfileSelectInputConnector';
import MetadataProfileSelectInputConnector from './MetadataProfileSelectInputConnector';
-import BookReleaseSelectInputConnector from './BookReleaseSelectInputConnector';
+import BookEditionSelectInputConnector from './BookEditionSelectInputConnector';
import RootFolderSelectInputConnector from './RootFolderSelectInputConnector';
import SeriesTypeSelectInput from './SeriesTypeSelectInput';
import EnhancedSelectInput from './EnhancedSelectInput';
@@ -66,8 +66,8 @@ function getComponent(type) {
case inputTypes.METADATA_PROFILE_SELECT:
return MetadataProfileSelectInputConnector;
- case inputTypes.BOOK_RELEASE_SELECT:
- return BookReleaseSelectInputConnector;
+ case inputTypes.BOOK_EDITION_SELECT:
+ return BookEditionSelectInputConnector;
case inputTypes.ROOT_FOLDER_SELECT:
return RootFolderSelectInputConnector;
diff --git a/frontend/src/Helpers/Props/inputTypes.js b/frontend/src/Helpers/Props/inputTypes.js
index ae6ba08ee..f55bd3248 100644
--- a/frontend/src/Helpers/Props/inputTypes.js
+++ b/frontend/src/Helpers/Props/inputTypes.js
@@ -11,7 +11,7 @@ export const PASSWORD = 'password';
export const PATH = 'path';
export const QUALITY_PROFILE_SELECT = 'qualityProfileSelect';
export const METADATA_PROFILE_SELECT = 'metadataProfileSelect';
-export const BOOK_RELEASE_SELECT = 'bookReleaseSelect';
+export const BOOK_EDITION_SELECT = 'bookEditionSelect';
export const ROOT_FOLDER_SELECT = 'rootFolderSelect';
export const SELECT = 'select';
export const SERIES_TYPE_SELECT = 'authorTypeSelect';
@@ -33,7 +33,7 @@ export const all = [
PATH,
QUALITY_PROFILE_SELECT,
METADATA_PROFILE_SELECT,
- BOOK_RELEASE_SELECT,
+ BOOK_EDITION_SELECT,
ROOT_FOLDER_SELECT,
SELECT,
SERIES_TYPE_SELECT,
diff --git a/frontend/src/InteractiveImport/Edition/SelectEditionModal.js b/frontend/src/InteractiveImport/Edition/SelectEditionModal.js
new file mode 100644
index 000000000..59a387490
--- /dev/null
+++ b/frontend/src/InteractiveImport/Edition/SelectEditionModal.js
@@ -0,0 +1,37 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import Modal from 'Components/Modal/Modal';
+import SelectEditionModalContentConnector from './SelectEditionModalContentConnector';
+
+class SelectEditionModal extends Component {
+
+ //
+ // Render
+
+ render() {
+ const {
+ isOpen,
+ onModalClose,
+ ...otherProps
+ } = this.props;
+
+ return (
+
+
+
+ );
+ }
+}
+
+SelectEditionModal.propTypes = {
+ isOpen: PropTypes.bool.isRequired,
+ onModalClose: PropTypes.func.isRequired
+};
+
+export default SelectEditionModal;
diff --git a/frontend/src/InteractiveImport/Edition/SelectEditionModalContent.css b/frontend/src/InteractiveImport/Edition/SelectEditionModalContent.css
new file mode 100644
index 000000000..54f67bb07
--- /dev/null
+++ b/frontend/src/InteractiveImport/Edition/SelectEditionModalContent.css
@@ -0,0 +1,18 @@
+.modalBody {
+ composes: modalBody from '~Components/Modal/ModalBody.css';
+
+ display: flex;
+ flex: 1 1 auto;
+ flex-direction: column;
+}
+
+.filterInput {
+ composes: input from '~Components/Form/TextInput.css';
+
+ flex: 0 0 auto;
+ margin-bottom: 20px;
+}
+
+.scroller {
+ flex: 1 1 auto;
+}
diff --git a/frontend/src/InteractiveImport/Edition/SelectEditionModalContent.js b/frontend/src/InteractiveImport/Edition/SelectEditionModalContent.js
new file mode 100644
index 000000000..e5146a0e9
--- /dev/null
+++ b/frontend/src/InteractiveImport/Edition/SelectEditionModalContent.js
@@ -0,0 +1,93 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import Button from 'Components/Link/Button';
+import { scrollDirections } from 'Helpers/Props';
+import ModalContent from 'Components/Modal/ModalContent';
+import ModalHeader from 'Components/Modal/ModalHeader';
+import ModalBody from 'Components/Modal/ModalBody';
+import ModalFooter from 'Components/Modal/ModalFooter';
+import Table from 'Components/Table/Table';
+import TableBody from 'Components/Table/TableBody';
+import SelectEditionRow from './SelectEditionRow';
+import Alert from 'Components/Alert';
+import styles from './SelectEditionModalContent.css';
+
+const columns = [
+ {
+ name: 'book',
+ label: 'Book',
+ isVisible: true
+ },
+ {
+ name: 'edition',
+ label: 'Edition',
+ isVisible: true
+ }
+];
+
+class SelectEditionModalContent extends Component {
+
+ //
+ // Render
+
+ render() {
+ const {
+ books,
+ onEditionSelect,
+ onModalClose,
+ ...otherProps
+ } = this.props;
+
+ return (
+
+
+ Manual Import - Select Edition
+
+
+
+
+ Overrriding an edition here will disable automatic edition selection for that book in future.
+
+
+
+
+ {
+ books.map((item) => {
+ return (
+
+ );
+ })
+ }
+
+
+
+
+
+
+
+
+ );
+ }
+}
+
+SelectEditionModalContent.propTypes = {
+ books: PropTypes.arrayOf(PropTypes.object).isRequired,
+ onEditionSelect: PropTypes.func.isRequired,
+ onModalClose: PropTypes.func.isRequired
+};
+
+export default SelectEditionModalContent;
diff --git a/frontend/src/InteractiveImport/Edition/SelectEditionModalContentConnector.js b/frontend/src/InteractiveImport/Edition/SelectEditionModalContentConnector.js
new file mode 100644
index 000000000..d02682260
--- /dev/null
+++ b/frontend/src/InteractiveImport/Edition/SelectEditionModalContentConnector.js
@@ -0,0 +1,63 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import {
+ updateInteractiveImportItem,
+ saveInteractiveImportItem
+} from 'Store/Actions/interactiveImportActions';
+import SelectEditionModalContent from './SelectEditionModalContent';
+
+function createMapStateToProps() {
+ return {};
+}
+
+const mapDispatchToProps = {
+ updateInteractiveImportItem,
+ saveInteractiveImportItem
+};
+
+class SelectEditionModalContentConnector extends Component {
+
+ //
+ // Listeners
+
+ onEditionSelect = (bookId, editionId) => {
+ const ids = this.props.importIdsByBook[bookId];
+
+ ids.forEach((id) => {
+ this.props.updateInteractiveImportItem({
+ id,
+ editionId,
+ disableReleaseSwitching: true,
+ tracks: [],
+ rejections: []
+ });
+ });
+
+ this.props.saveInteractiveImportItem({ id: ids });
+
+ this.props.onModalClose(true);
+ }
+
+ //
+ // Render
+
+ render() {
+ return (
+
+ );
+ }
+}
+
+SelectEditionModalContentConnector.propTypes = {
+ importIdsByBook: PropTypes.object.isRequired,
+ books: PropTypes.arrayOf(PropTypes.object).isRequired,
+ updateInteractiveImportItem: PropTypes.func.isRequired,
+ saveInteractiveImportItem: PropTypes.func.isRequired,
+ onModalClose: PropTypes.func.isRequired
+};
+
+export default connect(createMapStateToProps, mapDispatchToProps)(SelectEditionModalContentConnector);
diff --git a/frontend/src/InteractiveImport/Edition/SelectEditionRow.css b/frontend/src/InteractiveImport/Edition/SelectEditionRow.css
new file mode 100644
index 000000000..e78f0bc19
--- /dev/null
+++ b/frontend/src/InteractiveImport/Edition/SelectEditionRow.css
@@ -0,0 +1,3 @@
+.albumRow {
+ cursor: pointer;
+}
diff --git a/frontend/src/InteractiveImport/Edition/SelectEditionRow.js b/frontend/src/InteractiveImport/Edition/SelectEditionRow.js
new file mode 100644
index 000000000..1d2037a1f
--- /dev/null
+++ b/frontend/src/InteractiveImport/Edition/SelectEditionRow.js
@@ -0,0 +1,125 @@
+import _ from 'lodash';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { inputTypes } from 'Helpers/Props';
+import TableRow from 'Components/Table/TableRow';
+import TableRowCell from 'Components/Table/Cells/TableRowCell';
+import FormInputGroup from 'Components/Form/FormInputGroup';
+import titleCase from 'Utilities/String/titleCase';
+
+class SelectEditionRow extends Component {
+
+ //
+ // Listeners
+
+ onInputChange = ({ name, value }) => {
+ this.props.onEditionSelect(parseInt(name), parseInt(value));
+ }
+
+ //
+ // Render
+
+ render() {
+ const {
+ id,
+ matchedEditionId,
+ title,
+ disambiguation,
+ editions,
+ columns
+ } = this.props;
+
+ const extendedTitle = disambiguation ? `${title} (${disambiguation})` : title;
+
+ const values = _.map(editions, (bookEdition) => {
+
+ let value = `${bookEdition.title}`;
+
+ if (bookEdition.disambiguation) {
+ value = `${value} (${titleCase(bookEdition.disambiguation)})`;
+ }
+
+ const extras = [];
+ if (bookEdition.language) {
+ extras.push(bookEdition.language);
+ }
+ if (bookEdition.publisher) {
+ extras.push(bookEdition.publisher);
+ }
+ if (bookEdition.isbn13) {
+ extras.push(bookEdition.isbn13);
+ }
+ if (bookEdition.format) {
+ extras.push(bookEdition.format);
+ }
+ if (bookEdition.pageCount > 0) {
+ extras.push(`${bookEdition.pageCount}p`);
+ }
+
+ if (extras) {
+ value = `${value} [${extras.join(', ')}]`;
+ }
+
+ return {
+ key: bookEdition.id,
+ value
+ };
+ });
+
+ const sortedValues = _.orderBy(values, ['value']);
+
+ return (
+
+ {
+ columns.map((column) => {
+ const {
+ name,
+ isVisible
+ } = column;
+
+ if (!isVisible) {
+ return null;
+ }
+
+ if (name === 'book') {
+ return (
+
+ {extendedTitle}
+
+ );
+ }
+
+ if (name === 'edition') {
+ return (
+
+
+
+ );
+ }
+
+ return null;
+ })
+ }
+
+
+ );
+ }
+}
+
+SelectEditionRow.propTypes = {
+ id: PropTypes.number.isRequired,
+ matchedEditionId: PropTypes.number.isRequired,
+ title: PropTypes.string.isRequired,
+ disambiguation: PropTypes.string.isRequired,
+ editions: PropTypes.arrayOf(PropTypes.object).isRequired,
+ onEditionSelect: PropTypes.func.isRequired,
+ columns: PropTypes.arrayOf(PropTypes.object).isRequired
+};
+
+export default SelectEditionRow;
diff --git a/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js b/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js
index bd382a37e..e6090baf5 100644
--- a/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js
+++ b/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js
@@ -23,6 +23,7 @@ import TableBody from 'Components/Table/TableBody';
import SelectQualityModal from 'InteractiveImport/Quality/SelectQualityModal';
import SelectAuthorModal from 'InteractiveImport/Author/SelectAuthorModal';
import SelectBookModal from 'InteractiveImport/Book/SelectBookModal';
+import SelectEditionModal from 'InteractiveImport/Edition/SelectEditionModal';
import ConfirmImportModal from 'InteractiveImport/Confirmation/ConfirmImportModal';
import InteractiveImportRow from './InteractiveImportRow';
import styles from './InteractiveImportModalContent.css';
@@ -79,6 +80,7 @@ const importModeOptions = [
const SELECT = 'select';
const AUTHOR = 'author';
const BOOK = 'book';
+const EDITION = 'edition';
const QUALITY = 'quality';
const replaceExistingFilesOptions = {
@@ -112,7 +114,7 @@ class InteractiveImportModalContent extends Component {
const selectedItems = _.filter(this.props.items, (x) => _.includes(selectedIds, x.id));
const inconsistent = _(selectedItems)
- .map((x) => ({ bookId: x.book ? x.book.id : 0, releaseId: x.bookReleaseId }))
+ .map((x) => ({ bookId: x.book ? x.book.id : 0, releaseId: x.EditionId }))
.groupBy('bookId')
.mapValues((book) => _(book).groupBy((x) => x.releaseId).values().value().length)
.values()
@@ -273,6 +275,7 @@ class InteractiveImportModalContent extends Component {
const bulkSelectOptions = [
{ key: SELECT, value: 'Select...', disabled: true },
{ key: BOOK, value: 'Select Book' },
+ { key: EDITION, value: 'Select Edition' },
{ key: QUALITY, value: 'Select Quality' }
];
@@ -469,6 +472,13 @@ class InteractiveImportModalContent extends Component {
onModalClose={this.onSelectModalClose}
/>
+ x.album).groupBy((x) => x.book.id).mapValues((x) => x.map((y) => y.id)).value()}
+ books={_.chain(items).filter((x) => x.book).keyBy((x) => x.book.id).mapValues((x) => ({ matchedEditionId: x.editionId, book: x.book })).values().value()}
+ onModalClose={this.onSelectModalClose}
+ />
+
diff --git a/frontend/src/Search/Author/AddNewAuthorSearchResult.js b/frontend/src/Search/Author/AddNewAuthorSearchResult.js
index df837fe73..fd74959ec 100644
--- a/frontend/src/Search/Author/AddNewAuthorSearchResult.js
+++ b/frontend/src/Search/Author/AddNewAuthorSearchResult.js
@@ -3,6 +3,7 @@ import React, { Component } from 'react';
import TextTruncate from 'react-text-truncate';
import dimensions from 'Styles/Variables/dimensions';
import fonts from 'Styles/Variables/fonts';
+import stripHtml from 'Utilities/String/stripHtml';
import { icons, kinds, sizes } from 'Helpers/Props';
import HeartRating from 'Components/HeartRating';
import Icon from 'Components/Icon';
@@ -69,12 +70,10 @@ class AddNewAuthorSearchResult extends Component {
render() {
const {
foreignAuthorId,
- goodreadsId,
titleSlug,
authorName,
year,
disambiguation,
- authorType,
status,
overview,
ratings,
@@ -89,7 +88,7 @@ class AddNewAuthorSearchResult extends Component {
const linkProps = isExistingAuthor ? { to: `/author/${titleSlug}` } : { onPress: this.onPress };
- const endedString = authorType === 'Person' ? 'Deceased' : 'Ended';
+ const endedString = 'Deceased';
const height = calculateHeight(230, isSmallScreen);
@@ -143,7 +142,7 @@ class AddNewAuthorSearchResult extends Component {
-
-
{
- authorType ?
+ ratings.votes > 0 ?
:
null
}
@@ -191,7 +186,7 @@ class AddNewAuthorSearchResult extends Component {
@@ -214,12 +209,10 @@ class AddNewAuthorSearchResult extends Component {
AddNewAuthorSearchResult.propTypes = {
foreignAuthorId: PropTypes.string.isRequired,
- goodreadsId: PropTypes.number.isRequired,
titleSlug: PropTypes.string.isRequired,
authorName: PropTypes.string.isRequired,
year: PropTypes.number,
disambiguation: PropTypes.string,
- authorType: PropTypes.string,
status: PropTypes.string.isRequired,
overview: PropTypes.string,
ratings: PropTypes.object.isRequired,
diff --git a/frontend/src/Search/Book/AddNewBookModalContent.js b/frontend/src/Search/Book/AddNewBookModalContent.js
index 8a612c10b..e540fe7c6 100644
--- a/frontend/src/Search/Book/AddNewBookModalContent.js
+++ b/frontend/src/Search/Book/AddNewBookModalContent.js
@@ -1,6 +1,7 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import TextTruncate from 'react-text-truncate';
+import stripHtml from 'Utilities/String/stripHtml';
import { kinds } from 'Helpers/Props';
import SpinnerButton from 'Components/Link/SpinnerButton';
import CheckInput from 'Components/Form/CheckInput';
@@ -93,7 +94,7 @@ class AddNewBookModalContent extends Component {