From faf8f2b1a5f3cef87ad41f357ddd712abee04772 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sun, 26 Dec 2021 18:44:50 +0100
Subject: [PATCH 1/6] fix: load the list tasks only after the list itself was
 loaded

---
 src/components/home/contentAuth.vue |  5 +++++
 src/views/list/ShowList.vue         | 20 ++++++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/components/home/contentAuth.vue b/src/components/home/contentAuth.vue
index d3f0dc8a9..d4dd9a457 100644
--- a/src/components/home/contentAuth.vue
+++ b/src/components/home/contentAuth.vue
@@ -165,6 +165,11 @@ store.dispatch('labels/loadAllLabels')
   .app-content {
     padding: $navbar-height + 1.5rem 1.5rem 1rem 1.5rem;
     z-index: 2;
+	  
+	// Used to make sure the spinner is always in the middle while loading
+	> .loader-container {
+	  min-height: calc(100vh -  #{$navbar-height + 1.5rem + 1rem});
+	}
 
     @media screen and (max-width: $tablet) {
       margin-left: 0;
diff --git a/src/views/list/ShowList.vue b/src/views/list/ShowList.vue
index d0c1d20fe..ec02d7dc1 100644
--- a/src/views/list/ShowList.vue
+++ b/src/views/list/ShowList.vue
@@ -41,17 +41,17 @@
 			</message>
 		</transition>
 
-		<router-view/>
+		<router-view v-if="listLoaded"/>
 	</div>
 </template>
 
 <script>
 import Message from '@/components/misc/message'
-import ListModel from '../../models/list'
-import ListService from '../../services/list'
-import {CURRENT_LIST} from '../../store/mutation-types'
-import {getListView} from '../../helpers/saveListView'
-import {saveListToHistory} from '../../modules/listHistory'
+import ListModel from '@/models/list'
+import ListService from '@/services/list'
+import {CURRENT_LIST, BACKGROUND} from '@/store/mutation-types'
+import {getListView} from '@/helpers/saveListView'
+import {saveListToHistory} from '@/modules/listHistory'
 
 export default {
 	components: {Message},
@@ -96,6 +96,7 @@ export default {
 				return
 			}
 
+			this.listLoaded = 0
 			const listData = {id: parseInt(this.$route.params.listId)}
 
 			saveListToHistory(listData)
@@ -144,6 +145,13 @@ export default {
 			}
 
 			console.debug(`Loading list, $route.name = ${this.$route.name}, $route.params =`, this.$route.params, `, listLoaded = ${this.listLoaded}, currentList = `, this.currentList)
+			
+			// Put set the current list to the one we're about to load so that the title is already shown at the top
+			const listFromStore = this.$store.getters['lists/getListById'](listData.id)
+			if (listFromStore !== null) {
+				this.$store.commit(BACKGROUND, null)
+				this.$store.commit(CURRENT_LIST, listFromStore)
+			}
 
 			// We create an extra list object instead of creating it in this.list because that would trigger a ui update which would result in bad ux.
 			const list = new ListModel(listData)
-- 
2.40.1


From fc6201613079cef2c3f6773e8238dfa900ebd85d Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sun, 26 Dec 2021 18:49:56 +0100
Subject: [PATCH 2/6] fix: replacing list view

---
 src/views/list/ShowList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/list/ShowList.vue b/src/views/list/ShowList.vue
index ec02d7dc1..56c8831fc 100644
--- a/src/views/list/ShowList.vue
+++ b/src/views/list/ShowList.vue
@@ -96,7 +96,6 @@ export default {
 				return
 			}
 
-			this.listLoaded = 0
 			const listData = {id: parseInt(this.$route.params.listId)}
 
 			saveListToHistory(listData)
@@ -147,6 +146,7 @@ export default {
 			console.debug(`Loading list, $route.name = ${this.$route.name}, $route.params =`, this.$route.params, `, listLoaded = ${this.listLoaded}, currentList = `, this.currentList)
 			
 			// Put set the current list to the one we're about to load so that the title is already shown at the top
+			this.listLoaded = 0
 			const listFromStore = this.$store.getters['lists/getListById'](listData.id)
 			if (listFromStore !== null) {
 				this.$store.commit(BACKGROUND, null)
-- 
2.40.1


From 9c1464381c433fda65b6c1f6e31f7daf676a1ed9 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sun, 26 Dec 2021 19:08:18 +0100
Subject: [PATCH 3/6] fix: lint

---
 src/components/home/contentAuth.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/home/contentAuth.vue b/src/components/home/contentAuth.vue
index d4dd9a457..a205b6e5a 100644
--- a/src/components/home/contentAuth.vue
+++ b/src/components/home/contentAuth.vue
@@ -165,10 +165,10 @@ store.dispatch('labels/loadAllLabels')
   .app-content {
     padding: $navbar-height + 1.5rem 1.5rem 1rem 1.5rem;
     z-index: 2;
-	  
+
 	// Used to make sure the spinner is always in the middle while loading
 	> .loader-container {
-	  min-height: calc(100vh -  #{$navbar-height + 1.5rem + 1rem});
+      min-height: calc(100vh -  #{$navbar-height + 1.5rem + 1rem});
 	}
 
     @media screen and (max-width: $tablet) {
-- 
2.40.1


From d723644ff26a2ca7f736b6681f5d1ad80f0d5577 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sun, 27 Mar 2022 18:38:25 +0200
Subject: [PATCH 4/6] feat: only load tasks after the list was fully loaded

---
 src/views/list/ListWrapper.vue | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/views/list/ListWrapper.vue b/src/views/list/ListWrapper.vue
index 9b3911a7c..cac6e54b0 100644
--- a/src/views/list/ListWrapper.vue
+++ b/src/views/list/ListWrapper.vue
@@ -42,7 +42,7 @@
 			</Message>
 		</transition>
 
-		<slot />
+		<slot v-if="loadedListId"/>
 	</div>
 </template>
 
@@ -55,12 +55,12 @@ import Message from '@/components/misc/message.vue'
 import ListModel from '@/models/list'
 import ListService from '@/services/list'
 
-import {store} from '@/store'
-import {CURRENT_LIST} from '@/store/mutation-types'
+import {BACKGROUND, CURRENT_LIST} from '@/store/mutation-types'
 
 import {getListTitle} from '@/helpers/getListTitle'
 import {saveListToHistory} from '@/modules/listHistory'
-import { useTitle } from '@/composables/useTitle'
+import {useTitle} from '@/composables/useTitle'
+import {useStore} from 'vuex'
 
 const props = defineProps({
 	listId: {
@@ -74,6 +74,7 @@ const props = defineProps({
 })
 
 const route = useRoute()
+const store = useStore()
 
 const listService = shallowRef(new ListService())
 const loadedListId = ref(0)
@@ -87,7 +88,7 @@ const currentList = computed(() => {
 	} : store.state.currentList
 })
 
-// call again the method if the listId changes
+// call the method again if the listId changes
 watchEffect(() => loadList(props.listId))
 
 useTitle(() => currentList.value.id ? getListTitle(currentList.value) : '')
@@ -123,6 +124,14 @@ async function loadList(listIdToLoad: number) {
 
 	console.debug(`Loading list, props.viewName = ${props.viewName}, $route.params =`, route.params, `, loadedListId = ${loadedListId.value}, currentList = `, currentList.value)
 
+	// Put set the current list to the one we're about to load so that the title is already shown at the top
+	loadedListId.value = 0
+	const listFromStore = store.getters['lists/getListById'](listData.id)
+	if (listFromStore !== null) {
+		store.commit(BACKGROUND, null)
+		store.commit(CURRENT_LIST, listFromStore)
+	}
+
 	// We create an extra list object instead of creating it in list.value because that would trigger a ui update which would result in bad ux.
 	const list = new ListModel(listData)
 	try {
-- 
2.40.1


From 1b54debb9b05d18e4b4e816bdb420b0658c6ac96 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sun, 27 Mar 2022 18:39:11 +0200
Subject: [PATCH 5/6] fix: loading indicator while loading the list

---
 src/views/list/ListWrapper.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/list/ListWrapper.vue b/src/views/list/ListWrapper.vue
index cac6e54b0..50bd1e65d 100644
--- a/src/views/list/ListWrapper.vue
+++ b/src/views/list/ListWrapper.vue
@@ -76,7 +76,7 @@ const props = defineProps({
 const route = useRoute()
 const store = useStore()
 
-const listService = shallowRef(new ListService())
+const listService = ref(new ListService())
 const loadedListId = ref(0)
 
 const currentList = computed(() => {
-- 
2.40.1


From 824f8cd9b148e03fb8ba6963987376052a0c0029 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sun, 27 Mar 2022 18:52:13 +0200
Subject: [PATCH 6/6] fix: lint

---
 src/views/list/ListWrapper.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/list/ListWrapper.vue b/src/views/list/ListWrapper.vue
index 50bd1e65d..b1cb68ba6 100644
--- a/src/views/list/ListWrapper.vue
+++ b/src/views/list/ListWrapper.vue
@@ -47,7 +47,7 @@
 </template>
 
 <script setup lang="ts">
-import {ref, shallowRef, computed, watchEffect} from 'vue'
+import {ref, computed, watchEffect} from 'vue'
 import {useRoute} from 'vue-router'
 
 import Message from '@/components/misc/message.vue'
-- 
2.40.1