Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions config/config.example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,10 @@ homePage:
pageSize: 5
# Enable or disable the Discover filters on the homepage
showDiscoverFilters: false
# Disable if you don't want users to edit the homeNews section on your home-page.
editHomeNews: true
# Disable if you don't want users to edit the home header.
editHomeHeader: true

# Item Config
item:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@ export class AdminEditCmsMetadataComponent implements OnInit {
if (md === 'dspace.cms.footer' && !environment.homePage.showTopFooter) {
return;
}
if (md === 'dspace.cms.home-header' && !environment.homePage.editHomeHeader) {
return;
}
if (md === 'dspace.cms.home-news' && !environment.homePage.editHomeNews) {
return;
}
this.metadataList.push(md);
});
this.siteService.find().subscribe((site) => {
Expand Down
26 changes: 17 additions & 9 deletions src/app/home-page/home-news/home-news.component.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
import { AsyncPipe } from '@angular/common';
import {
Component,
Inject,
OnInit,
} from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import {
APP_CONFIG,
AppConfig,
} from '@dspace/config/app-config.interface';
import { LocaleService } from '@dspace/core/locale/locale.service';
import { Site } from '@dspace/core/shared/site.model';
import {
Expand Down Expand Up @@ -32,20 +37,23 @@ export class HomeNewsComponent implements OnInit {
homeNewsMetadataValue$: Observable<string>;

constructor(
@Inject(APP_CONFIG) protected appConfig: AppConfig,
protected route: ActivatedRoute,
private locale: LocaleService,
) {}

ngOnInit() {
this.homeNewsMetadataValue$ = combineLatest({
site$: this.route.data.pipe(
map((data) => data.site as Site),
),
language$: this.locale.getCurrentLanguageCode(),
}).pipe(
take(1),
map(({ site$, language$ }) => site$?.firstMetadataValue('dspace.cms.home-news', { language: language$ })),
);
if (this.appConfig.homePage.editHomeNews) {
this.homeNewsMetadataValue$ = combineLatest({
site$: this.route.data.pipe(
map((data) => data.site as Site),
),
language$: this.locale.getCurrentLanguageCode(),
}).pipe(
take(1),
map(({ site$, language$ }) => site$?.firstMetadataValue('dspace.cms.home-news', { language: language$ })),
);
}
}

}
17 changes: 9 additions & 8 deletions src/app/home-page/home-page.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,15 @@ export class HomePageComponent implements OnInit {
this.site$ = this.route.data.pipe(
map((data) => data.site as Site),
);

this.homeHeaderMetadataValue$ = combineLatest({
site: this.site$,
language: this.locale.getCurrentLanguageCode(),
}).pipe(
take(1),
map(({ site, language }) => site?.firstMetadataValue('dspace.cms.home-header', { language })),
);
if (this.appConfig.homePage.editHomeHeader) {
this.homeHeaderMetadataValue$ = combineLatest({
site: this.site$,
language: this.locale.getCurrentLanguageCode(),
}).pipe(
take(1),
map(({ site, language }) => site?.firstMetadataValue('dspace.cms.home-header', { language })),
);
}
}

}
12 changes: 10 additions & 2 deletions src/app/shared/menu/providers/edit-cms-metadata.menu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,14 @@
* http://www.dspace.org/license/
*/

import { Injectable } from '@angular/core';
import {
Inject,
Injectable,
} from '@angular/core';
import {
APP_CONFIG,
AppConfig,
} from '@dspace/config/app-config.interface';
import { AuthorizationDataService } from '@dspace/core/data/feature-authorization/authorization-data.service';
import { FeatureID } from '@dspace/core/data/feature-authorization/feature-id';
import {
Expand All @@ -28,6 +35,7 @@ import {
export class EditCMSMetadataMenuProvider extends AbstractMenuProvider {
constructor(
protected authorizationService: AuthorizationDataService,
@Inject(APP_CONFIG) protected appConfig: AppConfig,
) {
super();
}
Expand All @@ -39,7 +47,7 @@ export class EditCMSMetadataMenuProvider extends AbstractMenuProvider {
map(([isSiteAdmin]) => {
return [
{
visible: isSiteAdmin,
visible: isSiteAdmin && (this.appConfig.homePage.editHomeHeader || this.appConfig.homePage.editHomeHeader || this.appConfig.homePage.showTopFooter),
model: {
type: MenuItemType.LINK,
text: 'menu.section.edit-cms-metadata',
Expand Down
2 changes: 2 additions & 0 deletions src/config/default-app-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,8 @@ export class DefaultAppConfig implements AppConfig {
pageSize: 5,
},
showDiscoverFilters: false,
editHomeNews: true,
editHomeHeader: true,
};

// Item Config
Expand Down
10 changes: 10 additions & 0 deletions src/config/homepage-config.interface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,14 @@ export interface HomeConfig extends Config {
* Enable or disable the Discover filters on the homepage
*/
showDiscoverFilters: boolean;

/**
* Disable if you don't want users to edit the homeNews section on your home-page.
*/
editHomeNews: boolean;

/**
* Disable if you don't want users to edit the home header.
*/
editHomeHeader: boolean;
}
2 changes: 2 additions & 0 deletions src/environments/environment.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,8 @@ export const environment: BuildConfig = {
pageSize: 5,
},
showDiscoverFilters: false,
editHomeNews: true,
editHomeHeader: true,
},
item: {
edit: {
Expand Down
Loading