:bug: repacking titles with vuex state again | pass state to refactored helpers | #160

vue-theme/src/pages/list.vue

@@ -104,6 +104,12 @@ export default {
 
             if(shouldClear) {
                 this.$store.commit(`CLEAR_${this.pType.toUpperCase()}`)
+                
+                // Clear any state needed to track title inbetweens
+                const hasInbetweens = ['artist']
+                if(hasInbetweens.includes(this.type)) {
+                    this.$store.commit(`CLEAR_${this.pType.toUpperCase()}_SEEN`)
+                }
             }
 
             try {

vue-theme/src/store/modules/arrangements.js

@@ -3,11 +3,13 @@ import { sortTypes } from '../../utils/helpers'
 const _insertInBetweens = bySort => {
     const postListWithInBetweens = []
     Object.keys(bySort).forEach(term => {
-        postListWithInBetweens.push({ 
-            slug: term,
-            title: term,
-            inbetween: true
-        })
+        if(term) {
+            postListWithInBetweens.push({ 
+                slug: term,
+                title: term,
+                inbetween: true
+            })
+        }
         bySort[term].forEach(post => postListWithInBetweens.push(post))
     })
     return postListWithInBetweens
@@ -40,8 +42,7 @@ const _arrangeByType = postsList => {
     return flatPacked
 }
 
-let seenTitles = []
-const _arrangeByAlpha = postsList => {
+const _arrangeByAlpha = (postsList, seenTitles) => {
     const alphabet = [...'9abcdefghijklmnopqrstuvwxyz']
     const flatPacked = []
     
@@ -60,7 +61,6 @@ const _arrangeByAlpha = postsList => {
         storeTitle(alphabet[charaIndex])
         flatPacked.push(post)
     })
-    seenTitles = []
     return flatPacked
 }
 
@@ -75,7 +75,7 @@ const _arrangeByEpisode = postsList => {
     return flatPacked
 }
 
-const repackBySort = (postsList, sortedBy) => {
+const repackBySort = (postsList, sortedBy, seenTitles) => {
     let repacked = postsList
     if(sortedBy == sortTypes.material) {
         repacked = _arrangeByMaterial(postsList)
@@ -84,7 +84,7 @@ const repackBySort = (postsList, sortedBy) => {
     } else if(sortedBy == sortTypes.subtype) {
         repacked = _arrangeByType(postsList)
     } else if(sortedBy == sortTypes.alpha) {
-        repacked = _arrangeByAlpha(postsList)
+        repacked = _arrangeByAlpha(postsList, seenTitles)
     }
     return repacked
 }

vue-theme/src/store/modules/artist.js

@@ -6,6 +6,7 @@ const state = {
     all: [],
     loaded: false,
     singleArtist: null,
+    seenTitles: []
 }
 
 const getters = {
@@ -29,7 +30,7 @@ const actions = {
         const storeFetch = (artists => {
             let repacked = artists
             if(sortType == sortTypes.alpha) {
-                repacked = repackBySort(artists, sortType)
+                repacked = repackBySort(artists, sortType, state.seenTitles)
             }
             commit('ADD_TO_FETCHED_ARTISTS', { artists: repacked })
             commit('ARTISTS_LOADED', true)