Update package-lock.json and fix two dev env issues

LibrePhotos · Dec 12, 2023 · ba0e035 · ba0e035
1 parent acecfd3
commit ba0e035
Show file tree

Hide file tree

Showing 14 changed files with 8,912 additions and 11,622 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -14,5 +14,6 @@ module.exports = {
   },
   parserOptions: {
     project: "./tsconfig.eslint.json",
+    tsconfigRootDir: __dirname,
   },
 };
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/api_client/albums/people.ts b/src/api_client/albums/people.ts
@@ -69,8 +69,8 @@ export const peopleAlbumsApi = api
         }),
         transformResponse(response, meta, query) {
           showNotification({
-            message: i18n.t<string>("toasts.renameperson", query),
-            title: i18n.t<string>("toasts.renamepersontitle"),
+            message: i18n.t("toasts.renameperson", query),
+            title: i18n.t("toasts.renamepersontitle"),
             color: "teal",
           });
         },
@@ -82,8 +82,8 @@ export const peopleAlbumsApi = api
         }),
         transformResponse() {
           showNotification({
-            message: i18n.t<string>("toasts.deleteperson"),
-            title: i18n.t<string>("toasts.deletepersontitle"),
+            message: i18n.t("toasts.deleteperson"),
+            title: i18n.t("toasts.deletepersontitle"),
             color: "teal",
           });
         },

diff --git a/src/api_client/search.ts b/src/api_client/search.ts
@@ -52,6 +52,7 @@ const searchApi = api
             };
           } catch (e) {
             return {
+              // @ts-ignore
               photosFlat: response.results,
               photosGroupedByDate: [],
             };

diff --git a/src/components/AlbumLocationMap.tsx b/src/components/AlbumLocationMap.tsx
@@ -12,6 +12,7 @@ export function AlbumLocationMap({ photos }: Readonly<Props>) {
   const { avgLat, avgLon } = getAveragedCoordinates(photosWithGPS);
 
   const markers = photosWithGPS.map(photo => (
+    // @ts-ignore
     <Marker key={`marker-${photo.id}`} position={[photo.exif_gps_lat, photo.exif_gps_lon]} />
   ));
   if (photosWithGPS.length > 0) {

diff --git a/src/components/facedashboard/ButtonHeaderGroup.tsx b/src/components/facedashboard/ButtonHeaderGroup.tsx
@@ -130,8 +130,8 @@ export function ButtonHeaderGroup({
               onClick={() => {
                 dispatch(api.endpoints.trainFaces.initiate());
                 showNotification({
-                  message: i18n.t<string>("toasts.trainingstarted"),
-                  title: i18n.t<string>("toasts.trainingstartedtitle"),
+                  message: i18n.t("toasts.trainingstarted"),
+                  title: i18n.t("toasts.trainingstartedtitle"),
                   color: "teal",
                 });
               }}

diff --git a/src/components/facedashboard/FaceTooltip.tsx b/src/components/facedashboard/FaceTooltip.tsx
@@ -17,7 +17,7 @@ export function FaceTooltip({ tooltipOpened, cell, children }: Props) {
 
   const confidencePercentageLabel =
     activeTab === "inferred"
-      ? t<string>("settings.confidencepercentage", { percentage: (cell.person_label_probability * 100).toFixed(1) })
+      ? t("settings.confidencepercentage", { percentage: (cell.person_label_probability * 100).toFixed(1) })
       : null;
 
   const dateTimeLabel = DateTime.fromISO(cell.timestamp).isValid

diff --git a/src/components/job/JobList.tsx b/src/components/job/JobList.tsx
@@ -98,7 +98,6 @@ export function JobList() {
       </Table>
       <Flex justify="center" mt={20}>
         <Pagination
-          page={activePage}
           total={Math.ceil(+jobCount.toFixed(1) / pageSize)}
           onChange={newPage => setActivePage(newPage)}
           withEdges

diff --git a/src/components/lightbox/TimestampItem.tsx b/src/components/lightbox/TimestampItem.tsx
@@ -111,7 +111,12 @@ export function TimestampItem({ photoDetail }: Props) {
           </Group>
           <Stack>
             <DatePicker locale={lang} value={timestamp} onChange={onChangeDate} />
-            <TimeInput withSeconds value={timestamp} onChange={onChangeTime} />
+
+            <TimeInput
+              withSeconds
+              value={timestamp?.toString()}
+              onChange={event => onChangeTime(new Date(event.target.value))}
+            />
             <Group position="center">
               <Tooltip label={t("lightbox.sidebar.cancel")}>
                 <ActionIcon variant="light" onClick={onCancelDateTime} color="red">

diff --git a/src/components/modals/ModalPersonEdit.tsx b/src/components/modals/ModalPersonEdit.tsx
@@ -26,7 +26,7 @@ import { fuzzyMatch } from "../../util/util";
 type Props = {
   isOpen: boolean;
   onRequestClose: () => void;
-  resetGroups: () => void;
+  resetGroups?: () => void;
   selectedFaces: any[];
 };
 
@@ -100,14 +100,16 @@ export function ModalPersonEdit(props: Props) {
                 api.endpoints.setFacesPersonLabel.initiate({ faceIds: selectedFaceIDs, personName: newPersonName })
               );
               showNotification({
-                message: i18n.t<string>("toasts.addfacestoperson", {
+                message: i18n.t("toasts.addfacestoperson", {
                   numberOfFaces: selectedFaceIDs.length,
                   personName: newPersonName,
                 }),
-                title: i18n.t<string>("toasts.addfacestopersontitle"),
+                title: i18n.t("toasts.addfacestopersontitle"),
                 color: "teal",
               });
-              resetGroups();
+              if (resetGroups) {
+                resetGroups();
+              }
               onRequestClose();
               setNewPersonName("");
             }}
@@ -144,11 +146,11 @@ export function ModalPersonEdit(props: Props) {
                     })
                   );
                   showNotification({
-                    message: i18n.t<string>("toasts.addfacestoperson", {
+                    message: i18n.t("toasts.addfacestoperson", {
                       numberOfFaces: selectedFaceIDs.length,
                       personName: item.text,
                     }),
-                    title: i18n.t<string>("toasts.addfacestopersontitle"),
+                    title: i18n.t("toasts.addfacestopersontitle"),
                     color: "teal",
                   });
                   onRequestClose();
@@ -177,3 +179,7 @@ export function ModalPersonEdit(props: Props) {
     </Modal>
   );
 }
+
+ModalPersonEdit.defaultProps = {
+  resetGroups: () => {},
+};
diff --git a/src/components/modals/ModalUserDelete.tsx b/src/components/modals/ModalUserDelete.tsx
@@ -30,7 +30,6 @@ export function ModalUserDelete(props: Props) {
     <Modal
       opened={isOpen}
       centered
-      overflow="outside"
       size="md"
       onClose={() => {
         clearStateAndClose();

diff --git a/src/components/photolist/PhotoListView.tsx b/src/components/photolist/PhotoListView.tsx
@@ -293,31 +293,29 @@ function PhotoListViewComponent(props: Props) {
                 updateSelectionState={updateSelectionState}
               />
               <Group position="right">
-                {
-                  // @ts-ignore
-                  !route.location.pathname.startsWith("/deleted") && (
-                    <SelectionActions
-                      selectedItems={selectionState.selectedItems}
-                      albumID={params ? params.albumID : undefined}
-                      title={title}
-                      setAlbumCover={actionType => {
-                        if (actionType === "person") {
-                          dispatch(setAlbumCoverForPerson(params.albumID, selectionState.selectedItems[0].id));
-                        }
-                        if (actionType === "useralbum") {
-                          setUserAlbumCover({
-                            id: `${params.albumID}`,
-                            photo: selectionState.selectedItems[0].id,
-                          });
-                        }
-                      }}
-                      onSharePhotos={() => setModalSharePhotosOpen(true)}
-                      onShareAlbum={() => setModalAlbumShareOpen(true)}
-                      onAddToAlbum={() => setModalAddToAlbumOpen(true)}
-                      updateSelectionState={updateSelectionState}
-                    />
-                  )
-                }
+                {!route.location.pathname.startsWith("/deleted") && (
+                  <SelectionActions
+                    selectedItems={selectionState.selectedItems}
+                    // @ts-ignore
+                    albumID={params ? params.albumID : undefined}
+                    title={title}
+                    setAlbumCover={actionType => {
+                      if (actionType === "person") {
+                        dispatch(setAlbumCoverForPerson(params.albumID, selectionState.selectedItems[0].id));
+                      }
+                      if (actionType === "useralbum") {
+                        setUserAlbumCover({
+                          id: `${params.albumID}`,
+                          photo: selectionState.selectedItems[0].id,
+                        });
+                      }
+                    }}
+                    onSharePhotos={() => setModalSharePhotosOpen(true)}
+                    onShareAlbum={() => setModalAlbumShareOpen(true)}
+                    onAddToAlbum={() => setModalAddToAlbumOpen(true)}
+                    updateSelectionState={updateSelectionState}
+                  />
+                )}
                 <TrashcanActions
                   selectedItems={selectionState.selectedItems}
                   updateSelectionState={updateSelectionState}

diff --git a/src/components/photolist/SelectionActions.tsx b/src/components/photolist/SelectionActions.tsx
@@ -313,7 +313,7 @@ export function SelectionActions(props: Readonly<Props>) {
             disabled={!route.location.pathname.startsWith("/useralbum/") || selectedItems.length === 0}
             onClick={() => {
               removePhotosFromAlbum({
-                id: albumID,
+                id: albumID.toString(),
                 title,
                 photos: selectedItems.map(i => i.id),
               });

diff --git a/src/store/faces/faceSlice.ts b/src/store/faces/faceSlice.ts
@@ -159,17 +159,17 @@ const faceSlice = createSlice({
           personListToChange[indexToReplace] = personToChange;
         }
       })
-      // @ts-ignore
       .addMatcher(api.endpoints.clusterFaces.matchFulfilled, (state, { payload }) => ({
         ...state,
+        // @ts-ignore
         facesVis: payload,
         clustered: true,
       }))
-      // @ts-ignore
       .addMatcher(api.endpoints.trainFaces.matchFulfilled, (state, { payload }) => ({
         ...state,
         training: false,
         trained: true,
+        // @ts-ignore
         facesVis: payload,
       }))
       .addMatcher(api.endpoints.deleteFaces.matchFulfilled, (state, { payload }) => {