Merge pull request #7 from wells/v1.1.3-dev

v1.1.3 dev

public/build/rev-manifest.json

@@ -1,4 +1,4 @@
 {
   "css/app.css": "css/app-c6da92f35b.css",
-  "js/app.js": "js/app-1943400d38.js"
+  "js/app.js": "js/app-3a65e013a6.js"
 }

resources/assets/js/components/Movies.vue

@@ -111,30 +111,31 @@ export default {
       'loadingRoute'
     ]),
 
-    fetchData: function (payloadUrl) {
-      if(! payloadUrl) {
-        payloadUrl = '/api/movies' + this.$store.state.filters.queryMovies
-      }
+    fetchData: _.debounce(
+      function (payloadUrl) {
+        if(! payloadUrl) {
+          payloadUrl = '/api/movies' + this.$store.state.filters.queryMovies
+        }
 
-      let payload = {
-        url: payloadUrl
-      }
+        let payload = {
+          url: payloadUrl
+        }
 
-      this.getMovies(payload)
-    },
+        this.getMovies(payload)
+      }, 
+      250
+    ),
 
     filterMovieGenres: function (event) {
       this.filterGenres(event)
       this.fetchData()
     },
 
-    filterMovieKeywords: _.debounce(
-      function (event) {
-        this.filterKeywords(event)
-        this.fetchData()
-      }, 
-      250
-    ),
+    filterMovieKeywords: function (event) {
+      let self = this
+      this.filterKeywords(event)
+      this.fetchData()
+    },
 
     filterMovieOrder: function (event) {
       this.filterOrder(event)

resources/assets/js/components/Shows.vue

@@ -111,30 +111,30 @@ export default {
       'loadingRoute'
     ]),
 
-    fetchData: function (payloadUrl) {
-      if(! payloadUrl) {
-        payloadUrl = '/api/shows' + this.$store.state.filters.queryShows
-      }
+    fetchData: _.debounce(
+      function (payloadUrl) {
+        if(! payloadUrl) {
+          payloadUrl = '/api/shows' + this.$store.state.filters.queryShows
+        }
 
-      let payload = {
-        url: payloadUrl
-      }
+        let payload = {
+          url: payloadUrl
+        }
 
-      this.getShows(payload)
-    },
+        this.getShows(payload)
+      }, 
+      250
+    ),
 
     filterShowGenres: function (event) {
       this.filterGenres(event)
       this.fetchData()
     },
 
-    filterShowKeywords: _.debounce(
-      function (event) {
-        this.filterKeywords(event)
-        this.fetchData()
-      },
-      250
-    ),
+    filterShowKeywords: function (event) {
+      this.filterKeywords(event)
+      this.fetchData()
+    },
 
     filterShowOrder: function (event) {
       this.filterOrder(event)

resources/assets/js/vuex/helpers.js

@@ -8,20 +8,29 @@ export function addRecords (records, newRecords, type) {
   })
 }
 
-export function addRecord (records, newRecord, type) {
+export function addRecord (records, newRecord, type, callback) {
   if(!newRecord || newRecord.type != type) {
     return
   }
 
   // Find record index (if any)
   let index = records.findIndex(r => r.id == newRecord.id)
 
-  // Update record
-  if (index !== -1) {
-    records[index] = newRecord
+  // Add record
+  if (index == -1) {
+    records.push(newRecord)
     return
   }
 
-  // Add record
-  records.push(newRecord)
-}
+  // Update record with callback
+  if (callback) {
+    records[index].attributes = newRecord.attributes
+    records[index].links = newRecord.links
+
+    callback(records[index], newRecord)
+    return
+  }
+
+  // Replace record
+  records.splice(index, 1, newRecord)
+}

resources/assets/js/vuex/modules/movies.js

@@ -25,7 +25,7 @@ export default {
       state.links = links
     },
     [types.ADD_MOVIE] (state, movie) {
-      addRecord(state.all, movie, 'movies')
+      addRecord(state.all, movie, 'movies', updateRelationships)
     },
     [types.ADD_MOVIES] (state, movies) {
       addRecords(state.all, movies, 'movies')
@@ -123,3 +123,20 @@ export default {
     }
   }
 }
+
+function updateRelationships (record, movie) {
+  if(!movie.relationships) {
+    return
+  }
+  record.relationships.backdrops = movie.relationships.backdrops ? 
+    movie.relationships.backdrops : record.relationships.backdrops
+  record.relationships.genres = movie.relationships.genres ? 
+    movie.relationships.genres : record.relationships.genres
+  record.relationships.posters = movie.relationships.posters ? 
+    movie.relationships.posters : record.relationships.posters
+  record.relationships.results = movie.relationships.results ? 
+    movie.relationships.results : record.relationships.results
+  record.relationships.views = movie.relationships.views ? 
+    movie.relationships.views : record.relationships.views
+}
+

resources/assets/js/vuex/modules/shows.js

@@ -25,7 +25,7 @@ export default {
       state.links = links
     },
     [types.ADD_SHOW] (state, show) {
-      addRecord(state.all, show, 'shows')
+      addRecord(state.all, show, 'shows', updateRelationships)
     },
     [types.ADD_SHOWS] (state, shows) {
       addRecords(state.all, shows, 'shows')
@@ -126,3 +126,21 @@ export default {
     }
   }
 }
+
+function updateRelationships (record, show) {
+  if(!show.relationships) {
+    return
+  }
+  record.relationships.backdrops = show.relationships.backdrops ? 
+    show.relationships.backdrops : record.relationships.backdrops
+  record.relationships.genres = show.relationships.genres ? 
+    show.relationships.genres : record.relationships.genres
+  record.relationships.posters = show.relationships.posters ? 
+    show.relationships.posters : record.relationships.posters
+  record.relationships.results = show.relationships.results ? 
+    show.relationships.results : record.relationships.results
+  record.relationships.seasons = show.relationships.seasons ? 
+    show.relationships.seasons : record.relationships.seasons
+  record.relationships.views = show.relationships.views ? 
+    show.relationships.views : record.relationships.views
+}