Fix/files bugs

src/app/app.component.ts

@@ -13,10 +13,13 @@ import { NavigationEnd, Router, RouterOutlet } from '@angular/router';
 import { OSFConfigService } from '@core/services/osf-config.service';
 import { GetCurrentUser } from '@core/store/user';
 import { GetEmails, UserEmailsSelectors } from '@core/store/user-emails';
-import { ConfirmEmailComponent } from '@shared/components';
-import { CookieConsentComponent } from '@shared/components/cookie-consent/cookie-consent.component';
 
-import { FullScreenLoaderComponent, ToastComponent } from './shared/components';
+import {
+  ConfirmEmailComponent,
+  CookieConsentComponent,
+  FullScreenLoaderComponent,
+  ToastComponent,
+} from './shared/components';
 
 import { GoogleTagManagerService } from 'angular-google-tag-manager';
 

src/app/core/components/maintenance-banner/maintenance-banner.component.ts

@@ -5,8 +5,8 @@ import { MessageModule } from 'primeng/message';
 import { CommonModule } from '@angular/common';
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, OnInit } from '@angular/core';
 
-import { Maintenance } from '../../models/maintenance.model';
-import { MaintenanceService } from '../../services/maintenance.service';
+import { Maintenance } from '@core/models/maintenance.model';
+import { MaintenanceService } from '@core/services/maintenance.service';
 
 @Component({
   selector: 'osf-maintenance-banner',

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<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
@@ -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 },

src/app/core/store/user/user.state.ts

@@ -268,23 +268,21 @@ export class UserState {
     };
     const apiRequest = UserMapper.toAcceptedTermsOfServiceRequest(updatePayload);
 
-    return this.userService
-      .updateUserAcceptedTermsOfService(currentUser.id, apiRequest)
-      .pipe(
-        tap((response: User): void => {
-          if (response.acceptedTermsOfService) {
-            ctx.patchState({
-              currentUser: {
-                ...state.currentUser,
-                data: {
-                  ...currentUser,
-                  acceptedTermsOfService: true,
-                },
+    return this.userService.updateUserAcceptedTermsOfService(currentUser.id, apiRequest).pipe(
+      tap((response: User): void => {
+        if (response.acceptedTermsOfService) {
+          ctx.patchState({
+            currentUser: {
+              ...state.currentUser,
+              data: {
+                ...currentUser,
+                acceptedTermsOfService: true,
               },
-            });
-          }
-        })
-      );
+            },
+          });
+        }
+      })
+    );
   }
 
   @Action(ClearCurrentUser)

src/app/features/admin-institutions/admin-institutions.component.ts

@@ -9,8 +9,8 @@ import { ChangeDetectionStrategy, Component, inject, OnInit } from '@angular/cor
 import { ActivatedRoute, Router, RouterOutlet } from '@angular/router';
 
 import { FetchInstitutionById, InstitutionsAdminSelectors } from '@osf/features/admin-institutions/store';
+import { LoadingSpinnerComponent, SelectComponent } from '@osf/shared/components';
 import { Primitive } from '@osf/shared/helpers';
-import { LoadingSpinnerComponent, SelectComponent } from '@shared/components';
 
 import { resourceTabOptions } from './constants';
 import { AdminInstitutionResourceTab } from './enums';

src/app/features/admin-institutions/components/admin-table/admin-table.component.ts

@@ -13,18 +13,13 @@ import { DatePipe } from '@angular/common';
 import { ChangeDetectionStrategy, Component, computed, effect, inject, input, output, signal } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 
-import {
-  TableCellData,
-  TableCellLink,
-  TableColumn,
-  TableIconClickEvent,
-} from '@osf/features/admin-institutions/models';
 import { CustomPaginatorComponent } from '@osf/shared/components';
-import { StopPropagationDirective } from '@shared/directives';
-import { PaginationLinksModel, SearchFilters } from '@shared/models';
+import { StopPropagationDirective } from '@osf/shared/directives';
+import { PaginationLinksModel, SearchFilters } from '@osf/shared/models';
 
 import { DOWNLOAD_OPTIONS } from '../../constants';
 import { DownloadType } from '../../enums';
+import { TableCellData, TableCellLink, TableColumn, TableIconClickEvent } from '../../models';
 
 @Component({
   selector: 'osf-admin-table',

src/app/features/admin-institutions/components/filters-section/filters-section.component.ts

@@ -7,9 +7,9 @@ import { Card } from 'primeng/card';
 
 import { ChangeDetectionStrategy, Component, model } from '@angular/core';
 
-import { FilterChipsComponent, ReusableFilterComponent } from '@shared/components';
-import { StringOrNull } from '@shared/helpers';
-import { DiscoverableFilter } from '@shared/models';
+import { FilterChipsComponent, ReusableFilterComponent } from '@osf/shared/components';
+import { StringOrNull } from '@osf/shared/helpers';
+import { DiscoverableFilter } from '@osf/shared/models';
 import {
   ClearFilterSearchResults,
   FetchResources,
@@ -20,7 +20,7 @@ import {
   LoadMoreFilterOptions,
   SetDefaultFilterValue,
   UpdateFilterValue,
-} from '@shared/stores/global-search';
+} from '@osf/shared/stores/global-search';
 
 @Component({
   selector: 'osf-institution-resource-table-filters',

src/app/features/admin-institutions/pages/institutions-summary/institutions-summary.component.ts

@@ -5,8 +5,8 @@ import { TranslatePipe, TranslateService } from '@ngx-translate/core';
 import { ChangeDetectionStrategy, Component, effect, inject, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 
-import { BarChartComponent, LoadingSpinnerComponent, StatisticCardComponent } from '@shared/components';
-import { DoughnutChartComponent } from '@shared/components/doughnut-chart/doughnut-chart.component';
+import { BarChartComponent, LoadingSpinnerComponent, StatisticCardComponent } from '@osf/shared/components';
+import { DoughnutChartComponent } from '@osf/shared/components/doughnut-chart/doughnut-chart.component';
 import { DatasetInput, SelectOption } from '@shared/models';
 
 import {

src/app/features/auth/pages/reset-password/reset-password.component.ts

@@ -9,8 +9,8 @@ import { FormBuilder, ReactiveFormsModule, Validators } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
 
 import { AuthService } from '@osf/core/services';
+import { PasswordInputHintComponent } from '@osf/shared/components';
 import { CustomValidators, PASSWORD_REGEX } from '@osf/shared/helpers';
-import { PasswordInputHintComponent } from '@shared/components';
 
 import { ResetPasswordFormGroupType } from '../../models';
 

src/app/features/collections/components/add-to-collection/add-to-collection-confirmation-dialog/add-to-collection-confirmation-dialog.component.ts

@@ -10,9 +10,9 @@ import { forkJoin, of } from 'rxjs';
 import { ChangeDetectionStrategy, Component, DestroyRef, inject, signal } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
-import { CreateCollectionSubmission } from '@osf/features/collections/store/add-to-collection/add-to-collection.actions';
+import { CreateCollectionSubmission } from '@osf/features/collections/store/add-to-collection';
 import { UpdateProjectPublicStatus } from '@osf/features/project/overview/store';
-import { ToastService } from '@shared/services';
+import { ToastService } from '@osf/shared/services';
 
 @Component({
   selector: 'osf-add-to-collection-confirmation-dialog',

src/app/features/collections/components/add-to-collection/add-to-collection.component.ts

@@ -27,7 +27,7 @@ import {
   ClearAddToCollectionState,
   CreateCollectionSubmission,
 } from '@osf/features/collections/store/add-to-collection';
-import { LoadingSpinnerComponent } from '@shared/components';
+import { LoadingSpinnerComponent } from '@osf/shared/components';
 import { HeaderStyleHelper } from '@shared/helpers';
 import { CanDeactivateComponent } from '@shared/models';
 import { BrandService } from '@shared/services';

src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.ts

@@ -13,7 +13,7 @@ import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angula
 import { collectionFilterTypes } from '@osf/features/collections/constants/filter-types.const';
 import { AddToCollectionSteps } from '@osf/features/collections/enums';
 import { CollectionFilterEntry } from '@osf/features/collections/models';
-import { CollectionsSelectors, GetCollectionDetails } from '@shared/stores';
+import { CollectionsSelectors, GetCollectionDetails } from '@osf/shared/stores';
 
 @Component({
   selector: 'osf-collection-metadata-step',

src/app/features/collections/components/add-to-collection/project-contributors-step/project-contributors-step.component.ts

@@ -7,8 +7,7 @@ import { DialogService } from 'primeng/dynamicdialog';
 import { Step, StepItem, StepPanel } from 'primeng/stepper';
 import { Tooltip } from 'primeng/tooltip';
 
-import { forkJoin } from 'rxjs';
-import { filter } from 'rxjs/operators';
+import { filter, forkJoin } from 'rxjs';
 
 import { ChangeDetectionStrategy, Component, DestroyRef, effect, inject, input, output, signal } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';

src/app/features/collections/components/add-to-collection/project-metadata-step/project-metadata-step.component.ts

@@ -30,18 +30,15 @@ import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
 
 import { AddToCollectionSteps, ProjectMetadataFormControls } from '@osf/features/collections/enums';
 import { ProjectMetadataForm } from '@osf/features/collections/models';
-import { ProjectMetadataFormService } from '@osf/features/collections/services/project-metadata-form.service';
-import { GetCollectionLicenses } from '@osf/features/collections/store/add-to-collection/add-to-collection.actions';
-import { AddToCollectionSelectors } from '@osf/features/collections/store/add-to-collection/add-to-collection.selectors';
-import { TagsInputComponent, TextInputComponent, TruncatedTextComponent } from '@shared/components';
-import { InputLimits } from '@shared/constants';
-import { ResourceType } from '@shared/enums';
-import { LicenseModel } from '@shared/models';
-import { Project } from '@shared/models/projects';
-import { InterpolatePipe } from '@shared/pipes';
-import { ToastService } from '@shared/services';
-import { ClearProjects, GetAllContributors, UpdateProjectMetadata } from '@shared/stores';
-import { ProjectsSelectors } from '@shared/stores/projects/projects.selectors';
+import { ProjectMetadataFormService } from '@osf/features/collections/services';
+import { AddToCollectionSelectors, GetCollectionLicenses } from '@osf/features/collections/store/add-to-collection';
+import { TagsInputComponent, TextInputComponent, TruncatedTextComponent } from '@osf/shared/components';
+import { InputLimits } from '@osf/shared/constants';
+import { ResourceType } from '@osf/shared/enums';
+import { LicenseModel, Project } from '@osf/shared/models';
+import { InterpolatePipe } from '@osf/shared/pipes';
+import { ToastService } from '@osf/shared/services';
+import { ClearProjects, GetAllContributors, ProjectsSelectors, UpdateProjectMetadata } from '@osf/shared/stores';
 
 @Component({
   selector: 'osf-project-metadata-step',

src/app/features/collections/components/add-to-collection/select-project-step/select-project-step.component.ts

@@ -8,8 +8,8 @@ import { Step, StepItem, StepPanel } from 'primeng/stepper';
 import { ChangeDetectionStrategy, Component, computed, input, output, signal } from '@angular/core';
 
 import { AddToCollectionSteps } from '@osf/features/collections/enums';
+import { ProjectSelectorComponent } from '@osf/shared/components';
 import { SetSelectedProject } from '@osf/shared/stores';
-import { ProjectSelectorComponent } from '@shared/components';
 import { Project } from '@shared/models/projects';
 import { CollectionsSelectors, GetUserCollectionSubmissions } from '@shared/stores/collections';
 import { ProjectsSelectors } from '@shared/stores/projects/projects.selectors';

src/app/features/collections/components/collections-discover/collections-discover.component.ts

@@ -12,12 +12,10 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormControl } from '@angular/forms';
 import { ActivatedRoute, Router, RouterLink } from '@angular/router';
 
-import { CollectionsHelpDialogComponent, CollectionsMainContentComponent } from '@osf/features/collections/components';
-import { CollectionsQuerySyncService } from '@osf/features/collections/services';
-import { LoadingSpinnerComponent, SearchInputComponent } from '@shared/components';
-import { HeaderStyleHelper } from '@shared/helpers';
-import { CollectionsFilters } from '@shared/models';
-import { BrandService } from '@shared/services';
+import { LoadingSpinnerComponent, SearchInputComponent } from '@osf/shared/components';
+import { HeaderStyleHelper } from '@osf/shared/helpers';
+import { CollectionsFilters } from '@osf/shared/models';
+import { BrandService } from '@osf/shared/services';
 import {
   ClearCollections,
   ClearCollectionSubmissions,
@@ -27,7 +25,11 @@ import {
   SearchCollectionSubmissions,
   SetPageNumber,
   SetSearchValue,
-} from '@shared/stores/collections';
+} from '@osf/shared/stores';
+
+import { CollectionsQuerySyncService } from '../../services';
+import { CollectionsHelpDialogComponent } from '../collections-help-dialog/collections-help-dialog.component';
+import { CollectionsMainContentComponent } from '../collections-main-content';
 
 @Component({
   selector: 'osf-collections-discover',

src/app/features/collections/components/collections-filter-chips/collections-filter-chips.component.ts

@@ -4,8 +4,6 @@ import { Chip } from 'primeng/chip';
 
 import { ChangeDetectionStrategy, Component, computed } from '@angular/core';
 
-import { collectionFilterTypes } from '@osf/features/collections/constants/filter-types.const';
-import { CollectionFilterType } from '@osf/features/collections/enums';
 import {
   CollectionsSelectors,
   SetCollectedTypeFilters,
@@ -18,7 +16,10 @@ import {
   SetStatusFilters,
   SetStudyDesignFilters,
   SetVolumeFilters,
-} from '@shared/stores/collections';
+} from '@osf/shared/stores';
+
+import { collectionFilterTypes } from '../../constants/filter-types.const';
+import { CollectionFilterType } from '../../enums';
 
 @Component({
   selector: 'osf-collections-filter-chips',

src/app/features/collections/components/collections-filters/collections-filters.component.ts

@@ -8,8 +8,6 @@ import { MultiSelect, MultiSelectChangeEvent } from 'primeng/multiselect';
 import { ChangeDetectionStrategy, Component, computed } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 
-import { collectionFilterTypes } from '@osf/features/collections/constants/filter-types.const';
-import { CollectionFilterType } from '@osf/features/collections/enums';
 import {
   CollectionsSelectors,
   SetCollectedTypeFilters,
@@ -22,7 +20,10 @@ import {
   SetStatusFilters,
   SetStudyDesignFilters,
   SetVolumeFilters,
-} from '@shared/stores/collections';
+} from '@osf/shared/stores';
+
+import { collectionFilterTypes } from '../../constants/filter-types.const';
+import { CollectionFilterType } from '../../enums';
 
 @Component({
   selector: 'osf-collections-filters',

src/app/features/collections/components/collections-main-content/collections-main-content.component.ts

@@ -10,11 +10,11 @@ import { ChangeDetectionStrategy, Component, computed, inject, signal } from '@a
 import { toSignal } from '@angular/core/rxjs-interop';
 import { FormsModule } from '@angular/forms';
 
-import { CollectionsFilterChipsComponent } from '@osf/features/collections/components';
-import { collectionsSortOptions } from '@osf/features/collections/constants';
 import { IS_WEB } from '@osf/shared/helpers';
-import { CollectionsSelectors, SetSortBy } from '@shared/stores/collections';
+import { CollectionsSelectors, SetSortBy } from '@osf/shared/stores';
 
+import { collectionsSortOptions } from '../../constants';
+import { CollectionsFilterChipsComponent } from '../collections-filter-chips/collections-filter-chips.component';
 import { CollectionsFiltersComponent } from '../collections-filters/collections-filters.component';
 import { CollectionsSearchResultsComponent } from '../collections-search-results/collections-search-results.component';
 

src/app/features/collections/components/collections-search-result-card/collections-search-result-card.component.ts

@@ -3,8 +3,9 @@ import { TranslatePipe } from '@ngx-translate/core';
 import { DatePipe } from '@angular/common';
 import { ChangeDetectionStrategy, Component, computed, input } from '@angular/core';
 
-import { collectionFilterNames } from '@osf/features/collections/constants';
-import { CollectionSubmissionWithGuid } from '@shared/models';
+import { CollectionSubmissionWithGuid } from '@osf/shared/models';
+
+import { collectionFilterNames } from '../../constants';
 
 @Component({
   selector: 'osf-collections-search-result-card',

src/app/features/collections/components/collections-search-results/collections-search-results.component.ts

@@ -9,7 +9,7 @@ import { Skeleton } from 'primeng/skeleton';
 import { ChangeDetectionStrategy, Component, computed } from '@angular/core';
 
 import { CustomPaginatorComponent } from '@osf/shared/components';
-import { CollectionsSelectors, SetPageNumber } from '@shared/stores/collections';
+import { CollectionsSelectors, SetPageNumber } from '@osf/shared/stores';
 
 import { CollectionsSearchResultCardComponent } from '../collections-search-result-card/collections-search-result-card.component';
 

src/app/features/files/components/file-keywords/file-keywords.component.ts

@@ -11,8 +11,8 @@ import { ChangeDetectionStrategy, Component, DestroyRef, inject } from '@angular
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormControl, ReactiveFormsModule, Validators } from '@angular/forms';
 
+import { InputLimits } from '@osf/shared/constants';
 import { CustomValidators } from '@osf/shared/helpers';
-import { InputLimits } from '@shared/constants';
 
 import { FilesSelectors, UpdateTags } from '../../store';
 

src/app/features/files/components/file-revisions/file-revisions.component.ts

@@ -13,9 +13,8 @@ import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
 import { toObservable, toSignal } from '@angular/core/rxjs-interop';
 import { ActivatedRoute } from '@angular/router';
 
-import { CopyButtonComponent } from '@osf/shared/components';
-import { InfoIconComponent } from '@osf/shared/components/info-icon/info-icon.component';
-import { DataciteService } from '@shared/services/datacite/datacite.service';
+import { CopyButtonComponent, InfoIconComponent } from '@osf/shared/components';
+import { DataciteService } from '@osf/shared/services/datacite/datacite.service';
 
 import { FilesSelectors } from '../../store';