From 06769493e1c16f65f77fcad9afeab4acc0b09e7c Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Mon, 26 Oct 2020 17:49:56 +0100 Subject: [PATCH] 74199: Edit current DSO button --- .../collection-page.component.html | 62 ++++++++++--------- .../community-page.component.html | 40 ++++++------ .../item-status/item-status.component.ts | 2 +- .../item-version-history.component.ts | 2 +- .../full/full-item-page.component.html | 7 ++- .../publication/publication.component.html | 11 +++- .../data/feature-authorization/feature-id.ts | 1 + .../journal-issue.component.html | 11 +++- .../journal-volume.component.html | 11 +++- .../item-pages/journal/journal.component.html | 11 +++- .../org-unit/org-unit.component.html | 11 +++- .../item-pages/person/person.component.html | 11 +++- .../item-pages/project/project.component.html | 11 +++- .../dso-page-edit-button.component.html | 6 ++ .../dso-page-edit-button.component.scss | 3 + .../dso-page-edit-button.component.spec.ts | 25 ++++++++ .../dso-page-edit-button.component.ts | 28 +++++++++ src/app/shared/shared.module.ts | 21 ++++--- src/assets/i18n/en.json5 | 20 ++++++ 19 files changed, 214 insertions(+), 80 deletions(-) create mode 100644 src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.html create mode 100644 src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.scss create mode 100644 src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.spec.ts create mode 100644 src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.ts diff --git a/src/app/+collection-page/collection-page.component.html b/src/app/+collection-page/collection-page.component.html index 98552ed40b..beb7413415 100644 --- a/src/app/+collection-page/collection-page.component.html +++ b/src/app/+collection-page/collection-page.component.html @@ -3,37 +3,41 @@ *ngVar="(collectionRD$ | async) as collectionRD">
- -
+ +
+
- - - - - + + + + + - - - - - - - - - - -
+ + + + + + + + + +
+
+ +
+
-
- - - - - - - - - - - - - - - -
+
+
+ + + + + + + + + + + + + + +
+
+ +
+
diff --git a/src/app/+item-page/edit-item-page/item-status/item-status.component.ts b/src/app/+item-page/edit-item-page/item-status/item-status.component.ts index dd043330d6..3cd885ddca 100644 --- a/src/app/+item-page/edit-item-page/item-status/item-status.component.ts +++ b/src/app/+item-page/edit-item-page/item-status/item-status.component.ts @@ -56,7 +56,7 @@ export class ItemStatusComponent implements OnInit { } ngOnInit(): void { - this.itemRD$ = this.route.parent.data.pipe(map((data) => data.item)); + this.itemRD$ = this.route.parent.data.pipe(map((data) => data.dso)); this.itemRD$.pipe( first(), map((data: RemoteData) => data.payload) diff --git a/src/app/+item-page/edit-item-page/item-version-history/item-version-history.component.ts b/src/app/+item-page/edit-item-page/item-version-history/item-version-history.component.ts index ce662c5753..7cdd043603 100644 --- a/src/app/+item-page/edit-item-page/item-version-history/item-version-history.component.ts +++ b/src/app/+item-page/edit-item-page/item-version-history/item-version-history.component.ts @@ -30,6 +30,6 @@ export class ItemVersionHistoryComponent { } ngOnInit(): void { - this.itemRD$ = this.route.parent.data.pipe(map((data) => data.item)).pipe(getSucceededRemoteData()) as Observable>; + this.itemRD$ = this.route.parent.data.pipe(map((data) => data.dso)).pipe(getSucceededRemoteData()) as Observable>; } } diff --git a/src/app/+item-page/full/full-item-page.component.html b/src/app/+item-page/full/full-item-page.component.html index 29d3582492..ce63c269de 100644 --- a/src/app/+item-page/full/full-item-page.component.html +++ b/src/app/+item-page/full/full-item-page.component.html @@ -3,7 +3,12 @@
- +
+ +
+ +
+
{{"item.page.link.simple" | translate}} diff --git a/src/app/+item-page/simple/item-types/publication/publication.component.html b/src/app/+item-page/simple/item-types/publication/publication.component.html index 9eb704b9e9..ae3d62a108 100644 --- a/src/app/+item-page/simple/item-types/publication/publication.component.html +++ b/src/app/+item-page/simple/item-types/publication/publication.component.html @@ -1,6 +1,11 @@ -

- {{'publication.page.titleprefix' | translate}} -

+
+

+ {{'publication.page.titleprefix' | translate}} +

+
+ +
+
diff --git a/src/app/core/data/feature-authorization/feature-id.ts b/src/app/core/data/feature-authorization/feature-id.ts index 450d5057aa..3c17f43cb1 100644 --- a/src/app/core/data/feature-authorization/feature-id.ts +++ b/src/app/core/data/feature-authorization/feature-id.ts @@ -5,6 +5,7 @@ export enum FeatureID { LoginOnBehalfOf = 'loginOnBehalfOf', AdministratorOf = 'administratorOf', CanDelete = 'canDelete', + CanEditMetadata = 'canEditMetadata', WithdrawItem = 'withdrawItem', ReinstateItem = 'reinstateItem', EPersonRegistration = 'epersonRegistration', diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html index cdfa6293c4..c5eb3ba59e 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html +++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html @@ -1,6 +1,11 @@ -

- {{'journalissue.page.titleprefix' | translate}} -

+
+

+ {{'journalissue.page.titleprefix' | translate}} +

+
+ +
+
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html index 5df1997f0b..38a201df16 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html +++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html @@ -1,6 +1,11 @@ -

- {{'journalvolume.page.titleprefix' | translate}} -

+
+

+ {{'journalvolume.page.titleprefix' | translate}} +

+
+ +
+
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html index d8d32df04a..874f748049 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html +++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html @@ -1,6 +1,11 @@ -

- {{'journal.page.titleprefix' | translate}} -

+
+

+ {{'journal.page.titleprefix' | translate}} +

+
+ +
+
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html index 784000b446..4d90b85133 100644 --- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html +++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html @@ -1,6 +1,11 @@ -

- {{'orgunit.page.titleprefix' | translate}} -

+
+

+ {{'orgunit.page.titleprefix' | translate}} +

+
+ +
+
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.html b/src/app/entity-groups/research-entities/item-pages/person/person.component.html index af71d5a1c6..2d751eeabb 100644 --- a/src/app/entity-groups/research-entities/item-pages/person/person.component.html +++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.html @@ -1,6 +1,11 @@ -

- {{'person.page.titleprefix' | translate}} -

+
+

+ {{'person.page.titleprefix' | translate}} +

+
+ +
+
diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.html b/src/app/entity-groups/research-entities/item-pages/project/project.component.html index 6c4a0bab01..4d681bb172 100644 --- a/src/app/entity-groups/research-entities/item-pages/project/project.component.html +++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.html @@ -1,6 +1,11 @@ -

- {{'project.page.titleprefix' | translate}} -

+
+

+ {{'project.page.titleprefix' | translate}} +

+
+ +
+
diff --git a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.html b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.html new file mode 100644 index 0000000000..0cfa333ae0 --- /dev/null +++ b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.html @@ -0,0 +1,6 @@ + + + diff --git a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.scss b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.scss new file mode 100644 index 0000000000..c308aa71b9 --- /dev/null +++ b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.scss @@ -0,0 +1,3 @@ +.btn-dark { + background-color: $admin-sidebar-bg; +} diff --git a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.spec.ts b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.spec.ts new file mode 100644 index 0000000000..253c58c550 --- /dev/null +++ b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { DsoPageEditButtonComponent } from './dso-page-edit-button.component'; + +describe('DsoPageEditButtonComponent', () => { + let component: DsoPageEditButtonComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ DsoPageEditButtonComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DsoPageEditButtonComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.ts b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.ts new file mode 100644 index 0000000000..809d162849 --- /dev/null +++ b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.ts @@ -0,0 +1,28 @@ +import { Component, Input, OnInit } from '@angular/core'; +import { DSpaceObject } from '../../../core/shared/dspace-object.model'; +import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; +import { Observable } from 'rxjs/internal/Observable'; +import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; + +@Component({ + selector: 'ds-dso-page-edit-button', + templateUrl: './dso-page-edit-button.component.html', + styleUrls: ['./dso-page-edit-button.component.scss'] +}) +export class DsoPageEditButtonComponent implements OnInit { + + @Input() dso: DSpaceObject; + + @Input() pageRoutePrefix: string; + + @Input() tooltipMsg: string; + + isAuthorized$: Observable; + + constructor(protected authorizationService: AuthorizationDataService) { } + + ngOnInit() { + this.isAuthorized$ = this.authorizationService.isAuthorized(FeatureID.CanEditMetadata, this.dso.self); + } + +} diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index d8d8b51331..8add0c0977 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -215,6 +215,7 @@ import { SidebarSearchListElementComponent } from './object-list/sidebar-search- import { CollectionSidebarSearchListElementComponent } from './object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component'; import { CommunitySidebarSearchListElementComponent } from './object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component'; import { AuthorizedCollectionSelectorComponent } from './dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component'; +import { DsoPageEditButtonComponent } from './dso-page/dso-page-edit-button/dso-page-edit-button.component'; const MODULES = [ // Do NOT include UniversalModule, HttpModule, or JsonpModule here @@ -543,19 +544,21 @@ const DIRECTIVES = [ ...COMPONENTS, ...DIRECTIVES, ...ENTRY_COMPONENTS, - ...SHARED_ITEM_PAGE_COMPONENTS + ...SHARED_ITEM_PAGE_COMPONENTS, + DsoPageEditButtonComponent ], providers: [ ...PROVIDERS ], - exports: [ - ...MODULES, - ...PIPES, - ...COMPONENTS, - ...SHARED_ITEM_PAGE_COMPONENTS, - ...DIRECTIVES, - CurationFormComponent - ], + exports: [ + ...MODULES, + ...PIPES, + ...COMPONENTS, + ...SHARED_ITEM_PAGE_COMPONENTS, + ...DIRECTIVES, + CurationFormComponent, + DsoPageEditButtonComponent + ], entryComponents: [ ...ENTRY_COMPONENTS ] diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 97d7ce162a..9f8d7a0ec1 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -764,6 +764,8 @@ "collection.page.browse.recent.empty": "No items to show", + "collection.page.edit": "Edit this collection", + "collection.page.handle": "Permanent URI for this collection", "collection.page.license": "License", @@ -927,6 +929,8 @@ "community.form.title": "Name", + "community.page.edit": "Edit this community", + "community.page.handle": "Permanent URI for this community", "community.page.license": "License", @@ -1676,6 +1680,8 @@ "item.page.date": "Date", + "item.page.edit": "Edit this item", + "item.page.files": "Files", "item.page.filesection.description": "Description:", @@ -1782,6 +1788,8 @@ "journal.page.description": "Description", + "journal.page.edit": "Edit this item", + "journal.page.editor": "Editor-in-Chief", "journal.page.issn": "ISSN", @@ -1800,6 +1808,8 @@ "journalissue.page.description": "Description", + "journalissue.page.edit": "Edit this item", + "journalissue.page.issuedate": "Issue Date", "journalissue.page.journal-issn": "Journal ISSN", @@ -1818,6 +1828,8 @@ "journalvolume.page.description": "Description", + "journalvolume.page.edit": "Edit this item", + "journalvolume.page.issuedate": "Issue Date", "journalvolume.page.titleprefix": "Journal Volume: ", @@ -2180,6 +2192,8 @@ "orgunit.page.description": "Description", + "orgunit.page.edit": "Edit this item", + "orgunit.page.id": "ID", "orgunit.page.titleprefix": "Organizational Unit: ", @@ -2202,6 +2216,8 @@ "person.page.birthdate": "Birth Date", + "person.page.edit": "Edit this item", + "person.page.email": "Email Address", "person.page.firstname": "First Name", @@ -2433,6 +2449,8 @@ "project.page.description": "Description", + "project.page.edit": "Edit this item", + "project.page.expectedcompletion": "Expected Completion", "project.page.funder": "Funders", @@ -2453,6 +2471,8 @@ "publication.page.description": "Description", + "publication.page.edit": "Edit this item", + "publication.page.journal-issn": "Journal ISSN", "publication.page.journal-title": "Journal Title",