Fix typescript errors

inrupt · Aug 2, 2024 · d3b28aa · d3b28aa
1 parent 85a5b6f
commit d3b28aa
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 7 deletions.
diff --git a/api/accessGrant.ts b/api/accessGrant.ts
@@ -18,6 +18,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 // SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
+import type { AccessGrant, AccessGrantGroup } from "@/types/accessGrant";
 import { makeApiRequest } from "./apiRequest";
 
 export const getAccessGrants = async (): Promise<AccessGrantGroup[]> => {

diff --git a/api/files.ts b/api/files.ts
@@ -35,8 +35,7 @@ export const postFile = async (file: FileObject): Promise<void> => {
   const formData = new FormData();
   formData.append("file", {
     name: file.name,
-    type:
-      file.contentType || mime.getType(file.name) || "application/octet-stream",
+    type: file.type || mime.getType(file.name) || "application/octet-stream",
     uri: file.uri,
   } as unknown as Blob);
 

diff --git a/app/(tabs)/accesses/[webId].tsx b/app/(tabs)/accesses/[webId].tsx
@@ -38,6 +38,7 @@ import { faEllipsis } from "@fortawesome/free-solid-svg-icons/faEllipsis";
 import WebIdDisplay from "@/components/common/WebIdDisplay";
 import ConfirmModal from "@/components/common/ConfirmModal";
 import Loading from "@/components/LoadingButton";
+import type { AccessGrant, AccessGrantGroup } from "@/types/accessGrant";
 
 interface AccessGrantProps {}
 
@@ -63,7 +64,7 @@ const Page: React.FC<AccessGrantProps> = () => {
     onSuccess: async () => {
       setModalVisible(false);
       setUpdating(false);
-      if (selectedRequest.items.length <= 1) {
+      if (selectedRequest && selectedRequest.items.length <= 1) {
         navigation.goBack();
       } else {
         // eslint-disable-next-line no-console
@@ -83,7 +84,7 @@ const Page: React.FC<AccessGrantProps> = () => {
 
   useLayoutEffect(() => {
     navigation.setOptions({
-      headerTitle: selectedRequest.ownerName,
+      headerTitle: selectedRequest?.ownerName,
       headerLeft: () => (
         <TouchableOpacity
           onPress={() => navigation.goBack()}
@@ -96,7 +97,7 @@ const Page: React.FC<AccessGrantProps> = () => {
         <TouchableOpacity
           onPress={() => {
             setSelectedAG(undefined);
-            setSelectedWebId(selectedRequest.webId);
+            setSelectedWebId(selectedRequest?.webId);
             bottomSheetModalRef.current?.present();
           }}
         >

diff --git a/app/(tabs)/accesses/index.tsx b/app/(tabs)/accesses/index.tsx
@@ -23,6 +23,7 @@ import { useQuery } from "@tanstack/react-query";
 import { StyleSheet, View } from "react-native";
 import WebIdAccessGrantList from "@/components/accessGrants/WebIdAccessGrantList";
 import useRefreshOnFocus from "@/hooks/useRefreshOnFocus";
+import type { AccessGrantGroup } from "@/types/accessGrant";
 
 export default function AccessGrantScreen() {
   const {

diff --git a/app/(tabs)/home/download.tsx b/app/(tabs)/home/download.tsx
@@ -63,7 +63,7 @@ const Page: React.FC<FileDetailProps> = () => {
     mutation.mutate({
       uri: uri as string,
       name: fileName,
-      contentType,
+      type: contentType as string,
     });
     goBack();
   };

diff --git a/components/accessGrants/AccessGrantList.tsx b/components/accessGrants/AccessGrantList.tsx
@@ -21,6 +21,7 @@
 import React from "react";
 import { FlatList } from "react-native";
 import AccessGrantCard from "@/components/accessGrants/AccessGrantCard";
+import type { AccessGrant, AccessGrantGroup } from "@/types/accessGrant";
 
 interface AccessGrantListProps {
   data: AccessGrantGroup;

diff --git a/components/accessGrants/WebIdAccessGrantList.tsx b/components/accessGrants/WebIdAccessGrantList.tsx
@@ -24,6 +24,7 @@ import { FlatList, StyleSheet, View } from "react-native";
 import WebIdAccessGrantCard from "@/components/accessGrants/WebIdAccessGrantCard";
 import { ThemedText } from "@/components/ThemedText";
 import { Colors } from "@/constants/Colors";
+import type { AccessGrantGroup } from "@/types/accessGrant";
 import Loading from "../LoadingButton";
 
 interface WebIdAccessGrantListProps

diff --git a/components/accessGrants/modal/BottomModal.tsx b/components/accessGrants/modal/BottomModal.tsx
@@ -26,6 +26,7 @@ import { Colors } from "@/constants/Colors";
 import { ThemedText } from "@/components/ThemedText";
 import IconResourceName from "@/components/common/IconResourceName";
 import WebIdDisplay from "@/components/common/WebIdDisplay";
+import type { AccessGrant, AccessGrantGroup } from "@/types/accessGrant";
 
 interface BottomModalProps {
   accessGrant?: AccessGrant;

diff --git a/components/files/BottomModal.tsx b/components/files/BottomModal.tsx
@@ -29,6 +29,7 @@ import * as Sharing from "expo-sharing";
 import * as FileSystem from "expo-file-system";
 import QRCode from "react-native-qrcode-svg";
 import { formatResourceName } from "@/utils/fileUtils";
+import type { UserInfo } from "@/constants/user";
 import { ThemedText } from "../ThemedText";
 import ConfirmModal from "../common/ConfirmModal";
 
@@ -67,7 +68,8 @@ const BottomModal: React.FC<BottomModalProps> = ({
     const fr = new FileReader();
     fr.onload = async () => {
       const fileUri = `${FileSystem.documentDirectory}/${fileName}`;
-      await FileSystem.writeAsStringAsync(fileUri, fr.result?.split(",")[1], {
+      const result = fr.result as string;
+      await FileSystem.writeAsStringAsync(fileUri, result?.split(",")[1], {
         encoding: FileSystem.EncodingType.Base64,
       });
       await Sharing.shareAsync(fileUri);