chore: cleanup feature flags and dependency updates (#1979)

* cleanup deposition feature flag

* cleanup expand depositions feature flag

* cleanup postMlChallenge feature flag

* fix type errors

* more code cleanup

* cleanup idenitifiedObjects feature flag

* fix pre commit

* address feedback

* fix deposition page variant refactor issue

Author: codemonkey800

.github/workflows/helm-dep-update.yaml

@@ -8,4 +8,4 @@ on:
 jobs:
   helm_dependency_update:
     uses: chanzuckerberg/github-actions/.github/workflows/argus-helm-chart-update.yaml@v6
-    secrets: inherit
+    secrets: inherit

frontend/packages/data-portal/app/components/AnnotationFilter/AnnotationFilter.tsx

@@ -2,7 +2,6 @@ import { useSearchParams } from '@remix-run/react'
 
 import { NameOrIdFilterSection } from 'app/components/DepositionFilter'
 import {
-  AnnotatedObjectNameFilter,
   AnnotatedObjectShapeTypeFilter,
   AuthorFilter,
   FilterPanel,
@@ -11,17 +10,14 @@ import {
 import { QueryParams } from 'app/constants/query'
 import { useI18n } from 'app/hooks/useI18n'
 import { useRunById } from 'app/hooks/useRunById'
-import { useFeatureFlag } from 'app/utils/featureFlags'
 
 import { ObjectNameIdFilter } from '../Filters/ObjectNameIdFilter/ObjectNameIdFilter'
 import { AnnotationSoftwareFilter } from './AnnotationSoftwareFilter'
 import { MethodTypeFilter } from './MethodTypeFilter'
-import { ObjectIdFilter } from './ObjectIdFilter/ObjectIdFilter'
 
 export function AnnotationFilter() {
   const { t } = useI18n()
   const [searchParams] = useSearchParams()
-  const showObjectNameIdFilter = useFeatureFlag('identifiedObjects')
   const {
     objectNames,
     objectShapeTypes,
@@ -43,57 +39,27 @@ export function AnnotationFilter() {
     new Set([...objectNames, ...identifiedObjectNames]),
   )
 
-  const annotationMetadataFilters = (
-    <>
-      <AuthorFilter label={t('annotationAuthor')} />
-      <AnnotatedObjectNameFilter
-        label={t('objectName')}
-        allObjectNames={allObjectNames}
-      />
-      <ObjectIdFilter />
-      <AnnotatedObjectShapeTypeFilter allObjectShapeTypes={objectShapeTypes} />
-      <MethodTypeFilter />
-      <AnnotationSoftwareFilter allAnnotationSoftwares={annotationSoftwares} />
-    </>
-  )
-
-  const objectMetadataFilters = (
-    <>
-      <ObjectNameIdFilter
-        label={t('objectNameOrId')}
-        objectNames={allObjectNames}
-        showAnnotatedObjectsOnly={showAnnotatedObjectsOnly}
-      />
-      <AnnotatedObjectShapeTypeFilter allObjectShapeTypes={objectShapeTypes} />
-    </>
-  )
-
-  const otherAnnotationMetadataFilters = (
-    <>
-      <AuthorFilter label={t('annotationAuthor')} />
-      <MethodTypeFilter />
-      <AnnotationSoftwareFilter allAnnotationSoftwares={annotationSoftwares} />
-    </>
-  )
-
   return (
     <FilterPanel>
       <>
         <NameOrIdFilterSection />
-        {showObjectNameIdFilter ? (
-          <>
-            <FilterSection title={t('objectMetadata')}>
-              {objectMetadataFilters}
-            </FilterSection>
-            <FilterSection title={t('annotationMetadata')}>
-              {otherAnnotationMetadataFilters}
-            </FilterSection>
-          </>
-        ) : (
-          <FilterSection title={t('annotationMetadata')}>
-            {annotationMetadataFilters}
-          </FilterSection>
-        )}
+        <FilterSection title={t('objectMetadata')}>
+          <ObjectNameIdFilter
+            label={t('objectNameOrId')}
+            objectNames={allObjectNames}
+            showAnnotatedObjectsOnly={showAnnotatedObjectsOnly}
+          />
+          <AnnotatedObjectShapeTypeFilter
+            allObjectShapeTypes={objectShapeTypes}
+          />
+        </FilterSection>
+        <FilterSection title={t('annotationMetadata')}>
+          <AuthorFilter label={t('annotationAuthor')} />
+          <MethodTypeFilter />
+          <AnnotationSoftwareFilter
+            allAnnotationSoftwares={annotationSoftwares}
+          />
+        </FilterSection>
       </>
     </FilterPanel>
   )

frontend/packages/data-portal/app/components/AnnotationFilter/ObjectIdFilter/ObjectIdFilter.tsx

@@ -30,7 +30,6 @@ import { useIsLoading } from 'app/hooks/useIsLoading'
 import { Dataset } from 'app/types/gql/datasetsPageTypes'
 import { LogLevel } from 'app/types/logging'
 import { cnsNoMerge } from 'app/utils/cns'
-import { useFeatureFlag } from 'app/utils/featureFlags'
 import { sendLogs } from 'app/utils/logging'
 import { setObjectNameAndGroundTruthStatus } from 'app/utils/setObjectNameAndGroundTruthStatus'
 import { getErrorMessage } from 'app/utils/string'
@@ -47,7 +46,6 @@ const LOADING_DATASETS: Dataset[] = range(0, MAX_PER_PAGE).map(() => ({
 export function DatasetTable() {
   const { t } = useI18n()
   const { datasets } = useDatasets()
-  const isIdentifiedObjectsEnabled = useFeatureFlag('identifiedObjects')
 
   const [searchParams, setSearchParams] = useSearchParams()
   const datasetSort = (searchParams.get(QueryParams.Sort) ?? undefined) as
@@ -271,53 +269,33 @@ export function DatasetTable() {
           (dataset) => {
             const objectsMap = new Map<string, boolean>()
 
-            // When feature flag is enabled, use separate queries backward compatibility
-            if (isIdentifiedObjectsEnabled) {
-              // Handle annotations separately
-              dataset.annotationsObjectNames?.aggregate?.forEach(
-                (aggregate) => {
-                  const annotationObjectName =
-                    aggregate?.groupBy?.annotations?.objectName
-                  const groundTruthStatus =
-                    !!aggregate?.groupBy?.annotations?.groundTruthStatus
-                  if (annotationObjectName) {
-                    setObjectNameAndGroundTruthStatus(
-                      annotationObjectName,
-                      groundTruthStatus,
-                      objectsMap,
-                    )
-                  }
-                },
-              )
-
-              // Handle identifiedObjects separately
-              dataset.identifiedObjectNames?.aggregate?.forEach((aggregate) => {
-                const identifiedObjectName =
-                  aggregate?.groupBy?.identifiedObjects?.objectName
-                if (identifiedObjectName) {
-                  setObjectNameAndGroundTruthStatus(
-                    identifiedObjectName,
-                    false, // identifiedObjects don't have groundTruthStatus, default to false
-                    objectsMap,
-                  )
-                }
-              })
-            } else {
-              // Fall back to original query structure when feature flag is off
-              dataset.distinctObjectNames?.aggregate?.forEach((aggregate) => {
-                const annotationObjectName =
-                  aggregate?.groupBy?.annotations?.objectName
-                const groundTruthStatus =
-                  !!aggregate?.groupBy?.annotations?.groundTruthStatus
-                if (annotationObjectName) {
-                  setObjectNameAndGroundTruthStatus(
-                    annotationObjectName,
-                    groundTruthStatus,
-                    objectsMap,
-                  )
-                }
-              })
-            }
+            // Handle annotations
+            dataset.annotationsObjectNames?.aggregate?.forEach((aggregate) => {
+              const annotationObjectName =
+                aggregate?.groupBy?.annotations?.objectName
+              const groundTruthStatus =
+                !!aggregate?.groupBy?.annotations?.groundTruthStatus
+              if (annotationObjectName) {
+                setObjectNameAndGroundTruthStatus(
+                  annotationObjectName,
+                  groundTruthStatus,
+                  objectsMap,
+                )
+              }
+            })
+
+            // Handle identifiedObjects
+            dataset.identifiedObjectNames?.aggregate?.forEach((aggregate) => {
+              const identifiedObjectName =
+                aggregate?.groupBy?.identifiedObjects?.objectName
+              if (identifiedObjectName) {
+                setObjectNameAndGroundTruthStatus(
+                  identifiedObjectName,
+                  false, // identifiedObjects don't have groundTruthStatus, default to false
+                  objectsMap,
+                )
+              }
+            })
 
             return objectsMap
           },
@@ -376,7 +354,6 @@ export function DatasetTable() {
     t,
     searchParams,
     setSearchParams,
-    isIdentifiedObjectsEnabled,
   ])
 
   return (