refactor(app): move code to stop importing lw page

There were a couple helpers and types that lived in
app/src/pages/Desktop/Labware that were imported all over the place in
organisms. Let's give them a new home: local-resources

In the same way that resources/ provides app-specific wrappers around
robot api concerns, local-resources/ provides app-specific wrappers
around code and handling of other opentrons resources, like (for now)
labware.

app/src/organisms/Desktop/Labware/AddCustomLabwareSlideout/__tests__/AddCustomLabwareSlideout.test.tsx

@@ -11,7 +11,7 @@ import { renderWithProviders } from '/app/__testing-utils__'
 import { AddCustomLabwareSlideout } from '..'
 
 vi.mock('/app/redux/custom-labware')
-vi.mock('/app/pages/Desktop/Labware/helpers/getAllDefs')
+vi.mock('/app/local-resources/labware')
 vi.mock('/app/redux/analytics')
 
 let mockTrackEvent: any

app/src/organisms/Desktop/Labware/LabwareCard/__tests__/LabwareCard.test.tsx

@@ -3,14 +3,14 @@ import { screen } from '@testing-library/react'
 import { describe, it, vi, beforeEach } from 'vitest'
 import { renderWithProviders, nestedTextMatcher } from '/app/__testing-utils__'
 import { i18n } from '/app/i18n'
-import { useAllLabware } from '/app/pages/Desktop/Labware/hooks'
+import { useAllLabware } from '/app/local-resources/labware'
 import { mockDefinition } from '/app/redux/custom-labware/__fixtures__'
 import { CustomLabwareOverflowMenu } from '../CustomLabwareOverflowMenu'
 import { LabwareCard } from '..'
 
 import type * as OpentronsComponents from '@opentrons/components'
 
-vi.mock('/app/pages/Desktop/Labware/hooks')
+vi.mock('/app/local-resources/labware')
 vi.mock('../CustomLabwareOverflowMenu')
 
 vi.mock('@opentrons/components', async importOriginal => {

app/src/organisms/Desktop/Labware/LabwareCard/index.tsx

@@ -23,7 +23,7 @@ import {
 
 import { UNIVERSAL_FLAT_ADAPTER_X_DIMENSION } from '../LabwareDetails/Gallery'
 import { CustomLabwareOverflowMenu } from './CustomLabwareOverflowMenu'
-import type { LabwareDefAndDate } from '/app/pages/Desktop/Labware/hooks'
+import type { LabwareDefAndDate } from '/app/local-resources/labware'
 
 export interface LabwareCardProps {
   labware: LabwareDefAndDate

app/src/organisms/Desktop/Labware/LabwareDetails/Dimensions.tsx

@@ -4,7 +4,7 @@ import round from 'lodash/round'
 import { Box, SPACING, getFootprintDiagram } from '@opentrons/components'
 import { LabeledValue } from './StyledComponents/LabeledValue'
 import { ExpandingTitle } from './StyledComponents/ExpandingTitle'
-import type { LabwareDefinition } from '/app/pages/Desktop/Labware/types'
+import type { LabwareDefinition2 as LabwareDefinition } from '@opentrons/shared-data'
 
 const toFixed = (n: number): string => round(n, 2).toFixed(2)
 

app/src/organisms/Desktop/Labware/LabwareDetails/Gallery.tsx

@@ -11,9 +11,10 @@ import {
   SPACING_AUTO,
   SPACING,
 } from '@opentrons/components'
+
 import { labwareImages } from './labware-images'
 
-import type { LabwareDefinition } from '/app/pages/Desktop/Labware/types'
+import type { LabwareDefinition2 as LabwareDefinition } from '@opentrons/shared-data'
 
 export const UNIVERSAL_FLAT_ADAPTER_X_DIMENSION = 127.4
 

app/src/organisms/Desktop/Labware/LabwareDetails/InsertDetails.tsx

@@ -12,7 +12,7 @@ import { WellProperties } from './WellProperties'
 import { WellDimensions } from './WellDimensions'
 import { ManufacturerDetails } from './ManufacturerDetails'
 
-import type { LabwareDefinition } from '/app/pages/Desktop/Labware/types'
+import type { LabwareDefinition2 as LabwareDefinition } from '@opentrons/shared-data'
 
 export interface InsertDetailsProps {
   definition: LabwareDefinition

app/src/organisms/Desktop/Labware/LabwareDetails/ManufacturerDetails.tsx

@@ -12,7 +12,7 @@ import {
   SPACING,
   LegacyStyledText,
 } from '@opentrons/components'
-import type { LabwareBrand } from '/app/pages/Desktop/Labware/types'
+import type { LabwareBrand } from '@opentrons/shared-data'
 
 export interface ManufacturerDetailsProps {
   brand: LabwareBrand

app/src/organisms/Desktop/Labware/LabwareDetails/WellDimensions.tsx

@@ -5,10 +5,8 @@ import { Box, SPACING, getMeasurementDiagram } from '@opentrons/components'
 import { LabeledValue } from './StyledComponents/LabeledValue'
 import { ExpandingTitle } from './StyledComponents/ExpandingTitle'
 
-import type {
-  LabwareWellGroupProperties,
-  LabwareParameters,
-} from '/app/pages/Desktop/Labware/types'
+import type { LabwareParameters } from '@opentrons/shared-data'
+import type { LabwareWellGroupProperties } from '/app/local-resources/labware'
 
 const toFixed = (n: number): string => round(n, 2).toFixed(2)
 

app/src/organisms/Desktop/Labware/LabwareDetails/WellProperties.tsx

@@ -13,11 +13,12 @@ import {
 } from '@opentrons/components'
 import { getDisplayVolume } from '@opentrons/shared-data'
 
+import type { LabwareWellGroupProperties } from '/app/local-resources/labware'
+
 import type {
-  LabwareDefinition,
-  LabwareWellGroupProperties,
+  LabwareDefinition2 as LabwareDefinition,
   LabwareVolumeUnits,
-} from '/app/pages/Desktop/Labware/types'
+} from '@opentrons/shared-data'
 
 export interface AllWellPropertiesProps {
   definition: LabwareDefinition

app/src/organisms/Desktop/Labware/LabwareDetails/WellSpacing.tsx

@@ -5,7 +5,7 @@ import { getSpacingDiagram } from '@opentrons/components'
 import { LabeledValue } from './StyledComponents/LabeledValue'
 import { ExpandingTitle } from './StyledComponents/ExpandingTitle'
 
-import type { LabwareWellGroupProperties } from '/app/pages/Desktop/Labware/types'
+import type { LabwareWellGroupProperties } from '/app/local-resources/labware'
 
 const toFixed = (n: number): string => round(n, 2).toFixed(2)
 

app/src/organisms/Desktop/Labware/LabwareDetails/__tests__/LabwareDetails.test.tsx

@@ -4,7 +4,7 @@ import { describe, it, beforeEach, afterEach, vi, expect } from 'vitest'
 
 import { renderWithProviders } from '/app/__testing-utils__'
 import { i18n } from '/app/i18n'
-import { useAllLabware } from '/app/pages/Desktop/Labware/hooks'
+import { useAllLabware } from '/app/local-resources/labware'
 import { mockOpentronsLabwareDetailsDefinition } from '/app/redux/custom-labware/__fixtures__'
 import { CustomLabwareOverflowMenu } from '../../LabwareCard/CustomLabwareOverflowMenu'
 import { Dimensions } from '../Dimensions'
@@ -17,7 +17,7 @@ import { WellSpacing } from '../WellSpacing'
 
 import { LabwareDetails } from '..'
 
-vi.mock('/app/pages/Desktop/Labware/hooks')
+vi.mock('/app/local-resources/labware')
 vi.mock('../../LabwareCard/CustomLabwareOverflowMenu')
 vi.mock('../Dimensions')
 vi.mock('../Gallery')

app/src/organisms/Desktop/Labware/LabwareDetails/helpers/labels.ts

@@ -1,8 +1,7 @@
 import uniqBy from 'lodash/uniqBy'
-import type {
-  LabwareWellGroupProperties,
-  LabwareDefinition,
-} from '/app/pages/Desktop/Labware/types'
+import type { LabwareWellGroupProperties } from '/app/local-resources/labware'
+import type { LabwareDefinition2 as LabwareDefinition } from '@opentrons/shared-data'
+
 const WELL_TYPE_BY_CATEGORY = {
   tubeRack: 'tube',
   tipRack: 'tip',

app/src/organisms/Desktop/Labware/LabwareDetails/index.tsx

@@ -35,7 +35,7 @@ import { ManufacturerDetails } from './ManufacturerDetails'
 import { InsertDetails } from './InsertDetails'
 import { Gallery } from './Gallery'
 import { CustomLabwareOverflowMenu } from '../LabwareCard/CustomLabwareOverflowMenu'
-import type { LabwareDefAndDate } from '/app/pages/Desktop/Labware/hooks'
+import type { LabwareDefAndDate } from '/app/local-resources/labware'
 
 const CLOSE_ICON_STYLE = css`
   border-radius: 50%;

app/src/organisms/ProtocolDetails/ProtocolLabwareDetails.tsx

@@ -21,10 +21,10 @@ import {
 import { getLabwareDefURI } from '@opentrons/shared-data'
 import { Divider } from '/app/atoms/structure'
 import { getTopPortalEl } from '/app/App/portal'
-import { LabwareDetails } from '../Desktop/LabwareDetails'
+import { LabwareDetails } from '../Desktop/Labware/LabwareDetails'
 
 import type { LoadLabwareRunTimeCommand } from '@opentrons/shared-data'
-import type { LabwareDefAndDate } from '/app/pages/Desktop/Labware/hooks'
+import type { LabwareDefAndDate } from '/app/local-resources/labware'
 
 interface ProtocolLabwareDetailsProps {
   requiredLabwareDetails: LoadLabwareRunTimeCommand[] | null

app/src/organisms/QuickTransferFlow/SelectDestLabware.tsx

@@ -17,7 +17,7 @@ import { getCompatibleLabwareByCategory } from './utils'
 
 import type { LabwareDefinition2 } from '@opentrons/shared-data'
 import type { SmallButton } from '/app/atoms/buttons'
-import type { LabwareFilter } from '/app/pages/Desktop/Labware/types'
+import type { LabwareFilter } from '/app/local-resources/labware'
 import type {
   QuickTransferWizardState,
   QuickTransferWizardAction,

app/src/organisms/QuickTransferFlow/SelectSourceLabware.tsx

@@ -17,7 +17,7 @@ import { getCompatibleLabwareByCategory } from './utils'
 
 import type { LabwareDefinition2 } from '@opentrons/shared-data'
 import type { SmallButton } from '/app/atoms/buttons'
-import type { LabwareFilter } from '/app/pages/Desktop/Labware/types'
+import type { LabwareFilter } from '/app/local-resources/labware'
 import type {
   QuickTransferWizardState,
   QuickTransferWizardAction,

app/src/organisms/QuickTransferFlow/utils/generateCompatibleLabwareForPipette.ts

@@ -1,5 +1,5 @@
 import { makeWellSetHelpers, getLabwareDefURI } from '@opentrons/shared-data'
-import { getAllDefinitions as getAllLatestDefValues } from '/app/pages/Desktop/Labware/helpers/definitions'
+import { getAllDefinitions as getAllLatestDefValues } from '/app/local-resources/labware'
 
 import type { PipetteV2Specs, WellSetHelpers } from '@opentrons/shared-data'
 

app/src/organisms/QuickTransferFlow/utils/getCompatibleLabwareByCategory.ts

@@ -6,7 +6,7 @@ import {
 } from '../constants'
 
 import type { LabwareDefinition2 } from '@opentrons/shared-data'
-import type { LabwareFilter } from '/app/pages/Desktop/Labware/types'
+import type { LabwareFilter } from '/app/local-resources/labware'
 
 export function getCompatibleLabwareByCategory(
   pipetteChannels: 1 | 8 | 96,

app/src/pages/Desktop/Labware/__tests__/Labware.test.tsx

@@ -8,18 +8,20 @@ import {
   useTrackEvent,
   ANALYTICS_OPEN_LABWARE_CREATOR_FROM_BOTTOM_OF_LABWARE_LIBRARY_LIST,
 } from '/app/redux/analytics'
-import { LabwareCard } from '/app/organisms/Desktop/LabwareCard'
-import { AddCustomLabwareSlideout } from '/app/organisms/Desktop/AddCustomLabwareSlideout'
+import { LabwareCard } from '/app/organisms/Desktop/Labware/LabwareCard'
+import { AddCustomLabwareSlideout } from '/app/organisms/Desktop/Labware/AddCustomLabwareSlideout'
 import { useToaster } from '/app/organisms/ToasterOven'
-import { useAllLabware, useLabwareFailure, useNewLabwareName } from '../hooks'
+import { useLabwareFailure, useNewLabwareName } from '../hooks'
 import { Labware } from '..'
+import { useAllLabware } from '/app/local-resources/labware'
 import { mockDefinition } from '/app/redux/custom-labware/__fixtures__'
 
 vi.mock('/app/organisms/LabwareCard')
 vi.mock('/app/organisms/AddCustomLabwareSlideout')
 vi.mock('/app/organisms/ToasterOven')
 vi.mock('../hooks')
 vi.mock('/app/redux/analytics')
+vi.mock('/app/local-resources/labware')
 
 const mockTrackEvent = vi.fn()
 const mockMakeSnackbar = vi.fn()

app/src/pages/Desktop/Labware/__tests__/hooks.test.tsx

@@ -5,7 +5,7 @@ import { vi, it, describe, expect, beforeEach, afterEach } from 'vitest'
 import { renderHook } from '@testing-library/react'
 import { i18n } from '/app/i18n'
 import { I18nextProvider } from 'react-i18next'
-import { getAllDefs } from '../helpers/getAllDefs'
+import { getAllDefs } from '/app/local-resources/labware/utils/getAllDefs'
 
 import {
   getValidCustomLabware,
@@ -17,14 +17,15 @@ import {
   mockValidLabware,
 } from '/app/redux/custom-labware/__fixtures__'
 
-import { useAllLabware, useLabwareFailure, useNewLabwareName } from '../hooks'
+import { useLabwareFailure, useNewLabwareName } from '../hooks'
+import { useAllLabware } from '/app/local-resources/labware'
 
 import type { Store } from 'redux'
 import type { State } from '/app/redux/types'
 import type { FailedLabwareFile } from '/app/redux/custom-labware/types'
 
 vi.mock('/app/redux/custom-labware')
-vi.mock('../helpers/getAllDefs')
+vi.mock('/app/local-resources/labware/utils/getAllDefs')
 
 describe('useAllLabware hook', () => {
   const store: Store<State> = createStore(vi.fn(), {})

app/src/pages/Desktop/Labware/hooks.tsx

@@ -5,66 +5,9 @@ import {
   clearAddCustomLabwareFailure,
   getAddNewLabwareName,
   clearNewLabwareName,
-  getValidCustomLabware,
 } from '/app/redux/custom-labware'
-import { getAllDefinitions } from './helpers/definitions'
 import type { Dispatch } from '/app/redux/types'
 
-import type { LabwareDefinition2 as LabwareDefinition } from '@opentrons/shared-data'
-import type { LabwareFilter, LabwareSort } from './types'
-
-export interface LabwareDefAndDate {
-  definition: LabwareDefinition
-  modified?: number
-  filename?: string
-}
-
-export function useAllLabware(
-  sortBy: LabwareSort,
-  filterBy: LabwareFilter
-): LabwareDefAndDate[] {
-  const fullLabwareList: LabwareDefAndDate[] = []
-  const labwareDefinitions = getAllDefinitions()
-  labwareDefinitions.forEach(def => fullLabwareList.push({ definition: def }))
-  const customLabwareList = useSelector(getValidCustomLabware)
-  customLabwareList.forEach(customLabware =>
-    'definition' in customLabware
-      ? fullLabwareList.push({
-          modified: customLabware.modified,
-          definition: customLabware.definition,
-          filename: customLabware.filename,
-        })
-      : null
-  )
-  const sortLabware = (a: LabwareDefAndDate, b: LabwareDefAndDate): number => {
-    if (
-      a.definition.metadata.displayName.toUpperCase() <
-      b.definition.metadata.displayName.toUpperCase()
-    ) {
-      return sortBy === 'alphabetical' ? -1 : 1
-    }
-    if (
-      a.definition.metadata.displayName.toUpperCase() >
-      b.definition.metadata.displayName.toUpperCase()
-    ) {
-      return sortBy === 'alphabetical' ? 1 : -1
-    }
-    return 0
-  }
-
-  if (filterBy === 'customLabware') {
-    return (customLabwareList as LabwareDefAndDate[]).sort(sortLabware)
-  }
-  fullLabwareList.sort(sortLabware)
-  if (filterBy !== 'all') {
-    return fullLabwareList.filter(
-      labwareItem =>
-        labwareItem.definition.metadata.displayCategory === filterBy
-    )
-  }
-  return fullLabwareList
-}
-
 export function useLabwareFailure(): {
   labwareFailureMessage: string | null
   clearLabwareFailure: () => unknown

app/src/pages/Desktop/Labware/index.tsx

@@ -35,16 +35,20 @@ import {
   ANALYTICS_OPEN_LABWARE_CREATOR_FROM_BOTTOM_OF_LABWARE_LIBRARY_LIST,
 } from '/app/redux/analytics'
 import { addCustomLabwareFileFromCreator } from '/app/redux/custom-labware'
-import { LabwareCard } from '/app/organisms/Desktop/LabwareCard'
-import { AddCustomLabwareSlideout } from '/app/organisms/Desktop/AddCustomLabwareSlideout'
-import { LabwareDetails } from '/app/organisms/Desktop/LabwareDetails'
+import { LabwareCard } from '/app/organisms/Desktop/Labware/LabwareCard'
+import { AddCustomLabwareSlideout } from '/app/organisms/Desktop/Labware/AddCustomLabwareSlideout'
+import { LabwareDetails } from '/app/organisms/Desktop/Labware/LabwareDetails'
 import { useToaster } from '/app/organisms/ToasterOven'
 import { useFeatureFlag } from '/app/redux/config'
-import { useAllLabware, useLabwareFailure, useNewLabwareName } from './hooks'
+import { useLabwareFailure, useNewLabwareName } from './hooks'
+import { useAllLabware } from '/app/local-resources/labware'
 
 import type { DropdownOption } from '@opentrons/components'
-import type { LabwareFilter, LabwareSort } from './types'
-import type { LabwareDefAndDate } from './hooks'
+import type {
+  LabwareFilter,
+  LabwareSort,
+  LabwareDefAndDate,
+} from '/app/local-resources/labware'
 
 const LABWARE_CREATOR_HREF = 'https://labware.opentrons.com/create/'
 const labwareDisplayCategoryFilters: LabwareFilter[] = [