Skip to content

Commit 4642e30

Browse files
fix(prod-bugs): wiki and hide copy file action (#629)
1 parent b6e5d31 commit 4642e30

File tree

4 files changed

+30
-27
lines changed

4 files changed

+30
-27
lines changed

src/app/features/files/components/files-selection-actions/files-selection-actions.component.html

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,37 @@
1414
(onClick)="clearSelection.emit()"
1515
/>
1616
</div>
17+
@if (!hasViewOnly()) {
18+
<div class="flex gap-2 ml-auto">
19+
@if (canUpdateFiles()) {
20+
<p-button
21+
icon="fas fa-arrows-alt"
22+
outlined
23+
raised
24+
[label]="'common.buttons.move' | translate"
25+
(onClick)="moveSelected.emit()"
26+
/>
27+
}
1728

18-
<div class="flex gap-2 ml-auto">
19-
@if (canUpdateFiles()) {
2029
<p-button
21-
icon="fas fa-arrows-alt"
30+
icon="fas fa-copy"
31+
severity="success"
2232
outlined
2333
raised
24-
[label]="'common.buttons.move' | translate"
25-
(onClick)="moveSelected.emit()"
34+
[label]="'common.buttons.copyTo' | translate"
35+
(onClick)="copySelected.emit()"
2636
/>
27-
}
28-
29-
<p-button
30-
icon="fas fa-copy"
31-
severity="success"
32-
outlined
33-
raised
34-
[label]="'common.buttons.copyTo' | translate"
35-
(onClick)="copySelected.emit()"
36-
/>
37-
@if (canUpdateFiles()) {
38-
<p-button
39-
icon="fas fa-trash"
40-
severity="danger"
41-
outlined
42-
raised
43-
[label]="'common.buttons.delete' | translate"
44-
(onClick)="deleteSelected.emit()"
45-
/>
46-
}
47-
</div>
37+
@if (canUpdateFiles()) {
38+
<p-button
39+
icon="fas fa-trash"
40+
severity="danger"
41+
outlined
42+
raised
43+
[label]="'common.buttons.delete' | translate"
44+
(onClick)="deleteSelected.emit()"
45+
/>
46+
}
47+
</div>
48+
}
4849
</div>
4950
}

src/app/features/files/components/files-selection-actions/files-selection-actions.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import { FileModel } from '@osf/shared/models';
1616
export class FilesSelectionActionsComponent {
1717
selectedFiles = input<FileModel[]>([]);
1818
canUpdateFiles = input<boolean>(true);
19+
hasViewOnly = input<boolean>(false);
1920
copySelected = output<void>();
2021
moveSelected = output<void>();
2122
deleteSelected = output<void>();

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<osf-files-selection-actions
3030
[canUpdateFiles]="canUploadFiles()"
3131
[selectedFiles]="filesSelection"
32+
[hasViewOnly]="hasViewOnly()"
3233
(deleteSelected)="onDeleteSelected()"
3334
(moveSelected)="onMoveSelected()"
3435
(copySelected)="onCopySelected()"

src/app/shared/components/wiki/wiki-list/wiki-list.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ <h4 class="ml-2">{{ item.label | translate }}</h4>
6464
@default {
6565
<div>
6666
<i class="far fa-file"></i>
67-
<span class="ml-2">{{ item.label | translate }}</span>
67+
<span class="ml-2">{{ item.label }}</span>
6868
</div>
6969
}
7070
}

0 commit comments

Comments
 (0)