@@ -51,8 +51,8 @@
{{eventElement.title}}
|
- {{'openaire.broker.event.table.pidtype' | translate}} {{eventElement.event.message.type}}
- {{'openaire.broker.event.table.pidvalue' | translate}}
+ {{'notifications.broker.event.table.pidtype' | translate}} {{eventElement.event.message.type}}
+ {{'notifications.broker.event.table.pidvalue' | translate}}
{{eventElement.event.message.value}}
@@ -60,37 +60,37 @@
|
- {{'openaire.broker.event.table.subjectValue' | translate}}
{{eventElement.event.message.value}}
+ {{'notifications.broker.event.table.subjectValue' | translate}}
{{eventElement.event.message.value}}
|
- {{'openaire.broker.event.table.abstract' | translate}}
+ {{'notifications.broker.event.table.abstract' | translate}}
{{eventElement.event.message.abstract}}
|
- {{'openaire.broker.event.table.suggestedProject' | translate}}
+ {{'notifications.broker.event.table.suggestedProject' | translate}}
- {{'openaire.broker.event.table.project' | translate}}
+ {{'notifications.broker.event.table.project' | translate}}
{{eventElement.event.message.title}}
- {{'openaire.broker.event.table.acronym' | translate}} {{eventElement.event.message.acronym}}
- {{'openaire.broker.event.table.code' | translate}} {{eventElement.event.message.code}}
- {{'openaire.broker.event.table.funder' | translate}} {{eventElement.event.message.funder}}
- {{'openaire.broker.event.table.fundingProgram' | translate}} {{eventElement.event.message.fundingProgram}}
- {{'openaire.broker.event.table.jurisdiction' | translate}} {{eventElement.event.message.jurisdiction}}
+ {{'notifications.broker.event.table.acronym' | translate}} {{eventElement.event.message.acronym}}
+ {{'notifications.broker.event.table.code' | translate}} {{eventElement.event.message.code}}
+ {{'notifications.broker.event.table.funder' | translate}} {{eventElement.event.message.funder}}
+ {{'notifications.broker.event.table.fundingProgram' | translate}} {{eventElement.event.message.fundingProgram}}
+ {{'notifications.broker.event.table.jurisdiction' | translate}} {{eventElement.event.message.jurisdiction}}
- {{(eventElement.hasProject ? 'openaire.broker.event.project.found' : 'openaire.broker.event.project.notFound') | translate}}
+ {{(eventElement.hasProject ? 'notifications.broker.event.project.found' : 'notifications.broker.event.project.notFound') | translate}}
{{eventElement.handle}}
|
@@ -140,9 +140,9 @@
@@ -150,58 +150,58 @@
-
{{'openaire.broker.event.accept.description' | translate}}
+
{{'notifications.broker.event.accept.description' | translate}}
-
{{'openaire.broker.event.ignore.description' | translate}}
+
{{'notifications.broker.event.ignore.description' | translate}}
-
+
-
{{'openaire.broker.event.reject.description' | translate}}
+
{{'notifications.broker.event.reject.description' | translate}}
-
+
- , RemoteData
- ]) => {
- const data: OpenaireBrokerEventData = {
+ const data: NotificationsBrokerEventData = {
event: event,
id: event.id,
title: event.title,
diff --git a/src/app/openaire/broker/events/openaire-broker-events.scomponent.scss b/src/app/notifications/broker/events/notifications-broker-events.scomponent.scss
similarity index 100%
rename from src/app/openaire/broker/events/openaire-broker-events.scomponent.scss
rename to src/app/notifications/broker/events/notifications-broker-events.scomponent.scss
diff --git a/src/app/openaire/broker/project-entry-import-modal/project-entry-import-modal.component.html b/src/app/notifications/broker/project-entry-import-modal/project-entry-import-modal.component.html
similarity index 100%
rename from src/app/openaire/broker/project-entry-import-modal/project-entry-import-modal.component.html
rename to src/app/notifications/broker/project-entry-import-modal/project-entry-import-modal.component.html
diff --git a/src/app/openaire/broker/project-entry-import-modal/project-entry-import-modal.component.scss b/src/app/notifications/broker/project-entry-import-modal/project-entry-import-modal.component.scss
similarity index 100%
rename from src/app/openaire/broker/project-entry-import-modal/project-entry-import-modal.component.scss
rename to src/app/notifications/broker/project-entry-import-modal/project-entry-import-modal.component.scss
diff --git a/src/app/openaire/broker/project-entry-import-modal/project-entry-import-modal.component.spec.ts b/src/app/notifications/broker/project-entry-import-modal/project-entry-import-modal.component.spec.ts
similarity index 92%
rename from src/app/openaire/broker/project-entry-import-modal/project-entry-import-modal.component.spec.ts
rename to src/app/notifications/broker/project-entry-import-modal/project-entry-import-modal.component.spec.ts
index e19d0a7c86..7cac576844 100644
--- a/src/app/openaire/broker/project-entry-import-modal/project-entry-import-modal.component.spec.ts
+++ b/src/app/notifications/broker/project-entry-import-modal/project-entry-import-modal.component.spec.ts
@@ -17,16 +17,16 @@ import { buildPaginatedList } from '../../../core/data/paginated-list.model';
import { PageInfo } from '../../../core/shared/page-info.model';
import {
ItemMockPid10,
- openaireBrokerEventObjectMissingProjectFound,
- OpenaireMockDspaceObject
-} from '../../../shared/mocks/openaire.mock';
+ notificationsBrokerEventObjectMissingProjectFound,
+ NotificationsMockDspaceObject
+} from '../../../shared/mocks/notifications.mock';
const eventData = {
- event: openaireBrokerEventObjectMissingProjectFound,
- id: openaireBrokerEventObjectMissingProjectFound.id,
- title: openaireBrokerEventObjectMissingProjectFound.title,
+ event: notificationsBrokerEventObjectMissingProjectFound,
+ id: notificationsBrokerEventObjectMissingProjectFound.id,
+ title: notificationsBrokerEventObjectMissingProjectFound.title,
hasProject: true,
- projectTitle: openaireBrokerEventObjectMissingProjectFound.message.title,
+ projectTitle: notificationsBrokerEventObjectMissingProjectFound.message.title,
projectId: ItemMockPid10.id,
handle: ItemMockPid10.handle,
reason: null,
@@ -36,7 +36,7 @@ const eventData = {
const searchString = 'Test project to search';
const pagination = Object.assign(
new PaginationComponentOptions(), {
- id: 'openaire-project-bound',
+ id: 'notifications-project-bound',
pageSize: 3
}
);
@@ -54,7 +54,7 @@ const pageInfo = new PageInfo({
currentPage: 1
});
const array = [
- OpenaireMockDspaceObject,
+ NotificationsMockDspaceObject,
];
const paginatedList = buildPaginatedList(pageInfo, array);
const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
@@ -143,7 +143,7 @@ describe('ProjectEntryImportModalComponent test suite', () => {
spyOn(comp, 'deselectAllLists');
spyOn(comp, 'close');
spyOn(comp.importedObject, 'emit');
- comp.selectedEntity = OpenaireMockDspaceObject;
+ comp.selectedEntity = NotificationsMockDspaceObject;
comp.bound();
expect(comp.importedObject.emit).toHaveBeenCalled();
diff --git a/src/app/openaire/broker/project-entry-import-modal/project-entry-import-modal.component.ts b/src/app/notifications/broker/project-entry-import-modal/project-entry-import-modal.component.ts
similarity index 89%
rename from src/app/openaire/broker/project-entry-import-modal/project-entry-import-modal.component.ts
rename to src/app/notifications/broker/project-entry-import-modal/project-entry-import-modal.component.ts
index 5d8cb20c6d..64672fa1fa 100644
--- a/src/app/openaire/broker/project-entry-import-modal/project-entry-import-modal.component.ts
+++ b/src/app/notifications/broker/project-entry-import-modal/project-entry-import-modal.component.ts
@@ -12,7 +12,11 @@ import { ListableObject } from '../../../shared/object-collection/shared/listabl
import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
import { SearchService } from '../../../core/shared/search/search.service';
import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { OpenaireBrokerEventObject } from '../../../core/openaire/broker/models/openaire-broker-event.model';
+import {
+ NotificationsBrokerEventObject,
+ NotificationsBrokerEventMessageObject,
+ OpenaireBrokerEventMessageObject,
+} from '../../../core/notifications/broker/models/notifications-broker-event.model';
import { hasValue, isNotEmpty } from '../../../shared/empty.util';
import { Item } from '../../../core/shared/item.model';
@@ -30,13 +34,13 @@ export enum ImportType {
/**
* The data type passed from the parent page
*/
-export interface OpenaireBrokerEventData {
+export interface NotificationsBrokerEventData {
/**
- * The OpenAIRE Broker event
+ * The Notifications Broker event
*/
- event: OpenaireBrokerEventObject;
+ event: NotificationsBrokerEventObject;
/**
- * The OpenAIRE Broker event Id (uuid)
+ * The Notifications Broker event Id (uuid)
*/
id: string;
/**
@@ -79,14 +83,14 @@ export interface OpenaireBrokerEventData {
templateUrl: './project-entry-import-modal.component.html'
})
/**
- * Component to display a modal window for linking a project to an OpenAIRE Broker event
+ * Component to display a modal window for linking a project to an Notifications Broker event
* Shows information about the selected project and a selectable list.
*/
export class ProjectEntryImportModalComponent implements OnInit {
/**
* The external source entry
*/
- @Input() externalSourceEntry: OpenaireBrokerEventData;
+ @Input() externalSourceEntry: NotificationsBrokerEventData;
/**
* The number of results per page
*/
@@ -94,7 +98,7 @@ export class ProjectEntryImportModalComponent implements OnInit {
/**
* The prefix for every i18n key within this modal
*/
- labelPrefix = 'openaire.broker.event.modal.';
+ labelPrefix = 'notifications.broker.event.modal.';
/**
* The search configuration to retrieve project
*/
@@ -126,11 +130,11 @@ export class ProjectEntryImportModalComponent implements OnInit {
/**
* List ID for selecting local entities
*/
- entityListId = 'openaire-project-bound';
+ entityListId = 'notifications-project-bound';
/**
* List ID for selecting local authorities
*/
- authorityListId = 'openaire-project-bound-authority';
+ authorityListId = 'notifications-project-bound-authority';
/**
* ImportType enum
*/
@@ -175,8 +179,9 @@ export class ProjectEntryImportModalComponent implements OnInit {
* Component intitialization.
*/
public ngOnInit(): void {
- this.pagination = Object.assign(new PaginationComponentOptions(), { id: 'openaire-project-bound', pageSize: this.pageSize });
- this.projectTitle = (this.externalSourceEntry.projectTitle !== null) ? this.externalSourceEntry.projectTitle : this.externalSourceEntry.event.message.title;
+ this.pagination = Object.assign(new PaginationComponentOptions(), { id: 'notifications-project-bound', pageSize: this.pageSize });
+ this.projectTitle = (this.externalSourceEntry.projectTitle !== null) ? this.externalSourceEntry.projectTitle
+ : (this.externalSourceEntry.event.message as OpenaireBrokerEventMessageObject).title;
this.searchOptions = Object.assign(new PaginatedSearchOptions(
{
configuration: this.configuration,
diff --git a/src/app/openaire/broker/topics/openaire-broker-topics.actions.ts b/src/app/notifications/broker/topics/notifications-broker-topics.actions.ts
similarity index 60%
rename from src/app/openaire/broker/topics/openaire-broker-topics.actions.ts
rename to src/app/notifications/broker/topics/notifications-broker-topics.actions.ts
index fd98c6acb8..622ecc8141 100644
--- a/src/app/openaire/broker/topics/openaire-broker-topics.actions.ts
+++ b/src/app/notifications/broker/topics/notifications-broker-topics.actions.ts
@@ -1,6 +1,6 @@
import { Action } from '@ngrx/store';
import { type } from '../../../shared/ngrx/type';
-import { OpenaireBrokerTopicObject } from '../../../core/openaire/broker/models/openaire-broker-topic.model';
+import { NotificationsBrokerTopicObject } from '../../../core/notifications/broker/models/notifications-broker-topic.model';
/**
* For each action type in an action group, make a simple
@@ -10,19 +10,19 @@ import { OpenaireBrokerTopicObject } from '../../../core/openaire/broker/models/
* literal types and runs a simple check to guarantee all
* action types in the application are unique.
*/
-export const OpenaireBrokerTopicActionTypes = {
- ADD_TOPICS: type('dspace/integration/openaire/broker/topic/ADD_TOPICS'),
- RETRIEVE_ALL_TOPICS: type('dspace/integration/openaire/broker/topic/RETRIEVE_ALL_TOPICS'),
- RETRIEVE_ALL_TOPICS_ERROR: type('dspace/integration/openaire/broker/topic/RETRIEVE_ALL_TOPICS_ERROR'),
+export const NotificationsBrokerTopicActionTypes = {
+ ADD_TOPICS: type('dspace/integration/notifications/broker/topic/ADD_TOPICS'),
+ RETRIEVE_ALL_TOPICS: type('dspace/integration/notifications/broker/topic/RETRIEVE_ALL_TOPICS'),
+ RETRIEVE_ALL_TOPICS_ERROR: type('dspace/integration/notifications/broker/topic/RETRIEVE_ALL_TOPICS_ERROR'),
};
/* tslint:disable:max-classes-per-file */
/**
- * An ngrx action to retrieve all the OpenAIRE Broker topics.
+ * An ngrx action to retrieve all the Notifications Broker topics.
*/
export class RetrieveAllTopicsAction implements Action {
- type = OpenaireBrokerTopicActionTypes.RETRIEVE_ALL_TOPICS;
+ type = NotificationsBrokerTopicActionTypes.RETRIEVE_ALL_TOPICS;
payload: {
elementsPerPage: number;
currentPage: number;
@@ -45,20 +45,20 @@ export class RetrieveAllTopicsAction implements Action {
}
/**
- * An ngrx action for retrieving 'all OpenAIRE Broker topics' error.
+ * An ngrx action for retrieving 'all Notifications Broker topics' error.
*/
export class RetrieveAllTopicsErrorAction implements Action {
- type = OpenaireBrokerTopicActionTypes.RETRIEVE_ALL_TOPICS_ERROR;
+ type = NotificationsBrokerTopicActionTypes.RETRIEVE_ALL_TOPICS_ERROR;
}
/**
- * An ngrx action to load the OpenAIRE Broker topic objects.
+ * An ngrx action to load the Notifications Broker topic objects.
* Called by the ??? effect.
*/
export class AddTopicsAction implements Action {
- type = OpenaireBrokerTopicActionTypes.ADD_TOPICS;
+ type = NotificationsBrokerTopicActionTypes.ADD_TOPICS;
payload: {
- topics: OpenaireBrokerTopicObject[];
+ topics: NotificationsBrokerTopicObject[];
totalPages: number;
currentPage: number;
totalElements: number;
@@ -74,9 +74,9 @@ export class AddTopicsAction implements Action {
* @param currentPage
* the current page
* @param totalElements
- * the total available OpenAIRE Broker topics
+ * the total available Notifications Broker topics
*/
- constructor(topics: OpenaireBrokerTopicObject[], totalPages: number, currentPage: number, totalElements: number) {
+ constructor(topics: NotificationsBrokerTopicObject[], totalPages: number, currentPage: number, totalElements: number) {
this.payload = {
topics,
totalPages,
@@ -93,7 +93,7 @@ export class AddTopicsAction implements Action {
* Export a type alias of all actions in this action group
* so that reducers can easily compose action types.
*/
-export type OpenaireBrokerTopicsActions
+export type NotificationsBrokerTopicsActions
= AddTopicsAction
|RetrieveAllTopicsAction
|RetrieveAllTopicsErrorAction;
diff --git a/src/app/openaire/broker/topics/openaire-broker-topics.component.html b/src/app/notifications/broker/topics/notifications-broker-topics.component.html
similarity index 66%
rename from src/app/openaire/broker/topics/openaire-broker-topics.component.html
rename to src/app/notifications/broker/topics/notifications-broker-topics.component.html
index d8321bc932..02371a8a6b 100644
--- a/src/app/openaire/broker/topics/openaire-broker-topics.component.html
+++ b/src/app/notifications/broker/topics/notifications-broker-topics.component.html
@@ -1,34 +1,34 @@
-
{{'openaire.broker.title'| translate}}
-
{{'openaire.broker.topics.description'| translate}}
+
{{'notifications.broker.title'| translate}}
+
{{'notifications.broker.topics.description'| translate}}
-
{{'openaire.broker.topics'| translate}}
+
{{'notifications.broker.topics'| translate}}
-
+
+ (paginationChange)="getNotificationsBrokerTopics()">
-
+
- {{'openaire.broker.noTopics' | translate}}
+ {{'notifications.broker.noTopics' | translate}}
- | {{'openaire.broker.table.topic' | translate}} |
- {{'openaire.broker.table.last-event' | translate}} |
- {{'openaire.broker.table.actions' | translate}} |
+ {{'notifications.broker.table.topic' | translate}} |
+ {{'notifications.broker.table.last-event' | translate}} |
+ {{'notifications.broker.table.actions' | translate}} |
@@ -39,7 +39,7 @@