Skip to content

Commit 7c3cc5b

Browse files
atarix83atarix83
committed
[DURACOM-327] Reordering models after merge
1 parent d460dab commit 7c3cc5b

7 files changed

Lines changed: 19 additions & 20 deletions

File tree

‎src/app/core/provide-core.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ import {
33
inject,
44
makeEnvironmentProviders,
55
} from '@angular/core';
6-
import { APP_CONFIG } from 'src/config/app-config.interface';
6+
import { APP_CONFIG } from '@dspace/config/app-config.interface';
77

8-
import { ListableNotificationObject } from '../shared/object-list/listable-notification-object/listable-notification-object.model';
9-
import { StatisticsEndpoint } from '../statistics/statistics-endpoint.model';
108
import { AuthStatus } from './auth/models/auth-status.model';
119
import { ShortLivedToken } from './auth/models/short-lived-token.model';
1210
import { AdminNotifyMessage } from './coar-notify/models/admin-notify-message.model';
@@ -74,6 +72,7 @@ import { Relationship } from './shared/item-relationships/relationship.model';
7472
import { RelationshipType } from './shared/item-relationships/relationship-type.model';
7573
import { ItemRequest } from './shared/item-request.model';
7674
import { License } from './shared/license.model';
75+
import { ListableNotificationObject } from './shared/listable-notification-object.model';
7776
import { NonHierarchicalBrowseDefinition } from './shared/non-hierarchical-browse-definition';
7877
import { Registration } from './shared/registration.model';
7978
import { Script } from './shared/scripts/script.model';
@@ -90,6 +89,7 @@ import { TemplateItem } from './shared/template-item.model';
9089
import { ValueListBrowseDefinition } from './shared/value-list-browse-definition.model';
9190
import { Version } from './shared/version.model';
9291
import { VersionHistory } from './shared/version-history.model';
92+
import { StatisticsEndpoint } from './statistics/models/statistics-endpoint.model';
9393
import { UsageReport } from './statistics/models/usage-report.model';
9494
import { CorrectionType } from './submission/models/correctiontype.model';
9595
import { SubmissionCcLicence } from './submission/models/submission-cc-license.model';

src/app/shared/object-list/listable-notification-object/listable-notification-object.model.ts renamed to src/app/core/shared/listable-notification-object.model.ts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
import { typedObject } from '@dspace/core/cache/builders/build-decorators';
2-
import { TypedObject } from '@dspace/core/cache/typed-object.model';
3-
import { NotificationType } from '@dspace/core/notification-system/models/notification-type';
4-
import { GenericConstructor } from '@dspace/core/shared/generic-constructor';
5-
import { ResourceType } from '@dspace/core/shared/resource-type';
6-
7-
import { ListableObject } from '../../object-collection/shared/listable-object.model';
8-
import { LISTABLE_NOTIFICATION_OBJECT } from './listable-notification-object.resource-type';
1+
import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
2+
import { LISTABLE_NOTIFICATION_OBJECT } from '../../shared/object-list/listable-notification-object/listable-notification-object.resource-type';
3+
import { typedObject } from '../cache/builders/build-decorators';
4+
import { TypedObject } from '../cache/typed-object.model';
5+
import { NotificationType } from '../notification-system/models/notification-type';
6+
import { GenericConstructor } from './generic-constructor';
7+
import { ResourceType } from './resource-type';
98

109
/**
1110
* Object representing a notification message inside a list of objects

src/app/statistics/statistics-endpoint.model.ts renamed to src/app/core/statistics/models/statistics-endpoint.model.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { typedObject } from '@dspace/core/cache/builders/build-decorators';
2-
import { CacheableObject } from '@dspace/core/cache/cacheable-object.model';
3-
import { HALLink } from '@dspace/core/shared/hal-link.model';
4-
import { ResourceType } from '@dspace/core/shared/resource-type';
5-
import { excludeFromEquals } from '@dspace/core/utilities/equals.decorators';
61
import {
72
autoserialize,
83
deserialize,
94
} from 'cerialize';
105

6+
import { typedObject } from '../../cache/builders/build-decorators';
7+
import { CacheableObject } from '../../cache/cacheable-object.model';
8+
import { HALLink } from '../../shared/hal-link.model';
9+
import { ResourceType } from '../../shared/resource-type';
10+
import { excludeFromEquals } from '../../utilities/equals.decorators';
1111
import { STATISTICS_ENDPOINT } from './statistics-endpoint.resource-type';
1212

1313
/**

src/app/statistics/statistics-endpoint.resource-type.ts renamed to src/app/core/statistics/models/statistics-endpoint.resource-type.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ResourceType } from '@dspace/core/shared/resource-type';
1+
import { ResourceType } from '../../shared/resource-type';
22

33
/**
44
* The resource type for the statistics endpoint

‎src/app/shared/dso-selector/dso-selector/dso-selector.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import { NotificationsService } from '@dspace/core/notification-system/notificat
3030
import { Context } from '@dspace/core/shared/context.model';
3131
import { DSpaceObject } from '@dspace/core/shared/dspace-object.model';
3232
import { DSpaceObjectType } from '@dspace/core/shared/dspace-object-type.model';
33+
import { ListableNotificationObject } from '@dspace/core/shared/listable-notification-object.model';
3334
import {
3435
getFirstCompletedRemoteData,
3536
getFirstSucceededRemoteDataPayload,
@@ -69,7 +70,6 @@ import { ThemedLoadingComponent } from '../../loading/themed-loading.component';
6970
import { CollectionElementLinkType } from '../../object-collection/collection-element-link.type';
7071
import { ListableObject } from '../../object-collection/shared/listable-object.model';
7172
import { ListableObjectComponentLoaderComponent } from '../../object-collection/shared/listable-object/listable-object-component-loader.component';
72-
import { ListableNotificationObject } from '../../object-list/listable-notification-object/listable-notification-object.model';
7373
import { LISTABLE_NOTIFICATION_OBJECT } from '../../object-list/listable-notification-object/listable-notification-object.resource-type';
7474

7575
@Component({

‎src/app/shared/object-list/listable-notification-object/listable-notification-object.component.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import {
44
} from '@angular/core/testing';
55
import { By } from '@angular/platform-browser';
66
import { NotificationType } from '@dspace/core/notification-system/models/notification-type';
7+
import { ListableNotificationObject } from '@dspace/core/shared/listable-notification-object.model';
78
import { TranslateModule } from '@ngx-translate/core';
89

910
import { ListableNotificationObjectComponent } from './listable-notification-object.component';
10-
import { ListableNotificationObject } from './listable-notification-object.model';
1111

1212
describe('ListableNotificationObjectComponent', () => {
1313
let component: ListableNotificationObjectComponent;

‎src/app/shared/object-list/listable-notification-object/listable-notification-object.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { Component } from '@angular/core';
2+
import { ListableNotificationObject } from '@dspace/core/shared/listable-notification-object.model';
23
import { ViewMode } from '@dspace/core/shared/view-mode.model';
34
import { TranslateModule } from '@ngx-translate/core';
45

56
import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator';
67
import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
7-
import { ListableNotificationObject } from './listable-notification-object.model';
88
import { LISTABLE_NOTIFICATION_OBJECT } from './listable-notification-object.resource-type';
99

1010
/**

0 commit comments

Comments
 (0)