:recycle: rearranging get page | ignoring pages in getPosts

vue-theme/src/pages/list.vue

@@ -116,15 +116,18 @@ export default {
             let dispatchAction = `getMore${this.pType}`
             let params = this._getDispatchParams()
             
-            // For episodes or material sort we grab EVERYTHING
+            // For episodes, or material sort we grab EVERYTHING
             if(this.type == 'episode' || this.type == 'artist' && this._getSortBy() == sortTypes.material) {
                 dispatchAction = `getAll${this.pType}`
                 params = this._getDispatchParams(-1)
+                
+                // Clear sortType if this is an episodes list
+                params.sortType = this.type == 'episode' ? null : params.sortType
             }
 
-            const ignore = ['getMorePages']
             let res = null
-            if(this.pType && !ignore.includes(dispatchAction) && this.keepFetching) {
+            // We always grab all pages on hero init so no need to do it here
+            if(this.pType && this.keepFetching && this.type != 'page') {
                 res = await this.$store.dispatch(dispatchAction, params)
             }
 
@@ -135,22 +138,21 @@ export default {
             }
             this.loadingFetched = false
         },
+        async getPageForType(type) {
+            await this._getAll('page', this.$store)
+            if(!this.allPages) return console.warn('no pages in state', this)
+            const page = this.allPages.filter(page => page.slug == `${type}s`)[0]
+            if(!page) return console.warn(`no page for ${type} found`)
+            return page
+        },
         // _setHeroInfo(post) {} from mixin
         // _clearHero(store) {} from mixin
         async checkAndSetHero(type) {
             this._clearHero(this.$store)
-
-            await this._getAll('page', this.$store)
-
+            const page = await this.getPageForType(type)
             // We always set a hero no matter what
             // Because the hero component will deal
             // with how to render based on hero.url
-            if(!this.allPages) return console.warn('no pages in state', this)
-            const page = this.allPages.filter(
-                page => page.slug == `${type}s`,
-            )[0]
-            if(!page) return console.warn(`no page for ${type} found`)
-
             this.$store.commit('SET_HERO', this._setHeroInfo(page))
         },
         setIntersectionLoader() {
@@ -163,9 +165,7 @@ export default {
             const onIntersect = (entries, observer) => {
                 entries.forEach(entry => {
                     if (!entry.isIntersecting || this.loadingFetched) return
-                    setTimeout(() => {
-                        this.loadMorePosts()
-                    }, TIMEOUT)
+                    setTimeout(() => this.loadMorePosts(), TIMEOUT)
                 })
             }
             this.observer = new IntersectionObserver(onIntersect, {
@@ -173,6 +173,8 @@ export default {
             })
             this.observer['_for_type'] = this.type
             this.observer.observe(footerEl)
+            console.log('--- observer')
+            console.log(this.observer)
         },
         unsetIntersectionLoader() {
             const footerEl = document.querySelector(INTERSECT_SELECTOR)
@@ -220,19 +222,8 @@ export default {
                 this.setIntersectionLoader()
             }
 
-            // Check if we changed sort method
-            // from no sort to sorted
-            // or sorted to no sort
-            // or sort to a different sort(?)
-            if(
-                from.fullPath.includes(this.sortBy) ||
-                (!to.fullPath.includes(this.sortBy) && !from.fullPath.includes(this.sortBy))
-            ) {
-                const ignore = ['event', 'exhibition', 'post']
-                if(ignore.includes(this.type)) return
-                console.log('init from $route watch...')
-                this.clearAndInitPostList()
-            }
+            console.log('init from $route watch...')
+            this.clearAndInitPostList()
         }
     },
     mounted() {