Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/app/core/services/user.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import { UserMapper } from '@osf/shared/mappers';
import {
JsonApiResponse,
ProfileSettingsUpdate,
User, UserAcceptedTermsOfServiceJsonApi,
User,
UserAcceptedTermsOfServiceJsonApi,
UserData,
UserDataJsonApi,
UserDataResponseJsonApi,
Expand Down Expand Up @@ -53,7 +54,11 @@ export class UserService {
}

updateUserProfile(userId: string, key: string, data: ProfileSettingsUpdate): Observable<User> {
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
Expand All @@ -63,7 +68,7 @@ export class UserService {
.pipe(map((response) => UserMapper.fromUserGetResponse(response)));
}

updateUserAcceptedTermsOfService(userId: string, data: UserAcceptedTermsOfServiceJsonApi): Observable<User> {
updateUserAcceptedTermsOfService(userId: string, data: UserAcceptedTermsOfServiceJsonApi): Observable<User> {
return this.jsonApiService
.patch<UserDataJsonApi>(`${this.apiUrl}/users/${userId}/`, {
data: { type: 'users', id: userId, attributes: data },
Expand Down
2 changes: 1 addition & 1 deletion src/app/features/files/mappers/resource-metadata.mapper.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
5 changes: 3 additions & 2 deletions src/app/features/files/store/files.state.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
Expand Down
15 changes: 8 additions & 7 deletions src/app/shared/components/files-tree/files-tree.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Loading