diff --git a/resources/i18n/en.json b/resources/i18n/en.json
index a066ffe9d0..76e925f1a2 100644
--- a/resources/i18n/en.json
+++ b/resources/i18n/en.json
@@ -30,7 +30,26 @@
},
"edit": {
"head": "Edit Collection",
- "delete": "Delete this collection"
+ "delete": "Delete this collection",
+ "tabs": {
+ "metadata": {
+ "title": "Collection Edit - Metadata",
+ "head": "Edit Metadata"
+ },
+ "roles": {
+ "title": "Collection Edit - Roles",
+ "head": "Assign Roles"
+ },
+ "source": {
+ "title": "Collection Edit - Content Source",
+ "head": "Content Source"
+ },
+ "curate": {
+ "title": "Collection Edit - Curate",
+ "head": "Curate"
+ }
+ },
+ "return": "Return"
},
"create": {
"head": "Create a Collection",
@@ -72,7 +91,22 @@
},
"edit": {
"head": "Edit Community",
- "delete": "Delete this community"
+ "delete": "Delete this community",
+ "tabs": {
+ "metadata": {
+ "title": "Community Edit - Metadata",
+ "head": "Edit Metadata"
+ },
+ "roles": {
+ "title": "Community Edit - Roles",
+ "head": "Assign Roles"
+ },
+ "curate": {
+ "title": "Community Edit - Curate",
+ "head": "Curate"
+ }
+ },
+ "return": "Return"
},
"create": {
"head": "Create a Community",
diff --git a/src/app/+collection-page/collection-page-routing.module.ts b/src/app/+collection-page/collection-page-routing.module.ts
index cdbd7650b2..ad142e8fcf 100644
--- a/src/app/+collection-page/collection-page-routing.module.ts
+++ b/src/app/+collection-page/collection-page-routing.module.ts
@@ -5,7 +5,6 @@ import { CollectionPageComponent } from './collection-page.component';
import { CollectionPageResolver } from './collection-page.resolver';
import { CreateCollectionPageComponent } from './create-collection-page/create-collection-page.component';
import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
-import { EditCollectionPageComponent } from './edit-collection-page/edit-collection-page.component';
import { CreateCollectionPageGuard } from './create-collection-page/create-collection-page.guard';
import { DeleteCollectionPageComponent } from './delete-collection-page/delete-collection-page.component';
import { URLCombiner } from '../core/url-combiner/url-combiner';
@@ -38,12 +37,8 @@ const COLLECTION_EDIT_PATH = ':id/edit';
},
{
path: COLLECTION_EDIT_PATH,
- pathMatch: 'full',
- component: EditCollectionPageComponent,
- canActivate: [AuthenticatedGuard],
- resolve: {
- dso: CollectionPageResolver
- }
+ loadChildren: './edit-collection-page/edit-collection-page.module#EditCollectionPageModule',
+ canActivate: [AuthenticatedGuard]
},
{
path: ':id/delete',
diff --git a/src/app/+collection-page/collection-page.module.ts b/src/app/+collection-page/collection-page.module.ts
index bdeffa34f3..f7059deda0 100644
--- a/src/app/+collection-page/collection-page.module.ts
+++ b/src/app/+collection-page/collection-page.module.ts
@@ -7,7 +7,6 @@ import { CollectionPageComponent } from './collection-page.component';
import { CollectionPageRoutingModule } from './collection-page-routing.module';
import { CreateCollectionPageComponent } from './create-collection-page/create-collection-page.component';
import { CollectionFormComponent } from './collection-form/collection-form.component';
-import { EditCollectionPageComponent } from './edit-collection-page/edit-collection-page.component';
import { DeleteCollectionPageComponent } from './delete-collection-page/delete-collection-page.component';
import { SearchService } from '../+search-page/search-service/search.service';
@@ -20,10 +19,12 @@ import { SearchService } from '../+search-page/search-service/search.service';
declarations: [
CollectionPageComponent,
CreateCollectionPageComponent,
- EditCollectionPageComponent,
DeleteCollectionPageComponent,
CollectionFormComponent
],
+ exports: [
+ CollectionFormComponent
+ ],
providers: [
SearchService
]
diff --git a/src/app/shared/mocks/mock-store.ts b/src/app/+collection-page/edit-collection-page/collection-curate/collection-curate.component.html
similarity index 100%
rename from src/app/shared/mocks/mock-store.ts
rename to src/app/+collection-page/edit-collection-page/collection-curate/collection-curate.component.html
diff --git a/src/app/+collection-page/edit-collection-page/collection-curate/collection-curate.component.ts b/src/app/+collection-page/edit-collection-page/collection-curate/collection-curate.component.ts
new file mode 100644
index 0000000000..1445c343fe
--- /dev/null
+++ b/src/app/+collection-page/edit-collection-page/collection-curate/collection-curate.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+
+@Component({
+ selector: 'ds-collection-curate',
+ templateUrl: './collection-curate.component.html',
+})
+export class CollectionCurateComponent {
+ /* TODO: Implement Collection Edit - Curate */
+}
diff --git a/src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html b/src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html
new file mode 100644
index 0000000000..cc7a0d5de0
--- /dev/null
+++ b/src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html
@@ -0,0 +1,4 @@
+
+{{'collection.edit.delete'
+ | translate}}
diff --git a/src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts b/src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts
new file mode 100644
index 0000000000..350ccc0b46
--- /dev/null
+++ b/src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts
@@ -0,0 +1,21 @@
+import { Component } from '@angular/core';
+import { ComcolMetadataComponent } from '../../../shared/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component';
+import { Collection } from '../../../core/shared/collection.model';
+import { CollectionDataService } from '../../../core/data/collection-data.service';
+import { ActivatedRoute, Router } from '@angular/router';
+
+@Component({
+ selector: 'ds-collection-metadata',
+ templateUrl: './collection-metadata.component.html',
+})
+export class CollectionMetadataComponent extends ComcolMetadataComponent {
+ protected frontendURL = '/collections/';
+
+ public constructor(
+ protected collectionDataService: CollectionDataService,
+ protected router: Router,
+ protected route: ActivatedRoute
+ ) {
+ super(collectionDataService, router, route);
+ }
+}
diff --git a/src/app/+collection-page/edit-collection-page/collection-roles/collection-roles.component.html b/src/app/+collection-page/edit-collection-page/collection-roles/collection-roles.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/+collection-page/edit-collection-page/collection-roles/collection-roles.component.ts b/src/app/+collection-page/edit-collection-page/collection-roles/collection-roles.component.ts
new file mode 100644
index 0000000000..ffa3f7709c
--- /dev/null
+++ b/src/app/+collection-page/edit-collection-page/collection-roles/collection-roles.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+
+@Component({
+ selector: 'ds-collection-roles',
+ templateUrl: './collection-roles.component.html',
+})
+export class CollectionRolesComponent {
+ /* TODO: Implement Collection Edit - Roles */
+}
diff --git a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts
new file mode 100644
index 0000000000..a6fc92eec3
--- /dev/null
+++ b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+
+@Component({
+ selector: 'ds-collection-source',
+ templateUrl: './collection-source.component.html',
+})
+export class CollectionSourceComponent {
+ /* TODO: Implement Collection Edit - Content Source */
+}
diff --git a/src/app/+collection-page/edit-collection-page/edit-collection-page.component.html b/src/app/+collection-page/edit-collection-page/edit-collection-page.component.html
deleted file mode 100644
index c389c681ce..0000000000
--- a/src/app/+collection-page/edit-collection-page/edit-collection-page.component.html
+++ /dev/null
@@ -1,11 +0,0 @@
-
diff --git a/src/app/+collection-page/edit-collection-page/edit-collection-page.component.scss b/src/app/+collection-page/edit-collection-page/edit-collection-page.component.scss
deleted file mode 100644
index 8b13789179..0000000000
--- a/src/app/+collection-page/edit-collection-page/edit-collection-page.component.scss
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/app/+collection-page/edit-collection-page/edit-collection-page.component.ts b/src/app/+collection-page/edit-collection-page/edit-collection-page.component.ts
index ba70bd26c6..21671fe112 100644
--- a/src/app/+collection-page/edit-collection-page/edit-collection-page.component.ts
+++ b/src/app/+collection-page/edit-collection-page/edit-collection-page.component.ts
@@ -2,24 +2,30 @@ import { Component } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { EditComColPageComponent } from '../../shared/comcol-forms/edit-comcol-page/edit-comcol-page.component';
import { Collection } from '../../core/shared/collection.model';
-import { CollectionDataService } from '../../core/data/collection-data.service';
+import { getCollectionPageRoute } from '../collection-page-routing.module';
/**
* Component that represents the page where a user can edit an existing Collection
*/
@Component({
selector: 'ds-edit-collection',
- styleUrls: ['./edit-collection-page.component.scss'],
- templateUrl: './edit-collection-page.component.html'
+ templateUrl: '../../shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.html'
})
export class EditCollectionPageComponent extends EditComColPageComponent {
- protected frontendURL = '/collections/';
+ protected type = 'collection';
public constructor(
- protected collectionDataService: CollectionDataService,
protected router: Router,
protected route: ActivatedRoute
) {
- super(collectionDataService, router, route);
+ super(router, route);
+ }
+
+ /**
+ * Get the collection page url
+ * @param collection The collection for which the url is requested
+ */
+ getPageUrl(collection: Collection): string {
+ return getCollectionPageRoute(collection.id)
}
}
diff --git a/src/app/+collection-page/edit-collection-page/edit-collection-page.module.ts b/src/app/+collection-page/edit-collection-page/edit-collection-page.module.ts
new file mode 100644
index 0000000000..f442aae4d6
--- /dev/null
+++ b/src/app/+collection-page/edit-collection-page/edit-collection-page.module.ts
@@ -0,0 +1,32 @@
+import { NgModule } from '@angular/core';
+import { EditCollectionPageComponent } from './edit-collection-page.component';
+import { CommonModule } from '@angular/common';
+import { SharedModule } from '../../shared/shared.module';
+import { EditCollectionPageRoutingModule } from './edit-collection-page.routing.module';
+import { CollectionMetadataComponent } from './collection-metadata/collection-metadata.component';
+import { CollectionPageModule } from '../collection-page.module';
+import { CollectionRolesComponent } from './collection-roles/collection-roles.component';
+import { CollectionCurateComponent } from './collection-curate/collection-curate.component';
+import { CollectionSourceComponent } from './collection-source/collection-source.component';
+
+/**
+ * Module that contains all components related to the Edit Collection page administrator functionality
+ */
+@NgModule({
+ imports: [
+ CommonModule,
+ SharedModule,
+ EditCollectionPageRoutingModule,
+ CollectionPageModule
+ ],
+ declarations: [
+ EditCollectionPageComponent,
+ CollectionMetadataComponent,
+ CollectionRolesComponent,
+ CollectionCurateComponent,
+ CollectionSourceComponent
+ ]
+})
+export class EditCollectionPageModule {
+
+}
diff --git a/src/app/+collection-page/edit-collection-page/edit-collection-page.routing.module.ts b/src/app/+collection-page/edit-collection-page/edit-collection-page.routing.module.ts
new file mode 100644
index 0000000000..a3eab30d73
--- /dev/null
+++ b/src/app/+collection-page/edit-collection-page/edit-collection-page.routing.module.ts
@@ -0,0 +1,58 @@
+import { RouterModule } from '@angular/router';
+import { NgModule } from '@angular/core';
+import { EditCollectionPageComponent } from './edit-collection-page.component';
+import { CollectionPageResolver } from '../collection-page.resolver';
+import { CollectionMetadataComponent } from './collection-metadata/collection-metadata.component';
+import { CollectionRolesComponent } from './collection-roles/collection-roles.component';
+import { CollectionSourceComponent } from './collection-source/collection-source.component';
+import { CollectionCurateComponent } from './collection-curate/collection-curate.component';
+
+/**
+ * Routing module that handles the routing for the Edit Collection page administrator functionality
+ */
+@NgModule({
+ imports: [
+ RouterModule.forChild([
+ {
+ path: '',
+ component: EditCollectionPageComponent,
+ resolve: {
+ dso: CollectionPageResolver
+ },
+ children: [
+ {
+ path: '',
+ redirectTo: 'metadata',
+ pathMatch: 'full'
+ },
+ {
+ path: 'metadata',
+ component: CollectionMetadataComponent,
+ data: { title: 'collection.edit.tabs.metadata.title' }
+ },
+ {
+ path: 'roles',
+ component: CollectionRolesComponent,
+ data: { title: 'collection.edit.tabs.roles.title' }
+ },
+ {
+ path: 'source',
+ component: CollectionSourceComponent,
+ data: { title: 'collection.edit.tabs.source.title' }
+ },
+ {
+ path: 'curate',
+ component: CollectionCurateComponent,
+ data: { title: 'collection.edit.tabs.curate.title' }
+ }
+ ]
+ }
+ ])
+ ],
+ providers: [
+ CollectionPageResolver,
+ ]
+})
+export class EditCollectionPageRoutingModule {
+
+}
diff --git a/src/app/+community-page/community-page-routing.module.ts b/src/app/+community-page/community-page-routing.module.ts
index cecd17ec10..df548e0617 100644
--- a/src/app/+community-page/community-page-routing.module.ts
+++ b/src/app/+community-page/community-page-routing.module.ts
@@ -5,7 +5,6 @@ import { CommunityPageComponent } from './community-page.component';
import { CommunityPageResolver } from './community-page.resolver';
import { CreateCommunityPageComponent } from './create-community-page/create-community-page.component';
import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
-import { EditCommunityPageComponent } from './edit-community-page/edit-community-page.component';
import { CreateCommunityPageGuard } from './create-community-page/create-community-page.guard';
import { DeleteCommunityPageComponent } from './delete-community-page/delete-community-page.component';
import { URLCombiner } from '../core/url-combiner/url-combiner';
@@ -38,12 +37,8 @@ const COMMUNITY_EDIT_PATH = ':id/edit';
},
{
path: COMMUNITY_EDIT_PATH,
- pathMatch: 'full',
- component: EditCommunityPageComponent,
- canActivate: [AuthenticatedGuard],
- resolve: {
- dso: CommunityPageResolver
- }
+ loadChildren: './edit-community-page/edit-community-page.module#EditCommunityPageModule',
+ canActivate: [AuthenticatedGuard]
},
{
path: ':id/delete',
diff --git a/src/app/+community-page/community-page.module.ts b/src/app/+community-page/community-page.module.ts
index 6d63cadcc8..534c96989e 100644
--- a/src/app/+community-page/community-page.module.ts
+++ b/src/app/+community-page/community-page.module.ts
@@ -9,7 +9,6 @@ import { CommunityPageRoutingModule } from './community-page-routing.module';
import {CommunityPageSubCommunityListComponent} from './sub-community-list/community-page-sub-community-list.component';
import { CreateCommunityPageComponent } from './create-community-page/create-community-page.component';
import { CommunityFormComponent } from './community-form/community-form.component';
-import { EditCommunityPageComponent } from './edit-community-page/edit-community-page.component';
import { DeleteCommunityPageComponent } from './delete-community-page/delete-community-page.component';
@NgModule({
@@ -23,9 +22,11 @@ import { DeleteCommunityPageComponent } from './delete-community-page/delete-com
CommunityPageSubCollectionListComponent,
CommunityPageSubCommunityListComponent,
CreateCommunityPageComponent,
- EditCommunityPageComponent,
DeleteCommunityPageComponent,
CommunityFormComponent
+ ],
+ exports: [
+ CommunityFormComponent
]
})
diff --git a/src/app/+community-page/edit-community-page/community-curate/community-curate.component.html b/src/app/+community-page/edit-community-page/community-curate/community-curate.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/+community-page/edit-community-page/community-curate/community-curate.component.ts b/src/app/+community-page/edit-community-page/community-curate/community-curate.component.ts
new file mode 100644
index 0000000000..cf2d75ba6a
--- /dev/null
+++ b/src/app/+community-page/edit-community-page/community-curate/community-curate.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+
+@Component({
+ selector: 'ds-community-curate',
+ templateUrl: './community-curate.component.html',
+})
+export class CommunityCurateComponent {
+ /* TODO: Implement Community Edit - Curate */
+}
diff --git a/src/app/+community-page/edit-community-page/community-metadata/community-metadata.component.html b/src/app/+community-page/edit-community-page/community-metadata/community-metadata.component.html
new file mode 100644
index 0000000000..9a59be9067
--- /dev/null
+++ b/src/app/+community-page/edit-community-page/community-metadata/community-metadata.component.html
@@ -0,0 +1,4 @@
+
+{{'community.edit.delete'
+ | translate}}
diff --git a/src/app/+community-page/edit-community-page/community-metadata/community-metadata.component.ts b/src/app/+community-page/edit-community-page/community-metadata/community-metadata.component.ts
new file mode 100644
index 0000000000..feecdf47c8
--- /dev/null
+++ b/src/app/+community-page/edit-community-page/community-metadata/community-metadata.component.ts
@@ -0,0 +1,21 @@
+import { Component } from '@angular/core';
+import { ComcolMetadataComponent } from '../../../shared/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component';
+import { ActivatedRoute, Router } from '@angular/router';
+import { Community } from '../../../core/shared/community.model';
+import { CommunityDataService } from '../../../core/data/community-data.service';
+
+@Component({
+ selector: 'ds-community-metadata',
+ templateUrl: './community-metadata.component.html',
+})
+export class CommunityMetadataComponent extends ComcolMetadataComponent {
+ protected frontendURL = '/communities/';
+
+ public constructor(
+ protected communityDataService: CommunityDataService,
+ protected router: Router,
+ protected route: ActivatedRoute
+ ) {
+ super(communityDataService, router, route);
+ }
+}
diff --git a/src/app/+community-page/edit-community-page/community-roles/community-roles.component.html b/src/app/+community-page/edit-community-page/community-roles/community-roles.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/+community-page/edit-community-page/community-roles/community-roles.component.ts b/src/app/+community-page/edit-community-page/community-roles/community-roles.component.ts
new file mode 100644
index 0000000000..b6f84c8ba6
--- /dev/null
+++ b/src/app/+community-page/edit-community-page/community-roles/community-roles.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+
+@Component({
+ selector: 'ds-community-roles',
+ templateUrl: './community-roles.component.html',
+})
+export class CommunityRolesComponent {
+ /* TODO: Implement Community Edit - Roles */
+}
diff --git a/src/app/+community-page/edit-community-page/edit-community-page.component.html b/src/app/+community-page/edit-community-page/edit-community-page.component.html
deleted file mode 100644
index cedb771c14..0000000000
--- a/src/app/+community-page/edit-community-page/edit-community-page.component.html
+++ /dev/null
@@ -1,12 +0,0 @@
-
diff --git a/src/app/+community-page/edit-community-page/edit-community-page.component.scss b/src/app/+community-page/edit-community-page/edit-community-page.component.scss
deleted file mode 100644
index 8b13789179..0000000000
--- a/src/app/+community-page/edit-community-page/edit-community-page.component.scss
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/app/+community-page/edit-community-page/edit-community-page.component.ts b/src/app/+community-page/edit-community-page/edit-community-page.component.ts
index 9f49ac49dd..a8d4d32b7d 100644
--- a/src/app/+community-page/edit-community-page/edit-community-page.component.ts
+++ b/src/app/+community-page/edit-community-page/edit-community-page.component.ts
@@ -1,25 +1,31 @@
import { Component } from '@angular/core';
import { Community } from '../../core/shared/community.model';
-import { CommunityDataService } from '../../core/data/community-data.service';
import { ActivatedRoute, Router } from '@angular/router';
import { EditComColPageComponent } from '../../shared/comcol-forms/edit-comcol-page/edit-comcol-page.component';
+import { getCommunityPageRoute } from '../community-page-routing.module';
/**
* Component that represents the page where a user can edit an existing Community
*/
@Component({
selector: 'ds-edit-community',
- styleUrls: ['./edit-community-page.component.scss'],
- templateUrl: './edit-community-page.component.html'
+ templateUrl: '../../shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.html'
})
export class EditCommunityPageComponent extends EditComColPageComponent {
- protected frontendURL = '/communities/';
+ protected type = 'community';
public constructor(
- protected communityDataService: CommunityDataService,
protected router: Router,
protected route: ActivatedRoute
) {
- super(communityDataService, router, route);
+ super(router, route);
+ }
+
+ /**
+ * Get the community page url
+ * @param community The community for which the url is requested
+ */
+ getPageUrl(community: Community): string {
+ return getCommunityPageRoute(community.id)
}
}
diff --git a/src/app/+community-page/edit-community-page/edit-community-page.module.ts b/src/app/+community-page/edit-community-page/edit-community-page.module.ts
new file mode 100644
index 0000000000..f9a1e11a14
--- /dev/null
+++ b/src/app/+community-page/edit-community-page/edit-community-page.module.ts
@@ -0,0 +1,30 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { SharedModule } from '../../shared/shared.module';
+import { EditCommunityPageRoutingModule } from './edit-community-page.routing.module';
+import { CommunityPageModule } from '../community-page.module';
+import { EditCommunityPageComponent } from './edit-community-page.component';
+import { CommunityCurateComponent } from './community-curate/community-curate.component';
+import { CommunityMetadataComponent } from './community-metadata/community-metadata.component';
+import { CommunityRolesComponent } from './community-roles/community-roles.component';
+
+/**
+ * Module that contains all components related to the Edit Community page administrator functionality
+ */
+@NgModule({
+ imports: [
+ CommonModule,
+ SharedModule,
+ EditCommunityPageRoutingModule,
+ CommunityPageModule
+ ],
+ declarations: [
+ EditCommunityPageComponent,
+ CommunityCurateComponent,
+ CommunityMetadataComponent,
+ CommunityRolesComponent
+ ]
+})
+export class EditCommunityPageModule {
+
+}
diff --git a/src/app/+community-page/edit-community-page/edit-community-page.routing.module.ts b/src/app/+community-page/edit-community-page/edit-community-page.routing.module.ts
new file mode 100644
index 0000000000..527b3c018f
--- /dev/null
+++ b/src/app/+community-page/edit-community-page/edit-community-page.routing.module.ts
@@ -0,0 +1,52 @@
+import { CommunityPageResolver } from '../community-page.resolver';
+import { EditCommunityPageComponent } from './edit-community-page.component';
+import { RouterModule } from '@angular/router';
+import { NgModule } from '@angular/core';
+import { CommunityMetadataComponent } from './community-metadata/community-metadata.component';
+import { CommunityRolesComponent } from './community-roles/community-roles.component';
+import { CommunityCurateComponent } from './community-curate/community-curate.component';
+
+/**
+ * Routing module that handles the routing for the Edit Community page administrator functionality
+ */
+@NgModule({
+ imports: [
+ RouterModule.forChild([
+ {
+ path: '',
+ component: EditCommunityPageComponent,
+ resolve: {
+ dso: CommunityPageResolver
+ },
+ children: [
+ {
+ path: '',
+ redirectTo: 'metadata',
+ pathMatch: 'full'
+ },
+ {
+ path: 'metadata',
+ component: CommunityMetadataComponent,
+ data: { title: 'community.edit.tabs.metadata.title' }
+ },
+ {
+ path: 'roles',
+ component: CommunityRolesComponent,
+ data: { title: 'community.edit.tabs.roles.title' }
+ },
+ {
+ path: 'curate',
+ component: CommunityCurateComponent,
+ data: { title: 'community.edit.tabs.curate.title' }
+ }
+ ]
+ }
+ ])
+ ],
+ providers: [
+ CommunityPageResolver,
+ ]
+})
+export class EditCommunityPageRoutingModule {
+
+}
diff --git a/src/app/shared/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.ts b/src/app/shared/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.ts
new file mode 100644
index 0000000000..3806da5a84
--- /dev/null
+++ b/src/app/shared/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.ts
@@ -0,0 +1,48 @@
+import { Component, OnInit } from '@angular/core';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { Observable } from 'rxjs/internal/Observable';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { ActivatedRoute, Router } from '@angular/router';
+import { first, map } from 'rxjs/operators';
+import { getSucceededRemoteData } from '../../../../core/shared/operators';
+import { isNotUndefined } from '../../../empty.util';
+import { DataService } from '../../../../core/data/data.service';
+
+@Component({
+ selector: 'ds-comcol-metadata',
+ template: ''
+})
+export class ComcolMetadataComponent implements OnInit {
+ /**
+ * Frontend endpoint for this type of DSO
+ */
+ protected frontendURL: string;
+
+ public dsoRD$: Observable>;
+
+ public constructor(
+ protected dsoDataService: DataService,
+ protected router: Router,
+ protected route: ActivatedRoute
+ ) {
+ }
+
+ ngOnInit(): void {
+ this.dsoRD$ = this.route.parent.data.pipe(first(), map((data) => data.dso));
+ }
+
+ /**
+ * @param {TDomain} dso The updated version of the DSO
+ * Updates an existing DSO based on the submitted user data and navigates to the edited object's home page
+ */
+ onSubmit(dso: TDomain) {
+ this.dsoDataService.update(dso)
+ .pipe(getSucceededRemoteData())
+ .subscribe((dsoRD: RemoteData) => {
+ if (isNotUndefined(dsoRD)) {
+ const newUUID = dsoRD.payload.uuid;
+ this.router.navigate([this.frontendURL + newUUID]);
+ }
+ });
+ }
+}
diff --git a/src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.html b/src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
new file mode 100644
index 0000000000..964fea35e3
--- /dev/null
+++ b/src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
@@ -0,0 +1,24 @@
+
+
+
+
{{ type + '.edit.head' | translate }}
+
+
+
+
diff --git a/src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts b/src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts
index 24181b5e61..7e3b9957e2 100644
--- a/src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts
+++ b/src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
import { Observable } from 'rxjs';
import { ActivatedRoute, Router } from '@angular/router';
import { RemoteData } from '../../../core/data/remote-data';
-import { isNotUndefined } from '../../empty.util';
+import { isNotEmpty, isNotUndefined } from '../../empty.util';
import { first, map } from 'rxjs/operators';
import { getSucceededRemoteData } from '../../../core/shared/operators';
import { DataService } from '../../../core/data/data.service';
@@ -13,41 +13,48 @@ import { DSpaceObject } from '../../../core/shared/dspace-object.model';
*/
@Component({
selector: 'ds-edit-comcol',
- template: ''
+ templateUrl: './edit-comcol-page.component.html'
})
export class EditComColPageComponent implements OnInit {
/**
- * Frontend endpoint for this type of DSO
+ * The type of DSpaceObject (used to create i18n messages)
*/
- protected frontendURL: string;
+ protected type: string;
+
/**
- * The initial DSO object
+ * The current page outlet string
*/
+ public currentPage: string;
+
+ /**
+ * All possible page outlet strings
+ */
+ public pages: string[];
+
public dsoRD$: Observable>;
public constructor(
- protected dsoDataService: DataService,
protected router: Router,
protected route: ActivatedRoute
) {
+ this.router.events.subscribe(() => {
+ this.currentPage = this.route.snapshot.firstChild.routeConfig.path;
+ });
}
ngOnInit(): void {
+ this.pages = this.route.routeConfig.children
+ .map((child: any) => child.path)
+ .filter((path: string) => isNotEmpty(path)); // ignore reroutes
this.dsoRD$ = this.route.data.pipe(first(), map((data) => data.dso));
}
/**
- * @param {TDomain} dso The updated version of the DSO
- * Updates an existing DSO based on the submitted user data and navigates to the edited object's home page
+ * Get the dso's page url
+ * This method is expected to be overridden in the edit community/collection page components
+ * @param dso The DSpaceObject for which the url is requested
*/
- onSubmit(dso: TDomain) {
- this.dsoDataService.update(dso)
- .pipe(getSucceededRemoteData())
- .subscribe((dsoRD: RemoteData) => {
- if (isNotUndefined(dsoRD)) {
- const newUUID = dsoRD.payload.uuid;
- this.router.navigate([this.frontendURL + newUUID]);
- }
- });
+ getPageUrl(dso: TDomain): string {
+ return this.router.url;
}
}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 4654789b90..c134b89718 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -139,6 +139,7 @@ import { UserMenuComponent } from './auth-nav-menu/user-menu/user-menu.component
import { ClaimedTaskActionsReturnToPoolComponent } from './mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component';
import { ItemDetailPreviewFieldComponent } from './object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component';
import { AbstractTrackableComponent } from './trackable/abstract-trackable.component';
+import { ComcolMetadataComponent } from './comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component';
const MODULES = [
// Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -259,7 +260,8 @@ const COMPONENTS = [
TypedItemSearchResultListElementComponent,
ItemTypeSwitcherComponent,
BrowseByComponent,
- AbstractTrackableComponent
+ AbstractTrackableComponent,
+ ComcolMetadataComponent
];
const ENTRY_COMPONENTS = [