mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 01:54:15 +00:00
fixed errors
This commit is contained in:
@@ -185,8 +185,8 @@ import { FlatBrowseDefinition } from './shared/flat-browse-definition.model';
|
||||
import { ValueListBrowseDefinition } from './shared/value-list-browse-definition.model';
|
||||
import { NonHierarchicalBrowseDefinition } from './shared/non-hierarchical-browse-definition';
|
||||
import { BulkAccessConditionOptions } from './config/models/bulk-access-condition-options.model';
|
||||
import { SuggestionTarget } from './suggestion-notifications/reciter-suggestions/models/suggestion-target.model';
|
||||
import { SuggestionSource } from './suggestion-notifications/reciter-suggestions/models/suggestion-source.model';
|
||||
import { SuggestionTarget } from './notifications/reciter-suggestions/models/suggestion-target.model';
|
||||
import { SuggestionSource } from './notifications/reciter-suggestions/models/suggestion-source.model';
|
||||
import { LdnServicesService } from '../admin/admin-ldn-services/ldn-services-data/ldn-services-data.service';
|
||||
import { LdnService } from '../admin/admin-ldn-services/ldn-services-model/ldn-services.model';
|
||||
import { LdnItemfiltersService } from '../admin/admin-ldn-services/ldn-services-data/ldn-itemfilters-data.service';
|
||||
|
@@ -13,7 +13,7 @@ import { RecentItemListComponent } from './recent-item-list/recent-item-list.com
|
||||
import { JournalEntitiesModule } from '../entity-groups/journal-entities/journal-entities.module';
|
||||
import { ResearchEntitiesModule } from '../entity-groups/research-entities/research-entities.module';
|
||||
import { ThemedTopLevelCommunityListComponent } from './top-level-community-list/themed-top-level-community-list.component';
|
||||
import { SuggestionNotificationsModule } from '../suggestion-notifications/suggestion-notifications.module';
|
||||
import { NotificationsModule } from '../notifications/notifications.module';
|
||||
|
||||
const DECLARATIONS = [
|
||||
HomePageComponent,
|
||||
@@ -33,7 +33,7 @@ const DECLARATIONS = [
|
||||
ResearchEntitiesModule.withEntryComponents(),
|
||||
HomePageRoutingModule,
|
||||
StatisticsModule.forRoot(),
|
||||
SuggestionNotificationsModule
|
||||
NotificationsModule
|
||||
],
|
||||
declarations: [
|
||||
...DECLARATIONS,
|
||||
|
@@ -1,9 +1,9 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { QaEventNotificationComponent } from './qa-event-notification.component';
|
||||
import { QualityAssuranceSourceDataService } from '../../../core/suggestion-notifications/qa/source/quality-assurance-source-data.service';
|
||||
import { QualityAssuranceSourceDataService } from '../../../core/notifications/qa/source/quality-assurance-source-data.service';
|
||||
import { createPaginatedList } from '../../../shared/testing/utils.test';
|
||||
import { QualityAssuranceSourceObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-source.model';
|
||||
import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model';
|
||||
import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
|
||||
import { TranslateModule } from '@ngx-translate/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
|
@@ -5,8 +5,8 @@ import { Observable, filter } from 'rxjs';
|
||||
import { AlertType } from '../../../shared/alert/alert-type';
|
||||
import { FindListOptions } from '../../../core/data/find-list-options.model';
|
||||
import { RequestParam } from '../../../core/cache/models/request-param.model';
|
||||
import { QualityAssuranceSourceDataService } from '../../../core/suggestion-notifications/qa/source/quality-assurance-source-data.service';
|
||||
import { QualityAssuranceSourceObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-source.model';
|
||||
import { QualityAssuranceSourceDataService } from '../../../core/notifications/qa/source/quality-assurance-source-data.service';
|
||||
import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model';
|
||||
import { PaginatedList } from 'src/app/core/data/paginated-list.model';
|
||||
import { hasValue } from 'src/app/shared/empty.util';
|
||||
|
||||
|
@@ -15,7 +15,7 @@ import { MyDSpaceNewExternalDropdownComponent } from './my-dspace-new-submission
|
||||
import { ThemedMyDSpacePageComponent } from './themed-my-dspace-page.component';
|
||||
import { SearchModule } from '../shared/search/search.module';
|
||||
import { UploadModule } from '../shared/upload/upload.module';
|
||||
import { SuggestionNotificationsModule } from '../suggestion-notifications/suggestion-notifications.module';
|
||||
import { NotificationsModule } from '../notifications/notifications.module';
|
||||
import { MyDspaceQaEventsNotificationsComponent } from './my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component';
|
||||
|
||||
const DECLARATIONS = [
|
||||
@@ -36,7 +36,7 @@ const DECLARATIONS = [
|
||||
MyDspacePageRoutingModule,
|
||||
MyDspaceSearchModule.withEntryComponents(),
|
||||
UploadModule,
|
||||
SuggestionNotificationsModule,
|
||||
NotificationsModule,
|
||||
],
|
||||
declarations: DECLARATIONS,
|
||||
providers: [
|
||||
|
@@ -1,10 +1,10 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { MyDspaceQaEventsNotificationsComponent } from './my-dspace-qa-events-notifications.component';
|
||||
import { QualityAssuranceSourceDataService } from '../../core/suggestion-notifications/qa/source/quality-assurance-source-data.service';
|
||||
import { QualityAssuranceSourceDataService } from '../../core/notifications/qa/source/quality-assurance-source-data.service';
|
||||
import { createSuccessfulRemoteDataObject$ } from 'src/app/shared/remote-data.utils';
|
||||
import { createPaginatedList } from 'src/app/shared/testing/utils.test';
|
||||
import { QualityAssuranceSourceObject } from 'src/app/core/suggestion-notifications/qa/models/quality-assurance-source.model';
|
||||
import { QualityAssuranceSourceObject } from 'src/app/core/notifications/qa/models/quality-assurance-source.model';
|
||||
|
||||
describe('MyDspaceQaEventsNotificationsComponent', () => {
|
||||
let component: MyDspaceQaEventsNotificationsComponent;
|
||||
|
@@ -1,8 +1,8 @@
|
||||
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
|
||||
import { QualityAssuranceSourceDataService } from '../../core/suggestion-notifications/qa/source/quality-assurance-source-data.service';
|
||||
import { QualityAssuranceSourceDataService } from '../../core/notifications/qa/source/quality-assurance-source-data.service';
|
||||
import { getFirstCompletedRemoteData, getPaginatedListPayload, getRemoteDataPayload } from '../../core/shared/operators';
|
||||
import { Observable, of, tap } from 'rxjs';
|
||||
import { QualityAssuranceSourceObject } from 'src/app/core/suggestion-notifications/qa/models/quality-assurance-source.model';
|
||||
import { QualityAssuranceSourceObject } from 'src/app/core/notifications/qa/models/quality-assurance-source.model';
|
||||
|
||||
@Component({
|
||||
selector: 'ds-my-dspace-qa-events-notifications',
|
||||
|
@@ -1,7 +1,7 @@
|
||||
import { Component, EventEmitter, Input, Output } from '@angular/core';
|
||||
import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
|
||||
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
|
||||
import { Suggestion } from '../../../core/suggestion-notifications/reciter-suggestions/models/suggestion.model';
|
||||
import { Suggestion } from '../../../core/notifications/reciter-suggestions/models/suggestion.model';
|
||||
import { SuggestionApproveAndImport } from '../suggestion-list-element/suggestion-list-element.component';
|
||||
import { Collection } from '../../../core/shared/collection.model';
|
||||
import { take } from 'rxjs/operators';
|
||||
|
@@ -1,6 +1,6 @@
|
||||
import { Component, Input } from '@angular/core';
|
||||
import { fadeIn } from '../../../../shared/animations/fade';
|
||||
import { SuggestionEvidences } from '../../../../core/suggestion-notifications/reciter-suggestions/models/suggestion.model';
|
||||
import { SuggestionEvidences } from '../../../../core/notifications/reciter-suggestions/models/suggestion.model';
|
||||
|
||||
@Component({
|
||||
selector: 'ds-suggestion-evidences',
|
||||
|
@@ -12,7 +12,7 @@ import { ThemedProfilePageComponent } from './themed-profile-page.component';
|
||||
import { FormModule } from '../shared/form/form.module';
|
||||
import { UiSwitchModule } from 'ngx-ui-switch';
|
||||
import { ProfileClaimItemModalComponent } from './profile-claim-item-modal/profile-claim-item-modal.component';
|
||||
import { SuggestionNotificationsModule } from '../suggestion-notifications/suggestion-notifications.module';
|
||||
import { NotificationsModule } from '../notifications/notifications.module';
|
||||
|
||||
|
||||
@NgModule({
|
||||
@@ -22,7 +22,7 @@ import { SuggestionNotificationsModule } from '../suggestion-notifications/sugge
|
||||
SharedModule,
|
||||
FormModule,
|
||||
UiSwitchModule,
|
||||
SuggestionNotificationsModule
|
||||
NotificationsModule
|
||||
],
|
||||
exports: [
|
||||
ProfilePageComponent,
|
||||
|
@@ -1,5 +1,5 @@
|
||||
import { ResourceType } from '../../core/shared/resource-type';
|
||||
import { SuggestionTarget } from '../../core/suggestion-notifications/reciter-suggestions/models/suggestion-target.model';
|
||||
import { SuggestionTarget } from '../../core/notifications/reciter-suggestions/models/suggestion-target.model';
|
||||
|
||||
// REST Mock ---------------------------------------------------------------------
|
||||
// -------------------------------------------------------------------------------
|
||||
|
@@ -2,8 +2,8 @@
|
||||
// REST Mock ---------------------------------------------------------------------
|
||||
// -------------------------------------------------------------------------------
|
||||
|
||||
import { Suggestion } from '../../core/suggestion-notifications/reciter-suggestions/models/suggestion.model';
|
||||
import { SUGGESTION } from '../../core/suggestion-notifications/reciter-suggestions/models/suggestion-objects.resource-type';
|
||||
import { Suggestion } from '../../core/notifications/reciter-suggestions/models/suggestion.model';
|
||||
import { SUGGESTION } from '../../core/notifications/reciter-suggestions/models/suggestion-objects.resource-type';
|
||||
|
||||
export const mockSuggestionPublicationOne: Suggestion = {
|
||||
id: '24694772',
|
||||
|
@@ -7,13 +7,13 @@ import { TranslateModule, TranslateService } from '@ngx-translate/core';
|
||||
import { of as observableOf } from 'rxjs';
|
||||
|
||||
import { SuggestionsPageComponent } from './suggestions-page.component';
|
||||
import { SuggestionListElementComponent } from '../suggestion-notifications/reciter-suggestions/suggestion-list-element/suggestion-list-element.component';
|
||||
import { SuggestionsService } from '../suggestion-notifications/reciter-suggestions/suggestions.service';
|
||||
import { SuggestionListElementComponent } from '../notifications/reciter-suggestions/suggestion-list-element/suggestion-list-element.component';
|
||||
import { SuggestionsService } from '../notifications/reciter-suggestions/suggestions.service';
|
||||
import { getMockSuggestionNotificationsStateService, getMockSuggestionsService } from '../shared/mocks/suggestion.mock';
|
||||
import { buildPaginatedList, PaginatedList } from '../core/data/paginated-list.model';
|
||||
import { Suggestion } from '../core/suggestion-notifications/reciter-suggestions/models/suggestion.model';
|
||||
import { Suggestion } from '../core/notifications/reciter-suggestions/models/suggestion.model';
|
||||
import { mockSuggestionPublicationOne, mockSuggestionPublicationTwo } from '../shared/mocks/reciter-suggestion.mock';
|
||||
import { SuggestionEvidencesComponent } from '../suggestion-notifications/reciter-suggestions/suggestion-list-element/suggestion-evidences/suggestion-evidences.component';
|
||||
import { SuggestionEvidencesComponent } from '../notifications/reciter-suggestions/suggestion-list-element/suggestion-evidences/suggestion-evidences.component';
|
||||
import { ObjectKeysPipe } from '../shared/utils/object-keys-pipe';
|
||||
import { VarDirective } from '../shared/utils/var.directive';
|
||||
import { ActivatedRoute, Router } from '@angular/router';
|
||||
@@ -23,7 +23,7 @@ import { AuthService } from '../core/auth/auth.service';
|
||||
import { NotificationsService } from '../shared/notifications/notifications.service';
|
||||
import { NotificationsServiceStub } from '../shared/testing/notifications-service.stub';
|
||||
import { getMockTranslateService } from '../shared/mocks/translate.service.mock';
|
||||
import { SuggestionTargetsStateService } from '../suggestion-notifications/reciter-suggestions/suggestion-targets/suggestion-targets.state.service';
|
||||
import { SuggestionTargetsStateService } from '../notifications/reciter-suggestions/suggestion-targets/suggestion-targets.state.service';
|
||||
import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service';
|
||||
import { createSuccessfulRemoteDataObject } from '../shared/remote-data.utils';
|
||||
import { PageInfo } from '../core/shared/page-info.model';
|
||||
|
@@ -9,14 +9,14 @@ import { SortDirection, SortOptions, } from '../core/cache/models/sort-options.m
|
||||
import { PaginatedList } from '../core/data/paginated-list.model';
|
||||
import { RemoteData } from '../core/data/remote-data';
|
||||
import { getFirstSucceededRemoteDataPayload } from '../core/shared/operators';
|
||||
import { SuggestionBulkResult, SuggestionsService } from '../suggestion-notifications/reciter-suggestions/suggestions.service';
|
||||
import { SuggestionBulkResult, SuggestionsService } from '../notifications/reciter-suggestions/suggestions.service';
|
||||
import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
|
||||
import { Suggestion } from '../core/suggestion-notifications/reciter-suggestions/models/suggestion.model';
|
||||
import { SuggestionTarget } from '../core/suggestion-notifications/reciter-suggestions/models/suggestion-target.model';
|
||||
import { Suggestion } from '../core/notifications/reciter-suggestions/models/suggestion.model';
|
||||
import { SuggestionTarget } from '../core/notifications/reciter-suggestions/models/suggestion-target.model';
|
||||
import { AuthService } from '../core/auth/auth.service';
|
||||
import { SuggestionApproveAndImport } from '../suggestion-notifications/reciter-suggestions/suggestion-list-element/suggestion-list-element.component';
|
||||
import { SuggestionApproveAndImport } from '../notifications/reciter-suggestions/suggestion-list-element/suggestion-list-element.component';
|
||||
import { NotificationsService } from '../shared/notifications/notifications.service';
|
||||
import { SuggestionTargetsStateService } from '../suggestion-notifications/reciter-suggestions/suggestion-targets/suggestion-targets.state.service';
|
||||
import { SuggestionTargetsStateService } from '../notifications/reciter-suggestions/suggestion-targets/suggestion-targets.state.service';
|
||||
import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service';
|
||||
import { PaginationService } from '../core/pagination/pagination.service';
|
||||
import { WorkspaceItem } from '../core/submission/models/workspaceitem.model';
|
||||
|
@@ -4,16 +4,16 @@ import { CommonModule } from '@angular/common';
|
||||
import { SuggestionsPageComponent } from './suggestions-page.component';
|
||||
import { SharedModule } from '../shared/shared.module';
|
||||
import { SuggestionsPageRoutingModule } from './suggestions-page-routing.module';
|
||||
import { SuggestionsService } from '../suggestion-notifications/reciter-suggestions/suggestions.service';
|
||||
import { SuggestionNotificationsModule } from '../suggestion-notifications/suggestion-notifications.module';
|
||||
import { SuggestionsDataService } from '../core/suggestion-notifications/reciter-suggestions/suggestions-data.service';
|
||||
import { SuggestionsService } from '../notifications/reciter-suggestions/suggestions.service';
|
||||
import { NotificationsModule } from '../notifications/notifications.module';
|
||||
import { SuggestionsDataService } from '../core/notifications/reciter-suggestions/suggestions-data.service';
|
||||
|
||||
@NgModule({
|
||||
declarations: [SuggestionsPageComponent],
|
||||
imports: [
|
||||
CommonModule,
|
||||
SharedModule,
|
||||
SuggestionNotificationsModule,
|
||||
NotificationsModule,
|
||||
SuggestionsPageRoutingModule
|
||||
],
|
||||
providers: [
|
||||
|
@@ -6,10 +6,10 @@ import { find } from 'rxjs/operators';
|
||||
|
||||
import { RemoteData } from '../core/data/remote-data';
|
||||
import { hasValue } from '../shared/empty.util';
|
||||
import { SuggestionTarget } from '../core/suggestion-notifications/reciter-suggestions/models/suggestion-target.model';
|
||||
import { SuggestionTarget } from '../core/notifications/reciter-suggestions/models/suggestion-target.model';
|
||||
import {
|
||||
SuggestionTargetDataService
|
||||
} from '../core/suggestion-notifications/reciter-suggestions/target/suggestion-target-data.service';
|
||||
} from '../core/notifications/reciter-suggestions/target/suggestion-target-data.service';
|
||||
|
||||
/**
|
||||
* This class represents a resolver that requests a specific collection before the route is activated
|
||||
|
@@ -156,7 +156,7 @@ import { ItemStatusComponent } from './app/item-page/edit-item-page/item-status/
|
||||
import { EditBitstreamPageComponent } from './app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component';
|
||||
import { FormModule } from '../../app/shared/form/form.module';
|
||||
import { RequestCopyModule } from 'src/app/request-copy/request-copy.module';
|
||||
import { SuggestionNotificationsModule } from '../../app/suggestion-notifications/suggestion-notifications.module';
|
||||
import { NotificationsModule } from '../../app/notifications/notifications.module';
|
||||
import {UserMenuComponent} from './app/shared/auth-nav-menu/user-menu/user-menu.component';
|
||||
import { BrowseByComponent } from './app/shared/browse-by/browse-by.component';
|
||||
import { RegisterEmailFormComponent } from './app/register-email-form/register-email-form.component';
|
||||
@@ -306,7 +306,7 @@ const DECLARATIONS = [
|
||||
NgxGalleryModule,
|
||||
FormModule,
|
||||
RequestCopyModule,
|
||||
SuggestionNotificationsModule
|
||||
NotificationsModule
|
||||
],
|
||||
declarations: DECLARATIONS,
|
||||
exports: [
|
||||
|
Reference in New Issue
Block a user