Merge branch 'release/2.37.1' into master

opensupplyhub · Dec 15, 2020 · 0791307 · 0791307
2 parents 0efd2a1 + 8627707
commit 0791307
Show file tree

Hide file tree

Showing 8 changed files with 100 additions and 114 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Security
 
+## [2.37.1] - 2020-12-14
+
+### Fixed
+
+-   Remove leading and trailing whitespace from country when parsing [#1184](https://github.com/open-apparel-registry/open-apparel-registry/pull/1184)
+-   Fix pending matches bug [#1189](https://github.com/open-apparel-registry/open-apparel-registry/pull/1189)
+
 ## [2.37.0] - 2020-11-24
 
 ### Added
@@ -635,7 +642,8 @@ Directly connect health check to GazetteerCache and remove the use of threading
 
 -   Initial release.
 
-[unreleased]: https://github.com/open-apparel-registry/open-apparel-registry/compare/2.37.0...HEAD
+[unreleased]: https://github.com/open-apparel-registry/open-apparel-registry/compare/2.37.1...HEAD
+[2.37.1]: https://github.com/open-apparel-registry/open-apparel-registry/releases/tag/2.37.1
 [2.37.0]: https://github.com/open-apparel-registry/open-apparel-registry/releases/tag/2.37.0
 [2.36.0]: https://github.com/open-apparel-registry/open-apparel-registry/releases/tag/2.36.0
 [2.35.0]: https://github.com/open-apparel-registry/open-apparel-registry/releases/tag/2.35.0

diff --git a/research/rubota/package-lock.json b/research/rubota/package-lock.json
diff --git a/research/rubota/package.json b/research/rubota/package.json
@@ -10,6 +10,6 @@
   "license": "MIT",
   "dependencies": {
     "axios": "^0.19.0",
-    "fast-csv": "^2.4.1"
+    "fast-csv": "^4.3.6"
   }
 }
diff --git a/src/app/src/App.css b/src/app/src/App.css
@@ -693,7 +693,7 @@ hr {
   .form__action {
     margin-bottom: 5px;
   }
-  
+
   .filter-sidebar-tabgroup {
     position: sticky !important;
     top: -11px;
@@ -756,7 +756,3 @@ hr {
 .STATUS_PARSED:not(:hover) {
   background: #fff !important;
 }
-
-.STATUS_POTENTIAL_MATCH--ACTIONS + .STATUS_POTENTIAL_MATCH--ACTIONS {
-  display: none !important;
-}
diff --git a/src/app/src/components/CellElement.jsx b/src/app/src/components/CellElement.jsx
@@ -247,7 +247,6 @@ export default class CellElement extends Component {
             <div
                 key={item.id}
                 style={confirmRejectMatchRowStyles.cellRowStyles}
-                className="STATUS_POTENTIAL_MATCH--ACTIONS"
             >
                 <div style={confirmRejectMatchRowStyles.cellActionStyles}>
                     <Button

diff --git a/src/app/src/components/FacilityListItemsConfirmationTableRow.jsx b/src/app/src/components/FacilityListItemsConfirmationTableRow.jsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import { bool, func } from 'prop-types';
 import { connect } from 'react-redux';
-import { Link } from 'react-router-dom';
 import TableRow from '@material-ui/core/TableRow';
 import TableCell from '@material-ui/core/TableCell';
 
@@ -154,42 +153,35 @@ function FacilityListItemsConfirmationTableRow({
                     style={listTableCellStyles.nameCellStyles}
                     colSpan={2}
                 >
-                    {matchOARIDs ? (
-                        <>
-                            <b>Facility Match Name</b>
-                            <br />
-                            <Link
-                                to={makeFacilityDetailLink(matchOARIDs)}
-                                href={makeFacilityDetailLink(matchOARIDs)}
-                            >
-                                {matchNames}
-                            </Link>
-                        </>
-                    ) : (
-                        ' '
-                    )}
+                    <b>Facility Match Name</b>
+                    <FacilityListItemsDetailedTableRowCell
+                        title=" "
+                        stringisHidden={false}
+                        data={matchNames}
+                        hasActions={false}
+                        linkURLs={matchOARIDs.map(makeFacilityDetailLink)}
+                    />
                 </TableCell>
                 <TableCell
                     padding="default"
                     style={listTableCellStyles.addressCellStyles}
                     colSpan={2}
                 >
-                    {matchAddresses ? (
-                        <>
-                            <b>Facility Match Address</b>
-                            <br />
-                            {matchAddresses}
-                        </>
-                    ) : (
-                        ' '
-                    )}
+                    <b>Facility Match Address</b>
+                    <FacilityListItemsDetailedTableRowCell
+                        title=" "
+                        stringIsHidden={false}
+                        data={matchAddresses}
+                        hasActions={false}
+                    />
                 </TableCell>
                 <TableCell
                     padding="default"
                     style={listTableCellStyles.statusCellStyles}
                 >
+                    <b>Actions</b>
                     <FacilityListItemsDetailedTableRowCell
-                        title
+                        title=" "
                         stringIsHidden
                         data={matchConfirmOrRejectFunctions}
                         hasActions

diff --git a/src/app/src/components/FacilityListItemsDetailedTableRowCell.jsx b/src/app/src/components/FacilityListItemsDetailedTableRowCell.jsx
@@ -71,7 +71,7 @@ export default function FacilityListItemsDetailedTableRowCell({
                 </div>
                 {
                     data.map((item, index) => (
-                        <Fragment key={hasActions ? item.id : item}>
+                        <Fragment key={item.id ? item.id : item}>
                             <CellElement
                                 item={item}
                                 fetching={fetching}

diff --git a/src/django/api/processing.py b/src/django/api/processing.py
@@ -87,7 +87,7 @@ def parse_csv_line(line):
 
 def get_country_code(country):
     # TODO: Handle minor spelling errors in country names
-    country = str(country)
+    country = str(country).strip()
     if country.upper() in COUNTRY_NAMES:
         return country.upper()
     elif country.lower() in COUNTRY_CODES: