Fix table row key names

Clashing was causing some rendering bugs
iaincollins · Oct 8, 2024 · 29e50ad · 29e50ad
1 parent 00b7ccb
commit 29e50ad
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/components/commodity-export-orders.js b/components/commodity-export-orders.js
@@ -104,6 +104,7 @@ export default ({ commodities }) => {
         }
       ]}
       data={commodities}
+      rowKey={(r) => `commodity_export_orders_${r.commodityId}`}
       expandable={{
         expandRowByClick: true,
         expandedRowRender: (r) => <ExpandedRow r={r} />
@@ -206,7 +207,7 @@ function ExpandedRow ({ r }) {
           }
         ]}
         data={exports}
-        rowKey='commodityId'
+        rowKey={(r) => `commodity_export_orders_expanded_${r.commodityId}`}
       />
       <Collapsible
         trigger={<CollapsibleTrigger>Stock of <strong>{r.name}</strong> near <strong>{r.systemName}</strong></CollapsibleTrigger>}

diff --git a/components/commodity-import-orders.js b/components/commodity-import-orders.js
@@ -104,6 +104,7 @@ export default ({ commodities }) => {
         }
       ]}
       data={commodities}
+      rowKey={(r) => `commodity_import_orders_${r.commodityId}`}
       expandable={{
         expandRowByClick: true,
         expandedRowRender: (r) => <ExpandedRow r={r} />
@@ -206,7 +207,7 @@ function ExpandedRow ({ r }) {
           }
         ]}
         data={imports}
-        rowKey='commodityId'
+        rowKey={(r) => `commodity_import_orders_expanded_${r.commodityId}`}
       />
       <Collapsible
         trigger={<CollapsibleTrigger>Stock of <strong>{r.name}</strong> near <strong>{r.systemName}</strong></CollapsibleTrigger>}

diff --git a/components/commodity-report.js b/components/commodity-report.js
@@ -26,7 +26,6 @@ export default ({ commodityName, reportName = 'core-systems-1000' }) => {
         c.symbol = c.commodityName.toLowerCase()
         c.category = (commoditiesInfo.find(el => el.symbol.toLowerCase() === c.symbol))?.category ?? ''
         c.name = (commoditiesInfo.find(el => el.symbol.toLowerCase() === c.symbol))?.name ?? c.commodityName
-        delete c.commodityId
         delete c.commodityName
       })
       setExports((commodityReport?.bestExporters ?? []))
@@ -39,7 +38,6 @@ export default ({ commodityName, reportName = 'core-systems-1000' }) => {
         c.symbol = c.commodityName.toLowerCase()
         c.category = (commoditiesInfo.find(el => el.symbol.toLowerCase() === c.symbol))?.category ?? ''
         c.name = (commoditiesInfo.find(el => el.symbol.toLowerCase() === c.symbol))?.name ?? c.commodityName
-        delete c.commodityId
         delete c.commodityName
       })
       setImports((commodityReport?.bestImporters ?? []))

diff --git a/components/local-commodity-exporters.js b/components/local-commodity-exporters.js
@@ -68,7 +68,7 @@ export default ({ commodityOrders }) => {
             }
           ]}
           data={commodityOrders}
-          rowKey='commodityId'
+          rowKey={(r) => `local_commodity_exporters_${r.commodityId}`}
         />}
     </>
   )

diff --git a/components/local-commodity-importers.js b/components/local-commodity-importers.js
@@ -73,7 +73,7 @@ export default ({ commodityOrders }) => {
             }
           ]}
           data={commodityOrders}
-          rowKey='commodityId'
+          rowKey={(r) => `local_commodity_importers_${r.commodityId}`}
         />}
     </>
   )

diff --git a/components/nearby-commodity-exporters.js b/components/nearby-commodity-exporters.js
@@ -146,7 +146,7 @@ export default ({ commodity }) => {
             }
           ]}
           data={nearbyExporters}
-          rowKey='commodityId'
+          rowKey={(r) => `nearby_commodity_exporters_${r.commodityId}`}
         />}
     </>
   )

diff --git a/components/nearby-commodity-importers.js b/components/nearby-commodity-importers.js
@@ -146,7 +146,7 @@ export default ({ commodity }) => {
             }
           ]}
           data={nearbyImporters}
-          rowKey='commodityId'
+          rowKey={(r) => `nearby_commodity_importers_${r.commodityId}`}
         />}
     </>
   )

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ardent-www",
-  "version": "0.63.2",
+  "version": "0.64.0",
   "description": "Ardent Industry",
   "main": "index.js",
   "scripts": {

diff --git a/pages/commodity/[commodity-name]/index.js b/pages/commodity/[commodity-name]/index.js
@@ -57,7 +57,6 @@ export default () => {
         c.symbol = c.commodityName.toLowerCase()
         c.category = listOfCommodities[c.symbol]?.category ?? ''
         c.name = listOfCommodities[c.symbol]?.name ?? c.commodityName
-        delete c.commodityId
         delete c.commodityName
       })
       setImports(imports)
@@ -75,7 +74,6 @@ export default () => {
         c.symbol = c.commodityName.toLowerCase()
         c.category = listOfCommodities[c.symbol]?.category ?? ''
         c.name = listOfCommodities[c.symbol]?.name ?? c.commodityName
-        delete c.commodityId
         delete c.commodityName
       })
       setExports(exports)

diff --git a/pages/system/[system-name]/index.js b/pages/system/[system-name]/index.js
@@ -473,6 +473,7 @@ export default () => {
                     }
                   ]}
                   data={importOrders}
+                  rowKey={(r) => `system_imports_${r.systemAddress}_${r.symbol}`}
                   expandable={{
                     expandRowByClick: true,
                     expandedRowRender: r =>
@@ -573,6 +574,7 @@ export default () => {
                     }
                   ]}
                   data={exportOrders}
+                  rowKey={(r) => `system_exports_${r.systemAddress}_${r.symbol}`}
                   expandable={{
                     expandRowByClick: true,
                     expandedRowRender: r =>
-Original file line number
+Diff line change
@@ Expand Up / @@ -68,7 +68,7 @@ export default ({ commodityOrders }) => { @@
                 }
               ]}
               data={commodityOrders}
-              rowKey='commodityId'
+              rowKey={(r) => `local_commodity_exporters_${r.commodityId}`}
             />}
         </>
       )
@@ Expand Down @@