Merge pull request #1556 from clpetersonucf/issue/1553-fix-widget-set…

…tings-local-instance-cache Instance list request modifications to fix settings persistence
ucfopen · Jan 10, 2024 · 699e343 · 699e343
2 parents f38dd85 + c7b5d7a
commit 699e343
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/fuel/app/classes/materia/widget/instance/manager.php b/fuel/app/classes/materia/widget/instance/manager.php
@@ -89,7 +89,7 @@ public static function get_paginated_for_user($user_id, $page_number = 0)
 		$displayable_inst = array_slice($displayable_inst, $offset, $widgets_per_page);
 
 		$data = [
-			'pagination' => $displayable_inst,
+			'pagination' => $displayable_inst
 		];
 
 		if ($has_next_page) $data['next_page'] = $page_number + 1;

diff --git a/src/components/hooks/useCopyWidget.jsx b/src/components/hooks/useCopyWidget.jsx
@@ -36,7 +36,8 @@ export default function useCopyWidget() {
 					pages: previous.pages.map((page, index) => {
 						if (index == 0) return { ...page, pagination: [ newInst, ...page.pagination] }
 						else return page
-					})
+					}),
+					modified: Math.floor(Date.now() / 1000)
 				}))
 
 				return { previousValue }
@@ -51,7 +52,8 @@ export default function useCopyWidget() {
 							return inst
 						}) }
 						else return page
-					})
+					}),
+					modified: Math.floor(Date.now() / 1000)
 				}))
 				variables.successFunc(data)
 			},

diff --git a/src/components/hooks/useDeleteWidget.jsx b/src/components/hooks/useDeleteWidget.jsx
@@ -19,7 +19,8 @@ export default function useDeleteWidget() {
 						pages: previous.pages.map((page) => ({
 							...page,
 							pagination: page.pagination.filter(widget => widget.id !== inst.instId)
-						}))
+						})),
+						modified: Math.floor(Date.now() / 1000)
 					}
 				})
 

diff --git a/src/components/hooks/useUpdateWidget.jsx b/src/components/hooks/useUpdateWidget.jsx
@@ -16,27 +16,32 @@ export default function useUpdateWidget() {
 				widgetList = queryClient.getQueryData('widgets')
 
 				// widgetList is passed to onSuccess or onError depending on resolution of mutation function
-				return { widgetList }
+				return { ...widgetList }
 			},
 			onSuccess: (updatedInst, variables) => {
 
 				// update successful - insert new values into our local copy of widgetList
 				for (const page of widgetList?.pages) {
 					for (const inst of page?.pagination) {
 						if (inst.id === variables.args[0]) {
-							inst.open_at = `${variables.args[4]}`
-							inst.close_at = `${variables.args[5]}`
-							inst.attempts = `${variables.args[6]}`
+							inst.open_at = parseInt(variables.args[4])
+							inst.close_at = parseInt(variables.args[5])
+							inst.attempts = parseInt(variables.args[6])
 							inst.guest_access = variables.args[7]
 							inst.embedded_only = variables.args[8]
 							break
 						}
 					}
 				}
 
-
 				// update query cache for widgets. This does NOT invalidate the cache, forcing a re-fetch!!
-				queryClient.setQueryData('widgets', widgetList)
+				queryClient.setQueryData('widgets', previous => {
+					return {
+						...widgetList,
+						modified: Math.floor(Date.now() / 1000)
+					}
+				})
+
 				queryClient.invalidateQueries(['user-perms', variables.args[0]])
 
 				variables.successFunc(updatedInst)