diff --git a/src/app/core/components/layout/layout.component.html b/src/app/core/components/layout/layout.component.html
index a6b12163d..c67d66397 100644
--- a/src/app/core/components/layout/layout.component.html
+++ b/src/app/core/components/layout/layout.component.html
@@ -9,10 +9,10 @@
{{ 'home.loggedIn.hosting.subtitle' | translate }}
-- {{ 'resources.description' | translate }} + @if (addButtonVisible()) { + {{ 'resources.linkDoi' | translate }} + } + + {{ 'resources.description' | translate }} {{ 'common.labels.learnMore' | translate }} diff --git a/src/app/features/settings/tokens/components/token-add-edit-form/token-add-edit-form.component.ts b/src/app/features/settings/tokens/components/token-add-edit-form/token-add-edit-form.component.ts index 83d098b35..2abd3b83e 100644 --- a/src/app/features/settings/tokens/components/token-add-edit-form/token-add-edit-form.component.ts +++ b/src/app/features/settings/tokens/components/token-add-edit-form/token-add-edit-form.component.ts @@ -64,9 +64,7 @@ export class TokenAddEditFormComponent implements OnInit { }); constructor() { - effect(() => { - return this.isLoading() ? this.tokenForm.disable() : this.tokenForm.enable(); - }); + effect(() => (this.isLoading() ? this.tokenForm.disable() : this.tokenForm.enable())); } ngOnInit(): void { @@ -97,7 +95,7 @@ export class TokenAddEditFormComponent implements OnInit { const tokens = this.store.selectSignal(TokensSelectors.getTokens); const newToken = tokens()[0]; this.dialogRef.close(); - this.showTokenCreatedDialog(newToken.name, newToken.id); + this.showTokenCreatedDialog(newToken.name, newToken.tokenId); }, }); } else { diff --git a/src/app/features/settings/tokens/mappers/token.mapper.ts b/src/app/features/settings/tokens/mappers/token.mapper.ts index 92451a3cf..00a23d80c 100644 --- a/src/app/features/settings/tokens/mappers/token.mapper.ts +++ b/src/app/features/settings/tokens/mappers/token.mapper.ts @@ -16,6 +16,7 @@ export class TokenMapper { static fromGetResponse(response: TokenGetResponseJsonApi): TokenModel { return { id: response.id, + tokenId: response.attributes.token_id, name: response.attributes.name, scopes: response.embeds.scopes.data.map((item) => item.id), }; diff --git a/src/app/features/settings/tokens/models/token-json-api.model.ts b/src/app/features/settings/tokens/models/token-json-api.model.ts index 66bc0ac31..c2875fe9b 100644 --- a/src/app/features/settings/tokens/models/token-json-api.model.ts +++ b/src/app/features/settings/tokens/models/token-json-api.model.ts @@ -16,6 +16,7 @@ export interface TokenGetResponseJsonApi { interface TokenAttributesJsonApi { name: string; + token_id: string; } interface TokenEmbedsJsonApi { diff --git a/src/app/features/settings/tokens/models/token.model.ts b/src/app/features/settings/tokens/models/token.model.ts index 735b29bcd..2174e0e66 100644 --- a/src/app/features/settings/tokens/models/token.model.ts +++ b/src/app/features/settings/tokens/models/token.model.ts @@ -1,5 +1,6 @@ export interface TokenModel { id: string; + tokenId: string; name: string; scopes: string[]; } diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 07489ea56..e29e85ef0 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -326,11 +326,6 @@ "title": "Browse the latest research", "subtitle": "Check out the latest preprints hosted on OSF covering a variety of research areas", "button": "View Preprints" - }, - "hosting": { - "title": "Hosting a conference or meeting?", - "subtitle": "Use the OSF for Meetings service to provide a central location for conference submissions", - "button": "View Meetings" } }, "loggedOut": { @@ -672,7 +667,7 @@ }, "wiki": { "title": "Wiki", - "noWikiMessage": "Add important information, links, or images here to describe your project." + "noWikiMessage": "Click the “Edit” to add important information, links, or images here to describe your project." }, "files": { "title": "Files", @@ -2889,7 +2884,8 @@ }, "resources": { "title": "Resources", - "description": "Link a DOI from a repository to your registration by clicking “Add resource” button. Contributors affirmed to adhere to the criteria for each badge.", + "linkDoi": "Link a DOI from a repository to your registration by clicking “Add resource” button.", + "description": " Contributors affirmed to adhere to the criteria for each badge.", "add": "Add Resource", "edit": "Edit Resource", "delete": "Delete Resource",