From 6f24b31b393e8e3be91135e74cecf448df695908 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Tue, 7 Sep 2021 14:47:36 +0200 Subject: [PATCH] [CST-4499] Version history (WIP) - Removed summary page (with routing) and modal --- .../edit-item-page/edit-item-page.module.ts | 2 + .../edit-item-page.routing.module.ts | 5 +- .../item-version-history.component.html | 0 .../item-version-history.component.spec.ts | 6 +- .../item-version-history.component.ts | 8 +- .../item-version-history-form.component.html | 5 -- .../item-version-history-form.component.scss | 0 ...tem-version-history-form.component.spec.ts | 25 ------- .../item-version-history-form.component.ts | 74 ------------------- .../item-version-summary-modal.component.html | 11 --- .../item-version-summary-modal.component.scss | 0 ...em-version-summary-modal.component.spec.ts | 25 ------- .../item-version-summary-modal.component.ts | 23 ------ .../version-history/version-history.module.ts | 20 ----- .../version-history.routing.module.ts | 40 ---------- .../item-versions.component.html | 1 + .../item-versions/item-versions.component.ts | 5 +- 17 files changed, 13 insertions(+), 237 deletions(-) rename src/app/item-page/edit-item-page/{version-history => }/item-version-history/item-version-history.component.html (100%) rename src/app/item-page/edit-item-page/{version-history => }/item-version-history/item-version-history.component.spec.ts (87%) rename src/app/item-page/edit-item-page/{version-history => }/item-version-history/item-version-history.component.ts (75%) delete mode 100644 src/app/item-page/edit-item-page/version-history/item-version-history-form/item-version-history-form.component.html delete mode 100644 src/app/item-page/edit-item-page/version-history/item-version-history-form/item-version-history-form.component.scss delete mode 100644 src/app/item-page/edit-item-page/version-history/item-version-history-form/item-version-history-form.component.spec.ts delete mode 100644 src/app/item-page/edit-item-page/version-history/item-version-history-form/item-version-history-form.component.ts delete mode 100644 src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.html delete mode 100644 src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.scss delete mode 100644 src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.spec.ts delete mode 100644 src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.ts delete mode 100644 src/app/item-page/edit-item-page/version-history/version-history.module.ts delete mode 100644 src/app/item-page/edit-item-page/version-history/version-history.routing.module.ts diff --git a/src/app/item-page/edit-item-page/edit-item-page.module.ts b/src/app/item-page/edit-item-page/edit-item-page.module.ts index 6b12603fc2..11b1d585ba 100644 --- a/src/app/item-page/edit-item-page/edit-item-page.module.ts +++ b/src/app/item-page/edit-item-page/edit-item-page.module.ts @@ -28,6 +28,7 @@ import { DragDropModule } from '@angular/cdk/drag-drop'; import { ItemEditBitstreamDragHandleComponent } from './item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component'; import { PaginatedDragAndDropBitstreamListComponent } from './item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component'; import { VirtualMetadataComponent } from './virtual-metadata/virtual-metadata.component'; +import { ItemVersionHistoryComponent } from './item-version-history/item-version-history.component'; import { ItemAuthorizationsComponent } from './item-authorizations/item-authorizations.component'; import { ObjectValuesPipe } from '../../shared/utils/object-values-pipe'; @@ -56,6 +57,7 @@ import { ObjectValuesPipe } from '../../shared/utils/object-values-pipe'; ItemMetadataComponent, ItemRelationshipsComponent, ItemBitstreamsComponent, + ItemVersionHistoryComponent, EditInPlaceFieldComponent, ItemEditBitstreamComponent, ItemEditBitstreamBundleComponent, diff --git a/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts b/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts index 26327f9fcc..2535e42216 100644 --- a/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts +++ b/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts @@ -13,6 +13,7 @@ import { ItemCollectionMapperComponent } from './item-collection-mapper/item-col import { ItemMoveComponent } from './item-move/item-move.component'; import { ItemRelationshipsComponent } from './item-relationships/item-relationships.component'; import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { ItemVersionHistoryComponent } from './item-version-history/item-version-history.component'; import { ItemAuthorizationsComponent } from './item-authorizations/item-authorizations.component'; import { ResourcePolicyTargetResolver } from '../../shared/resource-policies/resolvers/resource-policy-target.resolver'; import { ResourcePolicyResolver } from '../../shared/resource-policies/resolvers/resource-policy.resolver'; @@ -43,7 +44,6 @@ import { ItemPageCollectionMapperGuard } from './item-page-collection-mapper.gua */ @NgModule({ imports: [ - // items//edit/''/public RouterModule.forChild([ { path: '', @@ -99,8 +99,7 @@ import { ItemPageCollectionMapperGuard } from './item-page-collection-mapper.gua }, */ { path: 'versionhistory', - loadChildren: () => import('./version-history/version-history.module') - .then((m) => m.VersionHistoryModule), + component: ItemVersionHistoryComponent, data: { title: 'item.edit.tabs.versionhistory.title', showBreadcrumbs: true }, canActivate: [ItemPageVersionHistoryGuard] }, diff --git a/src/app/item-page/edit-item-page/version-history/item-version-history/item-version-history.component.html b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.html similarity index 100% rename from src/app/item-page/edit-item-page/version-history/item-version-history/item-version-history.component.html rename to src/app/item-page/edit-item-page/item-version-history/item-version-history.component.html diff --git a/src/app/item-page/edit-item-page/version-history/item-version-history/item-version-history.component.spec.ts b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.spec.ts similarity index 87% rename from src/app/item-page/edit-item-page/version-history/item-version-history/item-version-history.component.spec.ts rename to src/app/item-page/edit-item-page/item-version-history/item-version-history.component.spec.ts index 6806decbf6..c68dcfeba3 100644 --- a/src/app/item-page/edit-item-page/version-history/item-version-history/item-version-history.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.spec.ts @@ -1,13 +1,13 @@ import { ItemVersionHistoryComponent } from './item-version-history.component'; import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { VarDirective } from '../../../../shared/utils/var.directive'; +import { VarDirective } from '../../../shared/utils/var.directive'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { Item } from '../../../../core/shared/item.model'; +import { Item } from '../../../core/shared/item.model'; import { ActivatedRoute } from '@angular/router'; import { of as observableOf } from 'rxjs'; -import { createSuccessfulRemoteDataObject } from '../../../../shared/remote-data.utils'; +import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils'; describe('ItemVersionHistoryComponent', () => { let component: ItemVersionHistoryComponent; diff --git a/src/app/item-page/edit-item-page/version-history/item-version-history/item-version-history.component.ts b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts similarity index 75% rename from src/app/item-page/edit-item-page/version-history/item-version-history/item-version-history.component.ts rename to src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts index a982447064..18878109c2 100644 --- a/src/app/item-page/edit-item-page/version-history/item-version-history/item-version-history.component.ts +++ b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts @@ -1,11 +1,11 @@ import { Component } from '@angular/core'; import { Observable } from 'rxjs'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { Item } from '../../../../core/shared/item.model'; +import { RemoteData } from '../../../core/data/remote-data'; +import { Item } from '../../../core/shared/item.model'; import { map } from 'rxjs/operators'; -import { getFirstSucceededRemoteData } from '../../../../core/shared/operators'; +import { getFirstSucceededRemoteData } from '../../../core/shared/operators'; import { ActivatedRoute } from '@angular/router'; -import { AlertType } from '../../../../shared/alert/aletr-type'; +import { AlertType } from '../../../shared/alert/aletr-type'; @Component({ selector: 'ds-item-version-history', diff --git a/src/app/item-page/edit-item-page/version-history/item-version-history-form/item-version-history-form.component.html b/src/app/item-page/edit-item-page/version-history/item-version-history-form/item-version-history-form.component.html deleted file mode 100644 index 74e2c195a6..0000000000 --- a/src/app/item-page/edit-item-page/version-history/item-version-history-form/item-version-history-form.component.html +++ /dev/null @@ -1,5 +0,0 @@ - - diff --git a/src/app/item-page/edit-item-page/version-history/item-version-history-form/item-version-history-form.component.scss b/src/app/item-page/edit-item-page/version-history/item-version-history-form/item-version-history-form.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/app/item-page/edit-item-page/version-history/item-version-history-form/item-version-history-form.component.spec.ts b/src/app/item-page/edit-item-page/version-history/item-version-history-form/item-version-history-form.component.spec.ts deleted file mode 100644 index d9a2892831..0000000000 --- a/src/app/item-page/edit-item-page/version-history/item-version-history-form/item-version-history-form.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { ItemVersionHistoryFormComponent } from './item-version-history-form.component'; - -describe('ItemVersionHistoryCreateComponent', () => { - let component: ItemVersionHistoryFormComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ ItemVersionHistoryFormComponent ] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(ItemVersionHistoryFormComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/item-page/edit-item-page/version-history/item-version-history-form/item-version-history-form.component.ts b/src/app/item-page/edit-item-page/version-history/item-version-history-form/item-version-history-form.component.ts deleted file mode 100644 index 892cb9ec01..0000000000 --- a/src/app/item-page/edit-item-page/version-history/item-version-history-form/item-version-history-form.component.ts +++ /dev/null @@ -1,74 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; -import { getFirstSucceededRemoteData } from '../../../../core/shared/operators'; -import { VersionDataService } from '../../../../core/data/version-data.service'; -import { take } from 'rxjs/operators'; -import { DynamicFormControlModel, DynamicFormLayout, DynamicInputModel } from '@ng-dynamic-forms/core'; -import { FormGroup } from '@angular/forms'; - -@Component({ - selector: 'ds-item-version-history-edit', - templateUrl: './item-version-history-form.component.html', - styleUrls: ['./item-version-history-form.component.scss'] -}) -export class ItemVersionHistoryFormComponent implements OnInit { - - versionId; - - itemId; - - itemVersion: DynamicInputModel; - - formId = 'item-version-form'; - formModel: DynamicFormControlModel[]; - formGroup: FormGroup; - formLayout: DynamicFormLayout = { - itemVersion: { - grid: { - host: 'row' - } - }, - }; - - - constructor(private route: ActivatedRoute, private versionDataService: VersionDataService) { - } - - ngOnInit(): void { - - this.versionId = this.route.snapshot.params.versionId; - - console.log(this.route.snapshot.params); - - - - this.itemVersion = new DynamicInputModel({ - id: 'groupName', - label: 'item version label', - name: 'itemVersion', - validators: { - required: null, - }, - required: true, - }); - - - this.formModel = [ - this.itemVersion, - ]; - - /*this.versionDataService.findById(this.versionId).pipe(getFirstSucceededRemoteData()).subscribe( - (res) => { - this.versionDataService.update() - const updatedVersion = - Object.assign({}, res.payload, { - summary: 'New summary', - }); - this.versionDataService.update(updatedVersion).pipe(take(1)).subscribe(); - } - );*/ // TODO check not null - - - } - -} diff --git a/src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.html b/src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.html deleted file mode 100644 index fde2b7a55d..0000000000 --- a/src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.html +++ /dev/null @@ -1,11 +0,0 @@ -
-
VERSION SUMMARY TMP - -
-
-
HEADER (NEW/EDIT)
-

input

-
-
diff --git a/src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.scss b/src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.spec.ts b/src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.spec.ts deleted file mode 100644 index b666f2a0b0..0000000000 --- a/src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { ItemVersionSummaryModalComponent } from './item-version-summary-modal.component'; - -describe('ItemVersionSummaryModalComponent', () => { - let component: ItemVersionSummaryModalComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ ItemVersionSummaryModalComponent ] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(ItemVersionSummaryModalComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.ts b/src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.ts deleted file mode 100644 index b64fd53772..0000000000 --- a/src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; - -@Component({ - selector: 'ds-item-version-summary-modal', - templateUrl: './item-version-summary-modal.component.html', - styleUrls: ['./item-version-summary-modal.component.scss'] -}) -export class ItemVersionSummaryModalComponent implements OnInit { - - constructor(protected activeModal: NgbActiveModal) { - } - - ngOnInit(): void { - } - - /** - * Close the modal - */ - close() { - this.activeModal.close(); - } -} diff --git a/src/app/item-page/edit-item-page/version-history/version-history.module.ts b/src/app/item-page/edit-item-page/version-history/version-history.module.ts deleted file mode 100644 index 0d15aef8c4..0000000000 --- a/src/app/item-page/edit-item-page/version-history/version-history.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { SharedModule } from '../../../shared/shared.module'; -import { VersionHistoryRoutingModule } from './version-history.routing.module'; -import { ItemVersionHistoryComponent } from './item-version-history/item-version-history.component'; -import { ItemVersionHistoryFormComponent } from './item-version-history-form/item-version-history-form.component'; - -@NgModule({ - declarations: [ - ItemVersionHistoryComponent, - ItemVersionHistoryFormComponent - ], - imports: [ - CommonModule, - SharedModule, - VersionHistoryRoutingModule - ] -}) -export class VersionHistoryModule { -} diff --git a/src/app/item-page/edit-item-page/version-history/version-history.routing.module.ts b/src/app/item-page/edit-item-page/version-history/version-history.routing.module.ts deleted file mode 100644 index 8a5c4a36e1..0000000000 --- a/src/app/item-page/edit-item-page/version-history/version-history.routing.module.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import { ItemVersionHistoryComponent } from './item-version-history/item-version-history.component'; -import { ItemVersionHistoryFormComponent } from './item-version-history-form/item-version-history-form.component'; - - -/** - * Routing module that handles the routing for the Edit Item page administrator functionality - */ -@NgModule({ - imports: [ - // items//edit/''/version-history - RouterModule.forChild([ - { - path: '', - component: ItemVersionHistoryComponent, - // children: [ - // { - // path: '', - // pathMatch: 'full', - // - // } - // ] - }, - { - path: 'create', - component: ItemVersionHistoryFormComponent, - }, - { - path: ':versionId/edit', - component: ItemVersionHistoryFormComponent, - } - ]) - ], - providers: [ - ] -}) -export class VersionHistoryRoutingModule { - -} diff --git a/src/app/shared/item/item-versions/item-versions.component.html b/src/app/shared/item/item-versions/item-versions.component.html index 7d8077d62d..68b64e690f 100644 --- a/src/app/shared/item/item-versions/item-versions.component.html +++ b/src/app/shared/item/item-versions/item-versions.component.html @@ -2,6 +2,7 @@

{{"item.version.history.head" | translate}}

+