Edit namespace retrieval

Author: smb2268

app/src/organisms/Desktop/ProtocolDetails/ProtocolLabwareDetails.tsx

@@ -61,7 +61,7 @@ export const ProtocolLabwareDetails = (props: {
           {labwareAndLidDetails?.map((labware, index) => (
             <ProtocolLabwareDetailItem
               key={index}
-              namespace={labware.namespace}
+              namespace={labware.labwareDef.namespace}
               displayName={labware.labwareDef.metadata.displayName}
               quantity={labware.quantity}
               labware={{ definition: labware.labwareDef }}

app/src/pages/ODD/ProtocolDetails/Labware.tsx

@@ -95,7 +95,7 @@ export const Labware = (props: { protocolId: string }): JSX.Element => {
                   paddingLeft={SPACING.spacing24}
                   alignItems={ALIGN_CENTER}
                 >
-                  {labware.namespace === 'opentrons' ? (
+                  {labware.labwareDef.namespace === 'opentrons' ? (
                     <Icon
                       color={COLORS.blue50}
                       name="check-decagram"

app/src/pages/ODD/ProtocolDetails/__tests__/Labware.test.tsx

@@ -39,22 +39,18 @@ describe('Labware', () => {
           labwareDef: fixtureTiprack10ul as LabwareDefinition2,
           lidDisplayName: 'tiprack lid',
           quantity: 1,
-          namespace: 'opentrons',
         },
         {
           labwareDef: fixtureTiprack300ul as LabwareDefinition2,
           quantity: 2,
-          namespace: 'opentrons',
         },
         {
           labwareDef: fixture96Plate as LabwareDefinition2,
           quantity: 1,
-          namespace: 'opentrons',
         },
         {
           labwareDef: fixtureTiprack10ul as LabwareDefinition2,
           quantity: 1,
-          namespace: 'opentrons',
         },
       ])
   })

app/src/pages/ODD/QuickTransferDetails/Labware.tsx

@@ -89,7 +89,7 @@ export const Labware = (props: { transferId: string }): JSX.Element => {
                   flexDirection={DIRECTION_ROW}
                   paddingLeft={SPACING.spacing24}
                 >
-                  {labware.namespace === 'opentrons' ? (
+                  {labware.labwareDef.namespace === 'opentrons' ? (
                     <Icon
                       color={COLORS.blue50}
                       name="check-decagram"

app/src/pages/ODD/QuickTransferDetails/__tests__/Labware.test.tsx

@@ -35,23 +35,19 @@ describe('Labware', () => {
       .thenReturn([
         {
           labwareDef: fixtureTiprack10ul as LabwareDefinition2,
-          quantity: 1,
-          namespace: 'opentrons',
+          quantity: 2,
         },
         {
           labwareDef: fixtureTiprack300ul as LabwareDefinition2,
           quantity: 1,
-          namespace: 'opentrons',
         },
         {
           labwareDef: fixture96Plate as LabwareDefinition2,
           quantity: 1,
-          namespace: 'opentrons',
         },
         {
           labwareDef: fixtureTiprack10ul as LabwareDefinition2,
           quantity: 1,
-          namespace: 'opentrons',
         },
       ])
   })

app/src/transformations/commands/transformations/getRequiredLabwareDetailsFromLoadCommands.ts

@@ -8,9 +8,8 @@ import type {
 } from '@opentrons/shared-data'
 
 export interface RequiredLabwareDetails {
-  namespace: string
-  quantity: number
   labwareDef: LabwareDefinition2
+  quantity: number
   lidDisplayName?: string
 }
 type ProtocolDetailMap = Map<string, RequiredLabwareDetails>
@@ -47,7 +46,6 @@ export function getRequiredLabwareDetailsFromLoadCommands(
       const stackCount = command.result?.labwareIds.length
       if (!acc.has(defUri)) {
         acc.set(defUri, {
-          namespace: command.params.namespace,
           labwareDef: command.result?.definition,
           quantity: 0,
         })
@@ -70,7 +68,6 @@ export function getRequiredLabwareDetailsFromLoadCommands(
 
       if (!acc.has(defUri)) {
         acc.set(defUri, {
-          namespace: command.params.namespace,
           labwareDef: command.result?.definition,
           quantity: 0,
           lidDisplayName: