fix(labware-library): fix ssr hydration bug, module product links, ne…

…st lw links, armadillo clone (#13083) Fix bug where in the rehydration step of conditionally rendered react children would replace server rendered elements with the wrong client rendered elements. Fix product links to opentrons module pages in nav. Replace all broken nest labware productlinks . duplicate armadillo pcr plate definition in favor of opentrons branded and retire old def Closes RLAB-334, RLAB-330, RLAB-277, RLAB-230
Opentrons · Jul 13, 2023 · 3b743c0 · 3b743c0
1 parent cb2a7be
commit 3b743c0
Show file tree

Hide file tree

Showing 75 changed files with 2,248 additions and 209 deletions.
diff --git a/api-client/src/protocols/__fixtures__/simpleAnalysisFile.json b/api-client/src/protocols/__fixtures__/simpleAnalysisFile.json
@@ -1564,9 +1564,7 @@
           "brand": {
             "brand": "NEST",
             "brandId": ["402501"],
-            "links": [
-              "http://www.cell-nest.com/page94?_l=en&product_id=97&product_category=96"
-            ]
+            "links": ["https://www.nest-biotech.com/pcr-plates/58773587.html"]
           },
           "parameters": {
             "format": "96Standard",

diff --git a/app-shell/src/protocol-storage/__fixtures__/analysisResult.json b/app-shell/src/protocol-storage/__fixtures__/analysisResult.json
@@ -78,7 +78,7 @@
                 "brand": "NEST",
                 "brandId": ["360102"],
                 "links": [
-                  "http://www.cell-nest.com/page94?_l=en&product_id=102"
+                  "https://www.nest-biotech.com/reagent-reserviors/59178414.html"
                 ]
               },
               "parameters": {

diff --git a/app-testing/files/protocols/json/OT2_P1000SLeft_None_6_1_SimpleTransfer.json b/app-testing/files/protocols/json/OT2_P1000SLeft_None_6_1_SimpleTransfer.json
@@ -1502,7 +1502,7 @@
                     "360102"
                 ],
                 "links": [
-                    "http://www.cell-nest.com/page94?_l=en&product_id=102"
+                    "https://www.nest-biotech.com/reagent-reserviors/59178414.html"
                 ]
             },
             "metadata": {

diff --git a/app-testing/files/protocols/json/OT2_P20SRight_None_6_1_SimpleTransferError.json b/app-testing/files/protocols/json/OT2_P20SRight_None_6_1_SimpleTransferError.json
@@ -1501,7 +1501,7 @@
                     "360102"
                 ],
                 "links": [
-                    "http://www.cell-nest.com/page94?_l=en&product_id=102"
+                    "https://www.nest-biotech.com/reagent-reserviors/59178414.html"
                 ]
             },
             "metadata": {

diff --git a/app-testing/files/protocols/json/OT2_P20S_P300M_HS_6_1_HS_WithCollision_Error.json b/app-testing/files/protocols/json/OT2_P20S_P300M_HS_6_1_HS_WithCollision_Error.json
diff --git a/app-testing/files/protocols/json/OT2_P20S_P300M_NoMods_6_1_TransferReTransferLiquid.json b/app-testing/files/protocols/json/OT2_P20S_P300M_NoMods_6_1_TransferReTransferLiquid.json
@@ -3310,7 +3310,7 @@
                             "601052"
                         ],
                         "links": [
-                            "http://www.cell-nest.com/page94?_l=en&product_id=110"
+                            "https://www.nest-biotech.com/centrifuge-tube/59282837.html"
                         ]
                     },
                     "wells": [

diff --git a/app-testing/files/protocols/json/OT2_P300M_P20S_HS_6_1_Smoke620release.json b/app-testing/files/protocols/json/OT2_P300M_P20S_HS_6_1_Smoke620release.json
@@ -4531,7 +4531,7 @@
                             "503001"
                         ],
                         "links": [
-                            "http://www.cell-nest.com/page94?product_id=101&_l=en"
+                            "https://www.nest-biotech.com/deep-well-plates/59253726.html"
                         ]
                     },
                     "wells": [

diff --git a/app-testing/files/protocols/json/OT2_P300M_P20S_MM_HS_TD_TC_6_1_AllMods_Error.json b/app-testing/files/protocols/json/OT2_P300M_P20S_MM_HS_TD_TC_6_1_AllMods_Error.json
diff --git a/app-testing/files/protocols/json/OT2_P300M_P20S_MM_TM_TC1_5_2_6_PD40.json b/app-testing/files/protocols/json/OT2_P300M_P20S_MM_TM_TC1_5_2_6_PD40.json
@@ -3866,7 +3866,7 @@
                     "360102"
                 ],
                 "links": [
-                    "http://www.cell-nest.com/page94?_l=en&product_id=102"
+                    "https://www.nest-biotech.com/reagent-reserviors/59178414.html"
                 ]
             },
             "metadata": {
@@ -4171,7 +4171,7 @@
                     "402501"
                 ],
                 "links": [
-                    "http://www.cell-nest.com/page94?_l=en&product_id=97&product_category=96"
+                    "https://www.nest-biotech.com/pcr-plates/58773587.html"
                 ]
             },
             "metadata": {
@@ -6192,7 +6192,7 @@
                             "402501"
                         ],
                         "links": [
-                            "http://www.cell-nest.com/page94?_l=en&product_id=97&product_category=96"
+                            "https://www.nest-biotech.com/pcr-plates/58773587.html"
                         ]
                     },
                     "wells": [

diff --git a/app-testing/files/protocols/json/OT2_P300M_P20S_MM_TM_TC1_5_2_6_PD40Error.json b/app-testing/files/protocols/json/OT2_P300M_P20S_MM_TM_TC1_5_2_6_PD40Error.json
@@ -3866,7 +3866,7 @@
                     "360102"
                 ],
                 "links": [
-                    "http://www.cell-nest.com/page94?_l=en&product_id=102"
+                    "https://www.nest-biotech.com/reagent-reserviors/59178414.html"
                 ]
             },
             "metadata": {
@@ -4171,7 +4171,7 @@
                     "402501"
                 ],
                 "links": [
-                    "http://www.cell-nest.com/page94?_l=en&product_id=97&product_category=96"
+                    "https://www.nest-biotech.com/pcr-plates/58773587.html"
                 ]
             },
             "metadata": {
@@ -6192,7 +6192,7 @@
                             "402501"
                         ],
                         "links": [
-                            "http://www.cell-nest.com/page94?_l=en&product_id=97&product_category=96"
+                            "https://www.nest-biotech.com/pcr-plates/58773587.html"
                         ]
                     },
                     "wells": [

diff --git a/app-testing/files/protocols/json/OT2_P300M_P20S_NoMod_6_1_MixTransferManyLiquids.json b/app-testing/files/protocols/json/OT2_P300M_P20S_NoMod_6_1_MixTransferManyLiquids.json
@@ -3224,7 +3224,7 @@
                     "360102"
                 ],
                 "links": [
-                    "http://www.cell-nest.com/page94?_l=en&product_id=102"
+                    "https://www.nest-biotech.com/reagent-reserviors/59178414.html"
                 ]
             },
             "metadata": {

diff --git a/app-testing/files/protocols/json/OT2_P300M_P300S_HS_6_1_HS_NormalUseWithTransfer.json b/app-testing/files/protocols/json/OT2_P300M_P300S_HS_6_1_HS_NormalUseWithTransfer.json
@@ -3399,7 +3399,7 @@
                             "503001"
                         ],
                         "links": [
-                            "http://www.cell-nest.com/page94?product_id=101&_l=en"
+                            "https://www.nest-biotech.com/deep-well-plates/59253726.html"
                         ]
                     },
                     "wells": [

diff --git a/app-testing/files/protocols/json/OT2_P300SG1_None_5_2_6_Gen1PipetteSimple.json b/app-testing/files/protocols/json/OT2_P300SG1_None_5_2_6_Gen1PipetteSimple.json
@@ -2239,7 +2239,7 @@
       "brand": {
         "brand": "NEST",
         "brandId": ["360103"],
-        "links": ["http://www.cell-nest.com/page94?_l=en&product_id=102"]
+        "links": ["https://www.nest-biotech.com/reagent-reserviors/59178414.html"]
       },
       "metadata": {
         "displayName": "NEST 1 Well Reservoir 195 mL",

diff --git a/app/src/organisms/CommandText/__fixtures__/mockRobotSideAnalysis.json b/app/src/organisms/CommandText/__fixtures__/mockRobotSideAnalysis.json
@@ -1503,9 +1503,7 @@
           "brand": {
             "brand": "NEST",
             "brandId": ["402501"],
-            "links": [
-              "http://www.cell-nest.com/page94?_l=en&product_id=97&product_category=96"
-            ]
+            "links": ["https://www.nest-biotech.com/pcr-plates/58773587.html"]
           },
           "parameters": {
             "format": "96Standard",
@@ -2544,9 +2542,7 @@
           "brand": {
             "brand": "NEST",
             "brandId": ["402501"],
-            "links": [
-              "http://www.cell-nest.com/page94?_l=en&product_id=97&product_category=96"
-            ]
+            "links": ["https://www.nest-biotech.com/pcr-plates/58773587.html"]
           },
           "parameters": {
             "format": "96Standard",
@@ -4594,7 +4590,7 @@
                 "brand": "NEST",
                 "brandId": ["402501"],
                 "links": [
-                  "http://www.cell-nest.com/page94?_l=en&product_id=97&product_category=96"
+                  "https://www.nest-biotech.com/pcr-plates/58773587.html"
                 ]
               }
             }
@@ -4634,7 +4630,9 @@
           "brand": {
             "brand": "NEST",
             "brandId": ["360103"],
-            "links": ["http://www.cell-nest.com/page94?_l=en&product_id=102"]
+            "links": [
+              "https://www.nest-biotech.com/reagent-reserviors/59178414.html"
+            ]
           },
           "parameters": {
             "format": "trough",

diff --git a/app/src/organisms/ProtocolSetupInstruments/__fixtures__/index.ts b/app/src/organisms/ProtocolSetupInstruments/__fixtures__/index.ts
@@ -3477,7 +3477,9 @@ export const mockRecentAnalysis = {
               brand: {
                 brand: 'NEST',
                 brandId: ['503501', '503001'],
-                links: ['http://www.cell-nest.com/page94?product_id=101&_l=en'],
+                links: [
+                  'https://www.nest-biotech.com/deep-well-plates/59253726.html',
+                ],
               },
             },
           ],
@@ -5418,7 +5420,9 @@ export const mockProtocolModuleInfo = [
           brand: {
             brand: 'NEST',
             brandId: ['503501', '503001'],
-            links: ['http://www.cell-nest.com/page94?product_id=101&_l=en'],
+            links: [
+              'https://www.nest-biotech.com/deep-well-plates/59253726.html',
+            ],
           },
         },
       ],

diff --git a/app/src/organisms/ProtocolSetupLabware/__fixtures__/index.ts b/app/src/organisms/ProtocolSetupLabware/__fixtures__/index.ts
@@ -3477,7 +3477,9 @@ export const mockRecentAnalysis = {
               brand: {
                 brand: 'NEST',
                 brandId: ['503501', '503001'],
-                links: ['http://www.cell-nest.com/page94?product_id=101&_l=en'],
+                links: [
+                  'https://www.nest-biotech.com/deep-well-plates/59253726.html',
+                ],
               },
             },
           ],
@@ -5418,7 +5420,9 @@ export const mockProtocolModuleInfo = [
           brand: {
             brand: 'NEST',
             brandId: ['503501', '503001'],
-            links: ['http://www.cell-nest.com/page94?product_id=101&_l=en'],
+            links: [
+              'https://www.nest-biotech.com/deep-well-plates/59253726.html',
+            ],
           },
         },
       ],

diff --git a/app/src/organisms/RunDetails/__fixtures__/analysis.json b/app/src/organisms/RunDetails/__fixtures__/analysis.json
@@ -2707,7 +2707,9 @@
           "brand": {
             "brand": "NEST",
             "brandId": ["360102"],
-            "links": ["http://www.cell-nest.com/page94?_l=en&product_id=102"]
+            "links": [
+              "https://www.nest-biotech.com/reagent-reserviors/59178414.html"
+            ]
           },
           "parameters": {
             "format": "trough",

diff --git a/...de-testing/g_code_test_data/protocol/protocols/fast/OT2_P300M_P20S_HS_TM_6_3_SmokeV3.json b/...de-testing/g_code_test_data/protocol/protocols/fast/OT2_P300M_P20S_HS_TM_6_3_SmokeV3.json
@@ -3456,9 +3456,7 @@
           "brand": {
             "brand": "NEST",
             "brandId": ["402501"],
-            "links": [
-              "http://www.cell-nest.com/page94?_l=en&product_id=97&product_category=96"
-            ]
+            "links": ["https://www.nest-biotech.com/pcr-plates/58773587.html"]
           },
           "wells": [
             "A1",
@@ -3589,7 +3587,9 @@
       "brand": {
         "brand": "NEST",
         "brandId": ["360102"],
-        "links": ["http://www.cell-nest.com/page94?_l=en&product_id=102"]
+        "links": [
+          "https://www.nest-biotech.com/reagent-reserviors/59178414.html"
+        ]
       },
       "metadata": {
         "displayName": "NEST 12 Well Reservoir 15 mL",
@@ -4658,9 +4658,7 @@
           "brand": {
             "brand": "NEST",
             "brandId": ["402501"],
-            "links": [
-              "http://www.cell-nest.com/page94?_l=en&product_id=97&product_category=96"
-            ]
+            "links": ["https://www.nest-biotech.com/pcr-plates/58773587.html"]
           },
           "wells": [
             "A1",
@@ -4792,9 +4790,7 @@
       "brand": {
         "brand": "NEST",
         "brandId": ["402501"],
-        "links": [
-          "http://www.cell-nest.com/page94?_l=en&product_id=97&product_category=96"
-        ]
+        "links": ["https://www.nest-biotech.com/pcr-plates/58773587.html"]
       },
       "metadata": {
         "displayName": "NEST 96 Well Plate 100 µL PCR Full Skirt",

diff --git a/...de_test_data/protocol/protocols/fast/OT2_P300M_P20S_NoMod_6_1_MixTransferManyLiquids.json b/...de_test_data/protocol/protocols/fast/OT2_P300M_P20S_NoMod_6_1_MixTransferManyLiquids.json
@@ -2921,7 +2921,9 @@
       "brand": {
         "brand": "NEST",
         "brandId": ["360102"],
-        "links": ["http://www.cell-nest.com/page94?_l=en&product_id=102"]
+        "links": [
+          "https://www.nest-biotech.com/reagent-reserviors/59178414.html"
+        ]
       },
       "metadata": {
         "displayName": "NEST 12 Well Reservoir 15 mL",

diff --git a/labware-library/src/components/App/Page.tsx b/labware-library/src/components/App/Page.tsx
@@ -5,28 +5,28 @@ import styles from './styles.css'
 
 export interface PageProps {
   scrollRef: React.RefObject<HTMLDivElement>
-  detailPage: boolean
+  isDetailPage: boolean
   sidebar: React.ReactNode
   content: React.ReactNode
 }
 
 export function Page(props: PageProps): JSX.Element {
-  const { scrollRef, detailPage, sidebar, content } = props
+  const { scrollRef, isDetailPage, sidebar, content } = props
 
   return (
     <div className={styles.page}>
       <div className={styles.content_scroller} ref={scrollRef}>
         <div className={styles.content_width_limiter}>
           <div
             className={cx(styles.sidebar_container, {
-              [styles.is_detail_page]: detailPage,
+              [styles.is_detail_page]: isDetailPage,
             })}
           >
             {sidebar}
           </div>
           <section
             className={cx(styles.content_container, {
-              [styles.is_detail_page]: detailPage,
+              [styles.is_detail_page]: isDetailPage,
             })}
           >
             {content}

diff --git a/labware-library/src/components/App/__tests__/Page.test.tsx b/labware-library/src/components/App/__tests__/Page.test.tsx
@@ -13,7 +13,7 @@ describe('Page', () => {
         scrollRef={{ current: null }}
         sidebar="foo"
         content="bar"
-        detailPage={false}
+        isDetailPage={false}
       />
     )
 
@@ -26,7 +26,7 @@ describe('Page', () => {
         scrollRef={{ current: null }}
         sidebar="foo"
         content="bar"
-        detailPage={true}
+        isDetailPage={true}
       />
     )
 

diff --git a/labware-library/src/components/App/__tests__/__snapshots__/App.test.tsx.snap b/labware-library/src/components/App/__tests__/__snapshots__/App.test.tsx.snap
@@ -5,7 +5,9 @@ exports[`App component renders with definition 1`] = `
   className="app is_detail_page"
 >
   <Nav />
-  <Breadcrumbs />
+  <Breadcrumbs
+    show={true}
+  />
   <Page
     content={
       <LabwareDetails
@@ -21,7 +23,7 @@ exports[`App component renders with definition 1`] = `
         }
       />
     }
-    detailPage={true}
+    isDetailPage={true}
     scrollRef={
       Object {
         "current": null,
@@ -46,6 +48,9 @@ exports[`App component renders without definition 1`] = `
   className="app"
 >
   <Nav />
+  <Breadcrumbs
+    show={false}
+  />
   <Page
     content={
       <LabwareList
@@ -57,7 +62,7 @@ exports[`App component renders without definition 1`] = `
         }
       />
     }
-    detailPage={false}
+    isDetailPage={false}
     scrollRef={
       Object {
         "current": null,