chore: merge pull request PapillonApp#344 from camarm-dev/fix/linter

🏷️ [Fix] Réparation de TOUS les types, et des erreur de lint (partie 2)

Author: Vexcited

package-lock.json

@@ -38,20 +38,20 @@ const AccountSwitcher: React.FC<{
     borderWidth: 1,
     borderRadius: 80,
     borderColor: interpolateColor(
-      translationY.value,
+      translationY?.value || 0, // Should think to pass a default value
       [200, 251],
       ["#ffffff50", colors.border],
     ),
     backgroundColor: interpolateColor(
-      translationY.value,
+      translationY?.value || 0, // Should think to pass a default value
       [200, 251],
       ["#ffffff30", "transparent"],
     ),
   }));
 
   const textAnimatedStyle = useAnimatedStyle(() => ({
     color: interpolateColor(
-      translationY.value,
+      translationY?.value || 0, // Should think to pass a default value
       [200, 251],
       ["#FFF", colors.text],
     ),
@@ -64,7 +64,7 @@ const AccountSwitcher: React.FC<{
   const AnimatedChevronDown = Animated.createAnimatedComponent(ChevronDown);
   const iconAnimatedStyle = useAnimatedStyle(() => ({
     color: interpolateColor(
-      translationY.value,
+      translationY?.value || 0, // Should think to pass a default value
       [200, 251],
       ["#FFF", colors.text],
     ),
@@ -124,7 +124,7 @@ const AccountSwitcher: React.FC<{
           >
             {!shouldHidePicture ? (
               <Image
-                source={(account.personalization.profilePictureB64 && account.personalization.profilePictureB64.trim() !== "") ? { uri: account.personalization.profilePictureB64 } : defaultProfilePicture(account.service)}
+                source={(account.personalization.profilePictureB64 && account.personalization.profilePictureB64.trim() !== "") ? { uri: account.personalization.profilePictureB64 } : defaultProfilePicture(account.service, account.identityProvider?.name || "")}
                 style={[
                   styles.avatar,
                   {

src/components/Home/AccountSwitcher.tsx

@@ -8,11 +8,20 @@ import Reanimated, {
   withTiming,
   Easing,
 } from "react-native-reanimated";
+import {Balance} from "@/services/shared/Balance";
+import {Theme} from "@react-navigation/native";
 
 const AnimatedTouchableOpacity = Reanimated.createAnimatedComponent(TouchableOpacity);
 const AnimatedView = Reanimated.createAnimatedComponent(View);
 
-const AccountButton = ({ account, isSelected, onPress, colors }) => {
+interface AccountButtonProps {
+  account: Balance
+  isSelected: boolean
+  onPress: () => any
+  colors: Theme["colors"]
+}
+
+const AccountButton: React.FC<AccountButtonProps> = ({ account, isSelected, onPress, colors }) => {
   const COLLAPSED_WIDTH = 47;
   const [textMeasurement, setTextMeasurement] = React.useState(0);
   const EXPANDED_WIDTH = React.useMemo(() => COLLAPSED_WIDTH + textMeasurement + 16, [textMeasurement]); // 16 pour le gap
@@ -135,4 +144,4 @@ const AccountButton = ({ account, isSelected, onPress, colors }) => {
   );
 };
 
-export default AccountButton;
+export default AccountButton;

src/components/Restaurant/AccountButton.tsx

@@ -60,7 +60,7 @@ export type RouteParameters = {
   UnivLimoges_Login: undefined;
   UnivSorbonneParisNord_login: undefined;
   UnivUphf_Login: undefined;
-  BackgroundIUTLannion: { url: string; username: string; password: string };
+  BackgroundIUTLannion: { url?: string; username: string; password: string, firstLogin?: boolean } | undefined;
 
   // login.skolengo
   SkolengoAuthenticationSelector: undefined;

src/router/helpers/types.ts

@@ -5,7 +5,7 @@ import UnivRennes1_Login from "@/views/login/IdentityProvider/providers/UnivRenn
 import UnivLimoges_Login from "@/views/login/IdentityProvider/providers/UnivLimoges";
 import UnivRennes2_Login from "@/views/login/IdentityProvider/providers/UnivRennes2";
 import UnivSorbonneParisNord_login from "@/views/login/IdentityProvider/providers/UnivSorbonneParisNord";
-import UnivUphf_Login from "@/views/login/IdentityProvider/providers/UnivUphf";
+//import UnivUphf_Login from "@/views/login/IdentityProvider/providers/UnivUphf";
 import { UnivIUTLannion_Login } from "@/views/login/IdentityProvider/providers/UnivIUTLannion";
 import Muli_Login from "@/views/login/IdentityProvider/providers/Multi";
 
@@ -44,4 +44,4 @@ export default [
     headerBackVisible: true,
     headerTitle: "ESUP Multi",
   }),
-] as const;
+] as const;

src/router/screens/login/identityProvider.ts

@@ -2,22 +2,22 @@ import type { ARDAccount } from "@/stores/account/types";
 import type { ReservationHistory } from "../shared/ReservationHistory";
 
 export const history = async (account: ARDAccount): Promise<ReservationHistory[]> => {
-  const uid = await account.instance?.getOnlinePayments().then((payments) => payments.user.uid)
-  if (!uid) throw new Error("We can't get the account UID")
+  const uid = await account.instance?.getOnlinePayments().then((payments) => payments.user.uid);
+  if (!uid) throw new Error("We can't get the account UID");
 
   let [financialHistory, ordersHistory, consumptionsHistory] = await Promise.all([
     account.instance?.getFinancialHistory(uid),
     account.instance?.getOrdersHistory(uid),
     account.instance?.getConsumptionsHistory(uid)
-  ])
+  ]);
 
   return [
-      ...(financialHistory ?? []).map((item) => ({
-        amount: ((item.credit ?? 0) - (item.debit ?? 0)) / 100,
-        timestamp: item.operationDate * 1000,
-        currency: "€",
-        label: item.operationName
-      })),
+    ...(financialHistory ?? []).map((item) => ({
+      amount: ((item.credit ?? 0) - (item.debit ?? 0)) / 100,
+      timestamp: item.operationDate * 1000,
+      currency: "€",
+      label: item.operationName
+    })),
     ...(ordersHistory ?? []).map((item) => ({
       amount: item.amount / 100,
       timestamp: item.orderDate * 1000,

src/services/ard/history.ts

@@ -20,15 +20,15 @@ export const getBookingsAvailableFromExternal = async (account: ExternalAccount,
   }
 };
 
-export const bookDayFromExternal = async (account: ExternalAccount, id: string, date: Date, booked: boolean): Promise<BookingDay | null> => {
+export const bookDayFromExternal = async (account: ExternalAccount, id: string, date: Date, booked: boolean): Promise<BookingDay | undefined> => {
   switch (account.service) {
     case AccountService.Turboself: {
       const { bookDay } = await import("./turboself/booking");
       const bookedDay = await bookDay(account, id, date, booked);
       return bookedDay;
     }
     case AccountService.ARD: {
-      return null;
+      return undefined;
     }
   }
-};
+};

src/services/booking.ts

@@ -1,12 +1,18 @@
 import { LocalAccount } from "@/stores/account/types";
-import { Grade } from "pawnote";
-import { AverageOverview } from "../shared/Grade";
+import  {
+  type AverageOverview,
+  type Grade
+} from "@/services/shared/Grade";
 import uuid from "@/utils/uuid-v4";
 
-export const saveIUTLanGrades = async (account: LocalAccount) => {
+export const saveIUTLanGrades = async (account: LocalAccount): Promise<{
+  grades: Grade[];
+  averages: AverageOverview;
+}> => {
   try {
+    // Il faudrait peut-être penser à typer cette partie, tous les types sont any :(
     const scodocData = account.identityProvider.rawData;
-    const matieres = scodocData["relevé"].ressources;
+    const matieres = (scodocData["relevé"] as any).ressources;
 
     const gradesList: Grade[] = [];
     const averages: AverageOverview = {
@@ -30,8 +36,8 @@ export const saveIUTLanGrades = async (account: LocalAccount) => {
         name: subjectName,
       };
 
-      const grades: Grade[] = matiere.evaluations.map((note) => {
-        const grade = {
+      const grades: Grade[] = matiere.evaluations.map((note: any) => {
+        const grade: Grade = {
           student: {
             value: parseInt(note.note.value),
             disabled: isNaN(parseInt(note.note.value)),
@@ -54,16 +60,11 @@ export const saveIUTLanGrades = async (account: LocalAccount) => {
             value: 20,
             disabled: false,
           },
-          defaultOutOf: 20,
           description: note.description,
           timestamp: new Date(note.date).getTime(),
-          subject: subject,
           coefficient: parseInt(note.coef),
-          isOutOf20: true,
-
           isBonus: false,
           isOptional: false,
-
           subjectName: subject.name,
         };
 
@@ -72,10 +73,10 @@ export const saveIUTLanGrades = async (account: LocalAccount) => {
         return grade;
       });
 
-      const average = grades.reduce((acc, grade) => acc + grade.student.value, 0) / grades.length;
-      const min = grades.reduce((acc, grade) => Math.min(acc, grade.min.value), 20);
-      const max = grades.reduce((acc, grade) => Math.max(acc, grade.max.value), 0);
-      const classAverage = grades.reduce((acc, grade) => acc + grade.average.value, 0) / grades.length;
+      const average = grades.filter(grade => grade.student.value != null).reduce((acc, grade) => acc + (grade.student.value as number), 0) / grades.length;
+      const min = grades.filter(grade => grade.min.value != null).reduce((acc, grade) => Math.min(acc, (grade.min.value as number)), 20);
+      const max = grades.filter(grade => grade.max.value != null).reduce((acc, grade) => Math.max(acc, (grade.max.value as number)), 0);
+      const classAverage = grades.filter(grade => grade.average.value != null).reduce((acc, grade) => acc + (grade.average.value as number), 0) / grades.length;
 
 
       if (grades.length === 0) {
@@ -112,5 +113,19 @@ export const saveIUTLanGrades = async (account: LocalAccount) => {
   }
   catch(e) {
     console.error(e);
+    return {
+      grades: [],
+      averages: {
+        classOverall: {
+          value: null,
+          disabled: true,
+        },
+        overall: {
+          value: null,
+          disabled: true,
+        },
+        subjects: []
+      }
+    };
   }
-};
+};

src/services/iutlan/grades.ts

@@ -3,8 +3,8 @@ import { log } from "@/utils/logger/logger";
 import {Identification, refresh} from "ezly";
 
 export const reload = async (account: IzlyAccount): Promise<Identification> => {
-  const instance = account.authentication.identification
-  const secret = account.authentication.secret
+  const instance = account.authentication.identification;
+  const secret = account.authentication.secret;
 
   await refresh(instance, secret);
   log("session refreshed", "izly");

src/services/izly/reload.ts

@@ -9,7 +9,7 @@ export async function getMenu <T extends Account> (account: Account, date: Date)
       return menu;
     }
     default: {
-      return null
+      return null;
     }
   }
 }