Small Reduction of compelxity in TracksResults

AnneHalliwell · Jan 30, 2019 · c5bba5f · c5bba5f
1 parent 9c3a803
commit c5bba5f
Showing 1 changed file with 18 additions and 33 deletions.
diff --git a/app/components/SearchResults/TracksResults/index.js b/app/components/SearchResults/TracksResults/index.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import _ from 'lodash';
 
 import TrackRow from '../../TrackRow';
 
@@ -17,44 +18,28 @@ class TracksResults extends React.Component {
         <table>
           <tbody>
             {(collection || []).slice(0, limit).map((track, index) => {
-
-              if (track) {
-                if (track.name && track.image && track.artist) {
-                  if (!track.artist.name) {
-                    track.artist = { name: track.artist };
-                  }
-
-                  return < TrackRow
-                    key={'search-result-track-row-' + index}
-                    track={track}
-                    index={'popular-track-' + index}
-                    clearQueue={this.props.clearQueue}
-                    addToQueue={this.props.addToQueue}
-                    startPlayback={this.props.startPlayback}
-                    selectSong={this.props.selectSong}
-                    musicSources={this.props.musicSources}
-                    displayArtist={true}
-                    displayDuration={false}
-                    displayPlayCount={false}
-                    displayCover={true}
-                  />;
+              if (track && _.hasIn(track, 'name') & _.hasIn(track, 'image') && _.hasIn(track, 'artist')) {
+                if (!track.artist.name) {
+                  track.artist = { name: track.artist };
                 }
-
+                return < TrackRow
+                  key={'search-result-track-row-' + index}
+                  track={track}
+                  index={'popular-track-' + index}
+                  clearQueue={this.props.clearQueue}
+                  addToQueue={this.props.addToQueue}
+                  startPlayback={this.props.startPlayback}
+                  selectSong={this.props.selectSong}
+                  musicSources={this.props.musicSources}
+                  displayArtist={true}
+                  displayDuration={false}
+                  displayPlayCount={false}
+                  displayCover={true}
+                />;
               }
             })}
           </tbody>
         </table>
-        /* <div className={styles.popular_tracks_container}>
-          {(collection || []).slice(0, limit).map((track, i) => {
-            if (track) {
-              if (track.name && track.image && track.artist) {
-                {
-                  return this.renderTrack(track, i);
-                }
-              }
-            }
-          })}
-        </div>*/
       );
     }
   }