Give pending entities BBIDs and treat them the same way as regular entities

sql/migrations/import/down.sql

@@ -7,13 +7,21 @@ DROP VIEW IF EXISTS bookbrainz.publisher_import;
 DROP VIEW IF EXISTS bookbrainz.series_import;
 DROP VIEW IF EXISTS bookbrainz.work_import;
 
+-- Only drop these tables if the database contains no pending imports!
 DROP TABLE IF EXISTS bookbrainz.author_import_header;
 DROP TABLE IF EXISTS bookbrainz.edition_import_header;
 DROP TABLE IF EXISTS bookbrainz.edition_group_import_header;
 DROP TABLE IF EXISTS bookbrainz.publisher_import_header;
 DROP TABLE IF EXISTS bookbrainz.series_import_header;
 DROP TABLE IF EXISTS bookbrainz.work_import_header;
 DROP TABLE IF EXISTS bookbrainz.discard_votes;
+DROP TABLE IF EXISTS bookbrainz.import_metadata;
+DROP TABLE IF EXISTS bookbrainz.external_source;
+
+-- Only drop this column if the database contains no pending imports!
+ALTER TABLE entity DROP COLUMN IF EXISTS is_import;
+
+-- Legacy tables from an earlier version of the import schema.
 DROP TABLE IF EXISTS bookbrainz.link_import;
 DROP TABLE IF EXISTS bookbrainz.origin_source;
 DROP TABLE IF EXISTS bookbrainz.import;

src/client/components/pages/entities/author.js

@@ -31,6 +31,7 @@ import EntityRelatedCollections from './related-collections';
 import EntityReviews from './cb-review';
 import EntityTitle from './title';
 import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
+import ImportFooter from '../import-entities/footer';
 import PropTypes from 'prop-types';
 import WikipediaExtract from './wikipedia-extract';
 import {kebabCase as _kebabCase} from 'lodash';
@@ -42,7 +43,7 @@ const {deletedEntityMessage, extractAttribute, getTypeAttribute, getEntityUrl,
 	ENTITY_TYPE_ICONS, getSortNameOfDefaultAlias, transformISODateForDisplay} = entityHelper;
 const {Button, Col, Row} = bootstrap;
 
-export function AuthorAttributes({author}) {
+function AuthorAttributes({author}) {
 	if (author.deleted) {
 		return deletedEntityMessage;
 	}
@@ -130,6 +131,8 @@ function AuthorDisplayPage({entity, identifierTypes, user, wikipediaExtract}) {
 		reviewsRef.current.handleClick();
 	}, [reviewsRef]);
 
+	const {importMetadata} = entity;
+	const isImport = !entity.revision;
 	const urlPrefix = getEntityUrl(entity);
 	const editions = [];
 	if (entity?.authorCredits) {
@@ -163,20 +166,21 @@ function AuthorDisplayPage({entity, identifierTypes, user, wikipediaExtract}) {
 				<React.Fragment>
 					<Row>
 						<Col lg={8}>
-							<EditionTable editions={editions} entity={entity}/>
+							<EditionTable editions={editions} entity={entity} showAdd={!isImport}/>
 							<EntityLinks
 								entity={entity}
 								identifierTypes={identifierTypes}
 								urlPrefix={urlPrefix}
 							/>
 							<EntityRelatedCollections collections={entity.collections}/>
-							<Button
-								className="margin-top-d15"
-								href={`/work/create?${_kebabCase(entity.type)}=${entity.bbid}`}
-								variant="success"
-							>
-								<FontAwesomeIcon className="margin-right-0-5" icon={faPlus}/>Add Work
-							</Button>
+							{!isImport &&
+								<Button
+									className="margin-top-d15"
+									href={`/work/create?${_kebabCase(entity.type)}=${entity.bbid}`}
+									variant="success"
+								>
+									<FontAwesomeIcon className="margin-right-0-5" icon={faPlus}/>Add Work
+								</Button>}
 						</Col>
 						<Col lg={4}>
 							<EntityReviews
@@ -190,23 +194,32 @@ function AuthorDisplayPage({entity, identifierTypes, user, wikipediaExtract}) {
 					</Row>
 				</React.Fragment>}
 			<hr className="margin-top-d40"/>
-			<EntityFooter
-				bbid={entity.bbid}
-				deleted={entity.deleted}
-				entityType={entity.type}
-				entityUrl={urlPrefix}
-				lastModified={entity.revision.revision.createdAt}
-				user={user}
-			/>
-			{!entity.deleted && <CBReviewModal
+			{importMetadata ?
+				<ImportFooter
+					hasVoted={importMetadata.userHasVoted}
+					importUrl={urlPrefix}
+					importedAt={importMetadata.importedAt}
+					source={importMetadata.source}
+					type={entity.type}
+				/> :
+				<EntityFooter
+					bbid={entity.bbid}
+					deleted={entity.deleted}
+					entityType={entity.type}
+					entityUrl={urlPrefix}
+					lastModified={entity.revision.revision.createdAt}
+					user={user}
+				/>}
+			{!entity.deleted && !isImport &&
+			<CBReviewModal
 				entityBBID={entity.bbid}
 				entityName={entity.defaultAlias.name}
 				entityType={entity.type}
 				handleModalToggle={handleModalToggle}
 				handleUpdateReviews={handleUpdateReviews}
 				showModal={showCBReviewModal}
 				userId={user?.id}
-			                    />}
+			/>}
 		</div>
 	);
 }

src/client/components/pages/entities/edition-group.js

@@ -31,14 +31,15 @@ import EntityLinks from './links';
 import EntityRelatedCollections from './related-collections';
 import EntityReviews from './cb-review';
 import EntityTitle from './title';
+import ImportFooter from '../import-entities/footer';
 import PropTypes from 'prop-types';
 import WikipediaExtract from './wikipedia-extract';
 
 
 const {deletedEntityMessage, getTypeAttribute, getEntityUrl, ENTITY_TYPE_ICONS, getSortNameOfDefaultAlias} = entityHelper;
 const {Col, Row} = bootstrap;
 
-export function EditionGroupAttributes({editionGroup}) {
+function EditionGroupAttributes({editionGroup}) {
 	if (editionGroup.deleted) {
 		return deletedEntityMessage;
 	}
@@ -91,6 +92,8 @@ function EditionGroupDisplayPage({entity, identifierTypes, user, wikipediaExtrac
 		reviewsRef.current.handleClick();
 	}, [reviewsRef]);
 
+	const {importMetadata} = entity;
+	const isImport = !entity.revision;
 	const urlPrefix = getEntityUrl(entity);
 	const hasAuthorCredits = entity.creditSection;
 
@@ -137,7 +140,7 @@ function EditionGroupDisplayPage({entity, identifierTypes, user, wikipediaExtrac
 			<EntityAnnotation entity={entity}/>
 			{!entity.deleted &&
 			<React.Fragment>
-				<EditionTable editions={entity.editions} entity={entity}/>
+				<EditionTable editions={entity.editions} entity={entity} showAdd={!isImport}/>
 				<Row>
 					<Col lg={8}>
 						<EntityLinks
@@ -160,23 +163,32 @@ function EditionGroupDisplayPage({entity, identifierTypes, user, wikipediaExtrac
 				</Row>
 			</React.Fragment>}
 			<hr className="margin-top-d40"/>
-			<EntityFooter
-				bbid={entity.bbid}
-				deleted={entity.deleted}
-				entityType={entity.type}
-				entityUrl={urlPrefix}
-				lastModified={entity.revision.revision.createdAt}
-				user={user}
-			/>
-			{!entity.deleted && <CBReviewModal
+			{importMetadata ?
+				<ImportFooter
+					hasVoted={importMetadata.userHasVoted}
+					importUrl={urlPrefix}
+					importedAt={importMetadata.importedAt}
+					source={importMetadata.source}
+					type={entity.type}
+				/> :
+				<EntityFooter
+					bbid={entity.bbid}
+					deleted={entity.deleted}
+					entityType={entity.type}
+					entityUrl={urlPrefix}
+					lastModified={entity.revision.revision.createdAt}
+					user={user}
+				/>}
+			{!entity.deleted && !isImport &&
+			<CBReviewModal
 				entityBBID={entity.bbid}
 				entityName={entity.defaultAlias.name}
 				entityType={entity.type}
 				handleModalToggle={handleModalToggle}
 				handleUpdateReviews={handleUpdateReviews}
 				showModal={showCBReviewModal}
 				userId={user?.id}
-			                    />}
+			/>}
 		</div>
 	);
 }

src/client/components/pages/entities/edition.js

@@ -26,6 +26,7 @@ import EntityLinks from './links';
 import EntityRelatedCollections from './related-collections';
 import EntityTitle from './title';
 import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
+import ImportFooter from '../import-entities/footer';
 import PropTypes from 'prop-types';
 import React from 'react';
 import WikipediaExtract from './wikipedia-extract';
@@ -39,7 +40,7 @@ const {
 } = entityHelper;
 const {Col, Row} = bootstrap;
 
-export function EditionAttributes({edition}) {
+function EditionAttributes({edition}) {
 	if (edition.deleted) {
 		return deletedEntityMessage;
 	}
@@ -108,6 +109,8 @@ EditionAttributes.propTypes = {
 
 
 function EditionDisplayPage({entity, identifierTypes, user, wikipediaExtract}) {
+	const {importMetadata} = entity;
+	const isImport = !entity.revision;
 	// relationshipTypeId = 10 refers the relation (<Work> is contained by <Edition>)
 	const relationshipTypeId = 10;
 	const worksContainedByEdition = getRelationshipTargetByTypeId(entity, relationshipTypeId);
@@ -152,6 +155,7 @@ function EditionDisplayPage({entity, identifierTypes, user, wikipediaExtract}) {
 			</div>
 		);
 	}
+
 	return (
 		<div>
 			<Row className="entity-display-background">
@@ -176,6 +180,7 @@ function EditionDisplayPage({entity, identifierTypes, user, wikipediaExtract}) {
 			<React.Fragment>
 				<WorksTable
 					entity={entity}
+					showAdd={!isImport}
 					works={worksContainedByEditionWithAuthors}
 				/>
 				<EntityLinks
@@ -186,14 +191,22 @@ function EditionDisplayPage({entity, identifierTypes, user, wikipediaExtract}) {
 				<EntityRelatedCollections collections={entity.collections}/>
 			</React.Fragment>}
 			<hr className="margin-top-d40"/>
-			<EntityFooter
-				bbid={entity.bbid}
-				deleted={entity.deleted}
-				entityType={entity.type}
-				entityUrl={urlPrefix}
-				lastModified={entity.revision.revision.createdAt}
-				user={user}
-			/>
+			{importMetadata ?
+				<ImportFooter
+					hasVoted={importMetadata.userHasVoted}
+					importUrl={urlPrefix}
+					importedAt={importMetadata.importedAt}
+					source={importMetadata.source}
+					type={entity.type}
+				/> :
+				<EntityFooter
+					bbid={entity.bbid}
+					deleted={entity.deleted}
+					entityType={entity.type}
+					entityUrl={urlPrefix}
+					lastModified={entity.revision.revision.createdAt}
+					user={user}
+				/>}
 		</div>
 	);
 }

src/client/components/pages/entities/publisher.js

@@ -25,6 +25,7 @@ import EntityImage from './image';
 import EntityLinks from './links';
 import EntityRelatedCollections from './related-collections';
 import EntityTitle from './title';
+import ImportFooter from '../import-entities/footer';
 import PropTypes from 'prop-types';
 import React from 'react';
 import WikipediaExtract from './wikipedia-extract';
@@ -34,7 +35,7 @@ const {deletedEntityMessage, extractAttribute, getTypeAttribute, getEntityUrl,
 	ENTITY_TYPE_ICONS, getSortNameOfDefaultAlias, transformISODateForDisplay} = entityHelper;
 const {Col, Row} = bootstrap;
 
-export function PublisherAttributes({publisher}) {
+function PublisherAttributes({publisher}) {
 	if (publisher.deleted) {
 		return deletedEntityMessage;
 	}
@@ -83,6 +84,8 @@ PublisherAttributes.propTypes = {
 
 
 function PublisherDisplayPage({entity, identifierTypes, user, wikipediaExtract}) {
+	const {importMetadata} = entity;
+	const isImport = !entity.revision;
 	const urlPrefix = getEntityUrl(entity);
 	return (
 		<div>
@@ -103,7 +106,7 @@ function PublisherDisplayPage({entity, identifierTypes, user, wikipediaExtract})
 			<EntityAnnotation entity={entity}/>
 			{!entity.deleted &&
 			<React.Fragment>
-				<EditionTable showAuthorCreditsColumn editions={entity.editions} entity={entity}/>
+				<EditionTable showAuthorCreditsColumn editions={entity.editions} entity={entity} showAdd={!isImport}/>
 				<EntityLinks
 					entity={entity}
 					identifierTypes={identifierTypes}
@@ -112,14 +115,22 @@ function PublisherDisplayPage({entity, identifierTypes, user, wikipediaExtract})
 				<EntityRelatedCollections collections={entity.collections}/>
 			</React.Fragment>}
 			<hr className="margin-top-d40"/>
-			<EntityFooter
-				bbid={entity.bbid}
-				deleted={entity.deleted}
-				entityType={entity.type}
-				entityUrl={urlPrefix}
-				lastModified={entity.revision.revision.createdAt}
-				user={user}
-			/>
+			{importMetadata ?
+				<ImportFooter
+					hasVoted={importMetadata.userHasVoted}
+					importUrl={urlPrefix}
+					importedAt={importMetadata.importedAt}
+					source={importMetadata.source}
+					type={entity.type}
+				/> :
+				<EntityFooter
+					bbid={entity.bbid}
+					deleted={entity.deleted}
+					entityType={entity.type}
+					entityUrl={urlPrefix}
+					lastModified={entity.revision.revision.createdAt}
+					user={user}
+				/>}
 		</div>
 	);
 }

src/client/components/pages/entities/related-collections.js

@@ -51,7 +51,7 @@ function EntityRelatedCollections({collections}) {
 }
 EntityRelatedCollections.displayName = 'EntityRelatedCollections';
 EntityRelatedCollections.propTypes = {
-	collections: PropTypes.object.isRequired
+	collections: PropTypes.array.isRequired
 };
 
 export default EntityRelatedCollections;