ci: upgrade prettier, manage package version from tag

polito · Feb 12, 2025 · 8cc811e · 8cc811e
1 parent 31f13b5
commit 8cc811e
Show file tree

Hide file tree

Showing 22 changed files with 103 additions and 108 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -185,6 +185,8 @@ jobs:
         restore-keys: ${{ runner.os }}-gradle-
     - name: Setup .npmrc
       run: printf '@polito:registry=https://npm.pkg.github.com\n//npm.pkg.github.com/:_authToken=${{ secrets.GITHUB_TOKEN }}\n' > .npmrc
+    - name: Enforce version
+      run: npm version "$APP_VERSION" --no-git-tag-version
     - name: Install npm dependencies
       run: npm install
     - name: Prepare fastlane
@@ -270,6 +272,8 @@ jobs:
         key: ${{ runner.os }}-npm-${{ hashFiles('./package-lock.json') }}
     - name: Setup .npmrc
       run: printf '@polito:registry=https://npm.pkg.github.com\n//npm.pkg.github.com/:_authToken=${{ secrets.GITHUB_TOKEN }}\n' > .npmrc
+    - name: Enforce version
+      run: npm version "$APP_VERSION" --no-git-tag-version
     - name: Cache pods
       uses: actions/cache@v4
       with:

diff --git a/.prettierrc → .prettierrc.js b/.prettierrc → .prettierrc.js
@@ -1,4 +1,5 @@
-{
+module.exports = {
+  "plugins": [require.resolve("@trivago/prettier-plugin-sort-imports")],
   "singleQuote": true,
   "trailingComma": "all",
   "arrowParens": "avoid",

diff --git a/lib/ui/components/ListItem.tsx b/lib/ui/components/ListItem.tsx
@@ -93,7 +93,7 @@ export const ListItem = ({
           numberOfLines={
             multilineTitle
               ? undefined
-              : titleProps?.numberOfLines ?? (card ? 2 : 1)
+              : (titleProps?.numberOfLines ?? (card ? 2 : 1))
           }
           ellipsizeMode={titleProps?.ellipsizeMode ?? 'tail'}
           {...titleProps}

diff --git a/lib/ui/components/Tab.tsx b/lib/ui/components/Tab.tsx
@@ -67,8 +67,8 @@ export const Tab = ({
               color: selected
                 ? palettes.text[50]
                 : dark
-                ? palettes.primary[400]
-                : palettes.primary[500],
+                  ? palettes.primary[400]
+                  : palettes.primary[500],
               fontWeight: fontWeights.medium,
             },
             textStyle,

diff --git a/lib/ui/components/TopTabBar.tsx b/lib/ui/components/TopTabBar.tsx
@@ -17,8 +17,8 @@ export const TopTabBar = ({
             options.tabBarLabel !== undefined
               ? options.tabBarLabel
               : options.title !== undefined
-              ? options.title
-              : route.name;
+                ? options.title
+                : route.name;
 
           const isFocused = state.index === index;
 

diff --git a/lib/ui/utils/calendar.ts b/lib/ui/utils/calendar.ts
@@ -174,10 +174,10 @@ export function getEventSpanningInfo(
     !showAdjacentMonths && monthDaysLeft < 7 && monthDaysLeft < eventDuration
       ? monthDaysLeft + 1
       : eventDaysLeft > weekDaysLeft
-      ? weekDaysLeft
-      : eventDaysLeft < eventDuration
-      ? eventDaysLeft
-      : eventDuration;
+        ? weekDaysLeft
+        : eventDaysLeft < eventDuration
+          ? eventDaysLeft
+          : eventDuration;
   // - 6 to take in account the padding
   const eventWidth = dayWidth * eventWeekDuration - 6;
 

diff --git a/lib/ui/utils/utility-types.ts b/lib/ui/utils/utility-types.ts
@@ -5,7 +5,7 @@ type DeepPartialObject<T> = { [P in keyof T]?: DeepPartial<T[P]> };
 export type DeepPartial<T> = T extends Function
   ? T
   : T extends Array<infer U>
-  ? DeepPartialArray<U>
-  : T extends object
-  ? DeepPartialObject<T>
-  : T | undefined;
+    ? DeepPartialArray<U>
+    : T extends object
+      ? DeepPartialObject<T>
+      : T | undefined;
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polito/students-app",
-  "version": "1.6.9",
+  "version": "0.0.1",
   "private": true,
   "scripts": {
     "android": "react-native run-android --active-arch-only --appIdSuffix=dev",
@@ -135,7 +135,7 @@
     "jest": "^29.6.3",
     "lint-staged": "^15.2.10",
     "pod-install": "^0.3.4",
-    "prettier": "2.8.8",
+    "prettier": "^3.5.0",
     "react-test-renderer": "18.3.1",
     "typescript": "5.0.4"
   },

diff --git a/src/core/hooks/useNotifications.ts b/src/core/hooks/useNotifications.ts
@@ -21,13 +21,14 @@ import {
   UnreadNotificationsByScope,
 } from '../types/notifications';
 
-type PathExtractor<T, Paths extends any[] = []> = T extends Array<Notification>
-  ? never
-  : T extends object
-  ? {
-      [K in keyof T]: PathExtractor<T[K], [...Paths, K]>;
-    }[keyof T]
-  : Paths;
+type PathExtractor<T, Paths extends any[] = []> =
+  T extends Array<Notification>
+    ? never
+    : T extends object
+      ? {
+          [K in keyof T]: PathExtractor<T[K], [...Paths, K]>;
+        }[keyof T]
+      : Paths;
 
 type CourseTransactionId =
   | 'avvisidoc'

diff --git a/src/features/agenda/components/AgendaNavigator.tsx b/src/features/agenda/components/AgendaNavigator.tsx
@@ -81,7 +81,7 @@ export const AgendaNavigator = () => {
           headerLargeStyle: {
             backgroundColor: colors.headersBackground,
           },
-          animation: params?.animated ?? true ? 'default' : 'none',
+          animation: (params?.animated ?? true) ? 'default' : 'none',
         })}
       />
       <Stack.Screen

diff --git a/src/features/courses/navigation/CourseSharedScreens.tsx b/src/features/courses/navigation/CourseSharedScreens.tsx
@@ -76,7 +76,7 @@ export const CourseSharedScreens = (
           headerLargeTitle: false,
           headerShadowVisible: false,
           headerBackTitleVisible: false,
-          animation: params?.animated ?? true ? 'default' : 'none',
+          animation: (params?.animated ?? true) ? 'default' : 'none',
         })}
       />
       <Stack.Screen

diff --git a/src/features/courses/screens/CoursesScreen.tsx b/src/features/courses/screens/CoursesScreen.tsx
@@ -33,14 +33,14 @@ export const CoursesScreen = () => {
         {coursesQuery.data &&
           (coursesQuery.data.length > 0 ? (
             Object.entries(
-              coursesQuery.data.reduce((byPeriod, course) => {
-                (byPeriod[course.teachingPeriod] =
-                  byPeriod[course.teachingPeriod] ?? []).push(course);
-                return byPeriod;
-              }, {} as Record<string, CourseOverview[]>) as Record<
-                string,
-                CourseOverview[]
-              >,
+              coursesQuery.data.reduce(
+                (byPeriod, course) => {
+                  (byPeriod[course.teachingPeriod] =
+                    byPeriod[course.teachingPeriod] ?? []).push(course);
+                  return byPeriod;
+                },
+                {} as Record<string, CourseOverview[]>,
+              ) as Record<string, CourseOverview[]>,
             ).map(([period, courses]) => (
               <Section key={period}>
                 <SectionHeader

diff --git a/src/features/offering/screens/DegreeCourseScreen.tsx b/src/features/offering/screens/DegreeCourseScreen.tsx
@@ -86,7 +86,7 @@ export const DegreeCourseScreen = ({ route }: Props) => {
           id: edition.toString(),
           title: edition,
           state: edition === currentYear ? 'on' : undefined,
-        } as MenuAction),
+        }) as MenuAction,
     );
   }, [currentYear, isOffline, offeringCourse]);
 
@@ -234,12 +234,14 @@ export const DegreeCourseScreen = ({ route }: Props) => {
               }
             />
             <OverviewList emptyStateText={t('degreeCourseScreen.noStaff')}>
-              {offeringCourse?.staff.slice(0, 3).map(item => (
-                <StaffListItem
-                  key={`${item.id}${item.courseId}`}
-                  staff={item}
-                />
-              ))}
+              {offeringCourse?.staff
+                .slice(0, 3)
+                .map(item => (
+                  <StaffListItem
+                    key={`${item.id}${item.courseId}`}
+                    staff={item}
+                  />
+                ))}
             </OverviewList>
           </Section>
           <Section>

diff --git a/src/features/places/components/MapNavigator.tsx b/src/features/places/components/MapNavigator.tsx
@@ -183,33 +183,33 @@ export const MapNavigator = ({
                               label: headerBackTitle,
                             })
                         : headerLeft === undefined && canGoBack
-                        ? ({ tintColor }) => (
-                            <HeaderBackButton
-                              tintColor={tintColor}
-                              backImage={
-                                headerBackImageSource !== undefined
-                                  ? () => (
-                                      <Image
-                                        source={headerBackImageSource}
-                                        style={[
-                                          styles.backImage,
-                                          { tintColor },
-                                        ]}
-                                      />
-                                    )
-                                  : undefined
-                              }
-                              onPress={navigation.goBack}
-                              canGoBack={canGoBack}
-                              label={
-                                headerBackTitle ??
-                                previousDescriptor?.options.title
-                              }
-                              labelVisible={IS_IOS && headerBackTitleVisible}
-                              labelStyle={headerBackTitleStyle}
-                            />
-                          )
-                        : headerLeft
+                          ? ({ tintColor }) => (
+                              <HeaderBackButton
+                                tintColor={tintColor}
+                                backImage={
+                                  headerBackImageSource !== undefined
+                                    ? () => (
+                                        <Image
+                                          source={headerBackImageSource}
+                                          style={[
+                                            styles.backImage,
+                                            { tintColor },
+                                          ]}
+                                        />
+                                      )
+                                    : undefined
+                                }
+                                onPress={navigation.goBack}
+                                canGoBack={canGoBack}
+                                label={
+                                  headerBackTitle ??
+                                  previousDescriptor?.options.title
+                                }
+                                labelVisible={IS_IOS && headerBackTitleVisible}
+                                labelStyle={headerBackTitleStyle}
+                              />
+                            )
+                          : headerLeft
                       : undefined
                   }
                   headerRight={

diff --git a/src/features/places/components/MarkersLayer.tsx b/src/features/places/components/MarkersLayer.tsx
@@ -78,7 +78,7 @@ export const MarkersLayer = ({
         priority:
           selectedPoiId === poi.id
             ? 0
-            : subcategory?.priority ?? category.priority ?? 100,
+            : (subcategory?.priority ?? category.priority ?? 100),
       };
     });
   }, [

diff --git a/src/features/places/components/PlacesBottomSheet.tsx b/src/features/places/components/PlacesBottomSheet.tsx
@@ -67,8 +67,8 @@ export const PlacesBottomSheet = forwardRef<
     const listItems = useMemo(
       () =>
         typing && !isLoading
-          ? placesSearched.map(p => searchPlaceToListItem(p, true)) ?? []
-          : listProps?.data ?? [],
+          ? (placesSearched.map(p => searchPlaceToListItem(p, true)) ?? [])
+          : (listProps?.data ?? []),
       [
         isLoading,
         listProps?.data,

diff --git a/src/features/places/hooks/useSearchPlaceToListItem.ts b/src/features/places/hooks/useSearchPlaceToListItem.ts
@@ -1,29 +1,19 @@
 import { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { DEFAULT_CATEGORY_MARKER } from '../constants';
 import { SearchPlace, isPlace } from '../types';
-import { usePlaceCategoriesMap } from './usePlaceCategoriesMap';
 
 /**
  * Converts a place or building to a list item object
  */
 export const useSearchPlaceToListItem = () => {
   const { t } = useTranslation();
-  const placeCategoriesMap = usePlaceCategoriesMap();
 
   return useCallback(
     (place: SearchPlace, isRecentlyViewed = false) => {
-      const markerUrl = !placeCategoriesMap
-        ? DEFAULT_CATEGORY_MARKER.markerUrl
-        : place.category?.subCategory?.id
-        ? placeCategoriesMap[place.category.subCategory.id].markerUrl
-        : place.category.id
-        ? placeCategoriesMap[place.category.id]?.markerUrl
-        : DEFAULT_CATEGORY_MARKER.markerUrl;
       return {
         title: isPlace(place)
-          ? place.room.name ?? place.category.subCategory?.name
+          ? (place.room.name ?? place.category.subCategory?.name)
           : place.name,
         subtitle: isPlace(place)
           ? `${
@@ -35,11 +25,8 @@ export const useSearchPlaceToListItem = () => {
         linkTo: isPlace(place)
           ? { screen: 'Place', params: { placeId: place.id } }
           : { screen: 'Building', params: { buildingId: place.id } },
-        // leadingItem: (
-        //   <Image source={{ uri: markerUrl }} width={30} height={30} />
-        // ),
       };
     },
-    [placeCategoriesMap, t],
+    [t],
   );
 };
diff --git a/src/features/places/utils/category.ts b/src/features/places/utils/category.ts
@@ -1,2 +1,2 @@
 export const formatPlaceCategory = (name?: string) =>
-  name?.length ? name.split(' - ')[1] ?? name : undefined;
+  name?.length ? (name.split(' - ')[1] ?? name) : undefined;
diff --git a/src/features/teaching/components/ExamCTA.tsx b/src/features/teaching/components/ExamCTA.tsx
@@ -84,10 +84,10 @@ export const ExamCTA = ({ exam, absolute = false }: Props) => {
         examUnavailable
           ? t('examScreen.notAvailable')
           : examRequestable
-          ? t('examScreen.ctaRequest')
-          : examAvailable
-          ? t('examScreen.ctaBook')
-          : t('examScreen.ctaCancel')
+            ? t('examScreen.ctaRequest')
+            : examAvailable
+              ? t('examScreen.ctaBook')
+              : t('examScreen.ctaCancel')
       }
       action={action}
       loading={mutationsLoading}