Merge pull request #779 from CSCfi/stable

Merge stable to master v0.9.38-rc-1

etsin_finder/frontend/.eslintrc

@@ -23,6 +23,8 @@
     "import/no-named-as-default": "off",
     "indent": 0,
     "max-len": ["warn", { "code": 150 }],
+    "max-classes-per-file": "off",
+    "no-multiple-empty-lines": ["error", { "max": 2 }],
     "no-console": 0,
     "no-extra-semi": 1,
     "no-lone-blocks": 0,
@@ -37,10 +39,14 @@
     "prefer-destructuring": 0,
     "react/destructuring-assignment": 0,
     "react/forbid-prop-types": [2, { "forbid": ["any"] }],
+    "react/jsx-curly-newline": "off",
     "react/jsx-curly-brace-presence": 0,
     "react/jsx-one-expression-per-line": 0,
     "react/prefer-stateless-function": 0,
     "react/prop-types": 2,
+    "react/jsx-props-no-spreading": "off",
+    "react/static-property-placement": "off",
+    "react/state-in-constructor": "off",
     "semi": 0,
     "template-curly-spacing": 0,
     "jsx-a11y/anchor-is-valid": [

etsin_finder/frontend/__tests__/__testdata__/dataset.att.js

@@ -1,11 +1,95 @@
+const dataCatalog = {
+  "id": 10,
+  "catalog_json": {
+    "logo": "fairdata_tree_logo.svg",
+    "title": {
+      "en": "Fairdata general register",
+      "fi": "Fairdata yleiskatalogi",
+      "sv": "Fairdata allmänt register"
+    },
+    "language": [
+      {
+        "title": {
+          "en": "Finnish",
+          "fi": "suomi",
+          "sv": "finska",
+          "und": "suomi"
+        },
+        "identifier": "http://lexvo.org/id/iso639-3/fin"
+      },
+      {
+        "title": {
+          "en": "English",
+          "fi": "englanti",
+          "sv": "engelska",
+          "und": "englanti"
+        },
+        "identifier": "http://lexvo.org/id/iso639-3/eng"
+      }
+    ],
+    "harvested": false,
+    "publisher": {
+      "name": {
+        "en": "Ministry of Education and Culture, Finland",
+        "fi": "Opetus- ja kulttuuriministeriö"
+      },
+      "homepage": [
+        {
+          "title": {
+            "en": "Fairdata.fi",
+            "fi": "Fairdata.fi"
+          },
+          "identifier": "https://www.fairdata.fi"
+        }
+      ]
+    },
+    "identifier": "urn:nbn:fi:att:data-catalog-att",
+    "access_rights": {
+      "license": [
+        {
+          "title": {
+            "en": "Creative Commons CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",
+            "fi": "Creative Commons Yleismaailmallinen (CC0 1.0) Public Domain -lausuma",
+            "und": "Creative Commons Yleismaailmallinen (CC0 1.0) Public Domain -lausuma"
+          },
+          "license": "https://creativecommons.org/publicdomain/zero/1.0/",
+          "identifier": "http://uri.suomi.fi/codelist/fairdata/license/code/CC0-1.0"
+        }
+      ],
+      "access_type": [
+        {
+          "identifier": "http://uri.suomi.fi/codelist/fairdata/access_type/code/open",
+          "pref_label": {
+            "en": "Open",
+            "fi": "Avoin",
+            "und": "Avoin"
+          }
+        }
+      ],
+      "description": {
+        "en": "Contains datasets that are not stored in the Finnish Fairdata services.",
+        "fi": "Sisältää esimerkiksi verkkoaineistot, rajapinnat ja muut muualla kuin fairdata-palveluissa säilytettävät aineistot."
+      }
+    },
+    "dataset_versioning": false,
+    "research_dataset_schema": "att"
+  },
+  "catalog_record_services_edit": "ida,metax,qvain,qvain-light,tpas",
+  "catalog_record_services_create": "ida,metax,qvain,qvain-light,tpas",
+  "catalog_record_services_read": "ida,metax,qvain,qvain-light,etsin,tpas,download",
+  "date_modified": "2020-12-16T12:23:48+02:00",
+  "date_created": "2019-09-25T16:38:35+03:00",
+  "service_modified": "metax",
+  "service_created": "metax",
+  "removed": false
+}
+
 const dataset = {
   "id": 1929,
   "identifier": "162e04c5-857b-477c-a452-cd063ee3c44d",
-  "data_catalog": {
-    "id": 10,
-    "identifier": "urn:nbn:fi:att:data-catalog-att"
-  },
+  "data_catalog": dataCatalog,
   "deprecated": false,
+  "metadata_owner_org": "test.csc.fi",
   "metadata_provider_org": "test.csc.fi",
   "metadata_provider_user": "teppo",
   "research_dataset": {
@@ -181,6 +265,92 @@ const dataset = {
       },
       "identifier": "https://orcid.org/person"
     },
+    "provenance": [
+      {
+        "title": {
+          "en": "Provenance name",
+          "fi": "Provenanssin nimi",
+          "und": "Provenanssin nimi"
+        },
+        "spatial": {
+          "as_wkt": [
+            "POINT(18.923 50.347)"
+          ],
+          "place_uri": {
+            "in_scheme": "http://www.yso.fi/onto/yso/places",
+            "identifier": "http://www.yso.fi/onto/yso/p112355",
+            "pref_label": {
+              "en": "Bytom",
+              "fi": "Bytom",
+              "sv": "Bytom",
+              "und": "Bytom"
+            }
+          },
+          "geographic_name": "Provenanssipaikka"
+        },
+        "temporal": {
+          "end_date": "2021-02-23T00:00:00.000Z",
+          "start_date": "2021-02-03T00:00:00.000Z"
+        },
+        "description": {
+          "en": "Provenance description",
+          "fi": "Provenanssin kuvaus",
+          "und": "Provenanssin kuvaus"
+        },
+        "used_entity": [
+          {
+            "type": {
+              "identifier": "http://uri.suomi.fi/codelist/fairdata/resource_type/code/instrument"
+            },
+            "title": {
+              "en": "Title of entity used by provenance",
+              "und": "Title of entity used by provenance"
+            },
+            "identifier": "https://example.com/provenance/entity",
+            "description": {
+              "en": "Description of entity used by provenance",
+              "und": "Description of entity used by provenance"
+            }
+          }
+        ],
+        "event_outcome": {
+          "in_scheme": "http://uri.suomi.fi/codelist/fairdata/event_outcome",
+          "identifier": "http://uri.suomi.fi/codelist/fairdata/event_outcome/code/unknown",
+          "pref_label": {
+            "en": "Unknown",
+            "fi": "Tuntematon",
+            "sv": "Ok\u00e4nt",
+            "und": "Tuntematon"
+          }
+        },
+        "lifecycle_event": {
+          "in_scheme": "http://uri.suomi.fi/codelist/fairdata/lifecycle_event",
+          "identifier": "http://uri.suomi.fi/codelist/fairdata/lifecycle_event/code/checked",
+          "pref_label": {
+            "en": "Checked",
+            "fi": "Tarkistettu",
+            "und": "Tarkistettu"
+          }
+        },
+        "outcome_description": {
+          "en": "Outcome description",
+          "fi": "Tuloksen kuvaus",
+          "und": "Tuloksen kuvaus"
+        },
+        "was_associated_with": [
+          {
+            "name": {
+              "en": "Aalto University",
+              "fi": "Aalto yliopisto",
+              "sv": "Aalto universitetet",
+              "und": "Aalto yliopisto"
+            },
+            "@type": "Organization",
+            "identifier": "http://uri.suomi.fi/codelist/fairdata/organization/code/10076"
+          }
+        ]
+      }
+    ],
     "contributor": [
       {
         "name": "Human Person",
@@ -385,9 +555,95 @@ const dataset = {
         "notation": "https://doi.org/another_identifier"
       }
     ],
+    "provenance": [
+      {
+        "title": {
+          "en": "Provenance name",
+          "fi": "Provenanssin nimi",
+          "und": "Provenanssin nimi"
+        },
+        "spatial": {
+          "as_wkt": [
+            "POINT(18.923 50.347)"
+          ],
+          "place_uri": {
+            "in_scheme": "http://www.yso.fi/onto/yso/places",
+            "identifier": "http://www.yso.fi/onto/yso/p112355",
+            "pref_label": {
+              "en": "Bytom",
+              "fi": "Bytom",
+              "sv": "Bytom",
+              "und": "Bytom"
+            }
+          },
+          "geographic_name": "Provenanssipaikka"
+        },
+        "temporal": {
+          "end_date": "2021-02-23T00:00:00.000Z",
+          "start_date": "2021-02-03T00:00:00.000Z"
+        },
+        "description": {
+          "en": "Provenance description",
+          "fi": "Provenanssin kuvaus",
+          "und": "Provenanssin kuvaus"
+        },
+        "used_entity": [
+          {
+            "type": {
+              "identifier": "http://uri.suomi.fi/codelist/fairdata/resource_type/code/instrument"
+            },
+            "title": {
+              "en": "Title of entity used by provenance",
+              "und": "Title of entity used by provenance"
+            },
+            "identifier": "https://example.com/provenance/entity",
+            "description": {
+              "en": "Description of entity used by provenance",
+              "und": "Description of entity used by provenance"
+            }
+          }
+        ],
+        "event_outcome": {
+          "in_scheme": "http://uri.suomi.fi/codelist/fairdata/event_outcome",
+          "identifier": "http://uri.suomi.fi/codelist/fairdata/event_outcome/code/unknown",
+          "pref_label": {
+            "en": "Unknown",
+            "fi": "Tuntematon",
+            "sv": "Okänt",
+            "und": "Tuntematon"
+          }
+        },
+        "lifecycle_event": {
+          "in_scheme": "http://uri.suomi.fi/codelist/fairdata/lifecycle_event",
+          "identifier": "http://uri.suomi.fi/codelist/fairdata/lifecycle_event/code/checked",
+          "pref_label": {
+            "en": "Checked",
+            "fi": "Tarkistettu",
+            "und": "Tarkistettu"
+          }
+        },
+        "outcome_description": {
+          "en": "Outcome description",
+          "fi": "Tuloksen kuvaus",
+          "und": "Tuloksen kuvaus"
+        },
+        "was_associated_with": [
+          {
+            "name": {
+              "en": "Aalto University",
+              "fi": "Aalto yliopisto",
+              "sv": "Aalto universitetet",
+              "und": "Aalto yliopisto"
+            },
+            "@type": "Organization",
+            "identifier": "http://uri.suomi.fi/codelist/fairdata/organization/code/10076"
+          }
+        ]
+      }
+    ],
     "remote_resources": [
       {
-        "title": "Remote resource",
+        "title": "A Resource",
         "access_url": {
           "identifier": "https://access.url"
         },
@@ -396,29 +652,34 @@ const dataset = {
         },
         "use_category": {
           "in_scheme": "http://uri.suomi.fi/codelist/fairdata/use_category",
-          "identifier": "http://uri.suomi.fi/codelist/fairdata/use_category/code/configuration",
+          "identifier": "http://uri.suomi.fi/codelist/fairdata/use_category/code/documentation",
           "pref_label": {
-            "en": "Configuration files",
-            "fi": "Konfiguraatiotiedosto",
-            "und": "Konfiguraatiotiedosto"
+            "en": "Documentation",
+            "fi": "Dokumentaatio",
+            "und": "Dokumentaatio"
           }
         }
       }
     ],
-    "preferred_identifier": "draft:162e04c5-857b-477c-a452-cd063ee3c44d",
-    "metadata_version_identifier": "2037942d-a9d1-44d8-bd6c-818a0278db83"
+    "preferred_identifier": "urn:nbn:fi:att:be05442c-1cb6-4fb3-999b-d076d12c7842",
+    "metadata_version_identifier": "746e5452-f281-4b51-be23-23709985c4b1",
+    "total_remote_resources_byte_size": 0
   },
   "preservation_state": 0,
-  "state": "draft",
-  "use_doi_for_published": false,
+  "state": "published",
   "cumulative_state": 0,
+  "access_granter": {
+    "name": "tepp\u00e5 testaaja",
+    "email": "[email protected]",
+    "userid": "teppo"
+  },
   "api_meta": {
     "version": 2
   },
-  "date_modified": "2021-01-28T10:26:12+02:00",
-  "date_created": "2021-01-28T10:06:32+02:00",
-  "service_modified": "qvain-light",
-  "service_created": "qvain-light",
+  "date_modified": "2021-02-10T12:03:42+02:00",
+  "date_created": "2021-02-10T11:44:51+02:00",
+  "service_modified": "qvain",
+  "service_created": "qvain",
   "removed": false
 }