Support for Artist Disambiguation and Type

frontend/src/AddArtist/AddNewArtist/AddNewArtistSearchResult.js

@@ -48,7 +48,8 @@ class AddNewArtistSearchResult extends Component {
       artistName,
       nameSlug,
       year,
-      network,
+      disambiguation,
+      artistType,
       status,
       overview,
       albumCount,
@@ -59,10 +60,10 @@ class AddNewArtistSearchResult extends Component {
     } = this.props;
 
     const linkProps = isExistingArtist ? { to: `/artist/${nameSlug}` } : { onPress: this.onPress };
-    let seasons = '1 Season';
+    let albums = '1 Album';
 
     if (albumCount > 1) {
-      seasons = `${albumCount} Seasons`;
+      albums = `${albumCount} Albums`;
     }
 
     return (
@@ -88,6 +89,11 @@ class AddNewArtistSearchResult extends Component {
                 <span className={styles.year}>({year})</span>
             }
 
+            {
+              !!disambiguation &&
+                <span className={styles.year}>({disambiguation})</span>
+            }
+
             {
               isExistingArtist &&
                 <Icon
@@ -108,16 +114,16 @@ class AddNewArtistSearchResult extends Component {
             </Label>
 
             {
-              !!network &&
+              !!artistType &&
                 <Label size={sizes.LARGE}>
-                  {network}
+                  {artistType}
                 </Label>
             }
 
             {
               !!albumCount &&
                 <Label size={sizes.LARGE}>
-                  {seasons}
+                  {albums}
                 </Label>
             }
 
@@ -156,7 +162,8 @@ AddNewArtistSearchResult.propTypes = {
   artistName: PropTypes.string.isRequired,
   nameSlug: PropTypes.string.isRequired,
   year: PropTypes.number,
-  network: PropTypes.string,
+  disambiguation: PropTypes.string,
+  artistType: PropTypes.string,
   status: PropTypes.string.isRequired,
   overview: PropTypes.string,
   albumCount: PropTypes.number,

frontend/src/AddArtist/ImportArtist/Import/SelectArtist/ImportArtistName.css

@@ -7,7 +7,7 @@
   margin-right: 5px;
 }
 
-.overview {
+.disambiguation {
   margin-right: 5px;
   color: $disabledColor;
 }

frontend/src/AddArtist/ImportArtist/Import/SelectArtist/ImportArtistName.js

@@ -7,6 +7,7 @@ import styles from './ImportArtistName.css';
 function ImportArtistName(props) {
   const {
     artistName,
+    disambiguation,
     // year,
     isExistingArtist
   } = props;
@@ -16,6 +17,9 @@ function ImportArtistName(props) {
       <div className={styles.artistName}>
         {artistName}
       </div>
+      <div className={styles.disambiguation}>
+        {disambiguation}
+      </div>
 
       {
         isExistingArtist &&
@@ -31,6 +35,7 @@ function ImportArtistName(props) {
 
 ImportArtistName.propTypes = {
   artistName: PropTypes.string.isRequired,
+  disambiguation: PropTypes.string,
   // year: PropTypes.number.isRequired,
   isExistingArtist: PropTypes.bool.isRequired
 };

frontend/src/AddArtist/ImportArtist/Import/SelectArtist/ImportArtistSearchResult.js

@@ -19,7 +19,7 @@ class ImportArtistSearchResult extends Component {
   render() {
     const {
       artistName,
-      // overview,
+      disambiguation,
       // year,
       isExistingArtist
     } = this.props;
@@ -31,7 +31,7 @@ class ImportArtistSearchResult extends Component {
       >
         <ImportArtistName
           artistName={artistName}
-          // overview={overview}
+          disambiguation={disambiguation}
           // year={year}
           isExistingArtist={isExistingArtist}
         />
@@ -43,7 +43,7 @@ class ImportArtistSearchResult extends Component {
 ImportArtistSearchResult.propTypes = {
   foreignArtistId: PropTypes.string.isRequired,
   artistName: PropTypes.string.isRequired,
-  // overview: PropTypes.string.isRequired,
+  disambiguation: PropTypes.string,
   // year: PropTypes.number.isRequired,
   isExistingArtist: PropTypes.bool.isRequired,
   onPress: PropTypes.func.isRequired

frontend/src/AddArtist/ImportArtist/Import/SelectArtist/ImportArtistSelectArtist.js

@@ -158,7 +158,7 @@ class ImportArtistSelectArtist extends Component {
             isPopulated && selectedArtist &&
               <ImportArtistName
                 artistName={selectedArtist.artistName}
-                overview={selectedArtist.overview}
+                disambiguation={selectedArtist.disambiguation}
                 // year={selectedArtist.year}
                 isExistingArtist={isExistingArtist}
               />
@@ -229,7 +229,7 @@ class ImportArtistSelectArtist extends Component {
                           key={item.foreignArtistId}
                           foreignArtistId={item.foreignArtistId}
                           artistName={item.artistName}
-                          // overview={item.overview}
+                          disambiguation={item.disambiguation}
                           // year={item.year}
                           onPress={this.onArtistSelect}
                         />