Merge release/v1.13.3 to develop (#7104)

* fix the schema manager not checking media type for group slices

* move attempt recording to in-flight request

---------

Co-authored-by: lanzhenw <lanzhenwang9@gmail.com>
Co-authored-by: Tom Schmidt <tom.schmidt@voxel51.com>
Co-authored-by: Lanny W <lanzhen@voxel51.com>

Author: 3 people

app/packages/annotation/src/hooks/useRegisterAnnotationEventHandlers.ts

@@ -24,14 +24,15 @@ export const useRegisterAnnotationEventHandlers = () => {
     useCallback(async () => {
       if (retryController.canAttempt) {
         await handlePersistenceRequest();
-        retryController.recordAttempt();
       }
-    }, [handlePersistenceRequest, retryController])
+    }, [handlePersistenceRequest, retryController.canAttempt])
   );
 
   useAnnotationEventHandler(
     "annotation:persistenceInFlight",
     useCallback(() => {
+      retryController.recordAttempt();
+
       // silence notifications when unhealthy
       if (!retryController.isUnhealthy) {
         setConfig({
@@ -41,7 +42,7 @@ export const useRegisterAnnotationEventHandlers = () => {
           timeout: INDEFINITE_TOAST_TIMEOUT,
         });
       }
-    }, [retryController.isUnhealthy, setConfig])
+    }, [retryController, setConfig])
   );
 
   useAnnotationEventHandler(

app/packages/core/src/components/Modal/Sidebar/Annotate/SchemaManager/hooks.ts

@@ -5,9 +5,12 @@
 import { useOperatorExecutor } from "@fiftyone/operators";
 import {
   datasetSampleCount,
+  groupMediaTypesMap,
+  isGroup,
   mediaType,
   queryPerformanceMaxSearch,
   useNotification,
+  usePreferredGroupAnnotationSlice,
 } from "@fiftyone/state";
 import { useAtom, useAtomValue, useSetAtom } from "jotai";
 import { useAtomCallback } from "jotai/utils";
@@ -623,10 +626,20 @@ export const useExitNewFieldMode = () => {
 // =============================================================================
 
 /**
- * Hook to get the current dataset media type
+ * Hook to get the effective media type.
+ * For group datasets, resolves to the preferred annotation slice's media type.
  */
 export const useMediaType = () => {
-  return useRecoilValue(mediaType);
+  const datasetMediaType = useRecoilValue(mediaType);
+  const isGroupDataset = useRecoilValue(isGroup);
+  const sliceMediaTypesMap = useRecoilValue(groupMediaTypesMap);
+  const [preferredSlice] = usePreferredGroupAnnotationSlice();
+
+  if (isGroupDataset && preferredSlice && sliceMediaTypesMap[preferredSlice]) {
+    return sliceMediaTypesMap[preferredSlice];
+  }
+
+  return datasetMediaType;
 };
 
 /**