Merge pull request #291 from LabKey/fb_merge_26.3_to_develop

Merge discvr-26.3 to develop

Author: bbimber

mcc/package-lock.json

@@ -12,7 +12,7 @@
   "dependencies": {
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.0",
-    "@labkey/api": "^1.39.0",
+    "@labkey/api": "^1.51.0",
     "@mui/material": "^5.0.0",
     "@mui/system": "^5.0.0",
     "@mui/x-data-grid": "^6.0.0",
@@ -22,7 +22,7 @@
     "react-dom": "^17.0.0",
     "react-tooltip": "^5.28.0",
     "tsv": "^0.2.0",
-    "uuid": "^11.1.0",
+    "uuid": "^14.0.0",
     "google-palette": "^1.1.1"
   },
   "devDependencies": {

mcc/package.json

@@ -242,7 +242,7 @@ Ext4.define('MCC.panel.MccImportPanel', {
         },
 
         damOrSire: function(val, panel, row) {
-            if (val && val.toUpperCase() === 'NA' || val.toUpperCase() === 'N/A') {
+            if (val && (val.toUpperCase() === 'NA' || val.toUpperCase() === 'N/A')) {
                 val = null;
             }
 
@@ -275,9 +275,19 @@ Ext4.define('MCC.panel.MccImportPanel', {
 
         sex: function(val, panel, row) {
             val = panel.stripLeadingNumbers(val);
-            if (val && val.toLowerCase() === 'tbd') {
+            if (!val) {
+                return val;
+            }
+
+            if (val.toLowerCase() === 'tbd') {
                 val = 'unknown';
             }
+            else if (val.toLowerCase() === 'm') {
+                val = 'male';
+            }
+            else if (val.toLowerCase() === 'f') {
+                val = 'female';
+            }
 
             val = panel.enforceAllowableValues(val, ['male', 'female', 'unknown'], row);