Merge branch 'main' of github.com:polito/students-app into feature/pl…

…aces-full-text-search

assets/translations/en.json

@@ -240,7 +240,8 @@
     "virtualClassroom": "Virtual classroom",
     "virtualClassroom_plural": "Virtual classrooms",
     "visualization": "Visualization",
-    "year": "year"
+    "year": "year",
+    "yesterday": "Yesterday"
   },
   "contactsScreen": {
     "cancelRecentSearch": "Remove",

assets/translations/it.json

@@ -241,7 +241,8 @@
     "virtualClassroom": "Virtual classroom",
     "virtualClassroom_plural": "Virtual classroom",
     "visualization": "Visualizzazione",
-    "year": "anno"
+    "year": "anno",
+    "yesterday": "Ieri"
   },
   "contactsScreen": {
     "cancelRecentSearch": "Rimuovi",

package.json

@@ -29,7 +29,7 @@
     "@miblanchard/react-native-slider": "^2.2.0",
     "@openspacelabs/react-native-zoomable-view": "^2.1.5",
     "@orama/orama": "^2.0.0-beta.8",
-    "@polito/api-client": "^1.0.0-ALPHA.50",
+    "@polito/api-client": "^1.0.0-ALPHA.51",
     "@react-native-async-storage/async-storage": "^1.17.11",
     "@react-native-clipboard/clipboard": "^1.12.1",
     "@react-native-community/blur": "^4.3.0",

src/core/components/RootNavigator.tsx

@@ -42,7 +42,7 @@ export const RootNavigator = () => {
   const { colors } = useTheme();
   const styles = useStylesheet(createStyles);
   const { data: student } = useGetStudent();
-  const { updatePreference } = usePreferencesContext();
+  const { onboardingStep, updatePreference } = usePreferencesContext();
   const navigation = useNavigation<NativeStackNavigationProp<RootParamList>>();
   const { getUnreadsCount } = usePushNotifications();
   const campus = useGetCurrentCampus();
@@ -69,8 +69,6 @@ export const RootNavigator = () => {
 
   const { data: messages } = useGetModalMessages();
 
-  const { onboardingStep } = usePreferencesContext();
-
   useEffect(() => {
     if (onboardingStep && onboardingStep >= 3) return;
     navigation.navigate('TeachingTab', {

src/core/contexts/PreferencesContext.ts

@@ -23,7 +23,7 @@ export const editablePreferenceKeys = [
   'agendaScreen',
 ] as const;
 
-export type PreferenceKey = typeof editablePreferenceKeys[number];
+export type PreferenceKey = (typeof editablePreferenceKeys)[number];
 
 // Specify here complex keys, that require serialization/deserialization
 export const objectPreferenceKeys = [

src/core/hooks/useHideTabs.ts

@@ -1,22 +1,27 @@
 import { useCallback } from 'react';
+import { Platform } from 'react-native';
 
 import { useFocusEffect, useNavigation } from '@react-navigation/native';
 
+import { tabBarStyle } from '../../utils/tab-bar';
+
 export const useHideTabs = (
   onFocusIn?: () => void,
   onFocusOut?: () => void,
 ) => {
   const navigation = useNavigation();
   useFocusEffect(
     useCallback(() => {
+      // Ios tab bar is hidden by default in modal context
+      if (Platform.OS === 'ios') return;
       const parent = navigation.getParent()!;
       parent.setOptions({
-        tabBarVisible: false,
+        tabBarStyle: { display: 'none' },
       });
       onFocusIn && onFocusIn();
       return () => {
         parent.setOptions({
-          tabBarVisible: true,
+          tabBarStyle,
         });
         onFocusOut && onFocusOut();
       };

src/core/queries/courseHooks.ts

@@ -11,6 +11,7 @@ import {
   CoursesApi,
   UploadCourseAssignmentRequest,
 } from '@polito/api-client';
+import { MenuAction } from '@react-native-menu/menu';
 import {
   useMutation,
   useQueries,
@@ -58,7 +59,7 @@ const setupCourses = (
       const usedColors = Object.values(coursePreferences)
         .map(cp => cp.color)
         .filter(notNullish);
-      let colorData: typeof courseColors[0] | undefined;
+      let colorData: (typeof courseColors)[0] | undefined;
       for (const currentColor of courseColors) {
         if (!usedColors.includes(currentColor.color)) {
           colorData = currentColor;
@@ -103,18 +104,19 @@ export const useGetCourses = () => {
 
 export const CourseSectionEnum = {
   Overview: 'overview',
+  Editions: 'editions',
   Guide: 'guide',
   Exams: 'exams',
   Notices: 'notices',
   Files: 'files',
   Assignments: 'assignments',
 } as const;
-export type CourseSectionEnum =
-  typeof CourseSectionEnum[keyof typeof CourseSectionEnum];
+export type CourseQueryEnum =
+  (typeof CourseSectionEnum)[keyof typeof CourseSectionEnum];
 
 export const getCourseKey = (
   courseId: number,
-  section: CourseSectionEnum = CourseSectionEnum.Overview,
+  section: CourseQueryEnum = CourseSectionEnum.Overview,
 ) => [COURSE_QUERY_PREFIX, courseId, section];
 
 export const useGetCourse = (courseId: number) => {
@@ -141,6 +143,44 @@ export const useGetCourse = (courseId: number) => {
   );
 };
 
+export const useGetCourseEditions = (courseId: number) => {
+  const coursesQuery = useGetCourses();
+
+  return useQuery(
+    getCourseKey(courseId, CourseSectionEnum.Editions),
+    () => {
+      const course = coursesQuery.data?.find(
+        c =>
+          c.id === courseId || c.previousEditions.some(e => e.id === courseId),
+      );
+      const editions: MenuAction[] = [];
+
+      if (!course || !course.previousEditions.length) return editions;
+
+      editions.push(
+        {
+          id: `${course.id}`,
+          title: course.year,
+          state: courseId === course?.id ? 'on' : undefined,
+        },
+        ...course.previousEditions.map(
+          e =>
+            ({
+              id: `${e.id}`,
+              title: e.year,
+              state: courseId === e.id ? 'on' : undefined,
+            } as MenuAction),
+        ),
+      );
+
+      return editions;
+    },
+    {
+      enabled: !!coursesQuery.data,
+    },
+  );
+};
+
 const courseFilesStaleTime = 60000; // 1 minute
 
 export const useGetCourseFiles = (courseId: number) => {

src/core/queries/offeringHooks.ts

@@ -1,8 +1,11 @@
-import { OfferingApi } from '@polito/api-client';
+import { Degree as ApiDegree, OfferingApi } from '@polito/api-client';
+import { MenuAction } from '@react-native-menu/menu';
 import { useQuery } from '@tanstack/react-query';
 
 import { compact } from 'lodash';
 
+import { Degree } from '../../features/offering/types/Degree';
+import { getShortYear } from '../../utils/offerings';
 import { pluckData } from '../../utils/queries';
 
 export const OFFERING_QUERY_KEY = ['offering'];
@@ -20,6 +23,20 @@ export const useGetOffering = () => {
   );
 };
 
+const mapDegreeToOfferingDegree = (degree: ApiDegree): Degree => ({
+  ...degree,
+  editions: degree.editions.map(edition => {
+    const degreeYear = Number(edition);
+    const previousDegreeYear = degreeYear - 1;
+
+    return {
+      id: edition,
+      title: `${previousDegreeYear}/${getShortYear(degreeYear)}`,
+      state: degreeYear === degree.year ? 'on' : undefined,
+    } as MenuAction;
+  }),
+});
+
 export const useGetOfferingDegree = ({
   degreeId,
   year,
@@ -30,7 +47,10 @@ export const useGetOfferingDegree = ({
   const offeringClient = useOfferingClient();
 
   return useQuery(compact([DEGREES_QUERY_PREFIX, degreeId, year]), () =>
-    offeringClient.getOfferingDegree({ degreeId, year }).then(pluckData),
+    offeringClient
+      .getOfferingDegree({ degreeId, year })
+      .then(pluckData)
+      .then(mapDegreeToOfferingDegree),
   );
 };
 

src/features/agenda/screens/AgendaScreen.tsx

@@ -1,12 +1,6 @@
 import { useCallback, useLayoutEffect, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import {
-  FlatList,
-  NativeScrollEvent,
-  NativeSyntheticEvent,
-  StyleSheet,
-  View,
-} from 'react-native';
+import { FlatList, StyleSheet, View } from 'react-native';
 import useStateRef from 'react-usestateref';
 
 import { faCalendarWeek, faRefresh } from '@fortawesome/free-solid-svg-icons';
@@ -185,9 +179,9 @@ export const AgendaScreen = ({ navigation }: Props) => {
           renderItem={({ item }) => (
             <WeeklyAgenda agendaWeek={item} setTodayOffset={setTodayOffset} />
           )}
-          ListHeaderComponent={
+          /* ListHeaderComponent={
             isLoading ? <ActivityIndicator size="small" /> : undefined
-          }
+          }*/
           ListFooterComponent={
             <>
               {isLoading ? <ActivityIndicator size="small" /> : undefined}
@@ -197,7 +191,7 @@ export const AgendaScreen = ({ navigation }: Props) => {
           ItemSeparatorComponent={() => <View style={styles.separator} />}
           scrollEventThrottle={100}
           // onContentSizeChange={(contentWidth, contentHeight) => onContentHeightChange(contentHeight)}
-          onScroll={(event: NativeSyntheticEvent<NativeScrollEvent>) => {
+          /* onScroll={(event: NativeSyntheticEvent<NativeScrollEvent>) => {
             const offsetY = event.nativeEvent.contentOffset.y;
 
             if (!isLoading && offsetY < prevPageThreshold) {
@@ -207,7 +201,7 @@ export const AgendaScreen = ({ navigation }: Props) => {
                 return [firstWeek.minus({ week: 1 }), ...prev];
               });
             }
-          }}
+          }}*/
           onEndReachedThreshold={0.3}
           onEndReached={() => {
             if (isLoading) return;

src/features/agenda/types/AgendaItem.ts

@@ -10,7 +10,7 @@ export const ALL_AGENDA_TYPES = [
   'lecture',
 ] as const;
 
-export type AgendaItemType = typeof ALL_AGENDA_TYPES[number];
+export type AgendaItemType = (typeof ALL_AGENDA_TYPES)[number];
 
 interface BaseAgendaItem {
   key: string;

src/features/courses/navigation/CourseNavigator.tsx

@@ -53,7 +53,9 @@ export const CourseNavigator = ({ route, navigation }: Props) => {
 
   useEffect(() => {
     if (!coursesQuery.data) return;
-    const course = coursesQuery.data.find(c => c.id === id);
+    const course = coursesQuery.data.find(
+      c => c.id === id || c.previousEditions.some(e => e.id === id),
+    );
     if (!course) return;
 
     navigation.setOptions({

src/features/courses/navigation/CourseSharedScreens.tsx

@@ -25,7 +25,7 @@ import { Assignment } from '../types/Assignment';
 import { CourseNavigator } from './CourseNavigator';
 
 export interface CourseSharedScreensParamList extends ParamListBase {
-  Course: { id: number };
+  Course: { id: number; animated?: boolean };
   Notice: { noticeId: number; courseId: number };
   CoursePreferences: { courseId: number; uniqueShortcode: string };
   CourseDirectory: {
@@ -68,15 +68,16 @@ export const CourseSharedScreens = (
         name="Course"
         component={CourseNavigator}
         getId={({ params }) => `${params.id}`}
-        options={{
+        options={({ route: { params } }) => ({
           headerLargeStyle: {
             backgroundColor: colors.headersBackground,
           },
           headerTransparent: false,
           headerLargeTitle: false,
           headerShadowVisible: false,
           headerBackTitleVisible: false,
-        }}
+          animation: params?.animated ?? true ? 'default' : 'none',
+        })}
       />
       <Stack.Screen
         name="Notice"