Skip to content

Commit 29a194b

Browse files
committed
[DURACOM-327] Move registry.service out the core folder
1 parent 8036082 commit 29a194b

14 files changed

Lines changed: 49 additions & 49 deletions

src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import { ConfigurationDataService } from '@core/data/configuration-data.service'
1616
import { GroupDataService } from '@core/eperson/group-data.service';
1717
import { MetadataSchema } from '@core/metadata/metadata-schema.model';
1818
import { PaginationService } from '@core/pagination/pagination.service';
19-
import { RegistryService } from '@core/registry/registry.service';
2019
import { ConfigurationProperty } from '@core/shared/configuration-property.model';
2120
import { SearchConfigurationService } from '@core/shared/search/search-configuration.service';
2221
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
@@ -38,6 +37,7 @@ import { RegistryServiceStub } from '../../../shared/testing/registry.service.st
3837
import { SearchConfigurationServiceStub } from '../../../shared/testing/search-configuration-service.stub';
3938
import { createPaginatedList } from '../../../shared/testing/utils.test';
4039
import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe';
40+
import { RegistryService } from '../registry/registry.service';
4141
import { MetadataRegistryComponent } from './metadata-registry.component';
4242
import { MetadataSchemaFormComponent } from './metadata-schema-form/metadata-schema-form.component';
4343

src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import { PaginatedList } from '@core/data/paginated-list.model';
1212
import { RemoteData } from '@core/data/remote-data';
1313
import { MetadataSchema } from '@core/metadata/metadata-schema.model';
1414
import { PaginationService } from '@core/pagination/pagination.service';
15-
import { RegistryService } from '@core/registry/registry.service';
1615
import { NoContent } from '@core/shared/NoContent.model';
1716
import { getFirstCompletedRemoteData } from '@core/shared/operators';
1817
import {
@@ -36,6 +35,7 @@ import { NotificationsService } from '../../../shared/notifications/notification
3635
import { PaginationComponent } from '../../../shared/pagination/pagination.component';
3736
import { toFindListOptions } from '../../../shared/pagination/pagination.utils';
3837
import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
38+
import { RegistryService } from '../registry/registry.service';
3939
import { MetadataSchemaFormComponent } from './metadata-schema-form/metadata-schema-form.component';
4040

4141
@Component({

src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import {
88
} from '@angular/core/testing';
99
import { RouterTestingModule } from '@angular/router/testing';
1010
import { MetadataSchema } from '@core/metadata/metadata-schema.model';
11-
import { RegistryService } from '@core/registry/registry.service';
1211
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
1312
import { TranslateModule } from '@ngx-translate/core';
1413
import { of } from 'rxjs';
@@ -18,6 +17,7 @@ import { FormComponent } from '../../../../shared/form/form.component';
1817
import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock';
1918
import { RegistryServiceStub } from '../../../../shared/testing/registry.service.stub';
2019
import { EnumKeysPipe } from '../../../../shared/utils/enum-keys-pipe';
20+
import { RegistryService } from '../../registry/registry.service';
2121
import { MetadataSchemaFormComponent } from './metadata-schema-form.component';
2222

2323
describe('MetadataSchemaFormComponent', () => {

src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import {
88
} from '@angular/core';
99
import { UntypedFormGroup } from '@angular/forms';
1010
import { MetadataSchema } from '@core/metadata/metadata-schema.model';
11-
import { RegistryService } from '@core/registry/registry.service';
1211
import {
1312
DynamicFormControlModel,
1413
DynamicFormGroupModel,
@@ -31,6 +30,7 @@ import {
3130

3231
import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
3332
import { FormComponent } from '../../../../shared/form/form.component';
33+
import { RegistryService } from '../../registry/registry.service';
3434

3535
@Component({
3636
selector: 'ds-metadata-schema-form',

src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import {
99
import { RouterTestingModule } from '@angular/router/testing';
1010
import { MetadataField } from '@core/metadata/metadata-field.model';
1111
import { MetadataSchema } from '@core/metadata/metadata-schema.model';
12-
import { RegistryService } from '@core/registry/registry.service';
1312
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
1413
import { TranslateModule } from '@ngx-translate/core';
1514
import { of } from 'rxjs';
@@ -19,6 +18,7 @@ import { FormComponent } from '../../../../shared/form/form.component';
1918
import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock';
2019
import { RegistryServiceStub } from '../../../../shared/testing/registry.service.stub';
2120
import { EnumKeysPipe } from '../../../../shared/utils/enum-keys-pipe';
21+
import { RegistryService } from '../../registry/registry.service';
2222
import { MetadataFieldFormComponent } from './metadata-field-form.component';
2323

2424
describe('MetadataFieldFormComponent', () => {

src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import {
1010
import { UntypedFormGroup } from '@angular/forms';
1111
import { MetadataField } from '@core/metadata/metadata-field.model';
1212
import { MetadataSchema } from '@core/metadata/metadata-schema.model';
13-
import { RegistryService } from '@core/registry/registry.service';
1413
import {
1514
DynamicFormControlModel,
1615
DynamicFormGroupModel,
@@ -27,6 +26,7 @@ import { take } from 'rxjs/operators';
2726

2827
import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
2928
import { FormComponent } from '../../../../shared/form/form.component';
29+
import { RegistryService } from '../../registry/registry.service';
3030

3131
@Component({
3232
selector: 'ds-metadata-field-form',

src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import { GroupDataService } from '@core/eperson/group-data.service';
1515
import { MetadataField } from '@core/metadata/metadata-field.model';
1616
import { MetadataSchema } from '@core/metadata/metadata-schema.model';
1717
import { PaginationService } from '@core/pagination/pagination.service';
18-
import { RegistryService } from '@core/registry/registry.service';
1918
import { ConfigurationProperty } from '@core/shared/configuration-property.model';
2019
import { SearchConfigurationService } from '@core/shared/search/search-configuration.service';
2120
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
@@ -35,6 +34,7 @@ import { SearchConfigurationServiceStub } from '../../../shared/testing/search-c
3534
import { createPaginatedList } from '../../../shared/testing/utils.test';
3635
import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe';
3736
import { VarDirective } from '../../../shared/utils/var.directive';
37+
import { RegistryService } from '../registry/registry.service';
3838
import { MetadataFieldFormComponent } from './metadata-field-form/metadata-field-form.component';
3939
import { MetadataSchemaComponent } from './metadata-schema.component';
4040

src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import { RemoteData } from '@core/data/remote-data';
1616
import { MetadataField } from '@core/metadata/metadata-field.model';
1717
import { MetadataSchema } from '@core/metadata/metadata-schema.model';
1818
import { PaginationService } from '@core/pagination/pagination.service';
19-
import { RegistryService } from '@core/registry/registry.service';
2019
import { NoContent } from '@core/shared/NoContent.model';
2120
import {
2221
getFirstCompletedRemoteData,
@@ -45,6 +44,7 @@ import { PaginationComponent } from '../../../shared/pagination/pagination.compo
4544
import { toFindListOptions } from '../../../shared/pagination/pagination.utils';
4645
import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
4746
import { VarDirective } from '../../../shared/utils/var.directive';
47+
import { RegistryService } from '../registry/registry.service';
4848
import { MetadataFieldFormComponent } from './metadata-field-form/metadata-field-form.component';
4949

5050
@Component({

src/app/core/registry/registry.service.spec.ts renamed to src/app/admin/admin-registries/registry/registry.service.spec.ts

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
import { CommonModule } from '@angular/common';
22
import { Component } from '@angular/core';
33
import { TestBed } from '@angular/core/testing';
4+
import { FindListOptions } from '@core/data/find-list-options.model';
5+
import { MetadataFieldDataService } from '@core/data/metadata-field-data.service';
6+
import { MetadataSchemaDataService } from '@core/data/metadata-schema-data.service';
7+
import { RemoteData } from '@core/data/remote-data';
8+
import { MetadataField } from '@core/metadata/metadata-field.model';
9+
import { MetadataSchema } from '@core/metadata/metadata-schema.model';
10+
import { NoContent } from '@core/shared/NoContent.model';
411
import {
512
Store,
613
StoreModule,
@@ -11,6 +18,15 @@ import {
1118
of,
1219
} from 'rxjs';
1320

21+
import { storeModuleConfig } from '../../../app.reducer';
22+
import { NotificationsService } from '../../../shared/notifications/notifications.service';
23+
import {
24+
createNoContentRemoteDataObject$,
25+
createSuccessfulRemoteDataObject$,
26+
} from '../../../shared/remote-data.utils';
27+
import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
28+
import { StoreMock } from '../../../shared/testing/store.mock';
29+
import { createPaginatedList } from '../../../shared/testing/utils.test';
1430
import {
1531
MetadataRegistryCancelFieldAction,
1632
MetadataRegistryCancelSchemaAction,
@@ -22,23 +38,7 @@ import {
2238
MetadataRegistryEditSchemaAction,
2339
MetadataRegistrySelectFieldAction,
2440
MetadataRegistrySelectSchemaAction,
25-
} from '../../admin/admin-registries/metadata-registry/metadata-registry.actions';
26-
import { storeModuleConfig } from '../../app.reducer';
27-
import { NotificationsService } from '../../shared/notifications/notifications.service';
28-
import {
29-
createNoContentRemoteDataObject$,
30-
createSuccessfulRemoteDataObject$,
31-
} from '../../shared/remote-data.utils';
32-
import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
33-
import { StoreMock } from '../../shared/testing/store.mock';
34-
import { createPaginatedList } from '../../shared/testing/utils.test';
35-
import { FindListOptions } from '../data/find-list-options.model';
36-
import { MetadataFieldDataService } from '../data/metadata-field-data.service';
37-
import { MetadataSchemaDataService } from '../data/metadata-schema-data.service';
38-
import { RemoteData } from '../data/remote-data';
39-
import { MetadataField } from '../metadata/metadata-field.model';
40-
import { MetadataSchema } from '../metadata/metadata-schema.model';
41-
import { NoContent } from '../shared/NoContent.model';
41+
} from '../metadata-registry/metadata-registry.actions';
4242
import { RegistryService } from './registry.service';
4343

4444
@Component({

src/app/core/registry/registry.service.ts renamed to src/app/admin/admin-registries/registry/registry.service.ts

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
11
import { Injectable } from '@angular/core';
2+
import { RequestParam } from '@core/cache/models/request-param.model';
3+
import { FindListOptions } from '@core/data/find-list-options.model';
4+
import { MetadataFieldDataService } from '@core/data/metadata-field-data.service';
5+
import { MetadataSchemaDataService } from '@core/data/metadata-schema-data.service';
6+
import { PaginatedList } from '@core/data/paginated-list.model';
7+
import { RemoteData } from '@core/data/remote-data';
8+
import { MetadataField } from '@core/metadata/metadata-field.model';
9+
import { MetadataSchema } from '@core/metadata/metadata-schema.model';
10+
import { NoContent } from '@core/shared/NoContent.model';
11+
import { getFirstSucceededRemoteDataPayload } from '@core/shared/operators';
212
import {
313
createSelector,
414
select,
@@ -15,6 +25,14 @@ import {
1525
tap,
1626
} from 'rxjs/operators';
1727

28+
import { AppState } from '../../../app.reducer';
29+
import {
30+
hasValue,
31+
hasValueOperator,
32+
isNotEmptyOperator,
33+
} from '../../../shared/empty.util';
34+
import { NotificationsService } from '../../../shared/notifications/notifications.service';
35+
import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
1836
import {
1937
MetadataRegistryCancelFieldAction,
2038
MetadataRegistryCancelSchemaAction,
@@ -26,26 +44,8 @@ import {
2644
MetadataRegistryEditSchemaAction,
2745
MetadataRegistrySelectFieldAction,
2846
MetadataRegistrySelectSchemaAction,
29-
} from '../../admin/admin-registries/metadata-registry/metadata-registry.actions';
30-
import { MetadataRegistryState } from '../../admin/admin-registries/metadata-registry/metadata-registry.reducers';
31-
import { AppState } from '../../app.reducer';
32-
import {
33-
hasValue,
34-
hasValueOperator,
35-
isNotEmptyOperator,
36-
} from '../../shared/empty.util';
37-
import { NotificationsService } from '../../shared/notifications/notifications.service';
38-
import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
39-
import { RequestParam } from '../cache/models/request-param.model';
40-
import { FindListOptions } from '../data/find-list-options.model';
41-
import { MetadataFieldDataService } from '../data/metadata-field-data.service';
42-
import { MetadataSchemaDataService } from '../data/metadata-schema-data.service';
43-
import { PaginatedList } from '../data/paginated-list.model';
44-
import { RemoteData } from '../data/remote-data';
45-
import { MetadataField } from '../metadata/metadata-field.model';
46-
import { MetadataSchema } from '../metadata/metadata-schema.model';
47-
import { NoContent } from '../shared/NoContent.model';
48-
import { getFirstSucceededRemoteDataPayload } from '../shared/operators';
47+
} from '../metadata-registry/metadata-registry.actions';
48+
import { MetadataRegistryState } from '../metadata-registry/metadata-registry.reducers';
4949

5050
const metadataRegistryStateSelector = (state: AppState) => state.metadataRegistry;
5151
const editMetadataSchemaSelector = createSelector(metadataRegistryStateSelector, (metadataState: MetadataRegistryState) => metadataState.editSchema);

0 commit comments

Comments
 (0)