Remove normalised cache (#2390)

* yeetus * fix * a * fix * todo * fix library stuff --------- Co-authored-by: Jamie Pine <[email protected]>
spacedriveapp · Apr 30, 2024 · ce5e285 · ce5e285
1 parent c76320e
commit ce5e285
Show file tree

Hide file tree

Showing 74 changed files with 279 additions and 1,397 deletions.
diff --git a/.npmrc b/.npmrc
@@ -8,3 +8,4 @@ node-linker=hoisted
 auto-install-peers=true
 max-old-space-size=4096
 enable-pre-post-scripts=true
+package-manager-strict=false
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/apps/desktop/src/App.tsx b/apps/desktop/src/App.tsx
@@ -3,7 +3,7 @@ import { QueryClientProvider } from '@tanstack/react-query';
 import { listen } from '@tauri-apps/api/event';
 import { PropsWithChildren, startTransition, useEffect, useMemo, useRef, useState } from 'react';
 import { createPortal } from 'react-dom';
-import { CacheProvider, createCache, RspcProvider } from '@sd/client';
+import { RspcProvider } from '@sd/client';
 import {
 	createRoutes,
 	ErrorPage,
@@ -56,16 +56,14 @@ export default function App() {
 	return (
 		<RspcProvider queryClient={queryClient}>
 			<QueryClientProvider client={queryClient}>
-				<CacheProvider cache={cache}>
-					{startupError ? (
-						<ErrorPage
-							message={startupError}
-							submessage="Error occurred starting up the Spacedrive core"
-						/>
-					) : (
-						<AppInner />
-					)}
-				</CacheProvider>
+				{startupError ? (
+					<ErrorPage
+						message={startupError}
+						submessage="Error occurred starting up the Spacedrive core"
+					/>
+				) : (
+					<AppInner />
+				)}
 			</QueryClientProvider>
 		</RspcProvider>
 	);
@@ -74,9 +72,7 @@ export default function App() {
 // we have a minimum delay between creating new tabs as react router can't handle creating tabs super fast
 const TAB_CREATE_DELAY = 150;
 
-const cache = createCache();
-
-const routes = createRoutes(platform, cache);
+const routes = createRoutes(platform);
 
 type redirect = { pathname: string; search: string | undefined };
 

diff --git a/apps/mobile/src/App.tsx b/apps/mobile/src/App.tsx
@@ -18,9 +18,7 @@ import { MenuProvider } from 'react-native-popup-menu';
 import { SafeAreaProvider } from 'react-native-safe-area-context';
 import { useSnapshot } from 'valtio';
 import {
-	CacheProvider,
 	ClientContextProvider,
-	createCache,
 	initPlausible,
 	LibraryContextProvider,
 	P2PContextProvider,
@@ -146,7 +144,6 @@ function AppContainer() {
 }
 
 const queryClient = new QueryClient();
-const cache = createCache();
 
 export default function App() {
 	useEffect(() => {
@@ -155,9 +152,7 @@ export default function App() {
 
 	return (
 		<RspcProvider queryClient={queryClient}>
-			<CacheProvider cache={cache}>
-				<AppContainer />
-			</CacheProvider>
+			<AppContainer />
 		</RspcProvider>
 	);
 }
diff --git a/apps/mobile/src/components/browse/BrowseLocations.tsx b/apps/mobile/src/components/browse/BrowseLocations.tsx
@@ -1,8 +1,8 @@
 import { useNavigation } from '@react-navigation/native';
-import { useCache, useLibraryQuery, useNodes } from '@sd/client';
 import { DotsThreeOutline, Plus } from 'phosphor-react-native';
 import { useRef } from 'react';
 import { Text, View } from 'react-native';
+import { useLibraryQuery } from '@sd/client';
 import { ModalRef } from '~/components/layout/Modal';
 import { tw } from '~/lib/tailwind';
 import { BrowseStackScreenProps } from '~/navigation/tabs/BrowseStack';
@@ -22,8 +22,7 @@ const BrowseLocations = () => {
 	const modalRef = useRef<ModalRef>(null);
 
 	const result = useLibraryQuery(['locations.list'], { keepPreviousData: true });
-	useNodes(result.data?.nodes);
-	const locations = useCache(result.data?.items);
+	const locations = result.data;
 
 	return (
 		<View style={tw`gap-5 px-6`}>

diff --git a/apps/mobile/src/components/browse/BrowseTags.tsx b/apps/mobile/src/components/browse/BrowseTags.tsx
@@ -1,8 +1,8 @@
 import { useNavigation } from '@react-navigation/native';
-import { useCache, useLibraryQuery, useNodes } from '@sd/client';
 import { DotsThreeOutline, Plus } from 'phosphor-react-native';
 import React, { useRef } from 'react';
 import { Text, View } from 'react-native';
+import { useLibraryQuery } from '@sd/client';
 import { ModalRef } from '~/components/layout/Modal';
 import { tw } from '~/lib/tailwind';
 import { BrowseStackScreenProps } from '~/navigation/tabs/BrowseStack';
@@ -16,9 +16,7 @@ const BrowseTags = () => {
 	const navigation = useNavigation<BrowseStackScreenProps<'Browse'>['navigation']>();
 
 	const tags = useLibraryQuery(['tags.list']);
-
-	useNodes(tags.data?.nodes);
-	const tagData = useCache(tags.data?.items);
+	const tagData = tags.data;
 
 	const modalRef = useRef<ModalRef>(null);
 

diff --git a/apps/mobile/src/components/context/OnboardingContext.tsx b/apps/mobile/src/components/context/OnboardingContext.tsx
@@ -11,7 +11,6 @@ import {
 	useBridgeMutation,
 	useCachedLibraries,
 	useMultiZodForm,
-	useNormalisedCache,
 	useOnboardingStore,
 	usePlausibleEvent
 } from '@sd/client';
@@ -69,12 +68,8 @@ const useFormState = () => {
 	const submitPlausibleEvent = usePlausibleEvent();
 
 	const queryClient = useQueryClient();
-	const cache = useNormalisedCache();
 	const createLibrary = useBridgeMutation('library.create', {
-		onSuccess: (libRaw) => {
-			cache.withNodes(libRaw.nodes);
-			const lib = cache.withCache(libRaw.item);
-
+		onSuccess: (lib) => {
 			// We do this instead of invalidating the query because it triggers a full app re-render??
 			insertLibrary(queryClient, lib);
 		}
@@ -90,15 +85,13 @@ const useFormState = () => {
 
 			try {
 				// show creation screen for a bit for smoothness
-				const [libraryRaw] = await Promise.all([
+				const [library] = await Promise.all([
 					createLibrary.mutateAsync({
 						name: data.NewLibrary.name,
 						default_locations: null
 					}),
 					new Promise((res) => setTimeout(res, 500))
 				]);
-				cache.withNodes(libraryRaw.nodes);
-				const library = cache.withCache(libraryRaw.item);
 
 				if (telemetryState.shareFullTelemetry) {
 					submitPlausibleEvent({ event: { type: 'libraryCreate' } });

diff --git a/apps/mobile/src/components/drawer/DrawerLocations.tsx b/apps/mobile/src/components/drawer/DrawerLocations.tsx
@@ -2,15 +2,7 @@ import { DrawerNavigationHelpers } from '@react-navigation/drawer/lib/typescript
 import { useNavigation } from '@react-navigation/native';
 import { useRef } from 'react';
 import { Pressable, Text, View } from 'react-native';
-import {
-	arraysEqual,
-	byteSize,
-	Location,
-	useCache,
-	useLibraryQuery,
-	useNodes,
-	useOnlineLocations
-} from '@sd/client';
+import { arraysEqual, byteSize, Location, useLibraryQuery, useOnlineLocations } from '@sd/client';
 import { ModalRef } from '~/components/layout/Modal';
 import { tw, twStyle } from '~/lib/tailwind';
 
@@ -67,8 +59,7 @@ const DrawerLocations = () => {
 	const modalRef = useRef<ModalRef>(null);
 
 	const result = useLibraryQuery(['locations.list'], { keepPreviousData: true });
-	useNodes(result.data?.nodes);
-	const locations = useCache(result.data?.items);
+	const locations = result.data || [];
 
 	return (
 		<>

diff --git a/apps/mobile/src/components/drawer/DrawerTags.tsx b/apps/mobile/src/components/drawer/DrawerTags.tsx
@@ -2,7 +2,7 @@ import { DrawerNavigationHelpers } from '@react-navigation/drawer/lib/typescript
 import { useNavigation } from '@react-navigation/native';
 import { useRef } from 'react';
 import { ColorValue, Pressable, Text, View } from 'react-native';
-import { Tag, useCache, useLibraryQuery, useNodes } from '@sd/client';
+import { Tag, useLibraryQuery } from '@sd/client';
 import { ModalRef } from '~/components/layout/Modal';
 import { tw, twStyle } from '~/lib/tailwind';
 
@@ -38,8 +38,7 @@ const DrawerTags = () => {
 	const tags = useLibraryQuery(['tags.list']);
 	const navigation = useNavigation<DrawerNavigationHelpers>();
 
-	useNodes(tags.data?.nodes);
-	const tagData = useCache(tags.data?.items);
+	const tagData = tags.data || [];
 
 	const modalRef = useRef<ModalRef>(null);
 

diff --git a/apps/mobile/src/components/explorer/sections/InfoTagPills.tsx b/apps/mobile/src/components/explorer/sections/InfoTagPills.tsx
@@ -6,9 +6,7 @@ import {
 	getItemFilePath,
 	getItemObject,
 	isPath,
-	useCache,
-	useLibraryQuery,
-	useNodes
+	useLibraryQuery
 } from '@sd/client';
 import { InfoPill, PlaceholderPill } from '~/components/primitive/InfoPill';
 import { tw, twStyle } from '~/lib/tailwind';
@@ -25,8 +23,7 @@ const InfoTagPills = ({ data, style }: Props) => {
 	const tagsQuery = useLibraryQuery(['tags.getForObject', objectData?.id ?? -1], {
 		enabled: objectData != null
 	});
-	useNodes(tagsQuery.data?.nodes);
-	const items = useCache(tagsQuery.data?.items);
+	const items = tagsQuery.data;
 
 	const isDir = data && isPath(data) ? data.item.is_dir : false;
 

diff --git a/apps/mobile/src/components/modal/CreateLibraryModal.tsx b/apps/mobile/src/components/modal/CreateLibraryModal.tsx
@@ -1,12 +1,7 @@
 import { useQueryClient } from '@tanstack/react-query';
 import { forwardRef, useState } from 'react';
 import { Text, View } from 'react-native';
-import {
-	insertLibrary,
-	useBridgeMutation,
-	useNormalisedCache,
-	usePlausibleEvent
-} from '@sd/client';
+import { insertLibrary, useBridgeMutation, usePlausibleEvent } from '@sd/client';
 import { Modal, ModalRef } from '~/components/layout/Modal';
 import { Button } from '~/components/primitive/Button';
 import { ModalInput } from '~/components/primitive/Input';
@@ -18,18 +13,14 @@ const CreateLibraryModal = forwardRef<ModalRef, unknown>((_, ref) => {
 	const modalRef = useForwardedRef(ref);
 
 	const queryClient = useQueryClient();
-	const cache = useNormalisedCache();
 	const [libName, setLibName] = useState('');
 
 	const submitPlausibleEvent = usePlausibleEvent();
 
 	const { mutate: createLibrary, isLoading: createLibLoading } = useBridgeMutation(
 		'library.create',
 		{
-			onSuccess: (libRaw) => {
-				cache.withNodes(libRaw.nodes);
-				const lib = cache.withCache(libRaw.item);
-
+			onSuccess: (lib) => {
 				// Reset form
 				setLibName('');