diff --git a/src/app/core/submission/models/submission-cc-license.model.ts b/src/app/core/submission/models/submission-cc-license.model.ts index 92c48fdbfe1..d00a08f8532 100644 --- a/src/app/core/submission/models/submission-cc-license.model.ts +++ b/src/app/core/submission/models/submission-cc-license.model.ts @@ -39,4 +39,5 @@ export interface Option { id: string; label: string; description: string; + default: boolean; } diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html index 0f79fa6a1dd..dcec80cacb5 100644 --- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html +++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html @@ -1,145 +1,147 @@ - -
-
- - -
-
- +
+

+ - - - - - - - - -
+ + + + + + {{ getSelectedCcLicense().name }} + + + + {{ 'submission.sections.ccLicense.change' | translate }} + + + {{ 'submission.sections.ccLicense.select' | translate }} + + + -
-
- {{ field.label }} -
- -
+ + - + +
-
+ +
+
-
-
-

- {{ field.label }} -

-
-
-
+
-
-
-
- {{ value.label }} -
-
+ +
+
+
+

{{ field.label }}

+
+
+ +
+
+
+
{{ value.label }}
+
+
+ -
+ + + {{ option.label }} + {{ 'submission.sections.ccLicense.option.select' | translate }} + + +
+ +
+ + - + +
+
+ + {{ option.label }} +
+
+ - - - - {{ option.label }} - - - {{ 'submission.sections.ccLicense.option.select' | translate }} - + +
+
+ + {{ field.description }} +
+
- -
- + + +
+
+ + {{ field.description }} +
- +
- -
-
- - {{ option.label }} + +
+
+ {{ 'submission.sections.ccLicense.selected' | translate }} + {{ licenseMap[licenseLink] }}. +

{{ 'submission.sections.ccLicense.link2' | translate }}

+
+
+

+
+
+
+ + + {{ 'submission.sections.ccLicense.copyrighted' | translate }} + + + + {{ 'submission.sections.ccLicense.confirmation' | translate }} + + + + + {{ 'submission.sections.ccLicense.cczero' | translate }} + + +
-
- - -
- -
-
-
- {{ 'submission.sections.ccLicense.link' | translate }} -
- - {{ licenseLink }} - -
-
- - {{ 'submission.sections.ccLicense.confirmation' | translate }} -
-
-
- +

{{ 'submission.sections.ccLicense.attribution' | translate }}, creativecommons.org

diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts index b2d9c5ad60a..ef022ffb904 100644 --- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts +++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts @@ -50,11 +50,13 @@ describe('SubmissionSectionCcLicensesComponent', () => { { id: 'test enum id 1a I', label: 'test enum label 1a I', + default: true, description: 'test enum description 1a I', }, { id: 'test enum id 1a II', label: 'test enum label 1a II', + default: false, description: 'test enum description 1a II', }, ], @@ -67,11 +69,13 @@ describe('SubmissionSectionCcLicensesComponent', () => { { id: 'test enum id 1b I', label: 'test enum label 1b I', + default: true, description: 'test enum description 1b I', }, { id: 'test enum id 1b II', label: 'test enum label 1b II', + default: false, description: 'test enum description 1b II', }, ], @@ -96,11 +100,13 @@ describe('SubmissionSectionCcLicensesComponent', () => { { id: 'test enum id 2a I', label: 'test enum label 2a I', + default: true, description: 'test enum description 2a I' }, { id: 'test enum id 2a II', label: 'test enum label 2a II', + default: false, description: 'test enum description 2a II' }, ], @@ -113,11 +119,13 @@ describe('SubmissionSectionCcLicensesComponent', () => { { id: 'test enum id 2b I', label: 'test enum label 2b I', + default: true, description: 'test enum description 2b I' }, { id: 'test enum id 2b II', label: 'test enum label 2b II', + default: false, description: 'test enum description 2b II' }, ], diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts index ddb3be855d7..bc59a40ceaa 100644 --- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts +++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts @@ -18,8 +18,9 @@ import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder import { isNotEmpty, hasValue, hasNoValue } from '../../../shared/empty.util'; import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder'; import { SubmissionCcLicenseUrlDataService } from '../../../core/submission/submission-cc-license-url-data.service'; -import {ConfigurationDataService} from '../../../core/data/configuration-data.service'; +import { ConfigurationDataService } from '../../../core/data/configuration-data.service'; import { FindListOptions } from '../../../core/data/find-list-options.model'; +import { TranslateService } from '@ngx-translate/core'; /** * This component represents the submission section to select the Creative Commons license. @@ -60,6 +61,18 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent */ submissionCcLicenses: SubmissionCcLicence[] = []; + /** + * Map of licence uris to names + */ + public licenseMap: Record = { + 'http://creativecommons.org/licenses/by/4.0/' : 'CC BY 4.0 (Attribution 4.0 International)', + 'http://creativecommons.org/licenses/by-sa/4.0/' : 'CC BY-SA 4.0 (Attribution-ShareAlike 4.0 International)', + 'http://creativecommons.org/licenses/by-nc/4.0/' : 'CC BY-NC 4.0 (Attribution-NonCommercial 4.0 International)', + 'http://creativecommons.org/licenses/by-nc-sa/4.0/' : 'CC BY-NC-SA 4.0 (Attribution-NonCommercial-ShareAlike 4.0 International)', + 'http://creativecommons.org/licenses/by-nd/4.0/' : 'CC BY-ND 4.0 (Attribution-NoDerivatives 4.0 International)', + 'http://creativecommons.org/licenses/by-nc-nd/4.0/' : 'CC BY-NC-ND 4.0 (Attribution-NonCommercial-NoDerivatives 4.0 International)' + }; + /** * Reference to NgbModal */ @@ -116,6 +129,7 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent protected operationsBuilder: JsonPatchOperationsBuilder, protected configService: ConfigurationDataService, protected ref: ChangeDetectorRef, + private translate: TranslateService, @Inject('collectionIdProvider') public injectedCollectionId: string, @Inject('sectionDataProvider') public injectedSectionData: SectionDataObject, @Inject('submissionIdProvider') public injectedSubmissionId: string @@ -157,10 +171,18 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent } this.selectedCcLicense = ccLicense; this.setAccepted(false); + + // Generate the defaults options for selected ccLicense + const defaults = {}; + ccLicense.fields.forEach(field => { + const defaultEnumOption = field.enums.find(enumOption => enumOption.default); + if (defaultEnumOption) { defaults[field.id] = defaultEnumOption; } + }); + this.updateSectionData({ ccLicense: { id: ccLicense.id, - fields: {}, + fields: defaults }, uri: undefined, }); @@ -199,6 +221,25 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent this.ccLicenseLink$ = this.getCcLicenseLink$(); } + /** + * Update value for a given license field. + * @param ccLicense the related Creative Commons license. + * @param field the field for which to set a value. + */ + updateInput(ccLicense: SubmissionCcLicence, field: Field) { + this.updateSectionData({ + ccLicense: { + id: ccLicense.id, + fields: Object.assign({}, this.data.ccLicense.fields, { + [field.id]: this.data.ccLicense.fields[field.id] + }), + }, + accepted: false, + uri: this.data.uri + }); + this.ccLicenseLink$ = this.getCcLicenseLink$(); + } + /** * Get the selected option for a given license field. * @param ccLicense the related Creative Commons license. @@ -290,11 +331,17 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent if (this.data.accepted !== data.accepted) { const path = this.pathCombiner.getPath('uri'); if (data.accepted) { - this.getCcLicenseLink$().pipe( - take(1), - ).subscribe((link) => { - this.operationsBuilder.add(path, link.toString(), false, true); - }); + if (data.ccLicense.id === 'other') { + this.operationsBuilder.add(path, { 'uri': data.ccLicense.fields.dc_rights_uri, 'rights': data.ccLicense.fields.dc_rights }, false, true); + } else if (data.ccLicense.id === 'none') { + this.operationsBuilder.add(path, { 'uri': '', 'rights': this.translate.instant('submission.sections.ccLicense.copyrighted') }, false, true); + } else { + this.getCcLicenseLink$().pipe( + take(1), + ).subscribe((link) => { + this.operationsBuilder.add(path, link.toString(), false, true); + }); + } } else if (!!this.data.uri) { this.operationsBuilder.remove(path); } diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index d1a319d90ef..189a05c6351 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -4549,19 +4549,33 @@ "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission", - "submission.sections.ccLicense.type": "License Type", + "submission.sections.ccLicense.attribution": "The language in this tool is adapted from Creative Commons", + + "submission.sections.ccLicense.change": "License selector…", - "submission.sections.ccLicense.select": "Select a license type…", + "submission.sections.ccLicense.confirmation": "I grant the license above", - "submission.sections.ccLicense.change": "Change your license type…", + "submission.sections.ccLicense.copyrighted": "This work is protected by copyright unless stated otherwise.", - "submission.sections.ccLicense.none": "No licenses available", + "submission.sections.ccLicense.cczero": "I have read and understand the terms and intended legal effect of CC0 (Public domain). I hereby waive all copyright and related or neighboring rights together with all associated claims and causes of action with respect to this work to the extent possible under the law.", - "submission.sections.ccLicense.option.select": "Select an option…", + "submission.sections.ccLicense.info": "Select license terms to limit how others may reuse your work. We recommend a CC BY-NC Creative Commons (CC) license. Learn more at About CC Licenses or use the “Help me choose” option in the License Selector. Tip: If you save and then re-visit this submission form, your previous entries in this section will not be displayed. However, they will remain saved unless you make a new selection in this section.", "submission.sections.ccLicense.link": "You’ve selected the following license:", - "submission.sections.ccLicense.confirmation": "I grant the license above", + "submission.sections.ccLicense.link2": "All Creative Commons licenses require attribution, meaning that credit must be given to you, the creator.", + + "submission.sections.ccLicense.none": "No licenses available", + + "submission.sections.ccLicense.option.select": "Select…", + + "submission.sections.ccLicense.publicdomain": "You have chosen to put your work into the public domain using the CC0 Public Domain Dedication deed.", + + "submission.sections.ccLicense.select": "License selector…", + + "submission.sections.ccLicense.selected": "You have selected", + + "submission.sections.ccLicense.type": "License Type", "submission.sections.general.add-more": "Add more", @@ -4609,7 +4623,7 @@ "submission.sections.submit.progressbar.accessCondition": "Item access conditions", - "submission.sections.submit.progressbar.CClicense": "Creative commons license", + "submission.sections.submit.progressbar.CClicense": "Rights", "submission.sections.submit.progressbar.describe.recycle": "Recycle", @@ -4619,6 +4633,8 @@ "submission.sections.submit.progressbar.describe.steptwo": "Describe", + "submission.sections.submit.progressbar.describe.rights": "Rights Statement", + "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates", "submission.sections.submit.progressbar.identifiers": "Identifiers",