Skip to content

Commit 905615d

Browse files
Merge pull request #198 from CenterForOpenScience/feat/242
Feat/242-registrie-metadata
2 parents ad9fa11 + ad37f55 commit 905615d

File tree

109 files changed

+3886
-605
lines changed

Some content is hidden

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

109 files changed

+3886
-605
lines changed

src/app/core/interceptors/auth.interceptor.ts

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,19 @@ export const authInterceptor: HttpInterceptorFn = (
1212
const localStorageToken = localStorage.getItem('authToken');
1313
const token = localStorageToken || authToken;
1414
if (token) {
15-
const authReq = req.clone({
16-
setHeaders: {
17-
Authorization: `Bearer ${token}`,
18-
Accept: req.responseType === 'text' ? '*/*' : 'application/vnd.api+json',
19-
'Content-Type': 'application/vnd.api+json',
20-
},
21-
});
15+
if (!req.url.includes('/api.crossref.org/funders')) {
16+
const authReq = req.clone({
17+
setHeaders: {
18+
Authorization: `Bearer ${token}`,
19+
Accept: req.responseType === 'text' ? '*/*' : 'application/vnd.api+json',
20+
'Content-Type': 'application/vnd.api+json',
21+
},
22+
});
2223

23-
return next(authReq);
24+
return next(authReq);
25+
} else {
26+
return next(req);
27+
}
2428
}
2529

2630
return next(req);

src/app/features/project/metadata/components/project-metadata-funding/project-metadata-funding.component.html

Lines changed: 0 additions & 29 deletions
This file was deleted.

src/app/features/project/metadata/components/project-metadata-subjects/project-metadata-subjects.component.html

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/app/features/project/metadata/components/project-metadata-subjects/project-metadata-subjects.component.ts

Lines changed: 0 additions & 53 deletions
This file was deleted.

src/app/features/project/metadata/dialogs/license-dialog/license-dialog.component.html

Lines changed: 0 additions & 34 deletions
This file was deleted.

src/app/features/project/metadata/dialogs/license-dialog/license-dialog.component.ts

Lines changed: 0 additions & 101 deletions
This file was deleted.

src/app/features/project/metadata/helpers/cedar-metadata.helper.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ export class CedarMetadataHelper {
44

55
return items.map((item) => {
66
const safeItem = typeof item === 'object' && item !== null ? (item as Record<string, unknown>) : {};
7+
78
return {
89
'@id': safeItem['@id'] ?? '',
910
'@type': safeItem['@type'] ?? '',

src/app/features/project/metadata/models/cedar-metadata-template.models.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ export interface CedarMetadataRecordData {
225225
};
226226
target: {
227227
data: {
228-
type: 'nodes';
228+
type: 'nodes' | 'registrations';
229229
id: string;
230230
};
231231
};

src/app/features/project/metadata/pages/add-metadata/add-metadata.component.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import { ChangeDetectionStrategy, Component, DestroyRef, effect, HostBinding, in
99
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
1010
import { ActivatedRoute, Router } from '@angular/router';
1111

12-
import { CedarTemplateFormComponent } from '@osf/features/project/metadata/components';
1312
import {
1413
CedarMetadataDataTemplateJsonApi,
1514
CedarMetadataRecord,
1615
CedarMetadataRecordData,
1716
CedarRecordDataBinding,
1817
} from '@osf/features/project/metadata/models';
1918
import { LoadingSpinnerComponent, SubHeaderComponent } from '@shared/components';
19+
import { CedarTemplateFormComponent } from '@shared/components/shared-metadata/components';
2020
import { ToastService } from '@shared/services';
2121

2222
import {
@@ -57,10 +57,6 @@ export class AddMetadataComponent implements OnInit {
5757
updateCedarMetadataRecord: UpdateCedarMetadataRecord,
5858
});
5959

60-
get isEditingExistingRecord(): boolean {
61-
return !!this.activatedRoute.snapshot.params['record-id'];
62-
}
63-
6460
constructor() {
6561
effect(() => {
6662
const records = this.cedarRecords();

0 commit comments

Comments
 (0)