From b34c369a71cf818df6c5b331d450ecd5849a11a2 Mon Sep 17 00:00:00 2001 From: nsemets Date: Tue, 14 Oct 2025 12:06:24 +0300 Subject: [PATCH] fix(bugs): fixed ui bugs --- .../core/components/layout/layout.component.html | 2 +- .../home/pages/dashboard/dashboard.component.html | 9 --------- .../home/pages/dashboard/dashboard.component.scss | 4 ---- .../overview-wiki/overview-wiki.component.html | 13 +++++++++++-- .../overview-wiki/overview-wiki.component.ts | 14 +++++++++++--- .../registry-resources.component.html | 6 +++++- .../token-add-edit-form.component.ts | 6 ++---- .../settings/tokens/mappers/token.mapper.ts | 1 + .../settings/tokens/models/token-json-api.model.ts | 1 + .../features/settings/tokens/models/token.model.ts | 1 + src/assets/i18n/en.json | 10 +++------- 11 files changed, 36 insertions(+), 31 deletions(-) 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 @@ } @else { - @if (isMedium()) { } + } diff --git a/src/app/features/home/pages/dashboard/dashboard.component.html b/src/app/features/home/pages/dashboard/dashboard.component.html index 1cebfca76..d2e420a6d 100644 --- a/src/app/features/home/pages/dashboard/dashboard.component.html +++ b/src/app/features/home/pages/dashboard/dashboard.component.html @@ -58,15 +58,6 @@

{{ 'home.loggedIn.latestResearch.title' | translate }}

severity="success" /> - -
-
-

{{ 'home.loggedIn.hosting.title' | translate }}

-

{{ 'home.loggedIn.hosting.subtitle' | translate }}

-
- - -
} @else { -

{{ 'project.overview.wiki.title' | translate }}

+
+

{{ 'project.overview.wiki.title' | translate }}

+ +
+ @if (isWikiLoading()) { } @else { @@ -14,7 +23,7 @@

{{ 'project.overview.wiki.title' | translate }}

} @else { -
+
} } diff --git a/src/app/features/project/overview/components/overview-wiki/overview-wiki.component.ts b/src/app/features/project/overview/components/overview-wiki/overview-wiki.component.ts index 186c87cd3..979f1992f 100644 --- a/src/app/features/project/overview/components/overview-wiki/overview-wiki.component.ts +++ b/src/app/features/project/overview/components/overview-wiki/overview-wiki.component.ts @@ -2,25 +2,33 @@ import { select } from '@ngxs/store'; import { TranslatePipe } from '@ngx-translate/core'; +import { Button } from 'primeng/button'; import { Skeleton } from 'primeng/skeleton'; -import { ChangeDetectionStrategy, Component, input } from '@angular/core'; +import { ChangeDetectionStrategy, Component, computed, inject, input } from '@angular/core'; +import { Router } from '@angular/router'; import { MarkdownComponent, TruncatedTextComponent } from '@osf/shared/components'; import { WikiSelectors } from '@osf/shared/stores'; @Component({ selector: 'osf-overview-wiki', - imports: [Skeleton, TranslatePipe, TruncatedTextComponent, MarkdownComponent], + imports: [Skeleton, TranslatePipe, TruncatedTextComponent, MarkdownComponent, Button], templateUrl: './overview-wiki.component.html', styleUrl: './overview-wiki.component.scss', changeDetection: ChangeDetectionStrategy.OnPush, }) export class OverviewWikiComponent { + private readonly router = inject(Router); + isWikiLoading = select(WikiSelectors.getHomeWikiLoading); wikiContent = select(WikiSelectors.getHomeWikiContent); resourceId = input(''); - wikiLink = () => ['/', this.resourceId(), 'wiki']; + wikiLink = computed(() => ['/', this.resourceId(), 'wiki']); + + navigateToWiki() { + this.router.navigate(this.wikiLink()); + } } diff --git a/src/app/features/registry/pages/registry-resources/registry-resources.component.html b/src/app/features/registry/pages/registry-resources/registry-resources.component.html index d03ab0cab..68ffcaef7 100644 --- a/src/app/features/registry/pages/registry-resources/registry-resources.component.html +++ b/src/app/features/registry/pages/registry-resources/registry-resources.component.html @@ -11,7 +11,11 @@ } @else {

- {{ '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",