refactor(page): use helper when refetching list

lemredd · Nov 23, 2022 · 4089f75 · 4089f75
1 parent 2a7f65b
commit 4089f75
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 58 deletions.
diff --git a/pages/department/list.page.vue b/pages/department/list.page.vue
@@ -74,6 +74,7 @@ import PageCounter from "@/helpers/page_counter.vue"
 import TabbedPageHeader from "@/helpers/tabbed_page_header.vue"
 import ResourceManager from "@/resource_management/resource_manager.vue"
 import ReceivedErrors from "@/helpers/message_handlers/received_errors.vue"
+import refetchList from "@/resource_management/helpers/refetch_resource_list"
 import ResourceList from "@/resource_management/resource_manager/resource_list.vue"
 
 type RequiredExtraProps =
@@ -174,7 +175,7 @@ async function countUsersPerDepartment(IDsToCount: string[]) {
 	})
 }
 
-async function fetchDepartmentInfos(): Promise<number|void> {
+async function fetchDepartmentInfos(): Promise<void> {
 	isLoaded.value = false
 
 	await loadRemainingResource(list, fetcher, () => ({
@@ -207,16 +208,14 @@ const mayCreateDepartment = computed<boolean>(() => {
 	return isPermitted
 })
 
-async function refetchDepartment() {
-	list.value = {
-		"data": [],
-		"meta": {
-			"count": 0
-		}
-	}
-	receivedErrors.value = []
-
-	await fetchDepartmentInfos()
+function refetchDepartment() {
+	refetchList(
+		isLoaded,
+		list,
+		receivedErrors,
+		selectedIDs,
+		fetchDepartmentInfos
+	)
 }
 
 const debouncedResetList = debounce(refetchDepartment, DEBOUNCED_WAIT_DURATION)

diff --git a/pages/role/list.page.vue b/pages/role/list.page.vue
@@ -82,6 +82,7 @@ import TabbedPageHeader from "@/helpers/tabbed_page_header.vue"
 import ResourceManager from "@/resource_management/resource_manager.vue"
 import extractAllErrorDetails from "$@/helpers/extract_all_error_details"
 import ReceivedErrors from "@/helpers/message_handlers/received_errors.vue"
+import refetchList from "@/resource_management/helpers/refetch_resource_list"
 import ResourceList from "@/resource_management/resource_manager/resource_list.vue"
 
 type RequiredExtraProps =
@@ -178,7 +179,7 @@ async function countUsersPerRole(IDsToCount: string[]) {
 		}
 	})
 }
-async function fetchRoleInfos(): Promise<number|void> {
+async function fetchRoleInfos(): Promise<void> {
 	isLoaded.value = false
 
 	await loadRemainingResource(list, fetcher, () => ({
@@ -225,16 +226,14 @@ const mayEditRole = computed<boolean>(() => {
 	return isPermitted
 })
 
-async function refetchRoles() {
-	list.value = {
-		"data": [],
-		"meta": {
-			"count": 0
-		}
-	}
-	receivedErrors.value = []
-
-	await fetchRoleInfos()
+function refetchRoles() {
+	refetchList(
+		isLoaded,
+		list,
+		receivedErrors,
+		selectedIDs,
+		fetchRoleInfos
+	)
 }
 
 const debouncedResetList = debounce(refetchRoles, DEBOUNCED_WAIT_DURATION)

diff --git a/pages/semester/list.page.vue b/pages/semester/list.page.vue
@@ -75,6 +75,7 @@ import PageCounter from "@/helpers/page_counter.vue"
 import TabbedPageHeader from "@/helpers/tabbed_page_header.vue"
 import ResourceManager from "@/resource_management/resource_manager.vue"
 import ReceivedErrors from "@/helpers/message_handlers/received_errors.vue"
+import refetchList from "@/resource_management/helpers/refetch_resource_list"
 import ResourceList from "@/resource_management/resource_manager/resource_list.vue"
 
 type RequiredExtraProps =
@@ -205,16 +206,14 @@ const mayEditSemester = computed<boolean>(() => {
 	return isPermitted
 })
 
-async function refetchSemester() {
-	list.value = {
-		"data": [],
-		"meta": {
-			"count": 0
-		}
-	}
-	receivedErrors.value = []
-
-	await fetchSemesterInfos()
+function refetchSemester() {
+	refetchList(
+		isLoaded,
+		list,
+		receivedErrors,
+		selectedIDs,
+		fetchSemesterInfos
+	)
 }
 
 const debouncedResetList = debounce(refetchSemester, DEBOUNCED_WAIT_DURATION)

diff --git a/pages/tag/list.page.vue b/pages/tag/list.page.vue
@@ -69,6 +69,7 @@ import PageCounter from "@/helpers/page_counter.vue"
 import TabbedPageHeader from "@/helpers/tabbed_page_header.vue"
 import ResourceManager from "@/resource_management/resource_manager.vue"
 import ReceivedErrors from "@/helpers/message_handlers/received_errors.vue"
+import refetchList from "@/resource_management/helpers/refetch_resource_list"
 import ResourceList from "@/resource_management/resource_manager/resource_list.vue"
 
 type RequiredExtraProps = "tags" | "roles"
@@ -139,7 +140,7 @@ const resourceCount = computed<number>(() => {
 })
 
 const receivedErrors = ref<string[]>([])
-async function fetchTagInfos(): Promise<number|void> {
+async function fetchTagInfos() {
 	await loadRemainingResource(list, fetcher, () => ({
 		"filter": {
 			"existence": existence.value,
@@ -159,18 +160,14 @@ async function fetchTagInfos(): Promise<number|void> {
 	isLoaded.value = true
 }
 
-async function refetchTags() {
-	isLoaded.value = false
-	list.value = {
-		"data": [],
-		"meta": {
-			"count": 0
-		}
-	}
-	receivedErrors.value = []
-	selectedIDs.value = []
-
-	await fetchTagInfos()
+function refetchTags() {
+	refetchList(
+		isLoaded,
+		list,
+		receivedErrors,
+		selectedIDs,
+		fetchTagInfos
+	)
 }
 
 const debouncedResetList = debounce(refetchTags, DEBOUNCED_WAIT_DURATION)

diff --git a/pages/user/list.page.vue b/pages/user/list.page.vue
@@ -75,7 +75,6 @@ import DepartmentFetcher from "$@/fetchers/department"
 
 import makeManagementInfo from "@/user/make_management_info"
 import convertForSentence from "$/string/convert_for_sentence"
-import determineTitle from "@/resource_management/determine_title"
 import loadRemainingResource from "$@/helpers/load_remaining_resource"
 import resourceTabInfos from "@/resource_management/resource_tab_infos"
 import loadRemainingRoles from "@/helpers/loaders/load_remaining_roles"
@@ -94,6 +93,7 @@ import PageCounter from "@/helpers/page_counter.vue"
 import TabbedPageHeader from "@/helpers/tabbed_page_header.vue"
 import ResourceManager from "@/resource_management/resource_manager.vue"
 import ReceivedErrors from "@/helpers/message_handlers/received_errors.vue"
+import refetchList from "@/resource_management/helpers/refetch_resource_list"
 import ResourceList from "@/resource_management/resource_manager/resource_list.vue"
 
 type RequiredExtraProps =
@@ -263,20 +263,17 @@ const mayCreateUser = computed<boolean>(() => {
 	return mayImportUsers
 })
 
-async function resetUsersList() {
-	list.value = {
-		"data": [],
-		"meta": {
-			"count": 0
-		}
-	}
-	receivedErrors.value = []
-	selectedIDs.value = []
-
-	await fetchUserInfo()
+function refetchUsers() {
+	refetchList(
+		isLoaded,
+		list,
+		receivedErrors,
+		selectedIDs,
+		fetchUserInfo
+	)
 }
 
-const debouncedResetList = debounce(resetUsersList, DEBOUNCED_WAIT_DURATION)
+const debouncedResetList = debounce(refetchUsers, DEBOUNCED_WAIT_DURATION)
 
 function clearOffset() {
 	offset.value = 0