Skip to content

Commit

Permalink
refactor(app): move labware organisms into Desktop
Browse files Browse the repository at this point in the history
This is a new container for desktop-specific organisms.

Also, there were a bunch of pictures of ~spider-man~ labware in here
that could go in assets/ instead.
  • Loading branch information
sfoster1 committed Sep 19, 2024
1 parent f2e03cc commit f5e287d
Show file tree
Hide file tree
Showing 100 changed files with 67 additions and 68 deletions.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import {
} from '@opentrons/components'

import { Divider } from '/app/atoms/structure'
import { getTopPortalEl } from '../../App/portal'
import { getTopPortalEl } from '/app/App/portal'
import {
deleteCustomLabwareFile,
openCustomLabwareDirectory,
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,65 +1,64 @@
// images by labware load name
// TODO(mc, 2019-05-29): shared-data? components-library?

import agilent_1_reservoir_290ml_side_view from './images/agilent_1_reservoir_290ml_side_view.jpg'
import axygen_1_reservoir_90ml_side_view from './images/axygen_1_reservoir_90ml_side_view.jpg'
import biorad_96_wellplate_200ul_pcr_photo_three_quarters from './images/biorad_96_wellplate_200ul_pcr_photo_three_quarters.jpg'
import corning_12_wellplate_6_9ml_flat_photo_three_quarters from './images/corning_12_wellplate_6.9ml_flat_photo_three_quarters.jpg'
import corning_24_wellplate_3_4ml_flat_photo_three_quarters from './images/corning_24_wellplate_3.4ml_flat_photo_three_quarters.jpg'
import corning_384_wellplate_112ul_flat_photo_three_quarters from './images/corning_384_wellplate_112ul_flat_photo_three_quarters.jpg'
import corning_96_wellplate_360ul_flat_three_quarters from './images/corning_96_wellplate_360ul_flat_three_quarters.jpg'
import corning_48_wellplate_1_6ml_flat_photo_three_quarters from './images/corning_48_wellplate_1.6ml_flat_photo_three_quarters.jpg'
import corning_6_wellplate_16_8ml_flat_photo_three_quarters from './images/corning_6_wellplate_16.8ml_flat_photo_three_quarters.jpg'
import eppendorf_1000ul_tip_eptips_side_view from './images/eppendorf_1000ul_tip_eptips_side_view.jpg'
import eppendorf_10ul_tips_eptips_side_view from './images/eppendorf_10ul_tips_eptips_side_view.jpg'
import geb_96_tiprack_1000ul_side_view from './images/geb_96_tiprack_1000ul_side_view.jpg'
import geb_1000ul_tip_side_view from './images/geb_1000ul_tip_side_view.jpg'
import geb_96_tiprack_10ul_side_view from './images/geb_96_tiprack_10ul_side_view.jpg'
import geb_10ul_tip_side_view from './images/geb_10ul_tip_side_view.jpg'
import nest_1_reservoir_195ml_three_quarters from './images/nest_1_reservoir_195ml_three_quarters.jpg'
import nest_1_reservoir_290ml from './images/nest_1_reservoir_290ml.jpg'
import nest_12_reservoir_15ml_three_quarters from './images/nest_12_reservoir_15ml_three_quarters.jpg'
import nest_96_wellplate_100ul_pcr_full_skirt_three_quarters from './images/nest_96_wellplate_100ul_pcr_full_skirt_three_quarters.jpg'
import nest_96_wellplate_200ul_flat_three_quarters from './images/nest_96_wellplate_200ul_flat_three_quarters.jpg'
import nest_96_wellplate_2ml_deep from './images/nest_96_wellplate_2ml_deep.jpg'
import opentrons_10_tuberack_4_6_side_view from './images/opentrons_10_tuberack_4_6_side_view.jpg'
import falcon_50ml_15ml_conical_tubes from './images/falcon_50ml_15ml_conical_tubes.jpg'
import opentrons_15_tuberack_side_view from './images/opentrons_15_tuberack_side_view.jpg'
import falcon_15ml_conical_tube from './images/falcon_15ml_conical_tube.jpg'
import nest_50ml_15ml_conical_tubes from './images/nest_50ml_15ml_conical_tubes.jpg'
import nest_15ml_conical_tube from './images/nest_15ml_conical_tube.jpg'
import opentrons_6_tuberack_side_view from './images/opentrons_6_tuberack_side_view.jpg'
import nest_50ml_conical_tube from './images/nest_50ml_conical_tube.jpg'
import opentrons_24_aluminumblock_side_view from './images/opentrons_24_aluminumblock_side_view.jpg'
import generic_2ml_screwcap_tube from './images/generic_2ml_screwcap_tube.jpg'
import nest_0_5ml_screwcap_tube from './images/nest_0.5ml_screwcap_tube.jpg'
import nest_1_5ml_screwcap_tube from './images/nest_1.5ml_screwcap_tube.jpg'
import nest_1_5ml_snapcap_tube from './images/nest_1.5ml_snapcap_tube.jpg'
import nest_2ml_screwcap_tube from './images/nest_2ml_screwcap_tube.jpg'
import nest_2ml_snapcap_tube from './images/nest_2ml_snapcap_tube.jpg'
import opentrons_24_tuberack_side_view from './images/opentrons_24_tuberack_side_view.jpg'
import eppendorf_1_5ml_safelock_snapcap_tube from './images/eppendorf_1.5ml_safelock_snapcap_tube.jpg'
import eppendorf_2ml_safelock_snapcap_tube from './images/eppendorf_2ml_safelock_snapcap_tube.jpg'
import falcon_50ml_conical_tube from './images/falcon_50ml_conical_tube.jpg'
import generic_pcr_strip_200ul_tubes from './images/generic_pcr_strip_200ul_tubes.jpg'
import opentrons_96_tiprack_1000ul_side_view from './images/opentrons_96_tiprack_1000ul_side_view.jpg'
import opentrons_96_tiprack_10ul_side_view from './images/opentrons_96_tiprack_10ul_side_view.jpg'
import opentrons_96_tiprack_300ul_side_view from './images/opentrons_96_tiprack_300ul_side_view.jpg'
import tipone_96_tiprack_200ul_side_view from './images/tipone_96_tiprack_200ul_side_view.jpg'
import tipone_200ul_tip_side_view from './images/tipone_200ul_tip_side_view.jpg'
import usascientific_12_reservoir_22ml_side_view from './images/usascientific_12_reservoir_22ml_side_view.jpg'
import usascientific_96_wellplate_2_4ml_deep_side_view from './images/usascientific_96_wellplate_2.4ml_deep_side_view.jpg'
import thermoscientificnunc_96_wellplate_1300ul from './images/thermoscientificnunc_96_wellplate_1300ul.jpg'
import thermoscientificnunc_96_wellplate_2000ul from './images/thermoscientificnunc_96_wellplate_2000ul.jpg'
import appliedbiosystemsmicroamp_384_wellplate_40ul from './images/appliedbiosystemsmicroamp_384_wellplate_40ul.jpg'
import biorad_384_wellplate_50ul from './images/biorad_384_wellplate_50ul.jpg'
import deep_well_plate_adapter from './images/deep_well_plate_adapter.jpg'
import flat_bottom_plate_adapter from './images/flat_bottom_plate_adapter.jpg'
import pcr_plate_adapter from './images/pcr_plate_adapter.jpg'
import universal_flat_adapter from './images/universal_flat_adapter.jpg'
import flat_bottom_aluminum from './images/flat_bottom_aluminum.png'
import opentrons_96_aluminumblock_side_view from './images/opentrons_96_aluminumblock_side_view.jpg'
import opentrons_96_deep_well_temp_mod_adapter_img from './images/opentrons_96_deep_well_temp_mod_adapter.png'
import agilent_1_reservoir_290ml_side_view from '/app/assets/images/labware/agilent_1_reservoir_290ml_side_view.jpg'
import axygen_1_reservoir_90ml_side_view from '/app/assets/images/labware/axygen_1_reservoir_90ml_side_view.jpg'
import biorad_96_wellplate_200ul_pcr_photo_three_quarters from '/app/assets/images/labware/biorad_96_wellplate_200ul_pcr_photo_three_quarters.jpg'
import corning_12_wellplate_6_9ml_flat_photo_three_quarters from '/app/assets/images/labware/corning_12_wellplate_6.9ml_flat_photo_three_quarters.jpg'
import corning_24_wellplate_3_4ml_flat_photo_three_quarters from '/app/assets/images/labware/corning_24_wellplate_3.4ml_flat_photo_three_quarters.jpg'
import corning_384_wellplate_112ul_flat_photo_three_quarters from '/app/assets/images/labware/corning_384_wellplate_112ul_flat_photo_three_quarters.jpg'
import corning_96_wellplate_360ul_flat_three_quarters from '/app/assets/images/labware/corning_96_wellplate_360ul_flat_three_quarters.jpg'
import corning_48_wellplate_1_6ml_flat_photo_three_quarters from '/app/assets/images/labware/corning_48_wellplate_1.6ml_flat_photo_three_quarters.jpg'
import corning_6_wellplate_16_8ml_flat_photo_three_quarters from '/app/assets/images/labware/corning_6_wellplate_16.8ml_flat_photo_three_quarters.jpg'
import eppendorf_1000ul_tip_eptips_side_view from '/app/assets/images/labware/eppendorf_1000ul_tip_eptips_side_view.jpg'
import eppendorf_10ul_tips_eptips_side_view from '/app/assets/images/labware/eppendorf_10ul_tips_eptips_side_view.jpg'
import geb_96_tiprack_1000ul_side_view from '/app/assets/images/labware/geb_96_tiprack_1000ul_side_view.jpg'
import geb_1000ul_tip_side_view from '/app/assets/images/labware/geb_1000ul_tip_side_view.jpg'
import geb_96_tiprack_10ul_side_view from '/app/assets/images/labware/geb_96_tiprack_10ul_side_view.jpg'
import geb_10ul_tip_side_view from '/app/assets/images/labware/geb_10ul_tip_side_view.jpg'
import nest_1_reservoir_195ml_three_quarters from '/app/assets/images/labware/nest_1_reservoir_195ml_three_quarters.jpg'
import nest_1_reservoir_290ml from '/app/assets/images/labware/nest_1_reservoir_290ml.jpg'
import nest_12_reservoir_15ml_three_quarters from '/app/assets/images/labware/nest_12_reservoir_15ml_three_quarters.jpg'
import nest_96_wellplate_100ul_pcr_full_skirt_three_quarters from '/app/assets/images/labware/nest_96_wellplate_100ul_pcr_full_skirt_three_quarters.jpg'
import nest_96_wellplate_200ul_flat_three_quarters from '/app/assets/images/labware/nest_96_wellplate_200ul_flat_three_quarters.jpg'
import nest_96_wellplate_2ml_deep from '/app/assets/images/labware/nest_96_wellplate_2ml_deep.jpg'
import opentrons_10_tuberack_4_6_side_view from '/app/assets/images/labware/opentrons_10_tuberack_4_6_side_view.jpg'
import falcon_50ml_15ml_conical_tubes from '/app/assets/images/labware/falcon_50ml_15ml_conical_tubes.jpg'
import opentrons_15_tuberack_side_view from '/app/assets/images/labware/opentrons_15_tuberack_side_view.jpg'
import falcon_15ml_conical_tube from '/app/assets/images/labware/falcon_15ml_conical_tube.jpg'
import nest_50ml_15ml_conical_tubes from '/app/assets/images/labware/nest_50ml_15ml_conical_tubes.jpg'
import nest_15ml_conical_tube from '/app/assets/images/labware/nest_15ml_conical_tube.jpg'
import opentrons_6_tuberack_side_view from '/app/assets/images/labware/opentrons_6_tuberack_side_view.jpg'
import nest_50ml_conical_tube from '/app/assets/images/labware/nest_50ml_conical_tube.jpg'
import opentrons_24_aluminumblock_side_view from '/app/assets/images/labware/opentrons_24_aluminumblock_side_view.jpg'
import generic_2ml_screwcap_tube from '/app/assets/images/labware/generic_2ml_screwcap_tube.jpg'
import nest_0_5ml_screwcap_tube from '/app/assets/images/labware/nest_0.5ml_screwcap_tube.jpg'
import nest_1_5ml_screwcap_tube from '/app/assets/images/labware/nest_1.5ml_screwcap_tube.jpg'
import nest_1_5ml_snapcap_tube from '/app/assets/images/labware/nest_1.5ml_snapcap_tube.jpg'
import nest_2ml_screwcap_tube from '/app/assets/images/labware/nest_2ml_screwcap_tube.jpg'
import nest_2ml_snapcap_tube from '/app/assets/images/labware/nest_2ml_snapcap_tube.jpg'
import opentrons_24_tuberack_side_view from '/app/assets/images/labware/opentrons_24_tuberack_side_view.jpg'
import eppendorf_1_5ml_safelock_snapcap_tube from '/app/assets/images/labware/eppendorf_1.5ml_safelock_snapcap_tube.jpg'
import eppendorf_2ml_safelock_snapcap_tube from '/app/assets/images/labware/eppendorf_2ml_safelock_snapcap_tube.jpg'
import falcon_50ml_conical_tube from '/app/assets/images/labware/falcon_50ml_conical_tube.jpg'
import generic_pcr_strip_200ul_tubes from '/app/assets/images/labware/generic_pcr_strip_200ul_tubes.jpg'
import opentrons_96_tiprack_1000ul_side_view from '/app/assets/images/labware/opentrons_96_tiprack_1000ul_side_view.jpg'
import opentrons_96_tiprack_10ul_side_view from '/app/assets/images/labware/opentrons_96_tiprack_10ul_side_view.jpg'
import opentrons_96_tiprack_300ul_side_view from '/app/assets/images/labware/opentrons_96_tiprack_300ul_side_view.jpg'
import tipone_96_tiprack_200ul_side_view from '/app/assets/images/labware/tipone_96_tiprack_200ul_side_view.jpg'
import tipone_200ul_tip_side_view from '/app/assets/images/labware/tipone_200ul_tip_side_view.jpg'
import usascientific_12_reservoir_22ml_side_view from '/app/assets/images/labware/usascientific_12_reservoir_22ml_side_view.jpg'
import usascientific_96_wellplate_2_4ml_deep_side_view from '/app/assets/images/labware/usascientific_96_wellplate_2.4ml_deep_side_view.jpg'
import thermoscientificnunc_96_wellplate_1300ul from '/app/assets/images/labware/thermoscientificnunc_96_wellplate_1300ul.jpg'
import thermoscientificnunc_96_wellplate_2000ul from '/app/assets/images/labware/thermoscientificnunc_96_wellplate_2000ul.jpg'
import appliedbiosystemsmicroamp_384_wellplate_40ul from '/app/assets/images/labware/appliedbiosystemsmicroamp_384_wellplate_40ul.jpg'
import biorad_384_wellplate_50ul from '/app/assets/images/labware/biorad_384_wellplate_50ul.jpg'
import deep_well_plate_adapter from '/app/assets/images/labware/deep_well_plate_adapter.jpg'
import flat_bottom_plate_adapter from '/app/assets/images/labware/flat_bottom_plate_adapter.jpg'
import pcr_plate_adapter from '/app/assets/images/labware/pcr_plate_adapter.jpg'
import universal_flat_adapter from '/app/assets/images/labware/universal_flat_adapter.jpg'
import flat_bottom_aluminum from '/app/assets/images/labware/flat_bottom_aluminum.png'
import opentrons_96_aluminumblock_side_view from '/app/assets/images/labware/opentrons_96_aluminumblock_side_view.jpg'
import opentrons_96_deep_well_temp_mod_adapter_img from '/app/assets/images/labware/opentrons_96_deep_well_temp_mod_adapter.png'
export const labwareImages: Record<string, string[]> = {
agilent_1_reservoir_290ml: [agilent_1_reservoir_290ml_side_view],
axygen_1_reservoir_90ml: [axygen_1_reservoir_90ml_side_view],
Expand Down
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
4 changes: 2 additions & 2 deletions app/src/organisms/ProtocolDetails/ProtocolLabwareDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import {
} from '@opentrons/components'
import { getLabwareDefURI } from '@opentrons/shared-data'
import { Divider } from '/app/atoms/structure'
import { getTopPortalEl } from '../../App/portal'
import { LabwareDetails } from '../LabwareDetails'
import { getTopPortalEl } from '/app/App/portal'
import { LabwareDetails } from '../Desktop/LabwareDetails'

import type { LoadLabwareRunTimeCommand } from '@opentrons/shared-data'
import type { LabwareDefAndDate } from '/app/pages/Desktop/Labware/hooks'
Expand Down
4 changes: 2 additions & 2 deletions app/src/pages/Desktop/Labware/__tests__/Labware.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import {
useTrackEvent,
ANALYTICS_OPEN_LABWARE_CREATOR_FROM_BOTTOM_OF_LABWARE_LIBRARY_LIST,
} from '/app/redux/analytics'
import { LabwareCard } from '/app/organisms/LabwareCard'
import { AddCustomLabwareSlideout } from '/app/organisms/AddCustomLabwareSlideout'
import { LabwareCard } from '/app/organisms/Desktop/LabwareCard'
import { AddCustomLabwareSlideout } from '/app/organisms/Desktop/AddCustomLabwareSlideout'
import { useToaster } from '/app/organisms/ToasterOven'
import { useAllLabware, useLabwareFailure, useNewLabwareName } from '../hooks'
import { Labware } from '..'
Expand Down
6 changes: 3 additions & 3 deletions app/src/pages/Desktop/Labware/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ 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/LabwareCard'
import { AddCustomLabwareSlideout } from '/app/organisms/AddCustomLabwareSlideout'
import { LabwareDetails } from '/app/organisms/LabwareDetails'
import { LabwareCard } from '/app/organisms/Desktop/LabwareCard'
import { AddCustomLabwareSlideout } from '/app/organisms/Desktop/AddCustomLabwareSlideout'
import { LabwareDetails } from '/app/organisms/Desktop/LabwareDetails'
import { useToaster } from '/app/organisms/ToasterOven'
import { useFeatureFlag } from '/app/redux/config'
import { useAllLabware, useLabwareFailure, useNewLabwareName } from './hooks'
Expand Down

0 comments on commit f5e287d

Please sign in to comment.