mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 01:54:15 +00:00
[CST-5249] Renamed notifications module to suggestion-notifications
This commit is contained in:
@@ -5,8 +5,8 @@ import { SharedModule } from '../../shared/shared.module';
|
|||||||
import { AdminNotificationsRoutingModule } from './admin-notifications-routing.module';
|
import { AdminNotificationsRoutingModule } from './admin-notifications-routing.module';
|
||||||
import { AdminQualityAssuranceTopicsPageComponent } from './admin-quality-assurance-topics-page/admin-quality-assurance-topics-page.component';
|
import { AdminQualityAssuranceTopicsPageComponent } from './admin-quality-assurance-topics-page/admin-quality-assurance-topics-page.component';
|
||||||
import { AdminQualityAssuranceEventsPageComponent } from './admin-quality-assurance-events-page/admin-quality-assurance-events-page.component';
|
import { AdminQualityAssuranceEventsPageComponent } from './admin-quality-assurance-events-page/admin-quality-assurance-events-page.component';
|
||||||
import { NotificationsModule } from '../../notifications/notifications.module';
|
|
||||||
import { AdminQualityAssuranceSourcePageComponent } from './admin-quality-assurance-source-page-component/admin-quality-assurance-source-page.component';
|
import { AdminQualityAssuranceSourcePageComponent } from './admin-quality-assurance-source-page-component/admin-quality-assurance-source-page.component';
|
||||||
|
import {SuggestionNotificationsModule} from '../../suggestion-notifications/suggestion-notifications.module';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
@@ -14,7 +14,7 @@ import { AdminQualityAssuranceSourcePageComponent } from './admin-quality-assura
|
|||||||
SharedModule,
|
SharedModule,
|
||||||
CoreModule.forRoot(),
|
CoreModule.forRoot(),
|
||||||
AdminNotificationsRoutingModule,
|
AdminNotificationsRoutingModule,
|
||||||
NotificationsModule
|
SuggestionNotificationsModule
|
||||||
],
|
],
|
||||||
declarations: [
|
declarations: [
|
||||||
AdminQualityAssuranceTopicsPageComponent,
|
AdminQualityAssuranceTopicsPageComponent,
|
||||||
|
@@ -3,8 +3,8 @@ import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot, Router } from '@a
|
|||||||
import { Observable } from 'rxjs';
|
import { Observable } from 'rxjs';
|
||||||
import { map } from 'rxjs/operators';
|
import { map } from 'rxjs/operators';
|
||||||
import { PaginatedList } from '../../../core/data/paginated-list.model';
|
import { PaginatedList } from '../../../core/data/paginated-list.model';
|
||||||
import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model';
|
import { QualityAssuranceSourceObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-source.model';
|
||||||
import { QualityAssuranceSourceService } from '../../../notifications/qa/source/quality-assurance-source.service';
|
import { QualityAssuranceSourceService } from '../../../suggestion-notifications/qa/source/quality-assurance-source.service';
|
||||||
/**
|
/**
|
||||||
* This class represents a resolver that retrieve the route data before the route is activated.
|
* This class represents a resolver that retrieve the route data before the route is activated.
|
||||||
*/
|
*/
|
||||||
|
@@ -167,9 +167,9 @@ import { SequenceService } from './shared/sequence.service';
|
|||||||
import { CoreState } from './core-state.model';
|
import { CoreState } from './core-state.model';
|
||||||
import { GroupDataService } from './eperson/group-data.service';
|
import { GroupDataService } from './eperson/group-data.service';
|
||||||
import { SubmissionAccessesModel } from './config/models/config-submission-accesses.model';
|
import { SubmissionAccessesModel } from './config/models/config-submission-accesses.model';
|
||||||
import { QualityAssuranceTopicObject } from './notifications/qa/models/quality-assurance-topic.model';
|
import { QualityAssuranceTopicObject } from './suggestion-notifications/qa/models/quality-assurance-topic.model';
|
||||||
import { QualityAssuranceEventObject } from './notifications/qa/models/quality-assurance-event.model';
|
import { QualityAssuranceEventObject } from './suggestion-notifications/qa/models/quality-assurance-event.model';
|
||||||
import { QualityAssuranceSourceObject } from './notifications/qa/models/quality-assurance-source.model';
|
import { QualityAssuranceSourceObject } from './suggestion-notifications/qa/models/quality-assurance-source.model';
|
||||||
import { AccessStatusObject } from '../shared/object-list/access-status-badge/access-status.model';
|
import { AccessStatusObject } from '../shared/object-list/access-status-badge/access-status.model';
|
||||||
import { AccessStatusDataService } from './data/access-status-data.service';
|
import { AccessStatusDataService } from './data/access-status-data.service';
|
||||||
import { LinkHeadService } from './services/link-head.service';
|
import { LinkHeadService } from './services/link-head.service';
|
||||||
|
@@ -1,9 +1,9 @@
|
|||||||
import { of as observableOf } from 'rxjs';
|
import { of as observableOf } from 'rxjs';
|
||||||
import { ResourceType } from '../../core/shared/resource-type';
|
import { ResourceType } from '../../core/shared/resource-type';
|
||||||
import { QualityAssuranceTopicObject } from '../../core/notifications/qa/models/quality-assurance-topic.model';
|
import { QualityAssuranceTopicObject } from '../../core/suggestion-notifications/qa/models/quality-assurance-topic.model';
|
||||||
import { QualityAssuranceEventObject } from '../../core/notifications/qa/models/quality-assurance-event.model';
|
import { QualityAssuranceEventObject } from '../../core/suggestion-notifications/qa/models/quality-assurance-event.model';
|
||||||
import { QualityAssuranceTopicRestService } from '../../core/notifications/qa/topics/quality-assurance-topic-rest.service';
|
import { QualityAssuranceTopicRestService } from '../../core/suggestion-notifications/qa/topics/quality-assurance-topic-rest.service';
|
||||||
import { QualityAssuranceEventRestService } from '../../core/notifications/qa/events/quality-assurance-event-rest.service';
|
import { QualityAssuranceEventRestService } from '../../core/suggestion-notifications/qa/events/quality-assurance-event-rest.service';
|
||||||
import { DSpaceObject } from '../../core/shared/dspace-object.model';
|
import { DSpaceObject } from '../../core/shared/dspace-object.model';
|
||||||
import { NotificationsStateService } from '../../notifications/notifications-state.service';
|
import { NotificationsStateService } from '../../notifications/notifications-state.service';
|
||||||
import { Item } from '../../core/shared/item.model';
|
import { Item } from '../../core/shared/item.model';
|
||||||
@@ -13,7 +13,7 @@ import {
|
|||||||
createSuccessfulRemoteDataObject$
|
createSuccessfulRemoteDataObject$
|
||||||
} from '../remote-data.utils';
|
} from '../remote-data.utils';
|
||||||
import { SearchResult } from '../search/models/search-result.model';
|
import { SearchResult } from '../search/models/search-result.model';
|
||||||
import { QualityAssuranceSourceObject } from '../../core/notifications/qa/models/quality-assurance-source.model';
|
import { QualityAssuranceSourceObject } from '../../core/suggestion-notifications/qa/models/quality-assurance-source.model';
|
||||||
|
|
||||||
// REST Mock ---------------------------------------------------------------------
|
// REST Mock ---------------------------------------------------------------------
|
||||||
// -------------------------------------------------------------------------------
|
// -------------------------------------------------------------------------------
|
||||||
@@ -1781,7 +1781,7 @@ export const qualityAssuranceEventObjectMissingProjectNotFound: QualityAssurance
|
|||||||
// -------------------------------------------------------------------------------
|
// -------------------------------------------------------------------------------
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Mock for [[NotificationsStateService]]
|
* Mock for [[SuggestionNotificationsStateService]]
|
||||||
*/
|
*/
|
||||||
export function getMockNotificationsStateService(): any {
|
export function getMockNotificationsStateService(): any {
|
||||||
return jasmine.createSpyObj('NotificationsStateService', {
|
return jasmine.createSpyObj('NotificationsStateService', {
|
||||||
|
@@ -5,7 +5,7 @@ import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/t
|
|||||||
import { TranslateModule, TranslateService } from '@ngx-translate/core';
|
import { TranslateModule, TranslateService } from '@ngx-translate/core';
|
||||||
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
|
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
|
||||||
import { of as observableOf } from 'rxjs';
|
import { of as observableOf } from 'rxjs';
|
||||||
import { QualityAssuranceEventRestService } from '../../../core/notifications/qa/events/quality-assurance-event-rest.service';
|
import { QualityAssuranceEventRestService } from '../../../core/suggestion-notifications/qa/events/quality-assurance-event-rest.service';
|
||||||
import { QualityAssuranceEventsComponent } from './quality-assurance-events.component';
|
import { QualityAssuranceEventsComponent } from './quality-assurance-events.component';
|
||||||
import {
|
import {
|
||||||
getMockQualityAssuranceEventRestService,
|
getMockQualityAssuranceEventRestService,
|
||||||
@@ -22,7 +22,7 @@ import { getMockTranslateService } from '../../../shared/mocks/translate.service
|
|||||||
import { createTestComponent } from '../../../shared/testing/utils.test';
|
import { createTestComponent } from '../../../shared/testing/utils.test';
|
||||||
import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
|
import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
|
||||||
import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
|
import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
|
||||||
import { QualityAssuranceEventObject } from '../../../core/notifications/qa/models/quality-assurance-event.model';
|
import { QualityAssuranceEventObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-event.model';
|
||||||
import { QualityAssuranceEventData } from '../project-entry-import-modal/project-entry-import-modal.component';
|
import { QualityAssuranceEventData } from '../project-entry-import-modal/project-entry-import-modal.component';
|
||||||
import { TestScheduler } from 'rxjs/testing';
|
import { TestScheduler } from 'rxjs/testing';
|
||||||
import { getTestScheduler } from 'jasmine-marbles';
|
import { getTestScheduler } from 'jasmine-marbles';
|
@@ -12,8 +12,8 @@ import { RemoteData } from '../../../core/data/remote-data';
|
|||||||
import {
|
import {
|
||||||
QualityAssuranceEventObject,
|
QualityAssuranceEventObject,
|
||||||
OpenaireQualityAssuranceEventMessageObject
|
OpenaireQualityAssuranceEventMessageObject
|
||||||
} from '../../../core/notifications/qa/models/quality-assurance-event.model';
|
} from '../../../core/suggestion-notifications/qa/models/quality-assurance-event.model';
|
||||||
import { QualityAssuranceEventRestService } from '../../../core/notifications/qa/events/quality-assurance-event-rest.service';
|
import { QualityAssuranceEventRestService } from '../../../core/suggestion-notifications/qa/events/quality-assurance-event-rest.service';
|
||||||
import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
|
import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
|
||||||
import { Metadata } from '../../../core/shared/metadata.utils';
|
import { Metadata } from '../../../core/shared/metadata.utils';
|
||||||
import { followLink } from '../../../shared/utils/follow-link-config.model';
|
import { followLink } from '../../../shared/utils/follow-link-config.model';
|
@@ -16,7 +16,7 @@ import {
|
|||||||
QualityAssuranceEventObject,
|
QualityAssuranceEventObject,
|
||||||
QualityAssuranceEventMessageObject,
|
QualityAssuranceEventMessageObject,
|
||||||
OpenaireQualityAssuranceEventMessageObject,
|
OpenaireQualityAssuranceEventMessageObject,
|
||||||
} from '../../../core/notifications/qa/models/quality-assurance-event.model';
|
} from '../../../core/suggestion-notifications/qa/models/quality-assurance-event.model';
|
||||||
import { hasValue, isNotEmpty } from '../../../shared/empty.util';
|
import { hasValue, isNotEmpty } from '../../../shared/empty.util';
|
||||||
import { Item } from '../../../core/shared/item.model';
|
import { Item } from '../../../core/shared/item.model';
|
||||||
|
|
@@ -1,6 +1,6 @@
|
|||||||
import { Action } from '@ngrx/store';
|
import { Action } from '@ngrx/store';
|
||||||
import { type } from '../../../shared/ngrx/type';
|
import { type } from '../../../shared/ngrx/type';
|
||||||
import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model';
|
import { QualityAssuranceSourceObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-source.model';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* For each action type in an action group, make a simple
|
* For each action type in an action group, make a simple
|
||||||
@@ -11,9 +11,9 @@ import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/mod
|
|||||||
* action types in the application are unique.
|
* action types in the application are unique.
|
||||||
*/
|
*/
|
||||||
export const QualityAssuranceSourceActionTypes = {
|
export const QualityAssuranceSourceActionTypes = {
|
||||||
ADD_SOURCE: type('dspace/integration/notifications/qa/ADD_SOURCE'),
|
ADD_SOURCE: type('dspace/integration/suggestion-notifications/qa/ADD_SOURCE'),
|
||||||
RETRIEVE_ALL_SOURCE: type('dspace/integration/notifications/qa/RETRIEVE_ALL_SOURCE'),
|
RETRIEVE_ALL_SOURCE: type('dspace/integration/suggestion-notifications/qa/RETRIEVE_ALL_SOURCE'),
|
||||||
RETRIEVE_ALL_SOURCE_ERROR: type('dspace/integration/notifications/qa/RETRIEVE_ALL_SOURCE_ERROR'),
|
RETRIEVE_ALL_SOURCE_ERROR: type('dspace/integration/suggestion-notifications/qa/RETRIEVE_ALL_SOURCE_ERROR'),
|
||||||
};
|
};
|
||||||
|
|
||||||
/* tslint:disable:max-classes-per-file */
|
/* tslint:disable:max-classes-per-file */
|
@@ -11,7 +11,7 @@ import {
|
|||||||
qualityAssuranceSourceObjectMorePid
|
qualityAssuranceSourceObjectMorePid
|
||||||
} from '../../../shared/mocks/notifications.mock';
|
} from '../../../shared/mocks/notifications.mock';
|
||||||
import { QualityAssuranceSourceComponent } from './quality-assurance-source.component';
|
import { QualityAssuranceSourceComponent } from './quality-assurance-source.component';
|
||||||
import { NotificationsStateService } from '../../notifications-state.service';
|
import { SuggestionNotificationsStateService } from '../../notifications-state.service';
|
||||||
import { cold } from 'jasmine-marbles';
|
import { cold } from 'jasmine-marbles';
|
||||||
import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
|
import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
|
||||||
import { PaginationService } from '../../../core/pagination/pagination.service';
|
import { PaginationService } from '../../../core/pagination/pagination.service';
|
||||||
@@ -40,7 +40,7 @@ describe('QualityAssuranceSourceComponent test suite', () => {
|
|||||||
TestComponent,
|
TestComponent,
|
||||||
],
|
],
|
||||||
providers: [
|
providers: [
|
||||||
{ provide: NotificationsStateService, useValue: mockNotificationsStateService },
|
{ provide: SuggestionNotificationsStateService, useValue: mockNotificationsStateService },
|
||||||
{ provide: ActivatedRoute, useValue: { data: observableOf(activatedRouteParams), params: observableOf({}) } },
|
{ provide: ActivatedRoute, useValue: { data: observableOf(activatedRouteParams), params: observableOf({}) } },
|
||||||
{ provide: PaginationService, useValue: paginationService },
|
{ provide: PaginationService, useValue: paginationService },
|
||||||
QualityAssuranceSourceComponent
|
QualityAssuranceSourceComponent
|
@@ -3,9 +3,9 @@ import { PaginationService } from '../../../core/pagination/pagination.service';
|
|||||||
import { Observable, Subscription } from 'rxjs';
|
import { Observable, Subscription } from 'rxjs';
|
||||||
import { distinctUntilChanged, take } from 'rxjs/operators';
|
import { distinctUntilChanged, take } from 'rxjs/operators';
|
||||||
import { SortOptions } from '../../../core/cache/models/sort-options.model';
|
import { SortOptions } from '../../../core/cache/models/sort-options.model';
|
||||||
import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model';
|
import { QualityAssuranceSourceObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-source.model';
|
||||||
import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
|
import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
|
||||||
import { NotificationsStateService } from '../../notifications-state.service';
|
import { SuggestionNotificationsStateService } from '../../suggestion-notifications-state.service';
|
||||||
import { AdminQualityAssuranceSourcePageParams } from '../../../admin/admin-notifications/admin-quality-assurance-source-page-component/admin-quality-assurance-source-page-resolver.service';
|
import { AdminQualityAssuranceSourcePageParams } from '../../../admin/admin-notifications/admin-quality-assurance-source-page-component/admin-quality-assurance-source-page-resolver.service';
|
||||||
import { hasValue } from '../../../shared/empty.util';
|
import { hasValue } from '../../../shared/empty.util';
|
||||||
|
|
||||||
@@ -47,11 +47,11 @@ export class QualityAssuranceSourceComponent implements OnInit {
|
|||||||
/**
|
/**
|
||||||
* Initialize the component variables.
|
* Initialize the component variables.
|
||||||
* @param {PaginationService} paginationService
|
* @param {PaginationService} paginationService
|
||||||
* @param {NotificationsStateService} notificationsStateService
|
* @param {SuggestionNotificationsStateService} notificationsStateService
|
||||||
*/
|
*/
|
||||||
constructor(
|
constructor(
|
||||||
private paginationService: PaginationService,
|
private paginationService: PaginationService,
|
||||||
private notificationsStateService: NotificationsStateService,
|
private notificationsStateService: SuggestionNotificationsStateService,
|
||||||
) { }
|
) { }
|
||||||
|
|
||||||
/**
|
/**
|
@@ -11,11 +11,11 @@ import {
|
|||||||
RetrieveAllSourceErrorAction,
|
RetrieveAllSourceErrorAction,
|
||||||
} from './quality-assurance-source.actions';
|
} from './quality-assurance-source.actions';
|
||||||
|
|
||||||
import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model';
|
import { QualityAssuranceSourceObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-source.model';
|
||||||
import { PaginatedList } from '../../../core/data/paginated-list.model';
|
import { PaginatedList } from '../../../core/data/paginated-list.model';
|
||||||
import { QualityAssuranceSourceService } from './quality-assurance-source.service';
|
import { QualityAssuranceSourceService } from './quality-assurance-source.service';
|
||||||
import { NotificationsService } from '../../../shared/notifications/notifications.service';
|
import { NotificationsService } from '../../../shared/notifications/notifications.service';
|
||||||
import { QualityAssuranceSourceRestService } from '../../../core/notifications/qa/source/quality-assurance-source-rest.service';
|
import { QualityAssuranceSourceRestService } from '../../../core/suggestion-notifications/qa/source/quality-assurance-source-rest.service';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Provides effect methods for the Quality Assurance source actions.
|
* Provides effect methods for the Quality Assurance source actions.
|
@@ -1,4 +1,4 @@
|
|||||||
import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model';
|
import { QualityAssuranceSourceObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-source.model';
|
||||||
import { QualityAssuranceSourceActionTypes, QualityAssuranceSourceActions } from './quality-assurance-source.actions';
|
import { QualityAssuranceSourceActionTypes, QualityAssuranceSourceActions } from './quality-assurance-source.actions';
|
||||||
|
|
||||||
/**
|
/**
|
@@ -11,7 +11,7 @@ import {
|
|||||||
import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
|
import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
|
||||||
import { cold } from 'jasmine-marbles';
|
import { cold } from 'jasmine-marbles';
|
||||||
import { buildPaginatedList } from '../../../core/data/paginated-list.model';
|
import { buildPaginatedList } from '../../../core/data/paginated-list.model';
|
||||||
import { QualityAssuranceSourceRestService } from '../../../core/notifications/qa/source/quality-assurance-source-rest.service';
|
import { QualityAssuranceSourceRestService } from '../../../core/suggestion-notifications/qa/source/quality-assurance-source-rest.service';
|
||||||
import { RequestParam } from '../../../core/cache/models/request-param.model';
|
import { RequestParam } from '../../../core/cache/models/request-param.model';
|
||||||
import {FindListOptions} from '../../../core/data/find-list-options.model';
|
import {FindListOptions} from '../../../core/data/find-list-options.model';
|
||||||
|
|
@@ -1,11 +1,11 @@
|
|||||||
import { Injectable } from '@angular/core';
|
import { Injectable } from '@angular/core';
|
||||||
import { Observable } from 'rxjs';
|
import { Observable } from 'rxjs';
|
||||||
import { find, map } from 'rxjs/operators';
|
import { find, map } from 'rxjs/operators';
|
||||||
import { QualityAssuranceSourceRestService } from '../../../core/notifications/qa/source/quality-assurance-source-rest.service';
|
import { QualityAssuranceSourceRestService } from '../../../core/suggestion-notifications/qa/source/quality-assurance-source-rest.service';
|
||||||
import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
|
import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
|
||||||
import { RemoteData } from '../../../core/data/remote-data';
|
import { RemoteData } from '../../../core/data/remote-data';
|
||||||
import { PaginatedList } from '../../../core/data/paginated-list.model';
|
import { PaginatedList } from '../../../core/data/paginated-list.model';
|
||||||
import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model';
|
import { QualityAssuranceSourceObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-source.model';
|
||||||
import {FindListOptions} from '../../../core/data/find-list-options.model';
|
import {FindListOptions} from '../../../core/data/find-list-options.model';
|
||||||
|
|
||||||
/**
|
/**
|
@@ -1,6 +1,6 @@
|
|||||||
import { Action } from '@ngrx/store';
|
import { Action } from '@ngrx/store';
|
||||||
import { type } from '../../../shared/ngrx/type';
|
import { type } from '../../../shared/ngrx/type';
|
||||||
import { QualityAssuranceTopicObject } from '../../../core/notifications/qa/models/quality-assurance-topic.model';
|
import { QualityAssuranceTopicObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-topic.model';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* For each action type in an action group, make a simple
|
* For each action type in an action group, make a simple
|
||||||
@@ -11,9 +11,9 @@ import { QualityAssuranceTopicObject } from '../../../core/notifications/qa/mode
|
|||||||
* action types in the application are unique.
|
* action types in the application are unique.
|
||||||
*/
|
*/
|
||||||
export const QualityAssuranceTopicActionTypes = {
|
export const QualityAssuranceTopicActionTypes = {
|
||||||
ADD_TOPICS: type('dspace/integration/notifications/qa/topic/ADD_TOPICS'),
|
ADD_TOPICS: type('dspace/integration/suggestion-notifications/qa/topic/ADD_TOPICS'),
|
||||||
RETRIEVE_ALL_TOPICS: type('dspace/integration/notifications/qa/topic/RETRIEVE_ALL_TOPICS'),
|
RETRIEVE_ALL_TOPICS: type('dspace/integration/suggestion-notifications/qa/topic/RETRIEVE_ALL_TOPICS'),
|
||||||
RETRIEVE_ALL_TOPICS_ERROR: type('dspace/integration/notifications/qa/topic/RETRIEVE_ALL_TOPICS_ERROR'),
|
RETRIEVE_ALL_TOPICS_ERROR: type('dspace/integration/suggestion-notifications/qa/topic/RETRIEVE_ALL_TOPICS_ERROR'),
|
||||||
};
|
};
|
||||||
|
|
||||||
/* tslint:disable:max-classes-per-file */
|
/* tslint:disable:max-classes-per-file */
|
@@ -11,7 +11,7 @@ import {
|
|||||||
qualityAssuranceTopicObjectMorePid
|
qualityAssuranceTopicObjectMorePid
|
||||||
} from '../../../shared/mocks/notifications.mock';
|
} from '../../../shared/mocks/notifications.mock';
|
||||||
import { QualityAssuranceTopicsComponent } from './quality-assurance-topics.component';
|
import { QualityAssuranceTopicsComponent } from './quality-assurance-topics.component';
|
||||||
import { NotificationsStateService } from '../../notifications-state.service';
|
import { SuggestionNotificationsStateService } from '../../notifications-state.service';
|
||||||
import { cold } from 'jasmine-marbles';
|
import { cold } from 'jasmine-marbles';
|
||||||
import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
|
import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
|
||||||
import { PaginationService } from '../../../core/pagination/pagination.service';
|
import { PaginationService } from '../../../core/pagination/pagination.service';
|
||||||
@@ -41,7 +41,7 @@ describe('QualityAssuranceTopicsComponent test suite', () => {
|
|||||||
TestComponent,
|
TestComponent,
|
||||||
],
|
],
|
||||||
providers: [
|
providers: [
|
||||||
{ provide: NotificationsStateService, useValue: mockNotificationsStateService },
|
{ provide: SuggestionNotificationsStateService, useValue: mockNotificationsStateService },
|
||||||
{ provide: ActivatedRoute, useValue: { data: observableOf(activatedRouteParams), snapshot: {
|
{ provide: ActivatedRoute, useValue: { data: observableOf(activatedRouteParams), snapshot: {
|
||||||
paramMap: {
|
paramMap: {
|
||||||
get: () => 'openaire',
|
get: () => 'openaire',
|
@@ -4,10 +4,10 @@ import { Observable, Subscription } from 'rxjs';
|
|||||||
import { distinctUntilChanged, map, take } from 'rxjs/operators';
|
import { distinctUntilChanged, map, take } from 'rxjs/operators';
|
||||||
|
|
||||||
import { SortOptions } from '../../../core/cache/models/sort-options.model';
|
import { SortOptions } from '../../../core/cache/models/sort-options.model';
|
||||||
import { QualityAssuranceTopicObject } from '../../../core/notifications/qa/models/quality-assurance-topic.model';
|
import { QualityAssuranceTopicObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-topic.model';
|
||||||
import { hasValue } from '../../../shared/empty.util';
|
import { hasValue } from '../../../shared/empty.util';
|
||||||
import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
|
import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
|
||||||
import { NotificationsStateService } from '../../notifications-state.service';
|
import { SuggestionNotificationsStateService } from '../../suggestion-notifications-state.service';
|
||||||
import { AdminQualityAssuranceTopicsPageParams } from '../../../admin/admin-notifications/admin-quality-assurance-topics-page/admin-quality-assurance-topics-page-resolver.service';
|
import { AdminQualityAssuranceTopicsPageParams } from '../../../admin/admin-notifications/admin-quality-assurance-topics-page/admin-quality-assurance-topics-page-resolver.service';
|
||||||
import { PaginationService } from '../../../core/pagination/pagination.service';
|
import { PaginationService } from '../../../core/pagination/pagination.service';
|
||||||
import { ActivatedRoute } from '@angular/router';
|
import { ActivatedRoute } from '@angular/router';
|
||||||
@@ -59,12 +59,12 @@ export class QualityAssuranceTopicsComponent implements OnInit {
|
|||||||
/**
|
/**
|
||||||
* Initialize the component variables.
|
* Initialize the component variables.
|
||||||
* @param {PaginationService} paginationService
|
* @param {PaginationService} paginationService
|
||||||
* @param {NotificationsStateService} notificationsStateService
|
* @param {SuggestionNotificationsStateService} notificationsStateService
|
||||||
*/
|
*/
|
||||||
constructor(
|
constructor(
|
||||||
private paginationService: PaginationService,
|
private paginationService: PaginationService,
|
||||||
private activatedRoute: ActivatedRoute,
|
private activatedRoute: ActivatedRoute,
|
||||||
private notificationsStateService: NotificationsStateService,
|
private notificationsStateService: SuggestionNotificationsStateService,
|
||||||
private qualityAssuranceTopicsService: QualityAssuranceTopicsService
|
private qualityAssuranceTopicsService: QualityAssuranceTopicsService
|
||||||
) {
|
) {
|
||||||
}
|
}
|
@@ -11,11 +11,11 @@ import {
|
|||||||
RetrieveAllTopicsErrorAction,
|
RetrieveAllTopicsErrorAction,
|
||||||
} from './quality-assurance-topics.actions';
|
} from './quality-assurance-topics.actions';
|
||||||
|
|
||||||
import { QualityAssuranceTopicObject } from '../../../core/notifications/qa/models/quality-assurance-topic.model';
|
import { QualityAssuranceTopicObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-topic.model';
|
||||||
import { PaginatedList } from '../../../core/data/paginated-list.model';
|
import { PaginatedList } from '../../../core/data/paginated-list.model';
|
||||||
import { QualityAssuranceTopicsService } from './quality-assurance-topics.service';
|
import { QualityAssuranceTopicsService } from './quality-assurance-topics.service';
|
||||||
import { NotificationsService } from '../../../shared/notifications/notifications.service';
|
import { NotificationsService } from '../../../shared/notifications/notifications.service';
|
||||||
import { QualityAssuranceTopicRestService } from '../../../core/notifications/qa/topics/quality-assurance-topic-rest.service';
|
import { QualityAssuranceTopicRestService } from '../../../core/suggestion-notifications/qa/topics/quality-assurance-topic-rest.service';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Provides effect methods for the Quality Assurance topics actions.
|
* Provides effect methods for the Quality Assurance topics actions.
|
@@ -1,4 +1,4 @@
|
|||||||
import { QualityAssuranceTopicObject } from '../../../core/notifications/qa/models/quality-assurance-topic.model';
|
import { QualityAssuranceTopicObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-topic.model';
|
||||||
import { QualityAssuranceTopicActionTypes, QualityAssuranceTopicsActions } from './quality-assurance-topics.actions';
|
import { QualityAssuranceTopicActionTypes, QualityAssuranceTopicsActions } from './quality-assurance-topics.actions';
|
||||||
|
|
||||||
/**
|
/**
|
@@ -2,7 +2,7 @@ import { TestBed } from '@angular/core/testing';
|
|||||||
import { of as observableOf } from 'rxjs';
|
import { of as observableOf } from 'rxjs';
|
||||||
import { QualityAssuranceTopicsService } from './quality-assurance-topics.service';
|
import { QualityAssuranceTopicsService } from './quality-assurance-topics.service';
|
||||||
import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
|
import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
|
||||||
import { QualityAssuranceTopicRestService } from '../../../core/notifications/qa/topics/quality-assurance-topic-rest.service';
|
import { QualityAssuranceTopicRestService } from '../../../core/suggestion-notifications/qa/topics/quality-assurance-topic-rest.service';
|
||||||
import { PageInfo } from '../../../core/shared/page-info.model';
|
import { PageInfo } from '../../../core/shared/page-info.model';
|
||||||
import {
|
import {
|
||||||
getMockQualityAssuranceTopicRestService,
|
getMockQualityAssuranceTopicRestService,
|
@@ -1,11 +1,11 @@
|
|||||||
import { Injectable } from '@angular/core';
|
import { Injectable } from '@angular/core';
|
||||||
import { Observable } from 'rxjs';
|
import { Observable } from 'rxjs';
|
||||||
import { find, map } from 'rxjs/operators';
|
import { find, map } from 'rxjs/operators';
|
||||||
import { QualityAssuranceTopicRestService } from '../../../core/notifications/qa/topics/quality-assurance-topic-rest.service';
|
import { QualityAssuranceTopicRestService } from '../../../core/suggestion-notifications/qa/topics/quality-assurance-topic-rest.service';
|
||||||
import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
|
import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
|
||||||
import { RemoteData } from '../../../core/data/remote-data';
|
import { RemoteData } from '../../../core/data/remote-data';
|
||||||
import { PaginatedList } from '../../../core/data/paginated-list.model';
|
import { PaginatedList } from '../../../core/data/paginated-list.model';
|
||||||
import { QualityAssuranceTopicObject } from '../../../core/notifications/qa/models/quality-assurance-topic.model';
|
import { QualityAssuranceTopicObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-topic.model';
|
||||||
import { RequestParam } from '../../../core/cache/models/request-param.model';
|
import { RequestParam } from '../../../core/cache/models/request-param.model';
|
||||||
import {FindListOptions} from '../../../core/data/find-list-options.model';
|
import {FindListOptions} from '../../../core/data/find-list-options.model';
|
||||||
|
|
@@ -1,18 +1,18 @@
|
|||||||
import { createFeatureSelector, createSelector, MemoizedSelector } from '@ngrx/store';
|
import { createFeatureSelector, createSelector, MemoizedSelector } from '@ngrx/store';
|
||||||
import { subStateSelector } from '../shared/selector.util';
|
import { subStateSelector } from '../shared/selector.util';
|
||||||
import { notificationsSelector, NotificationsState } from './notifications.reducer';
|
import { suggestionNotificationsSelector, SuggestionNotificationsState } from './suggestion-notifications.reducer';
|
||||||
import { QualityAssuranceTopicObject } from '../core/notifications/qa/models/quality-assurance-topic.model';
|
import { QualityAssuranceTopicObject } from '../core/suggestion-notifications/qa/models/quality-assurance-topic.model';
|
||||||
import { QualityAssuranceTopicState } from './qa/topics/quality-assurance-topics.reducer';
|
import { QualityAssuranceTopicState } from './qa/topics/quality-assurance-topics.reducer';
|
||||||
import { QualityAssuranceSourceState } from './qa/source/quality-assurance-source.reducer';
|
import { QualityAssuranceSourceState } from './qa/source/quality-assurance-source.reducer';
|
||||||
import { QualityAssuranceSourceObject } from '../core/notifications/qa/models/quality-assurance-source.model';
|
import { QualityAssuranceSourceObject } from '../core/suggestion-notifications/qa/models/quality-assurance-source.model';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the Notifications state.
|
* Returns the Notifications state.
|
||||||
* @function _getNotificationsState
|
* @function _getNotificationsState
|
||||||
* @param {AppState} state Top level state.
|
* @param {AppState} state Top level state.
|
||||||
* @return {NotificationsState}
|
* @return {SuggestionNotificationsState}
|
||||||
*/
|
*/
|
||||||
const _getNotificationsState = createFeatureSelector<NotificationsState>('notifications');
|
const _getNotificationsState = createFeatureSelector<SuggestionNotificationsState>('notifications');
|
||||||
|
|
||||||
// Quality Assurance topics
|
// Quality Assurance topics
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
@@ -22,8 +22,8 @@ const _getNotificationsState = createFeatureSelector<NotificationsState>('notifi
|
|||||||
* @function qualityAssuranceTopicsStateSelector
|
* @function qualityAssuranceTopicsStateSelector
|
||||||
* @return {QualityAssuranceTopicState}
|
* @return {QualityAssuranceTopicState}
|
||||||
*/
|
*/
|
||||||
export function qualityAssuranceTopicsStateSelector(): MemoizedSelector<NotificationsState, QualityAssuranceTopicState> {
|
export function qualityAssuranceTopicsStateSelector(): MemoizedSelector<SuggestionNotificationsState, QualityAssuranceTopicState> {
|
||||||
return subStateSelector<NotificationsState,QualityAssuranceTopicState>(notificationsSelector, 'qaTopic');
|
return subStateSelector<SuggestionNotificationsState,QualityAssuranceTopicState>(suggestionNotificationsSelector, 'qaTopic');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -31,8 +31,8 @@ export function qualityAssuranceTopicsStateSelector(): MemoizedSelector<Notifica
|
|||||||
* @function qualityAssuranceTopicsObjectSelector
|
* @function qualityAssuranceTopicsObjectSelector
|
||||||
* @return {QualityAssuranceTopicObject[]}
|
* @return {QualityAssuranceTopicObject[]}
|
||||||
*/
|
*/
|
||||||
export function qualityAssuranceTopicsObjectSelector(): MemoizedSelector<NotificationsState, QualityAssuranceTopicObject[]> {
|
export function qualityAssuranceTopicsObjectSelector(): MemoizedSelector<SuggestionNotificationsState, QualityAssuranceTopicObject[]> {
|
||||||
return subStateSelector<NotificationsState, QualityAssuranceTopicObject[]>(qualityAssuranceTopicsStateSelector(), 'topics');
|
return subStateSelector<SuggestionNotificationsState, QualityAssuranceTopicObject[]>(qualityAssuranceTopicsStateSelector(), 'topics');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -41,7 +41,7 @@ export function qualityAssuranceTopicsObjectSelector(): MemoizedSelector<Notific
|
|||||||
* @return {boolean}
|
* @return {boolean}
|
||||||
*/
|
*/
|
||||||
export const isQualityAssuranceTopicsLoadedSelector = createSelector(_getNotificationsState,
|
export const isQualityAssuranceTopicsLoadedSelector = createSelector(_getNotificationsState,
|
||||||
(state: NotificationsState) => state.qaTopic.loaded
|
(state: SuggestionNotificationsState) => state.qaTopic.loaded
|
||||||
);
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -50,7 +50,7 @@ export const isQualityAssuranceTopicsLoadedSelector = createSelector(_getNotific
|
|||||||
* @return {boolean}
|
* @return {boolean}
|
||||||
*/
|
*/
|
||||||
export const isQualityAssuranceTopicsProcessingSelector = createSelector(_getNotificationsState,
|
export const isQualityAssuranceTopicsProcessingSelector = createSelector(_getNotificationsState,
|
||||||
(state: NotificationsState) => state.qaTopic.processing
|
(state: SuggestionNotificationsState) => state.qaTopic.processing
|
||||||
);
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -59,7 +59,7 @@ export const isQualityAssuranceTopicsProcessingSelector = createSelector(_getNot
|
|||||||
* @return {number}
|
* @return {number}
|
||||||
*/
|
*/
|
||||||
export const getQualityAssuranceTopicsTotalPagesSelector = createSelector(_getNotificationsState,
|
export const getQualityAssuranceTopicsTotalPagesSelector = createSelector(_getNotificationsState,
|
||||||
(state: NotificationsState) => state.qaTopic.totalPages
|
(state: SuggestionNotificationsState) => state.qaTopic.totalPages
|
||||||
);
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -68,7 +68,7 @@ export const getQualityAssuranceTopicsTotalPagesSelector = createSelector(_getNo
|
|||||||
* @return {number}
|
* @return {number}
|
||||||
*/
|
*/
|
||||||
export const getQualityAssuranceTopicsCurrentPageSelector = createSelector(_getNotificationsState,
|
export const getQualityAssuranceTopicsCurrentPageSelector = createSelector(_getNotificationsState,
|
||||||
(state: NotificationsState) => state.qaTopic.currentPage
|
(state: SuggestionNotificationsState) => state.qaTopic.currentPage
|
||||||
);
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -77,7 +77,7 @@ export const getQualityAssuranceTopicsCurrentPageSelector = createSelector(_getN
|
|||||||
* @return {number}
|
* @return {number}
|
||||||
*/
|
*/
|
||||||
export const getQualityAssuranceTopicsTotalsSelector = createSelector(_getNotificationsState,
|
export const getQualityAssuranceTopicsTotalsSelector = createSelector(_getNotificationsState,
|
||||||
(state: NotificationsState) => state.qaTopic.totalElements
|
(state: SuggestionNotificationsState) => state.qaTopic.totalElements
|
||||||
);
|
);
|
||||||
|
|
||||||
// Quality Assurance source
|
// Quality Assurance source
|
||||||
@@ -88,8 +88,8 @@ export const getQualityAssuranceTopicsTotalsSelector = createSelector(_getNotifi
|
|||||||
* @function qualityAssuranceSourceStateSelector
|
* @function qualityAssuranceSourceStateSelector
|
||||||
* @return {QualityAssuranceSourceState}
|
* @return {QualityAssuranceSourceState}
|
||||||
*/
|
*/
|
||||||
export function qualityAssuranceSourceStateSelector(): MemoizedSelector<NotificationsState, QualityAssuranceSourceState> {
|
export function qualityAssuranceSourceStateSelector(): MemoizedSelector<SuggestionNotificationsState, QualityAssuranceSourceState> {
|
||||||
return subStateSelector<NotificationsState,QualityAssuranceSourceState>(notificationsSelector, 'qaSource');
|
return subStateSelector<SuggestionNotificationsState,QualityAssuranceSourceState>(suggestionNotificationsSelector, 'qaSource');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -97,8 +97,8 @@ export const getQualityAssuranceTopicsTotalsSelector = createSelector(_getNotifi
|
|||||||
* @function qualityAssuranceSourceObjectSelector
|
* @function qualityAssuranceSourceObjectSelector
|
||||||
* @return {QualityAssuranceSourceObject[]}
|
* @return {QualityAssuranceSourceObject[]}
|
||||||
*/
|
*/
|
||||||
export function qualityAssuranceSourceObjectSelector(): MemoizedSelector<NotificationsState, QualityAssuranceSourceObject[]> {
|
export function qualityAssuranceSourceObjectSelector(): MemoizedSelector<SuggestionNotificationsState, QualityAssuranceSourceObject[]> {
|
||||||
return subStateSelector<NotificationsState, QualityAssuranceSourceObject[]>(qualityAssuranceSourceStateSelector(), 'source');
|
return subStateSelector<SuggestionNotificationsState, QualityAssuranceSourceObject[]>(qualityAssuranceSourceStateSelector(), 'source');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -107,7 +107,7 @@ export function qualityAssuranceSourceObjectSelector(): MemoizedSelector<Notific
|
|||||||
* @return {boolean}
|
* @return {boolean}
|
||||||
*/
|
*/
|
||||||
export const isQualityAssuranceSourceLoadedSelector = createSelector(_getNotificationsState,
|
export const isQualityAssuranceSourceLoadedSelector = createSelector(_getNotificationsState,
|
||||||
(state: NotificationsState) => state.qaSource.loaded
|
(state: SuggestionNotificationsState) => state.qaSource.loaded
|
||||||
);
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -116,7 +116,7 @@ export const isQualityAssuranceSourceLoadedSelector = createSelector(_getNotific
|
|||||||
* @return {boolean}
|
* @return {boolean}
|
||||||
*/
|
*/
|
||||||
export const isQualityAssuranceSourceProcessingSelector = createSelector(_getNotificationsState,
|
export const isQualityAssuranceSourceProcessingSelector = createSelector(_getNotificationsState,
|
||||||
(state: NotificationsState) => state.qaSource.processing
|
(state: SuggestionNotificationsState) => state.qaSource.processing
|
||||||
);
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -125,7 +125,7 @@ export const isQualityAssuranceSourceProcessingSelector = createSelector(_getNot
|
|||||||
* @return {number}
|
* @return {number}
|
||||||
*/
|
*/
|
||||||
export const getQualityAssuranceSourceTotalPagesSelector = createSelector(_getNotificationsState,
|
export const getQualityAssuranceSourceTotalPagesSelector = createSelector(_getNotificationsState,
|
||||||
(state: NotificationsState) => state.qaSource.totalPages
|
(state: SuggestionNotificationsState) => state.qaSource.totalPages
|
||||||
);
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -134,7 +134,7 @@ export const getQualityAssuranceSourceTotalPagesSelector = createSelector(_getNo
|
|||||||
* @return {number}
|
* @return {number}
|
||||||
*/
|
*/
|
||||||
export const getQualityAssuranceSourceCurrentPageSelector = createSelector(_getNotificationsState,
|
export const getQualityAssuranceSourceCurrentPageSelector = createSelector(_getNotificationsState,
|
||||||
(state: NotificationsState) => state.qaSource.currentPage
|
(state: SuggestionNotificationsState) => state.qaSource.currentPage
|
||||||
);
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -143,5 +143,5 @@ export const getQualityAssuranceSourceCurrentPageSelector = createSelector(_getN
|
|||||||
* @return {number}
|
* @return {number}
|
||||||
*/
|
*/
|
||||||
export const getQualityAssuranceSourceTotalsSelector = createSelector(_getNotificationsState,
|
export const getQualityAssuranceSourceTotalsSelector = createSelector(_getNotificationsState,
|
||||||
(state: NotificationsState) => state.qaSource.totalElements
|
(state: SuggestionNotificationsState) => state.qaSource.totalElements
|
||||||
);
|
);
|
@@ -1,7 +1,7 @@
|
|||||||
import { QualityAssuranceSourceEffects } from './qa/source/quality-assurance-source.effects';
|
import { QualityAssuranceSourceEffects } from './qa/source/quality-assurance-source.effects';
|
||||||
import { QualityAssuranceTopicsEffects } from './qa/topics/quality-assurance-topics.effects';
|
import { QualityAssuranceTopicsEffects } from './qa/topics/quality-assurance-topics.effects';
|
||||||
|
|
||||||
export const notificationsEffects = [
|
export const suggestionNotificationsEffects = [
|
||||||
QualityAssuranceTopicsEffects,
|
QualityAssuranceTopicsEffects,
|
||||||
QualityAssuranceSourceEffects
|
QualityAssuranceSourceEffects
|
||||||
];
|
];
|
@@ -2,8 +2,8 @@ import { TestBed } from '@angular/core/testing';
|
|||||||
import { Store, StoreModule } from '@ngrx/store';
|
import { Store, StoreModule } from '@ngrx/store';
|
||||||
import { provideMockStore } from '@ngrx/store/testing';
|
import { provideMockStore } from '@ngrx/store/testing';
|
||||||
import { cold } from 'jasmine-marbles';
|
import { cold } from 'jasmine-marbles';
|
||||||
import { notificationsReducers } from './notifications.reducer';
|
import { suggestionNotificationsReducers } from './suggestion-notifications.reducer';
|
||||||
import { NotificationsStateService } from './notifications-state.service';
|
import { SuggestionNotificationsStateService } from './suggestion-notifications-state.service';
|
||||||
import {
|
import {
|
||||||
qualityAssuranceSourceObjectMissingPid,
|
qualityAssuranceSourceObjectMissingPid,
|
||||||
qualityAssuranceSourceObjectMoreAbstract,
|
qualityAssuranceSourceObjectMoreAbstract,
|
||||||
@@ -16,7 +16,7 @@ import { RetrieveAllTopicsAction } from './qa/topics/quality-assurance-topics.ac
|
|||||||
import { RetrieveAllSourceAction } from './qa/source/quality-assurance-source.actions';
|
import { RetrieveAllSourceAction } from './qa/source/quality-assurance-source.actions';
|
||||||
|
|
||||||
describe('NotificationsStateService', () => {
|
describe('NotificationsStateService', () => {
|
||||||
let service: NotificationsStateService;
|
let service: SuggestionNotificationsStateService;
|
||||||
let serviceAsAny: any;
|
let serviceAsAny: any;
|
||||||
let store: any;
|
let store: any;
|
||||||
let initialState: any;
|
let initialState: any;
|
||||||
@@ -63,18 +63,18 @@ describe('NotificationsStateService', () => {
|
|||||||
init('empty');
|
init('empty');
|
||||||
TestBed.configureTestingModule({
|
TestBed.configureTestingModule({
|
||||||
imports: [
|
imports: [
|
||||||
StoreModule.forRoot({ notifications: notificationsReducers } as any),
|
StoreModule.forRoot({ notifications: suggestionNotificationsReducers } as any),
|
||||||
],
|
],
|
||||||
providers: [
|
providers: [
|
||||||
provideMockStore({ initialState }),
|
provideMockStore({ initialState }),
|
||||||
{ provide: NotificationsStateService, useValue: service }
|
{ provide: SuggestionNotificationsStateService, useValue: service }
|
||||||
]
|
]
|
||||||
}).compileComponents();
|
}).compileComponents();
|
||||||
});
|
});
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
store = TestBed.get(Store);
|
store = TestBed.get(Store);
|
||||||
service = new NotificationsStateService(store);
|
service = new SuggestionNotificationsStateService(store);
|
||||||
serviceAsAny = service;
|
serviceAsAny = service;
|
||||||
spyOn(store, 'dispatch');
|
spyOn(store, 'dispatch');
|
||||||
});
|
});
|
||||||
@@ -155,18 +155,18 @@ describe('NotificationsStateService', () => {
|
|||||||
init('full');
|
init('full');
|
||||||
TestBed.configureTestingModule({
|
TestBed.configureTestingModule({
|
||||||
imports: [
|
imports: [
|
||||||
StoreModule.forRoot({ notifications: notificationsReducers } as any),
|
StoreModule.forRoot({ notifications: suggestionNotificationsReducers } as any),
|
||||||
],
|
],
|
||||||
providers: [
|
providers: [
|
||||||
provideMockStore({ initialState }),
|
provideMockStore({ initialState }),
|
||||||
{ provide: NotificationsStateService, useValue: service }
|
{ provide: SuggestionNotificationsStateService, useValue: service }
|
||||||
]
|
]
|
||||||
}).compileComponents();
|
}).compileComponents();
|
||||||
});
|
});
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
store = TestBed.get(Store);
|
store = TestBed.get(Store);
|
||||||
service = new NotificationsStateService(store);
|
service = new SuggestionNotificationsStateService(store);
|
||||||
serviceAsAny = service;
|
serviceAsAny = service;
|
||||||
spyOn(store, 'dispatch');
|
spyOn(store, 'dispatch');
|
||||||
});
|
});
|
||||||
@@ -251,18 +251,18 @@ describe('NotificationsStateService', () => {
|
|||||||
init('full');
|
init('full');
|
||||||
TestBed.configureTestingModule({
|
TestBed.configureTestingModule({
|
||||||
imports: [
|
imports: [
|
||||||
StoreModule.forRoot({ notifications: notificationsReducers } as any),
|
StoreModule.forRoot({ notifications: suggestionNotificationsReducers } as any),
|
||||||
],
|
],
|
||||||
providers: [
|
providers: [
|
||||||
provideMockStore({ initialState }),
|
provideMockStore({ initialState }),
|
||||||
{ provide: NotificationsStateService, useValue: service }
|
{ provide: SuggestionNotificationsStateService, useValue: service }
|
||||||
]
|
]
|
||||||
}).compileComponents();
|
}).compileComponents();
|
||||||
});
|
});
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
store = TestBed.get(Store);
|
store = TestBed.get(Store);
|
||||||
service = new NotificationsStateService(store);
|
service = new SuggestionNotificationsStateService(store);
|
||||||
serviceAsAny = service;
|
serviceAsAny = service;
|
||||||
spyOn(store, 'dispatch');
|
spyOn(store, 'dispatch');
|
||||||
});
|
});
|
||||||
@@ -321,18 +321,18 @@ describe('NotificationsStateService', () => {
|
|||||||
init('empty');
|
init('empty');
|
||||||
TestBed.configureTestingModule({
|
TestBed.configureTestingModule({
|
||||||
imports: [
|
imports: [
|
||||||
StoreModule.forRoot({ notifications: notificationsReducers } as any),
|
StoreModule.forRoot({ notifications: suggestionNotificationsReducers } as any),
|
||||||
],
|
],
|
||||||
providers: [
|
providers: [
|
||||||
provideMockStore({ initialState }),
|
provideMockStore({ initialState }),
|
||||||
{ provide: NotificationsStateService, useValue: service }
|
{ provide: SuggestionNotificationsStateService, useValue: service }
|
||||||
]
|
]
|
||||||
}).compileComponents();
|
}).compileComponents();
|
||||||
});
|
});
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
store = TestBed.get(Store);
|
store = TestBed.get(Store);
|
||||||
service = new NotificationsStateService(store);
|
service = new SuggestionNotificationsStateService(store);
|
||||||
serviceAsAny = service;
|
serviceAsAny = service;
|
||||||
spyOn(store, 'dispatch');
|
spyOn(store, 'dispatch');
|
||||||
});
|
});
|
||||||
@@ -413,18 +413,18 @@ describe('NotificationsStateService', () => {
|
|||||||
init('full');
|
init('full');
|
||||||
TestBed.configureTestingModule({
|
TestBed.configureTestingModule({
|
||||||
imports: [
|
imports: [
|
||||||
StoreModule.forRoot({ notifications: notificationsReducers } as any),
|
StoreModule.forRoot({ notifications: suggestionNotificationsReducers } as any),
|
||||||
],
|
],
|
||||||
providers: [
|
providers: [
|
||||||
provideMockStore({ initialState }),
|
provideMockStore({ initialState }),
|
||||||
{ provide: NotificationsStateService, useValue: service }
|
{ provide: SuggestionNotificationsStateService, useValue: service }
|
||||||
]
|
]
|
||||||
}).compileComponents();
|
}).compileComponents();
|
||||||
});
|
});
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
store = TestBed.get(Store);
|
store = TestBed.get(Store);
|
||||||
service = new NotificationsStateService(store);
|
service = new SuggestionNotificationsStateService(store);
|
||||||
serviceAsAny = service;
|
serviceAsAny = service;
|
||||||
spyOn(store, 'dispatch');
|
spyOn(store, 'dispatch');
|
||||||
});
|
});
|
||||||
@@ -509,18 +509,18 @@ describe('NotificationsStateService', () => {
|
|||||||
init('full');
|
init('full');
|
||||||
TestBed.configureTestingModule({
|
TestBed.configureTestingModule({
|
||||||
imports: [
|
imports: [
|
||||||
StoreModule.forRoot({ notifications: notificationsReducers } as any),
|
StoreModule.forRoot({ notifications: suggestionNotificationsReducers } as any),
|
||||||
],
|
],
|
||||||
providers: [
|
providers: [
|
||||||
provideMockStore({ initialState }),
|
provideMockStore({ initialState }),
|
||||||
{ provide: NotificationsStateService, useValue: service }
|
{ provide: SuggestionNotificationsStateService, useValue: service }
|
||||||
]
|
]
|
||||||
}).compileComponents();
|
}).compileComponents();
|
||||||
});
|
});
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
store = TestBed.get(Store);
|
store = TestBed.get(Store);
|
||||||
service = new NotificationsStateService(store);
|
service = new SuggestionNotificationsStateService(store);
|
||||||
serviceAsAny = service;
|
serviceAsAny = service;
|
||||||
spyOn(store, 'dispatch');
|
spyOn(store, 'dispatch');
|
||||||
});
|
});
|
@@ -16,23 +16,23 @@ import {
|
|||||||
getQualityAssuranceSourceCurrentPageSelector,
|
getQualityAssuranceSourceCurrentPageSelector,
|
||||||
getQualityAssuranceSourceTotalsSelector
|
getQualityAssuranceSourceTotalsSelector
|
||||||
} from './selectors';
|
} from './selectors';
|
||||||
import { QualityAssuranceTopicObject } from '../core/notifications/qa/models/quality-assurance-topic.model';
|
import { QualityAssuranceTopicObject } from '../core/suggestion-notifications/qa/models/quality-assurance-topic.model';
|
||||||
import { NotificationsState } from './notifications.reducer';
|
import { SuggestionNotificationsState } from './suggestion-notifications.reducer';
|
||||||
import { RetrieveAllTopicsAction } from './qa/topics/quality-assurance-topics.actions';
|
import { RetrieveAllTopicsAction } from './qa/topics/quality-assurance-topics.actions';
|
||||||
import { QualityAssuranceSourceObject } from '../core/notifications/qa/models/quality-assurance-source.model';
|
import { QualityAssuranceSourceObject } from '../core/suggestion-notifications/qa/models/quality-assurance-source.model';
|
||||||
import { RetrieveAllSourceAction } from './qa/source/quality-assurance-source.actions';
|
import { RetrieveAllSourceAction } from './qa/source/quality-assurance-source.actions';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The service handling the Notifications State.
|
* The service handling the Notifications State.
|
||||||
*/
|
*/
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class NotificationsStateService {
|
export class SuggestionNotificationsStateService {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initialize the service variables.
|
* Initialize the service variables.
|
||||||
* @param {Store<NotificationsState>} store
|
* @param {Store<SuggestionNotificationsState>} store
|
||||||
*/
|
*/
|
||||||
constructor(private store: Store<NotificationsState>) { }
|
constructor(private store: Store<SuggestionNotificationsState>) { }
|
||||||
|
|
||||||
// Quality Assurance topics
|
// Quality Assurance topics
|
||||||
// --------------------------------------------------------------------------
|
// --------------------------------------------------------------------------
|
@@ -8,25 +8,25 @@ import { SharedModule } from '../shared/shared.module';
|
|||||||
import { storeModuleConfig } from '../app.reducer';
|
import { storeModuleConfig } from '../app.reducer';
|
||||||
import { QualityAssuranceTopicsComponent } from './qa/topics/quality-assurance-topics.component';
|
import { QualityAssuranceTopicsComponent } from './qa/topics/quality-assurance-topics.component';
|
||||||
import { QualityAssuranceEventsComponent } from './qa/events/quality-assurance-events.component';
|
import { QualityAssuranceEventsComponent } from './qa/events/quality-assurance-events.component';
|
||||||
import { NotificationsStateService } from './notifications-state.service';
|
import { SuggestionNotificationsStateService } from './suggestion-notifications-state.service';
|
||||||
import { notificationsReducers, NotificationsState } from './notifications.reducer';
|
import { suggestionNotificationsReducers, SuggestionNotificationsState } from './suggestion-notifications.reducer';
|
||||||
import { notificationsEffects } from './notifications.effects';
|
import { suggestionNotificationsEffects } from './suggestion-notifications-effects';
|
||||||
import { QualityAssuranceTopicsService } from './qa/topics/quality-assurance-topics.service';
|
import { QualityAssuranceTopicsService } from './qa/topics/quality-assurance-topics.service';
|
||||||
import { QualityAssuranceTopicRestService } from '../core/notifications/qa/topics/quality-assurance-topic-rest.service';
|
import { QualityAssuranceTopicRestService } from '../core/suggestion-notifications/qa/topics/quality-assurance-topic-rest.service';
|
||||||
import { QualityAssuranceEventRestService } from '../core/notifications/qa/events/quality-assurance-event-rest.service';
|
import { QualityAssuranceEventRestService } from '../core/suggestion-notifications/qa/events/quality-assurance-event-rest.service';
|
||||||
import { ProjectEntryImportModalComponent } from './qa/project-entry-import-modal/project-entry-import-modal.component';
|
import { ProjectEntryImportModalComponent } from './qa/project-entry-import-modal/project-entry-import-modal.component';
|
||||||
import { TranslateModule } from '@ngx-translate/core';
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
import { SearchModule } from '../shared/search/search.module';
|
import { SearchModule } from '../shared/search/search.module';
|
||||||
import { QualityAssuranceSourceComponent } from './qa/source/quality-assurance-source.component';
|
import { QualityAssuranceSourceComponent } from './qa/source/quality-assurance-source.component';
|
||||||
import { QualityAssuranceSourceService } from './qa/source/quality-assurance-source.service';
|
import { QualityAssuranceSourceService } from './qa/source/quality-assurance-source.service';
|
||||||
import { QualityAssuranceSourceRestService } from '../core/notifications/qa/source/quality-assurance-source-rest.service';
|
import { QualityAssuranceSourceRestService } from '../core/suggestion-notifications/qa/source/quality-assurance-source-rest.service';
|
||||||
|
|
||||||
const MODULES = [
|
const MODULES = [
|
||||||
CommonModule,
|
CommonModule,
|
||||||
SharedModule,
|
SharedModule,
|
||||||
CoreModule.forRoot(),
|
CoreModule.forRoot(),
|
||||||
StoreModule.forFeature('notifications', notificationsReducers, storeModuleConfig as StoreConfig<NotificationsState, Action>),
|
StoreModule.forFeature('notifications', suggestionNotificationsReducers, storeModuleConfig as StoreConfig<SuggestionNotificationsState, Action>),
|
||||||
EffectsModule.forFeature(notificationsEffects),
|
EffectsModule.forFeature(suggestionNotificationsEffects),
|
||||||
TranslateModule
|
TranslateModule
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -43,7 +43,7 @@ const ENTRY_COMPONENTS = [
|
|||||||
];
|
];
|
||||||
|
|
||||||
const PROVIDERS = [
|
const PROVIDERS = [
|
||||||
NotificationsStateService,
|
SuggestionNotificationsStateService,
|
||||||
QualityAssuranceTopicsService,
|
QualityAssuranceTopicsService,
|
||||||
QualityAssuranceSourceService,
|
QualityAssuranceSourceService,
|
||||||
QualityAssuranceTopicRestService,
|
QualityAssuranceTopicRestService,
|
||||||
@@ -76,5 +76,5 @@ const PROVIDERS = [
|
|||||||
/**
|
/**
|
||||||
* This module handles all components that are necessary for the OpenAIRE components
|
* This module handles all components that are necessary for the OpenAIRE components
|
||||||
*/
|
*/
|
||||||
export class NotificationsModule {
|
export class SuggestionNotificationsModule {
|
||||||
}
|
}
|
@@ -5,14 +5,14 @@ import { qualityAssuranceTopicsReducer, QualityAssuranceTopicState, } from './qa
|
|||||||
/**
|
/**
|
||||||
* The OpenAIRE State
|
* The OpenAIRE State
|
||||||
*/
|
*/
|
||||||
export interface NotificationsState {
|
export interface SuggestionNotificationsState {
|
||||||
'qaTopic': QualityAssuranceTopicState;
|
'qaTopic': QualityAssuranceTopicState;
|
||||||
'qaSource': QualityAssuranceSourceState;
|
'qaSource': QualityAssuranceSourceState;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const notificationsReducers: ActionReducerMap<NotificationsState> = {
|
export const suggestionNotificationsReducers: ActionReducerMap<SuggestionNotificationsState> = {
|
||||||
qaTopic: qualityAssuranceTopicsReducer,
|
qaTopic: qualityAssuranceTopicsReducer,
|
||||||
qaSource: qualityAssuranceSourceReducer
|
qaSource: qualityAssuranceSourceReducer
|
||||||
};
|
};
|
||||||
|
|
||||||
export const notificationsSelector = createFeatureSelector<NotificationsState>('notifications');
|
export const suggestionNotificationsSelector = createFeatureSelector<SuggestionNotificationsState>('notifications');
|
Reference in New Issue
Block a user