From dd740cba65c8cd1bba4752b08457f35684554180 Mon Sep 17 00:00:00 2001 From: Roman Nastyuk Date: Tue, 23 Sep 2025 17:51:57 +0300 Subject: [PATCH 1/4] fix(ang-767): fixed toggle project publicity dialog --- .../overview-toolbar/overview-toolbar.component.ts | 8 +++++--- .../toggle-publicity-dialog.component.html | 6 +++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/app/features/project/overview/components/overview-toolbar/overview-toolbar.component.ts b/src/app/features/project/overview/components/overview-toolbar/overview-toolbar.component.ts index 3a7014766..f23f47388 100644 --- a/src/app/features/project/overview/components/overview-toolbar/overview-toolbar.component.ts +++ b/src/app/features/project/overview/components/overview-toolbar/overview-toolbar.component.ts @@ -12,7 +12,7 @@ import { timer } from 'rxjs'; import { NgClass } from '@angular/common'; import { ChangeDetectionStrategy, Component, computed, DestroyRef, effect, inject, input, signal } from '@angular/core'; -import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; +import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop'; import { FormsModule } from '@angular/forms'; import { ActivatedRoute, Router, RouterLink } from '@angular/router'; @@ -29,7 +29,7 @@ import { MyResourcesSelectors, RemoveResourceFromBookmarks, } from '@osf/shared/stores'; -import { hasViewOnlyParam } from '@shared/helpers'; +import { hasViewOnlyParam, IS_XSMALL } from '@shared/helpers'; import { SocialsShareActionItem } from '../../models'; import { DuplicateDialogComponent } from '../duplicate-dialog/duplicate-dialog.component'; @@ -66,6 +66,7 @@ export class OverviewToolbarComponent { destroyRef = inject(DestroyRef); isPublic = signal(false); isBookmarked = signal(false); + isMobile = toSignal(inject(IS_XSMALL)); isCollectionsRoute = input(false); canEdit = input.required(); @@ -144,6 +145,7 @@ export class OverviewToolbarComponent { handleToggleProjectPublicity(): void { const resource = this.currentResource(); if (!resource) return; + const dialogWidth = this.isMobile() ? '95vw' : '600px'; const isCurrentlyPublic = resource.isPublic; const newPublicStatus = !isCurrentlyPublic; @@ -154,7 +156,7 @@ export class OverviewToolbarComponent { this.dialogService.open(TogglePublicityDialogComponent, { focusOnShow: false, - width: '40vw', + width: dialogWidth, header: this.translateService.instant( isCurrentlyPublic ? 'project.overview.dialog.makePrivate.header' : 'project.overview.dialog.makePublic.header' ), diff --git a/src/app/features/project/overview/components/toggle-publicity-dialog/toggle-publicity-dialog.component.html b/src/app/features/project/overview/components/toggle-publicity-dialog/toggle-publicity-dialog.component.html index beb31db2e..26a5975d1 100644 --- a/src/app/features/project/overview/components/toggle-publicity-dialog/toggle-publicity-dialog.component.html +++ b/src/app/features/project/overview/components/toggle-publicity-dialog/toggle-publicity-dialog.component.html @@ -1,11 +1,13 @@
-
+
From 1a9b76a8a7a5c664e339932bf5ff7311b404655f Mon Sep 17 00:00:00 2001 From: Roman Nastyuk Date: Tue, 23 Sep 2025 18:09:13 +0300 Subject: [PATCH 2/4] fix(ang-767): changed breakpoint --- .../components/overview-toolbar/overview-toolbar.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/features/project/overview/components/overview-toolbar/overview-toolbar.component.ts b/src/app/features/project/overview/components/overview-toolbar/overview-toolbar.component.ts index f23f47388..9039afcce 100644 --- a/src/app/features/project/overview/components/overview-toolbar/overview-toolbar.component.ts +++ b/src/app/features/project/overview/components/overview-toolbar/overview-toolbar.component.ts @@ -29,7 +29,7 @@ import { MyResourcesSelectors, RemoveResourceFromBookmarks, } from '@osf/shared/stores'; -import { hasViewOnlyParam, IS_XSMALL } from '@shared/helpers'; +import { hasViewOnlyParam, IS_SMALL } from '@shared/helpers'; import { SocialsShareActionItem } from '../../models'; import { DuplicateDialogComponent } from '../duplicate-dialog/duplicate-dialog.component'; @@ -66,7 +66,7 @@ export class OverviewToolbarComponent { destroyRef = inject(DestroyRef); isPublic = signal(false); isBookmarked = signal(false); - isMobile = toSignal(inject(IS_XSMALL)); + isMobile = toSignal(inject(IS_SMALL)); isCollectionsRoute = input(false); canEdit = input.required(); From 07c420e75e8ef8c5e9b5630fb614645c4f0c47b6 Mon Sep 17 00:00:00 2001 From: Roman Nastyuk Date: Wed, 24 Sep 2025 10:00:49 +0300 Subject: [PATCH 3/4] fix(ang-767): changed breakpoint --- .../overview-toolbar/overview-toolbar.component.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/features/project/overview/components/overview-toolbar/overview-toolbar.component.ts b/src/app/features/project/overview/components/overview-toolbar/overview-toolbar.component.ts index 9039afcce..bcaf905f9 100644 --- a/src/app/features/project/overview/components/overview-toolbar/overview-toolbar.component.ts +++ b/src/app/features/project/overview/components/overview-toolbar/overview-toolbar.component.ts @@ -29,7 +29,7 @@ import { MyResourcesSelectors, RemoveResourceFromBookmarks, } from '@osf/shared/stores'; -import { hasViewOnlyParam, IS_SMALL } from '@shared/helpers'; +import { hasViewOnlyParam, IS_MEDIUM } from '@shared/helpers'; import { SocialsShareActionItem } from '../../models'; import { DuplicateDialogComponent } from '../duplicate-dialog/duplicate-dialog.component'; @@ -66,7 +66,7 @@ export class OverviewToolbarComponent { destroyRef = inject(DestroyRef); isPublic = signal(false); isBookmarked = signal(false); - isMobile = toSignal(inject(IS_SMALL)); + isTablet = toSignal(inject(IS_MEDIUM)); isCollectionsRoute = input(false); canEdit = input.required(); @@ -145,7 +145,7 @@ export class OverviewToolbarComponent { handleToggleProjectPublicity(): void { const resource = this.currentResource(); if (!resource) return; - const dialogWidth = this.isMobile() ? '95vw' : '600px'; + const dialogWidth = this.isTablet() ? '600px' : '95vw'; const isCurrentlyPublic = resource.isPublic; const newPublicStatus = !isCurrentlyPublic; From 41d1e7ef8ea6100b3cac9dc1cbb5b12b3c961ff9 Mon Sep 17 00:00:00 2001 From: Roman Nastyuk Date: Wed, 24 Sep 2025 17:58:06 +0300 Subject: [PATCH 4/4] fix(ang-765): various bugs fixing --- .../files/pages/files/files.component.html | 31 ++++++++-------- ...eprint-recent-activity-list.component.html | 36 ++++++++++--------- .../truncated-text.component.ts | 6 +++- src/styles/overrides/table.scss | 4 +++ 4 files changed, 43 insertions(+), 34 deletions(-) diff --git a/src/app/features/files/pages/files/files.component.html b/src/app/features/files/pages/files/files.component.html index a89194f1b..00615be84 100644 --- a/src/app/features/files/pages/files/files.component.html +++ b/src/app/features/files/pages/files/files.component.html @@ -9,23 +9,20 @@ }
- - - -

{{ selectedOption.label }}

-
- -

{{ option.label }}

-
-
- -
+ + +

{{ selectedOption.label }}

+
+ +

{{ option.label }}

+
+
diff --git a/src/app/features/moderation/components/preprint-recent-activity-list/preprint-recent-activity-list.component.html b/src/app/features/moderation/components/preprint-recent-activity-list/preprint-recent-activity-list.component.html index 6b80baedf..ed8d0f716 100644 --- a/src/app/features/moderation/components/preprint-recent-activity-list/preprint-recent-activity-list.component.html +++ b/src/app/features/moderation/components/preprint-recent-activity-list/preprint-recent-activity-list.component.html @@ -7,23 +7,27 @@
} @else {
- @for (item of reviews(); track $index) { -
-
- - {{ item.creator.name }} - {{ preprintReviewStatus[item.toState].label | translate: { name: item.preprint.name } }} - {{ item.provider.name }} -
+
+ @for (item of reviews(); track $index) { +
+
+ + {{ item.creator.name }} + {{ preprintReviewStatus[item.toState].label | translate: { name: item.preprint.name } }} + {{ item.provider.name }} +
-

- {{ item.dateModified | date: 'MMM d, y h:mm a' }} -

-
- } +

+ {{ item.dateModified | date: 'MMM d, y h:mm a' }} +

+
+ } +
@if (totalCount() > 10) { diff --git a/src/app/shared/components/truncated-text/truncated-text.component.ts b/src/app/shared/components/truncated-text/truncated-text.component.ts index dce11c821..b6c7d3d10 100644 --- a/src/app/shared/components/truncated-text/truncated-text.component.ts +++ b/src/app/shared/components/truncated-text/truncated-text.component.ts @@ -2,6 +2,8 @@ import { TranslatePipe } from '@ngx-translate/core'; import { Button } from 'primeng/button'; +import { timer } from 'rxjs'; + import { CommonModule } from '@angular/common'; import { AfterViewInit, Component, effect, ElementRef, inject, input, signal, viewChild } from '@angular/core'; import { Router } from '@angular/router'; @@ -37,8 +39,10 @@ export class TruncatedTextComponent implements AfterViewInit { constructor() { effect(() => { - if (this.text()) { + const currentText = this.text(); + if (currentText) { this.isTextExpanded.set(false); + timer(0).subscribe(() => this.checkTextOverflow()); } }); } diff --git a/src/styles/overrides/table.scss b/src/styles/overrides/table.scss index 78d7c239b..a27d956b4 100644 --- a/src/styles/overrides/table.scss +++ b/src/styles/overrides/table.scss @@ -53,6 +53,10 @@ p-table { tr:not(.loading-row) { cursor: pointer; } + + td { + max-width: 20vw; + } } .addon-table {