Merge branch 'beta'

* feat: extended specimen support, starting implementation
* chore: bump copyright year
* build:
    * Docker image now based on ubuntu:20.04 [was: :18.04]
    * Node version updated to 20.11.0 [was: 8.12.0]

Dockerfile

@@ -1,13 +1,14 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV NODE_OPTIONS=--use-openssl-ca
+ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update
-RUN apt-get -y install make gcc g++ python bash git curl openssl nodejs npm
+RUN apt-get -y install make gcc g++ python3 bash git curl openssl nodejs npm
 
 RUN npm i -g yarn
 RUN npm install -g n
-RUN n 8.12.0
+RUN n 20.11.0
 
 WORKDIR /var/www
 ADD . .

app/views/base.html

@@ -140,7 +140,7 @@
 
         </div>
         <div class="sixteen columns" id="footnote">
-            <p>iDigBio is funded by grants from the National Science Foundation [DBI-1115210 (2011-2018), DBI-1547229 (2016-2022), & DBI-2027654 (2021-2026)]. Any opinions, findings, and conclusions or recommendations expressed in this material are those of the author(s) and do not necessarily reflect the views of the National Science Foundation. © 2011-2023 iDigBio</p>
+            <p>iDigBio is funded by grants from the National Science Foundation [DBI-1115210 (2011-2018), DBI-1547229 (2016-2022), & DBI-2027654 (2021-2026)]. Any opinions, findings, and conclusions or recommendations expressed in this material are those of the author(s) and do not necessarily reflect the views of the National Science Foundation. © 2011-2024 iDigBio</p>
         </div>
 
     </footer>

package.json

@@ -27,6 +27,7 @@
     "@bower_components/leaflet-utfgrid": "danzel/Leaflet.utfgrid",
     "@bower_components/leaflet.fullscreen": "brunob/leaflet.fullscreen",
     "@elastic/filesaver": "^1.1.2",
+    "antd": "^5.16.1",
     "async": "^2.0.0",
     "body-parser": "^1.16.1",
     "bootstrap": "^3.3.6",
@@ -46,7 +47,6 @@
     "geopoint": "^1.0.1",
     "griddle-react": "^0.8.1",
     "hamljs": "^0.6.2",
-    "hiredis": "^0.5.0",
     "http-proxy": "~1.8.1",
     "jquery": "~3.3.1",
     "jquery-ui": "^1.12.1",
@@ -120,6 +120,9 @@
     "vinyl-source-stream": "^1.1.0",
     "watchify": "^3.7.0"
   },
+  "resolutions": {
+    "graceful-fs": "^4.2.11"
+  },
   "keywords": [],
   "repository": "git://github.com/idigbio/idigbio-portal",
   "license": "LGPL-3.0",

public/client/js/lib/dwc_fields.js

@@ -21,6 +21,7 @@ module.exports = {
       "dwc:taxonRemarks"
     ],
     "specimen": [
+      "dwc:associatedOccurrences",
       "dwc:typeStatus",
       "dwc:identifiedBy",
       "dwc:dateIdentified",
@@ -123,6 +124,18 @@ module.exports = {
       "dwc:lowestBiostratigraphicZone",
       "dwc:lithostratigraphicTerms"
     ],
+    "idhistory": [
+      "dwc:Identification"
+    ],
+    "extendedmeasurementorfact": [
+        "obis:ExtendedMeasurementOrFact"
+    ],
+    "materialsample": [
+      "ggbn:MaterialSample"
+    ],
+    "chronometricage": [
+      "chrono:ChronometricAge"
+    ],
     "other": [
       "dcterms:language",
       "dcterms:modified",
@@ -476,6 +489,37 @@ module.exports = {
     "idigbio:institutionName": "Institution Name",
     "idigbio:collectionCategory": "Collection Category",
     "idigbio:collectionSize": "Collection Size",
-    "idigbio:importantHoldings": "Important Holdings"
+    "idigbio:importantHoldings": "Important Holdings",
+    "dwc:associatedOccurrences": "Associated Occurrences",
+
+    "idhistory": "Identification History",
+    "dwc:identificationID": "Identification ID",
+    "dwc:verbatimIdentification": "Verbatim Identification",
+    "dwc:identifiedByID": "Identified By (ID)",
+    "dwc:identificationVerificationStatus": "Identification Verification Status",
+
+    "extendedmeasurementorfact": "Extended Measurement or Fact",
+    "dwc:measurementDeterminedBy": "Measurement Determined By",
+    "dwc:measurementDeterminedDate": "Measurement Determined Date",
+    "dwc:measurementType": "Measurement Type",
+    "dwc:measurementValue": "Measurement Value",
+    "obis:measurementTypeID": "Measurement Type ID",
+    "obis:measurementValueID": "Measurement Value ID",
+
+    "materialsample": "Material Sample",
+    "ggbn:concentrationUnit": "Concentration Unit",
+    "ggbn:concentration": "Concentration",
+    "ggbn:materialSampleType": "Material Sample Type",
+    "ggbn:ratioOfAbsorbance260_230": "Ratio of Absorbance (260/230 nm)", //| For DNA samples only
+    "ggbn:ratioOfAbsorbance260_280": "Ratio of Absorbance (260/280 nm)", //|
+    "ggbn:sampleDesignation": "Sample Designation",
+
+    "chronometricage": "Chronometric Age",
+    "chrono:chronometricAgeReferences": "Chronometric Age References",
+    "chrono:chronometricAgeRemarks": "Chronometric Age Remarks",
+    "chrono:maximumChronometricAge": "Maximum Chronometric Age",
+    "chrono:maximumChronometricAgeReferenceSystem": "Maximum Chronometric Age Reference System",
+    "chrono:minimumChronometricAge": "Minimum Chronometric Age",
+    "chrono:minimumChronometricAgeReferenceSystem": "Minimum Chronometric Age Reference System",
   }
-}
+}