From 1cc0fa630cee2646d6937db99b194b89828af545 Mon Sep 17 00:00:00 2001 From: NazarMykhalkevych Date: Sun, 14 Sep 2025 21:56:21 +0300 Subject: [PATCH 1/5] fix(file): rename file issue --- src/app/core/services/user.service.ts | 11 ++++++++--- .../files/mappers/resource-metadata.mapper.ts | 2 +- .../pages/file-detail/file-detail.component.ts | 2 +- src/app/features/files/store/files.state.ts | 5 +++-- .../meetings-landing.component.ts | 14 +++++++------- .../shared-metadata/shared-metadata.component.ts | 2 +- ...ollection-moderation-submissions.component.ts | 12 ++++++------ .../collection-submission-item.component.ts | 6 +++--- .../collection-submissions-list.component.ts | 4 ++-- .../moderators-list/moderators-list.component.ts | 16 ++++++++-------- .../preprint-recent-activity-list.component.ts | 5 +++-- .../preprint-submission-item.component.ts | 4 ++-- .../registry-pending-submissions.component.ts | 11 ++++------- .../preprint-moderation.component.ts | 5 +++-- .../files-tree/files-tree.component.ts | 15 ++++++++------- 15 files changed, 60 insertions(+), 54 deletions(-) diff --git a/src/app/core/services/user.service.ts b/src/app/core/services/user.service.ts index 2db3cdcd5..f2e8e12b6 100644 --- a/src/app/core/services/user.service.ts +++ b/src/app/core/services/user.service.ts @@ -7,7 +7,8 @@ import { UserMapper } from '@osf/shared/mappers'; import { JsonApiResponse, ProfileSettingsUpdate, - User, UserAcceptedTermsOfServiceJsonApi, + User, + UserAcceptedTermsOfServiceJsonApi, UserData, UserDataJsonApi, UserDataResponseJsonApi, @@ -53,7 +54,11 @@ export class UserService { } updateUserProfile(userId: string, key: string, data: ProfileSettingsUpdate): Observable { - let data_formatted = ProfileSettingsKey.User && data.hasOwnProperty('acceptedTermsOfService') ? {accepted_terms_of_service: true} : data; + const data_formatted = + // eslint-disable-next-line no-prototype-builtins + ProfileSettingsKey.User && data.hasOwnProperty('acceptedTermsOfService') + ? { accepted_terms_of_service: true } + : data; const patchedData = key === ProfileSettingsKey.User ? data_formatted : { [key]: data_formatted }; return this.jsonApiService @@ -63,7 +68,7 @@ export class UserService { .pipe(map((response) => UserMapper.fromUserGetResponse(response))); } - updateUserAcceptedTermsOfService(userId: string, data: UserAcceptedTermsOfServiceJsonApi): Observable { + updateUserAcceptedTermsOfService(userId: string, data: UserAcceptedTermsOfServiceJsonApi): Observable { return this.jsonApiService .patch(`${this.apiUrl}/users/${userId}/`, { data: { type: 'users', id: userId, attributes: data }, diff --git a/src/app/features/files/mappers/resource-metadata.mapper.ts b/src/app/features/files/mappers/resource-metadata.mapper.ts index 8e9ed18d2..b5a993af2 100644 --- a/src/app/features/files/mappers/resource-metadata.mapper.ts +++ b/src/app/features/files/mappers/resource-metadata.mapper.ts @@ -1,5 +1,5 @@ -import { IdentifiersMapper } from '@shared/mappers/identifiers.mapper'; import { ResourceMetadata } from '@osf/shared/models'; +import { IdentifiersMapper } from '@shared/mappers/identifiers.mapper'; import { GetResourceCustomMetadataResponse } from '../models/get-resource-custom-metadata-response.model'; import { GetResourceShortInfoResponse } from '../models/get-resource-short-info-response.model'; diff --git a/src/app/features/files/pages/file-detail/file-detail.component.ts b/src/app/features/files/pages/file-detail/file-detail.component.ts index 1b995c8db..318093b6b 100644 --- a/src/app/features/files/pages/file-detail/file-detail.component.ts +++ b/src/app/features/files/pages/file-detail/file-detail.component.ts @@ -41,7 +41,7 @@ import { MetadataResourceEnum, ResourceType } from '@osf/shared/enums'; import { pathJoin } from '@osf/shared/helpers'; import { MetadataTabsModel, OsfFile } from '@osf/shared/models'; import { CustomConfirmationService, MetaTagsService, ToastService } from '@osf/shared/services'; -import { DataciteService } from '@shared/services/datacite/datacite.service'; +import { DataciteService } from '@osf/shared/services/datacite/datacite.service'; import { FileKeywordsComponent, diff --git a/src/app/features/files/store/files.state.ts b/src/app/features/files/store/files.state.ts index d9e572374..2e2afb845 100644 --- a/src/app/features/files/store/files.state.ts +++ b/src/app/features/files/store/files.state.ts @@ -4,9 +4,10 @@ import { catchError, finalize, forkJoin, tap } from 'rxjs'; import { inject, Injectable } from '@angular/core'; -import { MapResourceMetadata } from '@osf/features/files/mappers'; import { handleSectionError } from '@osf/shared/helpers'; -import { FilesService, ToastService } from '@shared/services'; +import { FilesService, ToastService } from '@osf/shared/services'; + +import { MapResourceMetadata } from '../mappers'; import { CreateFolder, diff --git a/src/app/features/meetings/pages/meetings-landing/meetings-landing.component.ts b/src/app/features/meetings/pages/meetings-landing/meetings-landing.component.ts index 1ecbbecd2..20ac9a133 100644 --- a/src/app/features/meetings/pages/meetings-landing/meetings-landing.component.ts +++ b/src/app/features/meetings/pages/meetings-landing/meetings-landing.component.ts @@ -23,16 +23,16 @@ import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop'; import { FormControl } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; -import { Meeting } from '@osf/features/meetings/models'; -import { GetAllMeetings, MeetingsSelectors } from '@osf/features/meetings/store'; -import { SearchInputComponent, SubHeaderComponent } from '@shared/components'; -import { DEFAULT_TABLE_PARAMS } from '@shared/constants'; -import { SortOrder } from '@shared/enums'; -import { parseQueryFilterParams } from '@shared/helpers'; -import { QueryParams, SearchFilters, TableParameters } from '@shared/models'; +import { SearchInputComponent, SubHeaderComponent } from '@osf/shared/components'; +import { DEFAULT_TABLE_PARAMS } from '@osf/shared/constants'; +import { SortOrder } from '@osf/shared/enums'; +import { parseQueryFilterParams } from '@osf/shared/helpers'; +import { QueryParams, SearchFilters, TableParameters } from '@osf/shared/models'; import { MeetingsFeatureCardComponent } from '../../components'; import { MEETINGS_FEATURE_CARDS, PARTNER_ORGANIZATIONS } from '../../constants'; +import { Meeting } from '../../models'; +import { GetAllMeetings, MeetingsSelectors } from '../../store'; @Component({ selector: 'osf-meetings-landing', diff --git a/src/app/features/metadata/components/shared-metadata/shared-metadata.component.ts b/src/app/features/metadata/components/shared-metadata/shared-metadata.component.ts index 551238cae..8e8da97c7 100644 --- a/src/app/features/metadata/components/shared-metadata/shared-metadata.component.ts +++ b/src/app/features/metadata/components/shared-metadata/shared-metadata.component.ts @@ -5,11 +5,11 @@ import { Card } from 'primeng/card'; import { DatePipe } from '@angular/common'; import { ChangeDetectionStrategy, Component, input, output } from '@angular/core'; -import { CustomItemMetadataRecord, Metadata } from '@osf/features/metadata/models'; import { TagsInputComponent } from '@osf/shared/components'; import { ResourceType } from '@osf/shared/enums'; import { Institution, SubjectModel } from '@osf/shared/models'; +import { CustomItemMetadataRecord, Metadata } from '../../models'; import { MetadataAffiliatedInstitutionsComponent } from '../metadata-affiliated-institutions/metadata-affiliated-institutions.component'; import { MetadataContributorsComponent } from '../metadata-contributors/metadata-contributors.component'; import { MetadataDescriptionComponent } from '../metadata-description/metadata-description.component'; diff --git a/src/app/features/moderation/components/collection-moderation-submissions/collection-moderation-submissions.component.ts b/src/app/features/moderation/components/collection-moderation-submissions/collection-moderation-submissions.component.ts index 181ebc0b4..066f90cc8 100644 --- a/src/app/features/moderation/components/collection-moderation-submissions/collection-moderation-submissions.component.ts +++ b/src/app/features/moderation/components/collection-moderation-submissions/collection-moderation-submissions.component.ts @@ -9,11 +9,6 @@ import { ChangeDetectionStrategy, Component, computed, effect, inject, signal } import { FormsModule } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; -import { - CollectionsModerationSelectors, - GetCollectionSubmissions, - GetSubmissionsReviewActions, -} from '@osf/features/moderation/store/collections-moderation'; import { CustomPaginatorComponent, IconComponent, @@ -30,10 +25,15 @@ import { GetCollectionProvider, SearchCollectionSubmissions, SetPageNumber, -} from '@shared/stores'; +} from '@osf/shared/stores'; import { COLLECTIONS_SUBMISSIONS_REVIEW_OPTIONS } from '../../constants'; import { SubmissionReviewStatus } from '../../enums'; +import { + CollectionsModerationSelectors, + GetCollectionSubmissions, + GetSubmissionsReviewActions, +} from '../../store/collections-moderation'; import { CollectionSubmissionsListComponent } from '../collection-submissions-list/collection-submissions-list.component'; @Component({ diff --git a/src/app/features/moderation/components/collection-submission-item/collection-submission-item.component.ts b/src/app/features/moderation/components/collection-submission-item/collection-submission-item.component.ts index a44c3ff3e..7c0f867f7 100644 --- a/src/app/features/moderation/components/collection-submission-item/collection-submission-item.component.ts +++ b/src/app/features/moderation/components/collection-submission-item/collection-submission-item.component.ts @@ -9,13 +9,13 @@ import { ChangeDetectionStrategy, Component, computed, inject, input } from '@an import { ActivatedRoute, Router } from '@angular/router'; import { collectionFilterNames } from '@osf/features/collections/constants'; -import { SubmissionReviewStatus } from '@osf/features/moderation/enums'; import { IconComponent } from '@osf/shared/components'; +import { CollectionSubmissionWithGuid } from '@osf/shared/models'; import { DateAgoPipe } from '@osf/shared/pipes'; -import { CollectionSubmissionWithGuid } from '@shared/models'; -import { CollectionsSelectors } from '@shared/stores'; +import { CollectionsSelectors } from '@osf/shared/stores'; import { ReviewStatusIcon } from '../../constants'; +import { SubmissionReviewStatus } from '../../enums'; @Component({ selector: 'osf-submission-item', diff --git a/src/app/features/moderation/components/collection-submissions-list/collection-submissions-list.component.ts b/src/app/features/moderation/components/collection-submissions-list/collection-submissions-list.component.ts index c2625b282..1bf63272c 100644 --- a/src/app/features/moderation/components/collection-submissions-list/collection-submissions-list.component.ts +++ b/src/app/features/moderation/components/collection-submissions-list/collection-submissions-list.component.ts @@ -4,8 +4,8 @@ import { TranslatePipe } from '@ngx-translate/core'; import { ChangeDetectionStrategy, Component } from '@angular/core'; -import { CollectionSubmissionItemComponent } from '@osf/features/moderation/components/collection-submission-item/collection-submission-item.component'; -import { CollectionsModerationSelectors } from '@osf/features/moderation/store/collections-moderation'; +import { CollectionsModerationSelectors } from '../../store/collections-moderation'; +import { CollectionSubmissionItemComponent } from '../collection-submission-item/collection-submission-item.component'; @Component({ selector: 'osf-submissions-list', diff --git a/src/app/features/moderation/components/moderators-list/moderators-list.component.ts b/src/app/features/moderation/components/moderators-list/moderators-list.component.ts index 123fd3f6f..95bf596be 100644 --- a/src/app/features/moderation/components/moderators-list/moderators-list.component.ts +++ b/src/app/features/moderation/components/moderators-list/moderators-list.component.ts @@ -23,20 +23,20 @@ import { FormControl } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; import { UserSelectors } from '@core/store/user'; -import { AddModeratorType, ModeratorPermission } from '@osf/features/moderation/enums'; -import { ModeratorDialogAddModel, ModeratorModel } from '@osf/features/moderation/models'; +import { SearchInputComponent } from '@osf/shared/components'; +import { ResourceType } from '@osf/shared/enums'; +import { CustomConfirmationService, ToastService } from '@osf/shared/services'; +import { UpdateSearchValue } from '@osf/shared/stores'; + +import { AddModeratorType, ModeratorPermission } from '../../enums'; +import { ModeratorDialogAddModel, ModeratorModel } from '../../models'; import { AddModerator, DeleteModerator, LoadModerators, ModeratorsSelectors, UpdateModerator, - UpdateSearchValue, -} from '@osf/features/moderation/store/moderators'; -import { SearchInputComponent } from '@osf/shared/components'; -import { ResourceType } from '@osf/shared/enums'; -import { CustomConfirmationService, ToastService } from '@osf/shared/services'; - +} from '../../store/moderators'; import { AddModeratorDialogComponent } from '../add-moderator-dialog/add-moderator-dialog.component'; import { InviteModeratorDialogComponent } from '../invite-moderator-dialog/invite-moderator-dialog.component'; import { ModeratorsTableComponent } from '../moderators-table/moderators-table.component'; diff --git a/src/app/features/moderation/components/preprint-recent-activity-list/preprint-recent-activity-list.component.ts b/src/app/features/moderation/components/preprint-recent-activity-list/preprint-recent-activity-list.component.ts index 734ae2e36..49ad896eb 100644 --- a/src/app/features/moderation/components/preprint-recent-activity-list/preprint-recent-activity-list.component.ts +++ b/src/app/features/moderation/components/preprint-recent-activity-list/preprint-recent-activity-list.component.ts @@ -7,10 +7,11 @@ import { TableModule } from 'primeng/table'; import { DatePipe } from '@angular/common'; import { ChangeDetectionStrategy, Component, input, output, signal } from '@angular/core'; -import { PreprintReviewStatus, ReviewStatusIcon } from '@osf/features/moderation/constants'; -import { PreprintReviewActionModel } from '@osf/features/moderation/models'; import { CustomPaginatorComponent, IconComponent } from '@osf/shared/components'; +import { PreprintReviewStatus, ReviewStatusIcon } from '../../constants'; +import { PreprintReviewActionModel } from '../../models'; + @Component({ selector: 'osf-preprint-recent-activity-list', imports: [TableModule, DatePipe, TranslatePipe, IconComponent, Skeleton, CustomPaginatorComponent], diff --git a/src/app/features/moderation/components/preprint-submission-item/preprint-submission-item.component.ts b/src/app/features/moderation/components/preprint-submission-item/preprint-submission-item.component.ts index d53e6a994..b53ddc391 100644 --- a/src/app/features/moderation/components/preprint-submission-item/preprint-submission-item.component.ts +++ b/src/app/features/moderation/components/preprint-submission-item/preprint-submission-item.component.ts @@ -4,11 +4,11 @@ import { Button } from 'primeng/button'; import { ChangeDetectionStrategy, Component, input, output } from '@angular/core'; -import { PREPRINT_ACTION_LABEL, ReviewStatusIcon } from '@osf/features/moderation/constants'; -import { ActionStatus, SubmissionReviewStatus } from '@osf/features/moderation/enums'; import { IconComponent } from '@osf/shared/components'; import { DateAgoPipe } from '@osf/shared/pipes'; +import { PREPRINT_ACTION_LABEL, ReviewStatusIcon } from '../../constants'; +import { ActionStatus, SubmissionReviewStatus } from '../../enums'; import { PreprintSubmission, PreprintWithdrawalSubmission } from '../../models'; @Component({ diff --git a/src/app/features/moderation/components/registry-pending-submissions/registry-pending-submissions.component.ts b/src/app/features/moderation/components/registry-pending-submissions/registry-pending-submissions.component.ts index bee863994..af2f21a42 100644 --- a/src/app/features/moderation/components/registry-pending-submissions/registry-pending-submissions.component.ts +++ b/src/app/features/moderation/components/registry-pending-submissions/registry-pending-submissions.component.ts @@ -13,12 +13,6 @@ import { toSignal } from '@angular/core/rxjs-interop'; import { FormsModule } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; -import { PENDING_SUBMISSION_REVIEW_OPTIONS, REGISTRY_SORT_OPTIONS } from '@osf/features/moderation/constants'; -import { RegistrySort, SubmissionReviewStatus } from '@osf/features/moderation/enums'; -import { - GetRegistrySubmissions, - RegistryModerationSelectors, -} from '@osf/features/moderation/store/registry-moderation'; import { CustomPaginatorComponent, IconComponent, @@ -27,7 +21,10 @@ import { } from '@osf/shared/components'; import { Primitive } from '@osf/shared/helpers'; -import { RegistrySubmissionItemComponent } from '..'; +import { PENDING_SUBMISSION_REVIEW_OPTIONS, REGISTRY_SORT_OPTIONS } from '../../constants'; +import { RegistrySort, SubmissionReviewStatus } from '../../enums'; +import { GetRegistrySubmissions, RegistryModerationSelectors } from '../../store/registry-moderation'; +import { RegistrySubmissionItemComponent } from '../registry-submission-item/registry-submission-item.component'; @Component({ selector: 'osf-registry-pending-submissions', diff --git a/src/app/features/moderation/pages/preprint-moderation/preprint-moderation.component.ts b/src/app/features/moderation/pages/preprint-moderation/preprint-moderation.component.ts index 2890fe2d4..5a07a1385 100644 --- a/src/app/features/moderation/pages/preprint-moderation/preprint-moderation.component.ts +++ b/src/app/features/moderation/pages/preprint-moderation/preprint-moderation.component.ts @@ -7,12 +7,13 @@ import { toSignal } from '@angular/core/rxjs-interop'; import { FormsModule } from '@angular/forms'; import { ActivatedRoute, Router, RouterOutlet } from '@angular/router'; -import { PREPRINT_MODERATION_TABS } from '@osf/features/moderation/constants'; -import { PreprintModerationTab } from '@osf/features/moderation/enums'; import { SelectComponent, SubHeaderComponent } from '@osf/shared/components'; import { ResourceType } from '@osf/shared/enums'; import { IS_MEDIUM, Primitive } from '@osf/shared/helpers'; +import { PREPRINT_MODERATION_TABS } from '../../constants'; +import { PreprintModerationTab } from '../../enums'; + @Component({ selector: 'osf-preprint-moderation', imports: [ diff --git a/src/app/shared/components/files-tree/files-tree.component.ts b/src/app/shared/components/files-tree/files-tree.component.ts index fa143df9b..98a2ee568 100644 --- a/src/app/shared/components/files-tree/files-tree.component.ts +++ b/src/app/shared/components/files-tree/files-tree.component.ts @@ -25,15 +25,16 @@ import { } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { MoveFileDialogComponent, RenameFileDialogComponent } from '@osf/features/files/components'; +import { MoveFileDialogComponent } from '@osf/features/files/components/move-file-dialog/move-file-dialog.component'; +import { RenameFileDialogComponent } from '@osf/features/files/components/rename-file-dialog/rename-file-dialog.component'; import { embedDynamicJs, embedStaticHtml } from '@osf/features/files/constants'; +import { StopPropagationDirective } from '@osf/shared/directives'; import { FileMenuType } from '@osf/shared/enums'; -import { StopPropagationDirective } from '@shared/directives'; -import { hasViewOnlyParam } from '@shared/helpers'; -import { FileLabelModel, FileMenuAction, FilesTreeActions, OsfFile } from '@shared/models'; -import { FileSizePipe } from '@shared/pipes'; -import { CustomConfirmationService, FilesService, ToastService } from '@shared/services'; -import { DataciteService } from '@shared/services/datacite/datacite.service'; +import { hasViewOnlyParam } from '@osf/shared/helpers'; +import { FileLabelModel, FileMenuAction, FilesTreeActions, OsfFile } from '@osf/shared/models'; +import { FileSizePipe } from '@osf/shared/pipes'; +import { CustomConfirmationService, FilesService, ToastService } from '@osf/shared/services'; +import { DataciteService } from '@osf/shared/services/datacite/datacite.service'; import { CustomPaginatorComponent } from '../custom-paginator/custom-paginator.component'; import { FileMenuComponent } from '../file-menu/file-menu.component'; From 4b7993dccce68ceb0254cf093b68a01defad8adf Mon Sep 17 00:00:00 2001 From: NazarMykhalkevych Date: Mon, 15 Sep 2025 10:55:32 +0300 Subject: [PATCH 2/5] fix(file): add server error handler --- src/app/core/interceptors/error.interceptor.ts | 6 ++++++ src/app/features/files/store/files.state.ts | 9 +++++++++ src/assets/i18n/en.json | 3 +++ 3 files changed, 18 insertions(+) diff --git a/src/app/core/interceptors/error.interceptor.ts b/src/app/core/interceptors/error.interceptor.ts index 6019e8c7e..1a24dc46f 100644 --- a/src/app/core/interceptors/error.interceptor.ts +++ b/src/app/core/interceptors/error.interceptor.ts @@ -31,6 +31,12 @@ export const errorInterceptor: HttpInterceptorFn = (req, next) => { } } + const serverErrorRegex = /5\d{2}/; + + if (serverErrorRegex.test(error.status.toString())) { + errorMessage = error.error.message || 'common.errorMessages.serverError'; + } + if (error.status === 401) { if (!hasViewOnlyParam(router)) { authService.logout(); diff --git a/src/app/features/files/store/files.state.ts b/src/app/features/files/store/files.state.ts index 2e2afb845..1e1c691e1 100644 --- a/src/app/features/files/store/files.state.ts +++ b/src/app/features/files/store/files.state.ts @@ -129,6 +129,11 @@ export class FilesState { ctx.dispatch(new GetRootFolderFiles(action.resourceId)); } }, + }), + catchError((error) => { + const state = ctx.getState(); + ctx.patchState({ files: { ...state.files, isLoading: false, error: null } }); + return handleSectionError(ctx, 'files', error); }) ); } @@ -148,6 +153,10 @@ export class FilesState { ctx.dispatch(new GetRootFolderFiles(action.resourceId)); } }, + }), + catchError((error) => { + ctx.patchState({ files: { ...state.files, isLoading: false, error: null } }); + return handleSectionError(ctx, 'files', error); }) ); } diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 82b6e889a..d7178c476 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -156,6 +156,9 @@ "hint": { "tagSeparators": "Use enter or comma to create a tag.", "viewOnlyLinksBanner": "You are viewing OSF through a view-only link, which may limit the data you have permission to see." + }, + "errorMessages": { + "serverError": "An unexpected error occurred. Please try again later." } }, "navigation": { From 0680e6547e91eb2797865d491b4a1cb8b77fc167 Mon Sep 17 00:00:00 2001 From: NazarMykhalkevych Date: Mon, 15 Sep 2025 11:08:00 +0300 Subject: [PATCH 3/5] fix(file): refactor --- src/app/features/files/store/files.state.ts | 3 --- .../add-moderator-dialog/add-moderator-dialog.component.scss | 5 ----- .../add-contributor-dialog.component.scss | 5 ----- 3 files changed, 13 deletions(-) diff --git a/src/app/features/files/store/files.state.ts b/src/app/features/files/store/files.state.ts index 1e1c691e1..a36e38cfc 100644 --- a/src/app/features/files/store/files.state.ts +++ b/src/app/features/files/store/files.state.ts @@ -131,8 +131,6 @@ export class FilesState { }, }), catchError((error) => { - const state = ctx.getState(); - ctx.patchState({ files: { ...state.files, isLoading: false, error: null } }); return handleSectionError(ctx, 'files', error); }) ); @@ -155,7 +153,6 @@ export class FilesState { }, }), catchError((error) => { - ctx.patchState({ files: { ...state.files, isLoading: false, error: null } }); return handleSectionError(ctx, 'files', error); }) ); diff --git a/src/app/features/moderation/components/add-moderator-dialog/add-moderator-dialog.component.scss b/src/app/features/moderation/components/add-moderator-dialog/add-moderator-dialog.component.scss index 59134fadc..f45668c60 100644 --- a/src/app/features/moderation/components/add-moderator-dialog/add-moderator-dialog.component.scss +++ b/src/app/features/moderation/components/add-moderator-dialog/add-moderator-dialog.component.scss @@ -7,11 +7,6 @@ cursor: pointer; } -.users-list { - height: 30vh; - overflow: auto; -} - .border-divider { border-bottom: 1px solid var.$grey-2; } diff --git a/src/app/shared/components/contributors/add-contributor-dialog/add-contributor-dialog.component.scss b/src/app/shared/components/contributors/add-contributor-dialog/add-contributor-dialog.component.scss index a4c3a31e5..866f8bf02 100644 --- a/src/app/shared/components/contributors/add-contributor-dialog/add-contributor-dialog.component.scss +++ b/src/app/shared/components/contributors/add-contributor-dialog/add-contributor-dialog.component.scss @@ -6,11 +6,6 @@ cursor: pointer; } -.users-list { - height: 30vh; - overflow: auto; -} - .border-divider { border-bottom: 1px solid var(--grey-2); } From aea0d7d9418377100a2658141e9046b89e735911 Mon Sep 17 00:00:00 2001 From: nmykhalkevych-exoft Date: Mon, 15 Sep 2025 11:41:05 +0300 Subject: [PATCH 4/5] Update src/app/features/files/store/files.state.ts Co-authored-by: nsemets --- src/app/features/files/store/files.state.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/app/features/files/store/files.state.ts b/src/app/features/files/store/files.state.ts index a36e38cfc..eaee046bc 100644 --- a/src/app/features/files/store/files.state.ts +++ b/src/app/features/files/store/files.state.ts @@ -152,9 +152,7 @@ export class FilesState { } }, }), - catchError((error) => { - return handleSectionError(ctx, 'files', error); - }) + catchError((error) => handleSectionError(ctx, 'files', error)) ); } From 46addfffd831a9c6c0edad616e2f643dada24a8e Mon Sep 17 00:00:00 2001 From: NazarMykhalkevych Date: Mon, 15 Sep 2025 11:42:22 +0300 Subject: [PATCH 5/5] fix(file): refactor --- src/app/features/files/store/files.state.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/app/features/files/store/files.state.ts b/src/app/features/files/store/files.state.ts index eaee046bc..1bc51a8df 100644 --- a/src/app/features/files/store/files.state.ts +++ b/src/app/features/files/store/files.state.ts @@ -130,9 +130,7 @@ export class FilesState { } }, }), - catchError((error) => { - return handleSectionError(ctx, 'files', error); - }) + catchError((error) => handleSectionError(ctx, 'files', error)) ); }