From 6eef98f070f439ff75c71020b12f04bc3769db66 Mon Sep 17 00:00:00 2001 From: Martin Fenner Date: Tue, 24 Mar 2020 02:02:44 +0100 Subject: [PATCH 1/2] version bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c368fb7ca..0c24d2a44 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bracco", - "version": "3.5.14", + "version": "3.6.0", "private": true, "description": "Fabrica", "repository": { From 9a3b7c107d387b587eb4e21b13e7fc979dd13292 Mon Sep 17 00:00:00 2001 From: Martin Fenner Date: Tue, 24 Mar 2020 11:30:00 +0100 Subject: [PATCH 2/2] adjust user metadata. datacite/lupo#425 --- app/models/user.js | 2 +- app/templates/components/user-list.hbs | 4 +- app/templates/components/user-show.hbs | 4 +- .../recording.har | 59 +++++++++++++++++++ .../recording.har | 59 +++++++++++++++++++ .../recording.har | 59 +++++++++++++++++++ .../recording.har | 59 +++++++++++++++++++ 7 files changed, 241 insertions(+), 5 deletions(-) diff --git a/app/models/user.js b/app/models/user.js index 1dfbd592e..998fda991 100644 --- a/app/models/user.js +++ b/app/models/user.js @@ -6,7 +6,7 @@ export default Model.extend({ meta: attr(), name: attr('string'), - givenNames: attr('string'), + givenName: attr('string'), familyName: attr('string'), createdAt: attr('date'), updatedAt: attr('date'), diff --git a/app/templates/components/user-list.hbs b/app/templates/components/user-list.hbs index b455729ad..ce185b091 100644 --- a/app/templates/components/user-list.hbs +++ b/app/templates/components/user-list.hbs @@ -21,9 +21,9 @@
ORCID
{{user.orcid}} - {{#if user.givenNames}} + {{#if user.givenName}}
Given Name
- {{user.givenNames}} + {{user.givenName}} {{/if}} {{#if user.familyName}} diff --git a/app/templates/components/user-show.hbs b/app/templates/components/user-show.hbs index 700419d9b..b995306ab 100644 --- a/app/templates/components/user-show.hbs +++ b/app/templates/components/user-show.hbs @@ -7,9 +7,9 @@
ORCID ID
{{model.orcid}} - {{#if model.givenNames}} + {{#if model.givenName}}
Given Name
- {{model.givenNames}} + {{model.givenName}} {{/if}} {{#if model.familyName}} diff --git a/recordings/Acceptance-client_admin-repository_1178715723/visiting-repository-DataCite-Test-prefixes_3729007799/recording.har b/recordings/Acceptance-client_admin-repository_1178715723/visiting-repository-DataCite-Test-prefixes_3729007799/recording.har index 0984ea63b..d32042b3f 100644 --- a/recordings/Acceptance-client_admin-repository_1178715723/visiting-repository-DataCite-Test-prefixes_3729007799/recording.har +++ b/recordings/Acceptance-client_admin-repository_1178715723/visiting-repository-DataCite-Test-prefixes_3729007799/recording.har @@ -450,6 +450,65 @@ "ssl": -1, "wait": 83 } + }, + { + "_id": "e2831a55060530a68b1087aa3e2cd861", + "_order": 0, + "cache": {}, + "request": { + "bodySize": 0, + "cookies": [], + "headers": [ + { + "name": "accept", + "value": "application/vnd.api+json" + }, + { + "name": "content-type", + "value": "text/plain;charset=utf-8" + } + ], + "headersSize": 147, + "httpVersion": "HTTP/1.1", + "method": "GET", + "queryString": [], + "url": "https://api.test.datacite.org/repositories/datacite.test" + }, + "response": { + "bodySize": 659, + "content": { + "mimeType": "application/json; charset=utf-8", + "size": 659, + "text": "{\"data\":{\"id\":\"datacite.test\",\"type\":\"repositories\",\"attributes\":{\"name\":\"DataCite Test Repository\",\"symbol\":\"DATACITE.TEST\",\"re3data\":null,\"opendoar\":null,\"year\":2017,\"systemEmail\":\"mfenner@datacite.org\",\"alternateName\":null,\"description\":null,\"clientType\":\"repository\",\"repositoryType\":[],\"language\":[],\"certificate\":[],\"domains\":\"*\",\"issn\":{},\"url\":null,\"created\":\"2017-07-13T15:15:33.000Z\",\"updated\":\"2020-03-19T09:34:22.000Z\",\"isActive\":true,\"hasPassword\":true,\"serviceContact\":{}},\"relationships\":{\"provider\":{\"data\":{\"id\":\"datacite\",\"type\":\"providers\"}},\"prefixes\":{\"data\":[{\"id\":\"10.80225\",\"type\":\"prefixes\"}]}}},\"meta\":{\"doiCount\":3,\"prefixCount\":1}}" + }, + "cookies": [], + "headers": [ + { + "name": "cache-control", + "value": "max-age=0, private, must-revalidate" + }, + { + "name": "content-type", + "value": "application/json; charset=utf-8" + } + ], + "headersSize": 101, + "httpVersion": "HTTP/1.1", + "redirectURL": "", + "status": 200, + "statusText": "OK" + }, + "startedDateTime": "2020-03-24T10:23:19.469Z", + "time": 242, + "timings": { + "blocked": -1, + "connect": -1, + "dns": -1, + "receive": 0, + "send": 0, + "ssl": -1, + "wait": 242 + } } ], "pages": [], diff --git a/recordings/Acceptance-consortium_admin-repository_1373773937/visiting-repository-DataCite-Test-prefixes_3729007799/recording.har b/recordings/Acceptance-consortium_admin-repository_1373773937/visiting-repository-DataCite-Test-prefixes_3729007799/recording.har index c773c85ef..4d54fb4e8 100644 --- a/recordings/Acceptance-consortium_admin-repository_1373773937/visiting-repository-DataCite-Test-prefixes_3729007799/recording.har +++ b/recordings/Acceptance-consortium_admin-repository_1373773937/visiting-repository-DataCite-Test-prefixes_3729007799/recording.har @@ -562,6 +562,65 @@ "ssl": -1, "wait": 75 } + }, + { + "_id": "e2831a55060530a68b1087aa3e2cd861", + "_order": 0, + "cache": {}, + "request": { + "bodySize": 0, + "cookies": [], + "headers": [ + { + "name": "accept", + "value": "application/vnd.api+json" + }, + { + "name": "content-type", + "value": "text/plain;charset=utf-8" + } + ], + "headersSize": 147, + "httpVersion": "HTTP/1.1", + "method": "GET", + "queryString": [], + "url": "https://api.test.datacite.org/repositories/datacite.test" + }, + "response": { + "bodySize": 659, + "content": { + "mimeType": "application/json; charset=utf-8", + "size": 659, + "text": "{\"data\":{\"id\":\"datacite.test\",\"type\":\"repositories\",\"attributes\":{\"name\":\"DataCite Test Repository\",\"symbol\":\"DATACITE.TEST\",\"re3data\":null,\"opendoar\":null,\"year\":2017,\"systemEmail\":\"mfenner@datacite.org\",\"alternateName\":null,\"description\":null,\"clientType\":\"repository\",\"repositoryType\":[],\"language\":[],\"certificate\":[],\"domains\":\"*\",\"issn\":{},\"url\":null,\"created\":\"2017-07-13T15:15:33.000Z\",\"updated\":\"2020-03-19T09:34:22.000Z\",\"isActive\":true,\"hasPassword\":true,\"serviceContact\":{}},\"relationships\":{\"provider\":{\"data\":{\"id\":\"datacite\",\"type\":\"providers\"}},\"prefixes\":{\"data\":[{\"id\":\"10.80225\",\"type\":\"prefixes\"}]}}},\"meta\":{\"doiCount\":3,\"prefixCount\":1}}" + }, + "cookies": [], + "headers": [ + { + "name": "cache-control", + "value": "max-age=0, private, must-revalidate" + }, + { + "name": "content-type", + "value": "application/json; charset=utf-8" + } + ], + "headersSize": 101, + "httpVersion": "HTTP/1.1", + "redirectURL": "", + "status": 200, + "statusText": "OK" + }, + "startedDateTime": "2020-03-24T10:24:07.759Z", + "time": 134, + "timings": { + "blocked": -1, + "connect": -1, + "dns": -1, + "receive": 0, + "send": 0, + "ssl": -1, + "wait": 134 + } } ], "pages": [], diff --git a/recordings/Acceptance-organization_admin-repository_2151421519/visiting-repository-DataCite-Journal-prefixes_3178648116/recording.har b/recordings/Acceptance-organization_admin-repository_2151421519/visiting-repository-DataCite-Journal-prefixes_3178648116/recording.har index 4032558b9..d8ddb0704 100644 --- a/recordings/Acceptance-organization_admin-repository_2151421519/visiting-repository-DataCite-Journal-prefixes_3178648116/recording.har +++ b/recordings/Acceptance-organization_admin-repository_2151421519/visiting-repository-DataCite-Journal-prefixes_3178648116/recording.har @@ -680,6 +680,65 @@ "ssl": -1, "wait": 96 } + }, + { + "_id": "3b3ffb184cb145e8c1fa693f3e340e86", + "_order": 0, + "cache": {}, + "request": { + "bodySize": 0, + "cookies": [], + "headers": [ + { + "name": "accept", + "value": "application/vnd.api+json" + }, + { + "name": "content-type", + "value": "text/plain;charset=utf-8" + } + ], + "headersSize": 151, + "httpVersion": "HTTP/1.1", + "method": "GET", + "queryString": [], + "url": "https://api.test.datacite.org/repositories/datacite.datacite" + }, + "response": { + "bodySize": 885, + "content": { + "mimeType": "application/json; charset=utf-8", + "size": 885, + "text": "{\"data\":{\"id\":\"datacite.datacite\",\"type\":\"repositories\",\"attributes\":{\"name\":\"DataCite Repository\",\"symbol\":\"DATACITE.DATACITE\",\"re3data\":null,\"opendoar\":null,\"year\":2011,\"systemEmail\":\"support@datacite.org\",\"alternateName\":null,\"description\":null,\"clientType\":\"periodical\",\"repositoryType\":[],\"language\":[\"en\",\"fr\"],\"certificate\":[],\"domains\":\"datacite.org\",\"issn\":{\"issnl\":null,\"print\":\"1545-7885\",\"electronic\":\"1544-9173\"},\"url\":null,\"created\":\"2011-12-07T13:43:39.000Z\",\"updated\":\"2019-08-24T06:22:34.000Z\",\"isActive\":true,\"hasPassword\":true,\"serviceContact\":{\"email\":\"mfenner@datacite.org\",\"givenName\":\"Martin\",\"familyName\":\"Fenner\"}},\"relationships\":{\"provider\":{\"data\":{\"id\":\"datacite\",\"type\":\"providers\"}},\"prefixes\":{\"data\":[{\"id\":\"10.5438\",\"type\":\"prefixes\"},{\"id\":\"10.70002\",\"type\":\"prefixes\"},{\"id\":\"10.70001\",\"type\":\"prefixes\"}]}}},\"meta\":{\"doiCount\":189,\"prefixCount\":3}}" + }, + "cookies": [], + "headers": [ + { + "name": "cache-control", + "value": "max-age=0, private, must-revalidate" + }, + { + "name": "content-type", + "value": "application/json; charset=utf-8" + } + ], + "headersSize": 101, + "httpVersion": "HTTP/1.1", + "redirectURL": "", + "status": 200, + "statusText": "OK" + }, + "startedDateTime": "2020-03-24T10:24:46.783Z", + "time": 113, + "timings": { + "blocked": -1, + "connect": -1, + "dns": -1, + "receive": 0, + "send": 0, + "ssl": -1, + "wait": 113 + } } ], "pages": [], diff --git a/recordings/Acceptance-staff_admin-repository_4125372844/visiting-repository-DataCite-Test-prefixes_3729007799/recording.har b/recordings/Acceptance-staff_admin-repository_4125372844/visiting-repository-DataCite-Test-prefixes_3729007799/recording.har index 040a97b6d..37b0adccf 100644 --- a/recordings/Acceptance-staff_admin-repository_4125372844/visiting-repository-DataCite-Test-prefixes_3729007799/recording.har +++ b/recordings/Acceptance-staff_admin-repository_4125372844/visiting-repository-DataCite-Test-prefixes_3729007799/recording.har @@ -450,6 +450,65 @@ "ssl": -1, "wait": 84 } + }, + { + "_id": "e2831a55060530a68b1087aa3e2cd861", + "_order": 0, + "cache": {}, + "request": { + "bodySize": 0, + "cookies": [], + "headers": [ + { + "name": "accept", + "value": "application/vnd.api+json" + }, + { + "name": "content-type", + "value": "text/plain;charset=utf-8" + } + ], + "headersSize": 147, + "httpVersion": "HTTP/1.1", + "method": "GET", + "queryString": [], + "url": "https://api.test.datacite.org/repositories/datacite.test" + }, + "response": { + "bodySize": 659, + "content": { + "mimeType": "application/json; charset=utf-8", + "size": 659, + "text": "{\"data\":{\"id\":\"datacite.test\",\"type\":\"repositories\",\"attributes\":{\"name\":\"DataCite Test Repository\",\"symbol\":\"DATACITE.TEST\",\"re3data\":null,\"opendoar\":null,\"year\":2017,\"systemEmail\":\"mfenner@datacite.org\",\"alternateName\":null,\"description\":null,\"clientType\":\"repository\",\"repositoryType\":[],\"language\":[],\"certificate\":[],\"domains\":\"*\",\"issn\":{},\"url\":null,\"created\":\"2017-07-13T15:15:33.000Z\",\"updated\":\"2020-03-19T09:34:22.000Z\",\"isActive\":true,\"hasPassword\":true,\"serviceContact\":{}},\"relationships\":{\"provider\":{\"data\":{\"id\":\"datacite\",\"type\":\"providers\"}},\"prefixes\":{\"data\":[{\"id\":\"10.80225\",\"type\":\"prefixes\"}]}}},\"meta\":{\"doiCount\":3,\"prefixCount\":1}}" + }, + "cookies": [], + "headers": [ + { + "name": "cache-control", + "value": "max-age=0, private, must-revalidate" + }, + { + "name": "content-type", + "value": "application/json; charset=utf-8" + } + ], + "headersSize": 101, + "httpVersion": "HTTP/1.1", + "redirectURL": "", + "status": 200, + "statusText": "OK" + }, + "startedDateTime": "2020-03-24T10:25:51.496Z", + "time": 92, + "timings": { + "blocked": -1, + "connect": -1, + "dns": -1, + "receive": 0, + "send": 0, + "ssl": -1, + "wait": 92 + } } ], "pages": [],