fix types

LibrePhotos · Nov 5, 2023 · 1b6eecb · 1b6eecb
1 parent 67b74c5
commit 1b6eecb
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 21 deletions.
diff --git a/src/components/modals/ModalUserEdit.tsx b/src/components/modals/ModalUserEdit.tsx
@@ -12,6 +12,7 @@ import { useManageUpdateUserMutation, useSignUpMutation } from "../../api_client
 import type { DirTree } from "../../api_client/dir-tree";
 import { useLazyFetchDirsQuery } from "../../api_client/dir-tree";
 import { useAppDispatch, useAppSelector } from "../../store/store";
+import { IUser } from "../../store/user/user.zod";
 import { EMAIL_REGEX, mergeDirTree } from "../../util/util";
 import { PasswordEntry } from "../settings/PasswordEntry";
 
@@ -66,30 +67,30 @@ export function ModalUserEdit(props: Props) {
   const [updateUser] = useManageUpdateUserMutation();
   const [fetchDirectoryTree, { data: directoryTree }] = useLazyFetchDirsQuery();
 
-  const validateUsername = username => {
-    let error = null;
+  const validateUsername = (username: string) => {
+    let error = "";
     if (!username) {
       error = t("modaluseredit.errorusernamecannotbeblank");
-    } else if (userList && userList.results) {
-      userList.results.every(user => {
+    } else if (userList?.results) {
+      userList.results.every((user: IUser) => {
         if (user.username.toLowerCase() === username.toLowerCase() && user.id !== userToEdit.id) {
           error = t("modaluseredit.errorusernameexists");
           return false;
         }
         return true;
       });
     }
-    return error;
+    return error || null;
   };
 
-  const validateEmail = email => {
+  const validateEmail = (email: string) => {
     if (email && !EMAIL_REGEX.test(email)) {
       return t("modaluseredit.errorinvalidemail");
     }
     return null;
   };
 
-  const validatePath = path => {
+  const validatePath = (path: string) => {
     if (firstTimeSetup && !path) {
       return t("modalscandirectoryedit.mustspecifypath");
     }
@@ -118,7 +119,7 @@ export function ModalUserEdit(props: Props) {
   });
 
   useEffect(() => {
-    if (auth.access && auth.access.is_admin) {
+    if (auth?.access?.is_admin) {
       fetchDirectoryTree("");
     }
   }, [auth.access, dispatch]);
@@ -161,7 +162,7 @@ export function ModalUserEdit(props: Props) {
     }
   }, [form.values.scan_directory]);
 
-  const nodeClicked = (event, rowInfo) => {
+  const nodeClicked = (event: Event, rowInfo: any) => {
     if (inputRef.current) {
       const path = rowInfo.node.absolute_path;
       inputRef.current.value = path;
@@ -318,19 +319,13 @@ export function ModalUserEdit(props: Props) {
                 canDrag={() => false}
                 canDrop={() => false}
                 treeData={treeData}
-                onChange={changedTreeData => setTreeData(changedTreeData)}
+                onChange={setTreeData}
                 theme={FileExplorerTheme}
                 isVirtualized={false}
-                generateNodeProps={rowInfo => {
-                  const nodeProps = {
-                    onClick: event => nodeClicked(event, rowInfo),
-                  };
-                  if (selectedNodeId === rowInfo.node.id) {
-                    // @ts-ignore
-                    nodeProps.className = "selected-node";
-                  }
-                  return nodeProps;
-                }}
+                generateNodeProps={(rowInfo: any) => ({
+                  onClick: (event: Event) => nodeClicked(event, rowInfo),
+                  className: selectedNodeId === rowInfo.node.id ? "selected-node" : undefined,
+                })}
               />
             </div>
           </>

diff --git a/src/components/settings/date-time-settings.tsx b/src/components/settings/date-time-settings.tsx
@@ -1,4 +1,5 @@
 import { createStyles } from "@mantine/core";
+import type { TFunction } from "i18next";
 import React from "react";
 
 import type { DateTimeRule } from "./date-time.zod";
@@ -35,7 +36,7 @@ export const useDateTimeSettingsStyles = createStyles(theme => ({
   },
 }));
 
-export function getRuleExtraInfo(rule: DateTimeRule, t: (s: string, o: Object) => string) {
+export function getRuleExtraInfo(rule: DateTimeRule, t: TFunction<"translation", undefined>) {
   const ignoredProps = ["name", "id", "rule_type", "transform_tz", "is_default"];
   return (
     <>