Skip to content

Commit df66979

Browse files
committed
[DURACOM-327] WIP fixes
1 parent 7f26b5f commit df66979

355 files changed

Lines changed: 2637 additions & 2016 deletions

File tree

Some content is hidden

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

.eslintrc.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,9 @@
273273
"parserOptions": {
274274
"project": [
275275
"./tsconfig.json",
276-
"./cypress/tsconfig.json"
276+
"./cypress/tsconfig.json",
277+
"./modules/core/tsconfig.json",
278+
"./modules/utils/tsconfig.json"
277279
],
278280
"createDefaultProgram": true
279281
},

cypress/support/commands.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@
55

66
import {
77
AuthTokenInfo,
8-
TOKENITEM,
9-
} from '@dspace/core';
10-
import {
118
DSPACE_XSRF_COOKIE,
9+
TOKENITEM,
1210
XSRF_REQUEST_HEADER,
1311
} from '@dspace/core';
1412
import { v4 as uuidv4 } from 'uuid';

modules/core/src/lib/core/access-status/access-status.model.ts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,16 @@ import {
33
deserialize,
44
} from 'cerialize';
55

6-
7-
import { ACCESS_STATUS } from './access-status.resource-type';
8-
import { CacheableObject, typedObject } from '../cache';
6+
import {
7+
CacheableObject,
8+
typedObject,
9+
} from '../cache';
10+
import {
11+
HALLink,
12+
ResourceType,
13+
} from '../shared';
914
import { excludeFromEquals } from '../utilities';
10-
import { HALLink, ResourceType } from '../shared';
15+
import { ACCESS_STATUS } from './access-status.resource-type';
1116

1217
@typedObject
1318
export class AccessStatusObject implements CacheableObject {

modules/core/src/lib/core/admin/admin-notify-message/admin-notify-messages.service.ts

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,25 @@ import {
1313
tap,
1414
} from 'rxjs/operators';
1515

16-
17-
import { IdentifiableDataService, ItemDataService, PostRequest, RequestService, RestRequest } from '../../data';
18-
import { ObjectCacheService, RemoteDataBuildService } from '../../cache';
19-
import { getAllSucceededRemoteDataPayload, getFirstCompletedRemoteData, HALEndpointService } from '../../shared';
16+
import {
17+
ObjectCacheService,
18+
RemoteDataBuildService,
19+
} from '../../cache';
20+
import {
21+
IdentifiableDataService,
22+
ItemDataService,
23+
PostRequest,
24+
RequestService,
25+
RestRequest,
26+
} from '../../data';
2027
import { NotificationsService } from '../../notifications';
21-
import { AdminNotifyMessage } from './models/admin-notify-message.model';
28+
import {
29+
getAllSucceededRemoteDataPayload,
30+
getFirstCompletedRemoteData,
31+
HALEndpointService,
32+
} from '../../shared';
2233
import { LdnServicesService } from '../ldn-services-data';
34+
import { AdminNotifyMessage } from './models/admin-notify-message.model';
2335

2436
/**
2537
* Injectable service responsible for fetching/sending data from/to the REST API on the messages' endpoint.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
// created from 'create-ts-index'
22

3-
export * from './models';
43
export * from './admin-notify-messages.service';
4+
export * from './models';
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { AdminNotifyMessage } from './admin-notify-message.model';
21
import { SearchResult } from '../../../shared';
2+
import { AdminNotifyMessage } from './admin-notify-message.model';
33

44
export class AdminNotifySearchResult extends SearchResult<AdminNotifyMessage> {
55
}

modules/core/src/lib/core/admin/admin-notify-message/models/admin-notify-message.model.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@ import {
55
} from 'cerialize';
66
import { Observable } from 'rxjs';
77

8-
import { ADMIN_NOTIFY_MESSAGE } from './admin-notify-message.resource-type';
9-
import { DSpaceObject, GenericConstructor } from '../../../shared';
108
import { typedObject } from '../../../cache';
11-
import { excludeFromEquals } from '../../../utilities';
129
import { ListableObject } from '../../../object-collection';
10+
import {
11+
DSpaceObject,
12+
GenericConstructor,
13+
} from '../../../shared';
14+
import { excludeFromEquals } from '../../../utilities';
15+
import { ADMIN_NOTIFY_MESSAGE } from './admin-notify-message.resource-type';
1316

1417
/**
1518
* A message that includes admin notify info
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// created from 'create-ts-index'
22

3-
export * from './admin-notify-message-search-result.model';
43
export * from './admin-notify-message.model';
54
export * from './admin-notify-message.resource-type';
5+
export * from './admin-notify-message-search-result.model';

modules/core/src/lib/core/admin/ldn-services-data/ldn-itemfilter-data.service.spec.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,19 @@ import {
44
} from 'jasmine-marbles';
55
import { of } from 'rxjs';
66
import { TestScheduler } from 'rxjs/testing';
7-
import { LdnItemfiltersService } from './ldn-itemfilters-data.service';
8-
import { RequestService } from '../../data/request.service';
7+
98
import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
109
import { ObjectCacheService } from '../../cache/object-cache.service';
11-
import { HALEndpointService } from '../../shared/hal-endpoint.service';
12-
import { NotificationsService } from '../../notifications/notifications.service';
13-
import { RequestEntry } from '../../data/request-entry.model';
10+
import { RestResponse } from '../../cache/response.models';
11+
import { testFindAllDataImplementation } from '../../data/base/find-all-data.spec';
1412
import { RemoteData } from '../../data/remote-data';
13+
import { RequestService } from '../../data/request.service';
14+
import { RequestEntry } from '../../data/request-entry.model';
1515
import { RequestEntryState } from '../../data/request-entry-state.model';
16+
import { NotificationsService } from '../../notifications/notifications.service';
17+
import { HALEndpointService } from '../../shared/hal-endpoint.service';
1618
import { createSuccessfulRemoteDataObject$ } from '../../utilities/remote-data.utils';
17-
import { testFindAllDataImplementation } from '../../data/base/find-all-data.spec';
18-
import { RestResponse } from '../../cache/response.models';
19+
import { LdnItemfiltersService } from './ldn-itemfilters-data.service';
1920

2021

2122

modules/core/src/lib/core/admin/ldn-services-data/ldn-itemfilters-data.service.ts

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
11
import { Injectable } from '@angular/core';
22
import { Observable } from 'rxjs';
33

4-
4+
import {
5+
ObjectCacheService,
6+
RemoteDataBuildService,
7+
} from '../../cache';
58
import {
69
FindAllData,
710
FindAllDataImpl,
8-
FindListOptions, FollowLinkConfig,
11+
FindListOptions,
12+
FollowLinkConfig,
913
IdentifiableDataService,
10-
Itemfilter, PaginatedList, RemoteData,
11-
RequestService
14+
Itemfilter,
15+
PaginatedList,
16+
RemoteData,
17+
RequestService,
1218
} from '../../data';
13-
import { ObjectCacheService, RemoteDataBuildService } from '../../cache';
14-
import { HALEndpointService } from '../../shared';
1519
import { NotificationsService } from '../../notifications';
20+
import { HALEndpointService } from '../../shared';
1621

1722
/**
1823
* A service responsible for fetching/sending data from/to the REST API on the itemfilters endpoint

0 commit comments

Comments
 (0)