Skip to content

Commit 814813c

Browse files
authored
Fix/(ang-765) - Fixe various bugs (#476)
* fix(ang-767): fixed toggle project publicity dialog * fix(ang-767): changed breakpoint * fix(ang-767): changed breakpoint * fix(ang-765): various bugs fixing
1 parent 729acbf commit 814813c

File tree

4 files changed

+43
-34
lines changed

4 files changed

+43
-34
lines changed

src/app/features/files/pages/files/files.component.html

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,20 @@
99
}
1010

1111
<div class="flex flex-grow-0 w-full sm:w-30rem">
12-
<p-floatlabel class="w-full md:w-56" variant="in">
13-
<p-select
14-
inputId="in_label"
15-
[options]="rootFoldersOptions()"
16-
[(ngModel)]="currentRootFolder"
17-
styleClass="w-full"
18-
variant="filled"
19-
>
20-
<ng-template #selectedItem let-selectedOption>
21-
<p class="provider-name">{{ selectedOption.label }}</p>
22-
</ng-template>
23-
<ng-template #item let-option>
24-
<p class="provider-name">{{ option.label }}</p>
25-
</ng-template>
26-
</p-select>
27-
<label for="in_label">{{ currentRootFolder()?.label }}</label>
28-
</p-floatlabel>
12+
<p-select
13+
inputId="in_label"
14+
[options]="rootFoldersOptions()"
15+
[(ngModel)]="currentRootFolder"
16+
styleClass="w-full"
17+
variant="filled"
18+
>
19+
<ng-template #selectedItem let-selectedOption>
20+
<p class="provider-name">{{ selectedOption.label }}</p>
21+
</ng-template>
22+
<ng-template #item let-option>
23+
<p class="provider-name">{{ option.label }}</p>
24+
</ng-template>
25+
</p-select>
2926
</div>
3027

3128
<div class="flex flex-column gap-4 md:justify-content-between md:flex-row md:flex-wrap">

src/app/features/moderation/components/preprint-recent-activity-list/preprint-recent-activity-list.component.html

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,27 @@
77
</div>
88
} @else {
99
<div class="overflow-auto">
10-
@for (item of reviews(); track $index) {
11-
<div class="recent-activity-item flex align-items-center justify-content-between py-2 white-space-nowrap">
12-
<div class="flex align-items-center gap-1">
13-
<osf-icon
14-
[class]="reviewStatusIcon[item.toState].value"
15-
[iconClass]="reviewStatusIcon[item.toState].icon"
16-
></osf-icon>
17-
<span class="ml-2">{{ item.creator.name }}</span>
18-
<span>{{ preprintReviewStatus[item.toState].label | translate: { name: item.preprint.name } }}</span>
19-
<span>{{ item.provider.name }}</span>
20-
</div>
10+
<div class="w-max">
11+
@for (item of reviews(); track $index) {
12+
<div
13+
class="recent-activity-item flex w-full align-items-center justify-content-between py-2 white-space-nowrap"
14+
>
15+
<div class="flex align-items-center gap-1">
16+
<osf-icon
17+
[class]="reviewStatusIcon[item.toState].value"
18+
[iconClass]="reviewStatusIcon[item.toState].icon"
19+
></osf-icon>
20+
<span class="ml-2">{{ item.creator.name }}</span>
21+
<span>{{ preprintReviewStatus[item.toState].label | translate: { name: item.preprint.name } }}</span>
22+
<span>{{ item.provider.name }}</span>
23+
</div>
2124

22-
<p class="flex flex-wrap gap-1 ml-3">
23-
{{ item.dateModified | date: 'MMM d, y h:mm a' }}
24-
</p>
25-
</div>
26-
}
25+
<p class="flex flex-wrap gap-1 ml-3">
26+
{{ item.dateModified | date: 'MMM d, y h:mm a' }}
27+
</p>
28+
</div>
29+
}
30+
</div>
2731
</div>
2832

2933
@if (totalCount() > 10) {

src/app/shared/components/truncated-text/truncated-text.component.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import { TranslatePipe } from '@ngx-translate/core';
22

33
import { Button } from 'primeng/button';
44

5+
import { timer } from 'rxjs';
6+
57
import { CommonModule } from '@angular/common';
68
import { AfterViewInit, Component, effect, ElementRef, inject, input, signal, viewChild } from '@angular/core';
79
import { Router } from '@angular/router';
@@ -37,8 +39,10 @@ export class TruncatedTextComponent implements AfterViewInit {
3739

3840
constructor() {
3941
effect(() => {
40-
if (this.text()) {
42+
const currentText = this.text();
43+
if (currentText) {
4144
this.isTextExpanded.set(false);
45+
timer(0).subscribe(() => this.checkTextOverflow());
4246
}
4347
});
4448
}

src/styles/overrides/table.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ p-table {
5353
tr:not(.loading-row) {
5454
cursor: pointer;
5555
}
56+
57+
td {
58+
max-width: 20vw;
59+
}
5660
}
5761

5862
.addon-table {

0 commit comments

Comments
 (0)