From 094815551f6c712b35a542ae074a9cab28997930 Mon Sep 17 00:00:00 2001 From: NazarMykhalkevych Date: Sat, 11 Oct 2025 16:57:15 +0300 Subject: [PATCH 1/2] fix(prod-bugs): wiki and hide copy file action --- .../files-selection-actions.component.html | 53 ++++++++++--------- .../files-selection-actions.component.ts | 1 + .../files/pages/files/files.component.html | 1 + .../wiki/wiki-list/wiki-list.component.html | 2 +- 4 files changed, 30 insertions(+), 27 deletions(-) diff --git a/src/app/features/files/components/files-selection-actions/files-selection-actions.component.html b/src/app/features/files/components/files-selection-actions/files-selection-actions.component.html index aed5f5983..a5c2a5ffc 100644 --- a/src/app/features/files/components/files-selection-actions/files-selection-actions.component.html +++ b/src/app/features/files/components/files-selection-actions/files-selection-actions.component.html @@ -14,36 +14,37 @@ (onClick)="clearSelection.emit()" /> + @if (!hasViewOnly()) { +
+ @if (canUpdateFiles()) { + + } -
- @if (canUpdateFiles()) { - } - - - @if (canUpdateFiles()) { - - } -
+ @if (canUpdateFiles()) { + + } +
+ } } diff --git a/src/app/features/files/components/files-selection-actions/files-selection-actions.component.ts b/src/app/features/files/components/files-selection-actions/files-selection-actions.component.ts index 3cb2597bd..d21568c95 100644 --- a/src/app/features/files/components/files-selection-actions/files-selection-actions.component.ts +++ b/src/app/features/files/components/files-selection-actions/files-selection-actions.component.ts @@ -16,6 +16,7 @@ import { FileModel } from '@osf/shared/models'; export class FilesSelectionActionsComponent { selectedFiles = input([]); canUpdateFiles = input(true); + hasViewOnly = input(false); copySelected = output(); moveSelected = output(); deleteSelected = output(); diff --git a/src/app/features/files/pages/files/files.component.html b/src/app/features/files/pages/files/files.component.html index 2e25ce491..a47132833 100644 --- a/src/app/features/files/pages/files/files.component.html +++ b/src/app/features/files/pages/files/files.component.html @@ -29,6 +29,7 @@ {{ item.label | translate }} @default {
- {{ item.label | translate }} + {{ item.label }}
} } From 99197fe3a1823e4b70ffc23abcbbd99d9021a19e Mon Sep 17 00:00:00 2001 From: NazarMykhalkevych Date: Sat, 11 Oct 2025 20:14:26 +0300 Subject: [PATCH 2/2] fix(wiki): pagination --- src/app/shared/services/wiki.service.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/app/shared/services/wiki.service.ts b/src/app/shared/services/wiki.service.ts index 4ed7c11fb..8d9a22cb3 100644 --- a/src/app/shared/services/wiki.service.ts +++ b/src/app/shared/services/wiki.service.ts @@ -92,9 +92,13 @@ export class WikiService { } getWikiList(resourceType: ResourceType, resourceId: string): Observable { + const params: Record = { + 'page[size]': 100, + }; + const baseUrl = this.getBaseUrl(resourceType, resourceId); - return this.jsonApiService.get(baseUrl).pipe( + return this.jsonApiService.get(baseUrl, params).pipe( map((response) => ({ wikis: response.data.map((wiki) => WikiMapper.fromGetWikiResponse(wiki)), meta: response.meta, @@ -104,14 +108,19 @@ export class WikiService { getComponentsWikiList(resourceType: ResourceType, resourceId: string): Observable { const resourcePath = this.urlMap.get(resourceType); + const params: Record = { + embed: 'wikis', + 'page[size]': 100, + }; return this.jsonApiService - .get(`${this.apiUrl}/${resourcePath}/${resourceId}/children/?embed=wikis`) + .get(`${this.apiUrl}/${resourcePath}/${resourceId}/children/`, params) .pipe(map((response) => response.data.map((component) => WikiMapper.fromGetComponentsWikiResponse(component)))); } getWikiVersions(wikiId: string): Observable { const params: Record = { embed: 'user', + 'page[size]': 100, 'fields[users]': 'full_name', };