Merge branch 'refs/heads/main' into fix/search-updates

Author: rrromchIk

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

@@ -145,6 +145,8 @@ export class UserState {
  data: user,
  },
  });
+
+ localStorage.setItem('currentUser', JSON.stringify(user));
  })
  );
  }
@@ -168,6 +170,8 @@ export class UserState {
  data: user,
  },
  });
+
+ localStorage.setItem('currentUser', JSON.stringify(user));
  })
  );
  }
@@ -191,6 +195,8 @@ export class UserState {
  data: user,
  },
  });
+
+ localStorage.setItem('currentUser', JSON.stringify(user));
  })
  );
  }
@@ -221,6 +227,8 @@ export class UserState {
  data: user,
  },
  });
+
+ localStorage.setItem('currentUser', JSON.stringify(user));
  })
  );
  }

src/app/features/my-projects/components/create-project-dialog/create-project-dialog.component.ts

@@ -8,12 +8,12 @@ import { DynamicDialogRef } from 'primeng/dynamicdialog';
 import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 
+import { AddProjectFormComponent } from '@osf/shared/components';
 import { MY_PROJECTS_TABLE_PARAMS } from '@osf/shared/constants';
+import { ProjectFormControls } from '@osf/shared/enums';
 import { CustomValidators } from '@osf/shared/helpers';
-import { AddProjectFormComponent } from '@shared/components';
-import { ProjectFormControls } from '@shared/enums';
-import { ProjectForm } from '@shared/models';
-import { CreateProject, GetMyProjects, MyResourcesSelectors } from '@shared/stores';
+import { ProjectForm } from '@osf/shared/models';
+import { CreateProject, GetMyProjects, MyResourcesSelectors } from '@osf/shared/stores';
 
 @Component({
  selector: 'osf-create-project-dialog',

src/app/features/my-projects/mappers/my-resources.mapper.ts

@@ -1,4 +1,4 @@
-import { MyResourcesItem, MyResourcesItemGetResponseJsonApi } from 'src/app/shared/models/my-resources';
+import { MyResourcesItem, MyResourcesItemGetResponseJsonApi } from '@osf/shared/models';
 
 export class MyResourcesMapper {
  static fromResponse(response: MyResourcesItemGetResponseJsonApi): MyResourcesItem {

src/app/features/my-projects/my-projects.component.ts

@@ -23,27 +23,26 @@ import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop';
 import { FormControl, FormsModule } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 
-import { CreateProjectDialogComponent } from '@osf/features/my-projects/components';
 import { MyProjectsTableComponent, SelectComponent, SubHeaderComponent } from '@osf/shared/components';
 import { MY_PROJECTS_TABLE_PARAMS } from '@osf/shared/constants';
 import { ResourceType, SortOrder } from '@osf/shared/enums';
 import { IS_MEDIUM, parseQueryFilterParams } from '@osf/shared/helpers';
-import { QueryParams, TableParameters } from '@osf/shared/models';
-import { BookmarksSelectors, GetBookmarksCollectionId } from '@osf/shared/stores';
+import { MyResourcesItem, MyResourcesSearchFilters, QueryParams, TableParameters } from '@osf/shared/models';
 import {
+ BookmarksSelectors,
  ClearMyResources,
+ GetBookmarksCollectionId,
  GetMyBookmarks,
  GetMyPreprints,
  GetMyProjects,
  GetMyRegistrations,
  MyResourcesSelectors,
-} from '@shared/stores';
+} from '@osf/shared/stores';
 
+import { CreateProjectDialogComponent } from './components';
 import { MY_PROJECTS_TABS } from './constants';
 import { MyProjectsTab } from './enums';
 
-import { MyResourcesItem, MyResourcesSearchFilters } from 'src/app/shared/models/my-resources';
-
 @Component({
  selector: 'osf-my-projects',
  imports: [

src/app/features/preprints/pages/landing/preprints-landing.component.html

@@ -73,7 +73,7 @@ <h2 class="text-2xl">{{ 'preprints.createServer.title' | translate }}</h2>
  </a>
  {{ 'preprints.createServer.and' | translate }}
  <a class="font-bold" href="https://www.cos.io/product-roadmap" target="_blank">
- {{ 'preprints.createServer.publicRoadmap' | translate }} </a
+ {{ 'preprints.createServer.publicRoadmap' | translate }}</a
  >. {{ 'preprints.createServer.inputWelcome' | translate }}
  </p>
  </div>

src/app/features/project/analytics/components/view-duplicates/view-duplicates.component.html

@@ -8,7 +8,7 @@
 <div class="flex flex-column flex-1 bg-white gap-5 p-3 sm:p-4">
  @if (!isDuplicatesLoading() && currentResource()) {
  @if (!duplicates().length) {
- <h3 class="mt-5 text-center">{{ 'project.overview.dialog.fork.noForksMessage' | translate }}</h3>
+ <p class="mt-5 text-center">{{ 'project.overview.dialog.fork.noForksMessage' | translate }}</p>
  } @else {
  <p>{{ 'project.overview.dialog.fork.forksMessage' | translate }}</p>
 
@@ -63,7 +63,7 @@ <h2 class="flex align-items-center gap-2">
  </div>
 
  <div class="component-description">
- <div class="flex flex-wrap align-items-center gap-1">
+ <div class="flex flex-wrap align-items-baseline gap-1">
  <span class="font-bold">{{ 'common.labels.description' | translate }}:</span>
  <osf-truncated-text [text]="duplicate.description" />
  </div>

src/app/features/project/contributors/components/create-view-link-dialog/create-view-link-dialog.component.html

@@ -49,15 +49,15 @@
  <p-button
  class="w-full"
  styleClass="w-full"
- (click)="dialogRef.close()"
+ (onClick)="dialogRef.close()"
  severity="info"
  [label]="'project.contributors.addDialog.cancel' | translate"
  ></p-button>
 
  <p-button
  class="w-full"
  styleClass="w-full"
- (click)="addLink()"
+ (onClick)="addLink()"
  [label]="'project.contributors.addDialog.next' | translate"
  ></p-button>
  </div>

src/app/features/project/contributors/contributors.component.html

@@ -4,7 +4,7 @@ <h1 class="py-5 px-3 md:px-5 xl:px-4">{{ 'navigation.contributors' | translate }
  <p-button
  [label]="'project.contributors.addContributor' | translate"
  [disabled]="isContributorsLoading()"
- (click)="openAddContributorDialog()"
+ (onClick)="openAddContributorDialog()"
  ></p-button>
 
  <div class="filters-container flex flex-column xl:flex-row">
@@ -73,13 +73,13 @@ <h1 class="py-5 px-3 md:px-5 xl:px-4">{{ 'navigation.contributors' | translate }
  <p-button
  class="w-3"
  styleClass="w-full"
- (click)="cancel()"
+ (onClick)="cancel()"
  severity="info"
  [label]="'common.buttons.cancel' | translate"
  >
  </p-button>
 
- <p-button class="w-3" styleClass="w-full" (click)="save()" [label]="'common.buttons.save' | translate">
+ <p-button class="w-3" styleClass="w-full" (onClick)="save()" [label]="'common.buttons.save' | translate">
  </p-button>
  </div>
  }
@@ -89,7 +89,7 @@ <h2>{{ 'project.contributors.viewOnly' | translate }}</h2>
 
  <p>{{ 'project.contributors.createLink' | translate }}</p>
 
- <p-button class="w-10rem" [label]="'project.contributors.createButton' | translate" (click)="createViewLink()">
+ <p-button class="w-10rem" [label]="'project.contributors.createButton' | translate" (onClick)="createViewLink()">
  </p-button>
 
  <osf-view-only-table

src/app/features/project/overview/components/add-component-dialog/add-component-dialog.component.ts

@@ -15,7 +15,7 @@ import { ChangeDetectionStrategy, Component, DestroyRef, inject, OnInit } from '
 import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop';
 import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
 
-import { STORAGE_LOCATIONS } from '@osf/core/constants';
+import { STORAGE_LOCATIONS } from '@core/constants';
 import { ComponentFormControls } from '@osf/shared/enums';
 import { IS_XSMALL } from '@osf/shared/helpers';
 import { ComponentForm } from '@osf/shared/models';
@@ -43,7 +43,8 @@ import { CreateComponent, GetComponents, ProjectOverviewSelectors } from '../../
 })
 export class AddComponentDialogComponent implements OnInit {
  private store = inject(Store);
- private toastService = inject(ToastService);
+ private readonly toastService = inject(ToastService);
+
  protected isMobile = toSignal(inject(IS_XSMALL));
  protected dialogRef = inject(DynamicDialogRef);
  protected destroyRef = inject(DestroyRef);

src/app/features/project/overview/components/delete-component-dialog/delete-component-dialog.component.html

@@ -4,13 +4,15 @@
  {{ 'project.overview.dialog.deleteComponent.confirmation' | translate }}
  <strong> {{ selectedScientist() }}</strong>
 </p>
+
 <input pInputText class="mt-3" [ngModel]="userInput()" (ngModelChange)="onInputChange($event)" />
+
 <div class="flex pt-5 justify-content-end gap-3">
  <p-button
  class="w-12rem btn-full-width"
  [label]="'project.overview.dialog.deleteComponent.cancelButton' | translate"
  severity="info"
- (click)="dialogRef.close()"
+ (onClick)="dialogRef.close()"
  [disabled]="isSubmitting()"
  />
  <p-button