fix(app, labware library): prevent white screen when opening adapter …

…definitions (#13063)
Opentrons · Jul 24, 2023 · 6584665 · 6584665
1 parent 8380fb7
commit 6584665
Show file tree

Hide file tree

Showing 69 changed files with 42 additions and 354 deletions.
diff --git a/app/src/organisms/LabwareDetails/Dimensions.tsx b/app/src/organisms/LabwareDetails/Dimensions.tsx
@@ -1,10 +1,9 @@
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 import round from 'lodash/round'
-import { Box, SPACING } from '@opentrons/components'
+import { Box, SPACING, getFootprintDiagram } from '@opentrons/components'
 import { LabeledValue } from './StyledComponents/LabeledValue'
 import { ExpandingTitle } from './StyledComponents/ExpandingTitle'
-import { getFootprintDiagram } from './measurementGuide'
 import type { LabwareDefinition } from '../../pages/Labware/types'
 
 const toFixed = (n: number): string => round(n, 2).toFixed(2)

diff --git a/app/src/organisms/LabwareDetails/InsertDetails.tsx b/app/src/organisms/LabwareDetails/InsertDetails.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 import { Box, SPACING, BORDERS, TYPOGRAPHY } from '@opentrons/components'
+import { getUniqueWellProperties } from '@opentrons/shared-data'
 import { StyledText } from '../../atoms/text'
-import { getUniqueWellProperties } from './helpers/labwareInference'
 import { getWellLabel } from './helpers/labels'
 import { WellProperties } from './WellProperties'
 import { WellDimensions } from './WellDimensions'

diff --git a/app/src/organisms/LabwareDetails/StyledComponents/__tests__/ExpandingTitle.test.tsx b/app/src/organisms/LabwareDetails/StyledComponents/__tests__/ExpandingTitle.test.tsx
@@ -1,7 +1,6 @@
 import * as React from 'react'
 import { fireEvent } from '@testing-library/react'
-import { renderWithProviders } from '@opentrons/components'
-import { getFootprintDiagram } from '../../measurementGuide'
+import { renderWithProviders, getFootprintDiagram } from '@opentrons/components'
 import { ExpandingTitle } from '../ExpandingTitle'
 
 const render = (props: React.ComponentProps<typeof ExpandingTitle>) => {

diff --git a/app/src/organisms/LabwareDetails/WellDimensions.tsx b/app/src/organisms/LabwareDetails/WellDimensions.tsx
@@ -1,10 +1,9 @@
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 import round from 'lodash/round'
-import { Box, SPACING } from '@opentrons/components'
+import { Box, SPACING, getMeasurementDiagram } from '@opentrons/components'
 import { LabeledValue } from './StyledComponents/LabeledValue'
 import { ExpandingTitle } from './StyledComponents/ExpandingTitle'
-import { getMeasurementDiagram } from './measurementGuide'
 
 import type {
   LabwareWellGroupProperties,

diff --git a/app/src/organisms/LabwareDetails/WellSpacing.tsx b/app/src/organisms/LabwareDetails/WellSpacing.tsx
@@ -1,9 +1,9 @@
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 import round from 'lodash/round'
+import { getSpacingDiagram } from '@opentrons/components'
 import { LabeledValue } from './StyledComponents/LabeledValue'
 import { ExpandingTitle } from './StyledComponents/ExpandingTitle'
-import { getSpacingDiagram } from './measurementGuide'
 
 import type { LabwareWellGroupProperties } from '../../pages/Labware/types'
 

diff --git a/app/src/organisms/LabwareDetails/helpers/labwareInference.ts b/app/src/organisms/LabwareDetails/helpers/labwareInference.ts
diff --git a/app/src/organisms/LabwareDetails/index.tsx b/app/src/organisms/LabwareDetails/index.tsx
@@ -20,11 +20,11 @@ import {
   useHoverTooltip,
   TOOLTIP_TOP_START,
 } from '@opentrons/components'
+import { getUniqueWellProperties } from '@opentrons/shared-data'
 import { StyledText } from '../../atoms/text'
 import { Slideout } from '../../atoms/Slideout'
 import { Tooltip } from '../../atoms/Tooltip'
 import { getWellLabel } from './helpers/labels'
-import { getUniqueWellProperties } from './helpers/labwareInference'
 import { WellCount } from './WellCount'
 import { WellProperties } from './WellProperties'
 import { Dimensions } from './Dimensions'

diff --git a/app/src/organisms/LabwareDetails/measurementGuide/index.ts b/app/src/organisms/LabwareDetails/measurementGuide/index.ts
diff --git a/components/src/images/index.ts b/components/src/images/index.ts
@@ -0,0 +1 @@
+export * from './labware'
diff --git a/components/src/images/labware/index.ts b/components/src/images/labware/index.ts
@@ -0,0 +1 @@
+export * from './measurement-guide'
diff --git a/...uide/images/depth/[email protected] → ...uide/images/depth/[email protected] b/...uide/images/depth/[email protected] → ...uide/images/depth/[email protected]
diff --git a/...ide/images/depth/[email protected] → ...ide/images/depth/[email protected] b/...ide/images/depth/[email protected] → ...ide/images/depth/[email protected]
diff --git a/...ntGuide/images/depth/[email protected] → ...t-guide/images/depth/[email protected] b/...ntGuide/images/depth/[email protected] → ...t-guide/images/depth/[email protected]
diff --git a/...pth/[email protected] → ...pth/[email protected] b/...pth/[email protected] → ...pth/[email protected]
diff --git a/...th/[email protected] → ...th/[email protected] b/...th/[email protected] → ...th/[email protected]
diff --git a/.../depth/[email protected] → .../depth/[email protected] b/.../depth/[email protected] → .../depth/[email protected]
diff --git a/...Guide/images/depth/[email protected] → ...guide/images/depth/[email protected] b/...Guide/images/depth/[email protected] → ...guide/images/depth/[email protected]
diff --git a/...tGuide/images/dimensions/[email protected] → ...-guide/images/dimensions/[email protected] b/...tGuide/images/dimensions/[email protected] → ...-guide/images/dimensions/[email protected]
diff --git a/...dimensions/[email protected] → ...dimensions/[email protected] b/...dimensions/[email protected] → ...dimensions/[email protected]
diff --git a/...dimensions/[email protected] → ...dimensions/[email protected] b/...dimensions/[email protected] → ...dimensions/[email protected]
diff --git a/...ensions/[email protected] → ...ensions/[email protected] b/...ensions/[email protected] → ...ensions/[email protected]
diff --git a/.../images/dimensions/[email protected] → .../images/dimensions/[email protected] b/.../images/dimensions/[email protected] → .../images/dimensions/[email protected]
diff --git a/...ensions/[email protected] → ...ensions/[email protected] b/...ensions/[email protected] → ...ensions/[email protected]
diff --git a/...images/dimensions/[email protected] → ...images/dimensions/[email protected] b/...images/dimensions/[email protected] → ...images/dimensions/[email protected]
diff --git a/...ide/images/offset/[email protected] → ...ide/images/offset/[email protected] b/...ide/images/offset/[email protected] → ...ide/images/offset/[email protected]
diff --git a/...images/offset/[email protected] → ...images/offset/[email protected] b/...images/offset/[email protected] → ...images/offset/[email protected]
diff --git a/...ges/offset/[email protected] → ...ges/offset/[email protected] b/...ges/offset/[email protected] → ...ges/offset/[email protected]
diff --git a/...tGuide/images/shape/[email protected] → ...-guide/images/shape/[email protected] b/...tGuide/images/shape/[email protected] → ...-guide/images/shape/[email protected]
diff --git a/...ide/images/shape/[email protected] → ...ide/images/shape/[email protected] b/...ide/images/shape/[email protected] → ...ide/images/shape/[email protected]
diff --git a/...pacing/[email protected] → ...pacing/[email protected] b/...pacing/[email protected] → ...pacing/[email protected]
diff --git a/...e/images/spacing/[email protected] → ...e/images/spacing/[email protected] b/...e/images/spacing/[email protected] → ...e/images/spacing/[email protected]
diff --git a/...ages/spacing/[email protected] → ...ages/spacing/[email protected] b/...ages/spacing/[email protected] → ...ages/spacing/[email protected]
diff --git a/...s/spacing/[email protected] → ...s/spacing/[email protected] b/...s/spacing/[email protected] → ...s/spacing/[email protected]
diff --git a/...src/components/measurement-guide/index.ts → ...images/labware/measurement-guide/index.ts b/...src/components/measurement-guide/index.ts → ...images/labware/measurement-guide/index.ts
@@ -32,6 +32,10 @@ const FOOTPRINT_DIAGRAMS: Diagrams = {
     require('./images/dimensions/[email protected]'),
     require('./images/dimensions/[email protected]'),
   ],
+  adapter: [
+    require('./images/dimensions/[email protected]'),
+    require('./images/dimensions/[email protected]'),
+  ],
 }
 
 const ALUM_BLOCK_FOOTPRINTS: Diagrams = {

diff --git a/components/src/index.ts b/components/src/index.ts
@@ -12,6 +12,7 @@ export * from './hardware-sim'
 export * from './legacy-hardware-sim'
 export * from './forms'
 export * from './icons'
+export * from './images'
 export * from './instrument'
 export * from './interaction-enhancers'
 export * from './lists'