Skip to content

Commit 163b27b

Browse files
[DURACOM-327] move mocks and routing functions + remaining references of AppState + move notification state in core
1 parent 9eaefaf commit 163b27b

File tree

351 files changed

+611
-582
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

351 files changed

+611
-582
lines changed

scripts/base-href.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { existsSync, writeFileSync } from 'fs';
22
import { join } from 'path';
33

44
import { AppConfig } from '../src/app/core/config/app-config.interface';
5-
import { buildAppConfig } from '../src/app/core/config/config.server';
5+
import { buildAppConfig } from '../src/config/config.server';
66

77
/**
88
* Script to set baseHref as `ui.nameSpace` for development mode. Adds `baseHref` to angular.json build options.

scripts/serve.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { spawn } from 'child_process';
22

33
import { AppConfig } from '../src/app/core/config/app-config.interface';
4-
import { buildAppConfig } from '../src/app/core/config/config.server';
4+
import { buildAppConfig } from '../src/config/config.server';
55

66
const appConfig: AppConfig = buildAppConfig();
77

scripts/test-rest.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { request } from 'http';
22
import { request as https_request } from 'https';
33

44
import { AppConfig } from '../src/app/core/config/app-config.interface';
5-
import { buildAppConfig } from '../src/app/core/config/config.server';
5+
import { buildAppConfig } from '../src/config/config.server';
66

77
const appConfig: AppConfig = buildAppConfig();
88

server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import { createProxyMiddleware } from 'http-proxy-middleware';
4444
import { hasValue } from './modules/shared/utils/src/lib/utils/empty.util';
4545
import { UIServerConfig } from './src/app/core/config/ui-server-config.interface';
4646
import bootstrap from './src/main.server';
47-
import { buildAppConfig } from './src/app/core/config/config.server';
47+
import { buildAppConfig } from './src/config/config.server';
4848
import {
4949
APP_CONFIG,
5050
AppConfig,

src/app/access-control/bulk-access/bulk-access.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import { TranslateModule } from '@ngx-translate/core';
88
import { of } from 'rxjs';
99

1010
import { NotificationsService } from '../../core/notifications/notifications.service';
11+
import { Process } from '../../core/processes/process.model';
1112
import { createSuccessfulRemoteDataObject$ } from '../../core/utilities/remote-data.utils';
1213
import { NotificationsServiceStub } from '../../core/utilities/testing/notifications-service.stub';
13-
import { Process } from '../../process-page/processes/process.model';
1414
import { BulkAccessControlService } from '../../shared/access-control-form-container/bulk-access-control.service';
1515
import { getMockThemeService } from '../../shared/mocks/theme-service.mock';
1616
import { SelectableListState } from '../../shared/object-list/selectable-list/selectable-list.reducer';

src/app/access-control/epeople-registry/epeople-registry.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ import { RemoteData } from '../../core/data/remote-data';
4040
import { RequestService } from '../../core/data/request.service';
4141
import { EPersonDataService } from '../../core/eperson/eperson-data.service';
4242
import { EPerson } from '../../core/eperson/models/eperson.model';
43+
import { RouterMock } from '../../core/mocks/router.mock';
4344
import { NotificationsService } from '../../core/notifications/notifications.service';
4445
import { PaginationService } from '../../core/pagination/pagination.service';
4546
import { PageInfo } from '../../core/shared/page-info.model';
@@ -54,7 +55,6 @@ import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
5455
import { FormBuilderService } from '../../shared/form/builder/form-builder.service';
5556
import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
5657
import { getMockFormBuilderService } from '../../shared/mocks/form-builder-service.mock';
57-
import { RouterMock } from '../../shared/mocks/router.mock';
5858
import { PaginationComponent } from '../../shared/pagination/pagination.component';
5959
import { EPeopleRegistryComponent } from './epeople-registry.component';
6060
import { EPersonFormComponent } from './eperson-form/eperson-form.component';

src/app/access-control/group-registry/group-form/group-form.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ import { RemoteData } from '../../../core/data/remote-data';
4444
import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
4545
import { GroupDataService } from '../../../core/eperson/group-data.service';
4646
import { Group } from '../../../core/eperson/models/group.model';
47+
import { RouterMock } from '../../../core/mocks/router.mock';
4748
import { NotificationsService } from '../../../core/notifications/notifications.service';
4849
import { DSpaceObject } from '../../../core/shared/dspace-object.model';
4950
import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
@@ -64,7 +65,6 @@ import { FormBuilderService } from '../../../shared/form/builder/form-builder.se
6465
import { FormComponent } from '../../../shared/form/form.component';
6566
import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
6667
import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
67-
import { RouterMock } from '../../../shared/mocks/router.mock';
6868
import { GroupFormComponent } from './group-form.component';
6969
import { MembersListComponent } from './members-list/members-list.component';
7070
import { SubgroupsListComponent } from './subgroup-list/subgroups-list.component';

src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ import { EPersonDataService } from '../../../../core/eperson/eperson-data.servic
4646
import { GroupDataService } from '../../../../core/eperson/group-data.service';
4747
import { EPerson } from '../../../../core/eperson/models/eperson.model';
4848
import { Group } from '../../../../core/eperson/models/group.model';
49+
import { RouterMock } from '../../../../core/mocks/router.mock';
50+
import { getMockTranslateService } from '../../../../core/mocks/translate.service.mock';
4951
import { NotificationsService } from '../../../../core/notifications/notifications.service';
5052
import { PaginationService } from '../../../../core/pagination/pagination.service';
5153
import { PageInfo } from '../../../../core/shared/page-info.model';
@@ -63,8 +65,6 @@ import { ContextHelpDirective } from '../../../../shared/context-help.directive'
6365
import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
6466
import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
6567
import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock';
66-
import { RouterMock } from '../../../../shared/mocks/router.mock';
67-
import { getMockTranslateService } from '../../../../shared/mocks/translate.service.mock';
6868
import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
6969
import { MembersListComponent } from './members-list.component';
7070

src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ import {
4343
import { RemoteData } from '../../../../core/data/remote-data';
4444
import { GroupDataService } from '../../../../core/eperson/group-data.service';
4545
import { Group } from '../../../../core/eperson/models/group.model';
46+
import { RouterMock } from '../../../../core/mocks/router.mock';
47+
import { getMockTranslateService } from '../../../../core/mocks/translate.service.mock';
4648
import { NotificationsService } from '../../../../core/notifications/notifications.service';
4749
import { PaginationService } from '../../../../core/pagination/pagination.service';
4850
import { PageInfo } from '../../../../core/shared/page-info.model';
@@ -60,8 +62,6 @@ import { ContextHelpDirective } from '../../../../shared/context-help.directive'
6062
import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
6163
import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
6264
import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock';
63-
import { RouterMock } from '../../../../shared/mocks/router.mock';
64-
import { getMockTranslateService } from '../../../../shared/mocks/translate.service.mock';
6565
import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
6666
import { SubgroupsListComponent } from './subgroups-list.component';
6767

src/app/access-control/group-registry/groups-registry.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ import { EPersonDataService } from '../../core/eperson/eperson-data.service';
4545
import { GroupDataService } from '../../core/eperson/group-data.service';
4646
import { EPerson } from '../../core/eperson/models/eperson.model';
4747
import { Group } from '../../core/eperson/models/group.model';
48+
import { RouterMock } from '../../core/mocks/router.mock';
4849
import { NotificationsService } from '../../core/notifications/notifications.service';
4950
import { PaginationService } from '../../core/pagination/pagination.service';
5051
import { RouteService } from '../../core/services/route.service';
@@ -69,7 +70,6 @@ import {
6970
DSONameServiceMock,
7071
UNDEFINED_NAME,
7172
} from '../../shared/mocks/dso-name.service.mock';
72-
import { RouterMock } from '../../shared/mocks/router.mock';
7373
import { PaginationComponent } from '../../shared/pagination/pagination.component';
7474
import { GroupsRegistryComponent } from './groups-registry.component';
7575

0 commit comments

Comments
 (0)