progress

Author: TamarZanzouri

app/src/organisms/DeviceDetailsDeckConfiguration/index.tsx

@@ -22,11 +22,20 @@ import {
 } from '@opentrons/components'
 import { useModulesQuery } from '@opentrons/react-api-client'
 import {
+  FAKE_STAGING_AREA_RIGHT_SLOT,
   FLEX_ROBOT_TYPE,
+  FLEX_STACKER_FIXTURES,
+  getAAByAAId,
+  getAADisplayName,
+  getAASlotNameForAA,
   getCutoutDisplayName,
   getDeckDefFromRobotType,
+  getDeckDefWithFakes,
   getFixtureDisplayName,
+  replaceFixtureToFakeFixtureAndTransformCutoutFixturesToAA,
+  SINGLE_RIGHT_CUTOUTS,
   SINGLE_SLOT_FIXTURES,
+  STAGING_AREA_RIGHT_SLOT_FIXTURE,
 } from '@opentrons/shared-data'
 
 import { useIsRobotViewable } from '/app/redux-resources/robots'
@@ -67,6 +76,10 @@ export function DeviceDetailsDeckConfiguration({
     useNotifyDeckConfigurationQuery({
       refetchInterval: DECK_CONFIG_REFETCH_INTERVAL,
     }).data ?? []
+    
+  const deckConfigWithAA = replaceFixtureToFakeFixtureAndTransformCutoutFixturesToAA(
+      deckConfig
+  )
   const deckDef = getDeckDefFromRobotType(FLEX_ROBOT_TYPE)
   const { isRunRunning } = useRunStatuses()
   const { data: maintenanceRunData } = useNotifyCurrentMaintenanceRun({
@@ -83,14 +96,17 @@ export function DeviceDetailsDeckConfiguration({
   } = useDeckConfigurationEditingTools(false)
 
   // do not show standard slot in fixture display list
-  const { displayList: fixtureDisplayList } = deckConfig.reduce<{
+  const { displayList: fixtureDisplayList } = deckConfigWithAA.reduce<{
     displayList: Array<{ displayLocation: string; displayName: string }>
     groupedCutoutIds: CutoutId[]
   }>(
-    (acc, { cutoutId, cutoutFixtureId, opentronsModuleSerialNumber }) => {
+    (acc, { cutoutId, cutoutFixtureId, opentronsModuleSerialNumber, addressableAreaId }) => {
+      const areaInCheck = getAAByAAId(addressableAreaId, deckDef)
+      const shouldShow = areaInCheck.areaType != 'slot' && areaInCheck.areaType!= 'stagingSlot'
       if (
         cutoutFixtureId == null ||
         SINGLE_SLOT_FIXTURES.includes(cutoutFixtureId)
+        || FAKE_STAGING_AREA_RIGHT_SLOT === cutoutFixtureId || !shouldShow
       ) {
         return acc
       }
@@ -102,9 +118,11 @@ export function DeviceDetailsDeckConfiguration({
           ? `${usbPort.port}.${usbPort.hubPort}`
           : usbPort?.port
       const displayName = getFixtureDisplayName(cutoutFixtureId, portDisplay)
+      console.log("displayName: ", displayName)
       const fixtureGroup =
         deckDef.cutoutFixtures.find(cf => cf.id === cutoutFixtureId)
           ?.fixtureGroup ?? {}
+      const name = getAASlotNameForAA(cutoutId, cutoutFixtureId, addressableAreaId)
       if (cutoutId in fixtureGroup) {
         const groupMap =
           fixtureGroup[cutoutId]?.find(group =>
@@ -117,11 +135,14 @@ export function DeviceDetailsDeckConfiguration({
           ) ?? {}
         const groupedCutoutIds = Object.keys(groupMap) as CutoutId[]
         const displayLocation = getDisplayLocationForCutoutIds(groupedCutoutIds)
+        console.log("displayLocation: ", displayLocation
+        )
         if (acc.groupedCutoutIds.includes(cutoutId)) {
           return acc // only list grouped fixtures once
         } else {
+          console.log("in elsse")
           return {
-            displayList: [...acc.displayList, { displayLocation, displayName }],
+            displayList: [...acc.displayList, {  displayLocation: (name ??  displayLocation), displayName }],
             groupedCutoutIds: [...acc.groupedCutoutIds, ...groupedCutoutIds],
           }
         }
@@ -131,7 +152,7 @@ export function DeviceDetailsDeckConfiguration({
         displayList: [
           ...acc.displayList,
           {
-            displayLocation: getDisplayLocationForCutoutIds([cutoutId]),
+            displayLocation: name ? name.replace('fake', '') : getDisplayLocationForCutoutIds([cutoutId]),
             displayName,
           },
         ],