Skip to content

Commit a984e84

Browse files
[DSC-1864] fix compilation issue
1 parent fe212c5 commit a984e84

23 files changed

Lines changed: 873 additions & 78 deletions

File tree

src/app/app.component.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ export class AppComponent implements OnInit, AfterViewInit {
6161
* Whether or not the idle modal is is currently open
6262
*/
6363
idleModalOpen: boolean;
64+
/**
65+
* In order to show sharing component only in csr
66+
*/
67+
browserPlatform = false;
6468

6569
constructor(
6670
@Inject(NativeWindowService) private _window: NativeWindowRef,
@@ -79,8 +83,9 @@ export class AppComponent implements OnInit, AfterViewInit {
7983

8084
/* Use models object so all decorators are actually called */
8185
this.models = models;
86+
this.browserPlatform = this.platformId;
8287

83-
if (isPlatformBrowser(this.platformId)) {
88+
if (this.browserPlatform) {
8489
this.trackIdleModal();
8590
}
8691

src/app/audit-page/overview/audit-overview.component.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ <h2 class="flex-grow-1">{{'audit.overview.title' | translate}}</h2>
1010

1111
<ds-pagination *ngIf="(auditsRD$ | async)?.payload?.totalElements > 0"
1212
[paginationOptions]="pageConfig"
13-
[pageInfoState]="(auditsRD$ | async)?.payload"
1413
[collectionSize]="(auditsRD$ | async)?.payload?.totalElements"
1514
[hideGear]="true"
1615
[hidePagerWhenSinglePage]="true">

src/app/core/browse/browse.service.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ export class BrowseService {
113113
/**
114114
* Get all items linked to a certain metadata value
115115
* @param {string} filterValue metadata value to filter by (e.g. author's name)
116+
* @param filterAuthority
116117
* @param options Options to narrow down your search
117118
* @returns {Observable<RemoteData<PaginatedList<Item>>>}
118119
*/

src/app/core/browse/search-manager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export class SearchManager {
4444
* @returns {Observable<RemoteData<PaginatedList<Item>>>}
4545
*/
4646
getBrowseItemsFor(filterValue: string, filterAuthority: string, options: BrowseEntrySearchOptions, ...linksToFollow: FollowLinkConfig<any>[]): Observable<RemoteData<PaginatedList<Item>>> {
47-
return this.browseService.getBrowseItemsFor(filterValue, filterAuthority, options, ...linksToFollow)
47+
return this.browseService.getBrowseItemsFor(filterValue, filterAuthority, options)
4848
.pipe(this.completeWithExtraData());
4949
}
5050

src/app/core/openaire/broker/events/openaire-broker-event-rest.service.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ export class OpenaireBrokerEventRestService extends IdentifiableDataService<Open
8080
options.searchParams = [
8181
{
8282
fieldName: 'topic',
83-
fieldValue: topic
83+
fieldValue: topic,
84+
encodeValue: false
8485
}
8586
];
8687
return this.searchData.searchBy('findByTopic', options, true, true, ...linksToFollow);

src/app/core/statistics/usage-report-data.service.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,23 +47,27 @@ export class UsageReportDataService extends IdentifiableDataService<UsageReport>
4747
{
4848
fieldName: `uri`,
4949
fieldValue: uri,
50+
encodeValue: false
5051
},{
5152
fieldName: `category`,
5253
fieldValue: categoryId,
54+
encodeValue: false
5355
}
5456
];
5557

5658
if (startDate !== undefined) {
5759
params.push({
5860
fieldName: `startDate`,
5961
fieldValue: startDate,
62+
encodeValue: false
6063
});
6164
}
6265

6366
if (endDate !== undefined) {
6467
params.push({
6568
fieldName: `endDate`,
6669
fieldValue: endDate,
70+
encodeValue: false
6771
});
6872
}
6973

src/app/core/submission/edititem-data.service.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import { IdentifiableDataService } from '../data/base/identifiable-data.service'
1818
import { SearchDataImpl } from '../data/base/search-data';
1919
import { DeleteDataImpl } from '../data/base/delete-data';
2020
import { FindListOptions } from '../data/find-list-options.model';
21+
import { tr } from "date-fns/locale";
2122

2223
/**
2324
* A service that provides methods to make REST requests with edititems endpoint.
@@ -58,7 +59,8 @@ export class EditItemDataService extends IdentifiableDataService<EditItem> {
5859
options.searchParams = [
5960
{
6061
fieldName: 'uuid',
61-
fieldValue: id
62+
fieldValue: id,
63+
encodeValue: false
6264
},
6365
];
6466
return this.searchData.searchBy(this.searchById, options, useCachedVersionIfAvailable, reRequestOnStale);

src/app/edit-item-relationships/edit-item-relationships.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ export class EditItemRelationshipsComponent implements OnInit, OnDestroy {
358358
*/
359359
deleteRelationship(relationship: Relationship, objectItem: Item, action: ManageRelationshipEventType): void {
360360
this.processing$.next(true);
361-
this.relationshipService.deleteRelationship(relationship.id).pipe(take(1)).pipe(
361+
this.relationshipService.deleteRelationship(relationship.id, 'none').pipe(take(1)).pipe(
362362
switchMap((rd: RemoteData<Relationship>) => {
363363
if (rd.hasSucceeded) {
364364
return this.retrieveRelationships(objectItem);
@@ -381,7 +381,7 @@ export class EditItemRelationshipsComponent implements OnInit, OnDestroy {
381381
*/
382382
deleteAddRelationship(type: RelationshipType, objectItem: Item, relationship: Relationship, action: ManageRelationshipEventType): Observable<Relationship[]> {
383383
this.processing$.next(true);
384-
return this.relationshipService.deleteRelationship(relationship.id).pipe(take(1)).pipe(
384+
return this.relationshipService.deleteRelationship(relationship.id, 'none').pipe(take(1)).pipe(
385385
switchMap((rd: RemoteData<Relationship>) => {
386386
if (rd.hasSucceeded) {
387387
return this.addRelationship(type, objectItem, action);

src/app/item-page/full/full-item-page.component.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import { ServerResponseService } from '../../core/services/server-response.servi
1919
import { SignpostingDataService } from '../../core/data/signposting-data.service';
2020
import { LinkHeadService } from '../../core/services/link-head.service';
2121
import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface';
22+
import { AuthService } from "../../core/auth/auth.service";
2223

2324
/**
2425
* This component renders a full item page.
@@ -53,6 +54,7 @@ export class FullItemPageComponent extends ItemPageComponent implements OnInit,
5354
protected route: ActivatedRoute,
5455
protected router: Router,
5556
protected items: ItemDataService,
57+
protected authService: AuthService,
5658
protected authorizationService: AuthorizationDataService,
5759
protected _location: Location,
5860
protected responseService: ServerResponseService,
@@ -61,7 +63,7 @@ export class FullItemPageComponent extends ItemPageComponent implements OnInit,
6163
@Inject(PLATFORM_ID) protected platformId: string,
6264
@Inject(APP_CONFIG) private appConfig: AppConfig,
6365
) {
64-
super(route, router, items, authorizationService, responseService, signpostingDataService, linkHeadService, platformId);
66+
super(route, router, items, authService, authorizationService, responseService, signpostingDataService, linkHeadService, platformId);
6567
}
6668

6769
/*** AoT inheritance fix, will hopefully be resolved in the near future **/

src/app/openaire/broker/topics/openaire-broker-topics.component.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ <h3 class="border-bottom pb-2">{{'openaire.broker.topics'| translate}}</h3>
1414
[paginationOptions]="paginationConfig"
1515
[collectionSize]="(totalElements$ | async)"
1616
[hideGear]="false"
17-
[hideSortOptions]="true"
1817
(paginationChange)="getOpenaireBrokerTopics()">
1918

2019
<ds-loading class="container" *ngIf="(isTopicsProcessing() | async)" message="'openaire.broker.loading' | translate"></ds-loading>

0 commit comments

Comments
 (0)