#9 - Review

HF6-PROJECT · Oct 5, 2023 · 0a2623d · 0a2623d
1 parent 4e3fba0
commit 0a2623d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 19 deletions.
diff --git a/src/components/files/FileBrowser.vue b/src/components/files/FileBrowser.vue
@@ -48,22 +48,13 @@ const items = ref<ItemClass[]>([]);
 getItems();
 
 function getItems() {
-	fetch(
-		api(
-			`item${
-				ItemClass.isItem(props.modelValue) && FolderClass.isFolder(props.modelValue)
-					? `/${props.modelValue.id}`
-					: ''
-			}`,
-		),
-		{
-			method: 'GET',
-			headers: {
-				'Content-Type': 'application/json',
-			},
-			credentials: 'include',
+	fetch(api(`item${FolderClass.isFolder(props.modelValue) ? `/${props.modelValue.id}` : ''}`), {
+		method: 'GET',
+		headers: {
+			'Content-Type': 'application/json',
 		},
-	)
+		credentials: 'include',
+	})
 		.then(async (response) => {
 			if (!response.ok) {
 				if (response.status >= 400 && response.status < 500) {

diff --git a/src/lib/items/files.ts b/src/lib/items/files.ts
@@ -33,7 +33,9 @@ export class FileClass extends ItemClass {
 		return this._blobUrl;
 	}
 
-	static isFile(object: ItemType): object is FileType {
+	static isFile(object: any): object is FileType {
+		if (!ItemClass.isItem(object)) return false;
+
 		// BlobUrl
 		if (!('blobUrl' in object && typeof object.blobUrl === 'string')) return false;
 

diff --git a/src/lib/items/folders.ts b/src/lib/items/folders.ts
@@ -42,7 +42,9 @@ export class FolderClass extends ItemClass {
 		] as FolderColor;
 	}
 
-	static isFolder(object: ItemType): object is FolderType {
+	static isFolder(object: any): object is FolderType {
+		if (!ItemClass.isItem(object)) return false;
+
 		// Color
 		if (!('color' in object && typeof object.color === 'string')) return false;
 

diff --git a/src/pages/u/folder/[id].astro b/src/pages/u/folder/[id].astro
@@ -3,7 +3,6 @@ import LayoutSidebar from '@layouts/LayoutSidebar.astro';
 import FileBrowser from '@components/files/FileBrowser.vue';
 // @ts-ignore https://github.com/withastro/language-tools/issues/476
 import { api, url } from '@lib/helpers';
-import { ItemClass } from '@lib/items/items';
 import { FolderClass } from '@lib/items/folders';
 
 const { id } = Astro.params;
@@ -25,7 +24,7 @@ if (!folderResponse || folderResponse?.statusCode <= 400) {
 }
 
 // If the folder isn't a valid folder, redirect
-if (!(ItemClass.isItem(folderResponse) && FolderClass.isFolder(folderResponse))) {
+if (!FolderClass.isFolder(folderResponse)) {
 	return Astro.redirect(url('404'));
 }