fix(updates): updates

Author: nsemets

src/app/app.routes.ts

@@ -125,10 +125,19 @@ export const routes: Routes = [
  },
  {
  path: 'my-profile',
- loadComponent: () => import('./features/profile/profile.component').then((mod) => mod.ProfileComponent),
+ loadComponent: () =>
+ import('./features/profile/pages/my-profile/my-profile.component').then((mod) => mod.MyProfileComponent),
  providers: [provideStates([ProfileResourceFiltersState, ProfileResourceFiltersOptionsState, ProfileState])],
  canActivate: [authGuard],
  },
+ {
+ path: 'user/:id',
+ loadComponent: () =>
+ import('./features/profile/pages/user-profile/user-profile.component').then(
+ (mod) => mod.UserProfileComponent
+ ),
+ providers: [provideStates([ProfileResourceFiltersState, ProfileResourceFiltersOptionsState, ProfileState])],
+ },
  {
  path: 'institutions',
  loadChildren: () => import('./features/institutions/institutions.routes').then((r) => r.routes),

src/app/core/services/user.service.ts

@@ -45,12 +45,6 @@ export class UserService {
  .pipe(map((response) => UserMapper.fromUserSettingsGetResponse(response)));
  }
 
- getUserById(userId: string): Observable<User> {
- return this.jsonApiService
- .get<UserGetResponse>(`${environment.apiUrl}/users/${userId}/`)
- .pipe(map((response) => UserMapper.fromUserGetResponse(response)));
- }
-
  updateUserProfile(userId: string, key: string, data: ProfileSettingsUpdate): Observable<User> {
  const patchedData = key === ProfileSettingsKey.User ? data : { [key]: data };
 

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

@@ -189,7 +189,6 @@ export class InstitutionsUsersComponent implements OnInit {
  const filters = this.buildFilters();
  const sortField = this.sortField();
  const sortOrder = this.sortOrder();
- console.log(sortOrder);
  const sortParam = sortOrder === 0 ? `-${sortField}` : sortField;
 
  this.actions.fetchInstitutionUsers(

src/app/features/profile/components/filters/index.ts

@@ -1,8 +1,8 @@
-export { MyProfileDateCreatedFilterComponent } from './my-profile-date-created-filter/my-profile-date-created-filter.component';
-export { MyProfileFunderFilterComponent } from './my-profile-funder-filter/my-profile-funder-filter.component';
-export { MyProfileInstitutionFilterComponent } from './my-profile-institution-filter/my-profile-institution-filter.component';
-export { MyProfileLicenseFilterComponent } from './my-profile-license-filter/my-profile-license-filter.component';
-export { MyProfilePartOfCollectionFilterComponent } from './my-profile-part-of-collection-filter/my-profile-part-of-collection-filter.component';
-export { MyProfileProviderFilterComponent } from './my-profile-provider-filter/my-profile-provider-filter.component';
-export { MyProfileResourceTypeFilterComponent } from './my-profile-resource-type-filter/my-profile-resource-type-filter.component';
-export { MyProfileSubjectFilterComponent } from './my-profile-subject-filter/my-profile-subject-filter.component';
+export { ProfileDateCreatedFilterComponent } from './profile-date-created-filter/profile-date-created-filter.component';
+export { ProfileFunderFilterComponent } from './profile-funder-filter/profile-funder-filter.component';
+export { ProfileInstitutionFilterComponent } from './profile-institution-filter/profile-institution-filter.component';
+export { ProfileLicenseFilterComponent } from './profile-license-filter/profile-license-filter.component';
+export { ProfilePartOfCollectionFilterComponent } from './profile-part-of-collection-filter/profile-part-of-collection-filter.component';
+export { ProfileProviderFilterComponent } from './profile-provider-filter/profile-provider-filter.component';
+export { ProfileResourceTypeFilterComponent } from './profile-resource-type-filter/profile-resource-type-filter.component';
+export { ProfileSubjectFilterComponent } from './profile-subject-filter/profile-subject-filter.component';

src/app/features/profile/components/index.ts

@@ -1,5 +1,5 @@
 export * from './filters';
-export { MyProfileFilterChipsComponent } from './my-profile-filter-chips/my-profile-filter-chips.component';
-export { MyProfileResourceFiltersComponent } from './my-profile-resource-filters/my-profile-resource-filters.component';
-export { ProfileResourcesComponent } from './my-profile-resources/my-profile-resources.component';
-export { ProfileSearchComponent } from './my-profile-search/my-profile-search.component';
+export { ProfileFilterChipsComponent } from './profile-filter-chips/profile-filter-chips.component';
+export { ProfileResourceFiltersComponent } from './profile-resource-filters/profile-resource-filters.component';
+export { ProfileResourcesComponent } from './profile-resources/profile-resources.component';
+export { ProfileSearchComponent } from './profile-search/profile-search.component';

src/app/features/profile/profile.component.html renamed to src/app/features/profile/components/profile-information/profile-information.component.html

@@ -2,7 +2,7 @@
  <div class="flex align-items-center">
  <h1>{{ currentUser()?.fullName }}</h1>
 
- @if (isMedium()) {
+ @if (isMedium() && showEdit()) {
  <p-button class="ml-auto" [label]="'myProfile.editProfile' | translate" (click)="toProfileSettings()"></p-button>
  }
  </div>
@@ -113,7 +113,7 @@ <h3 class="font-bold">
  }
  </div>
 
- @if (!isMedium()) {
+ @if (!isMedium() && showEdit()) {
  <div class="btn-full-width">
  <p-button
  class="ml-auto"
@@ -145,4 +145,3 @@ <h2 class="mb-3">{{ 'settings.profileSettings.tabs.education' | translate }}</h2
  }
  </div>
 }
-<osf-profile-search></osf-profile-search>

src/app/features/profile/profile.component.scss renamed to src/app/features/profile/components/profile-information/profile-information.component.scss

@@ -0,0 +1,22 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ProfileInformationComponent } from './profile-information.component';
+
+describe('ProfileInformationComponent', () => {
+ let component: ProfileInformationComponent;
+ let fixture: ComponentFixture<ProfileInformationComponent>;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ imports: [ProfileInformationComponent],
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(ProfileInformationComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});

src/app/features/profile/components/profile-information/profile-information.component.spec.ts

@@ -0,0 +1,34 @@
+import { TranslatePipe } from '@ngx-translate/core';
+
+import { Button } from 'primeng/button';
+
+import { DatePipe } from '@angular/common';
+import { ChangeDetectionStrategy, Component, computed, inject, input, output } from '@angular/core';
+import { toSignal } from '@angular/core/rxjs-interop';
+
+import { EducationHistoryComponent, EmploymentHistoryComponent } from '@osf/shared/components';
+import { IS_MEDIUM } from '@osf/shared/helpers';
+import { User } from '@osf/shared/models';
+
+@Component({
+ selector: 'osf-profile-information',
+ imports: [Button, EmploymentHistoryComponent, EducationHistoryComponent, TranslatePipe, DatePipe],
+ templateUrl: './profile-information.component.html',
+ styleUrl: './profile-information.component.scss',
+ changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class ProfileInformationComponent {
+ currentUser = input<User | null>();
+ showEdit = input(false);
+ editProfile = output<void>();
+
+ readonly isMedium = toSignal(inject(IS_MEDIUM));
+
+ isEmploymentAndEducationVisible = computed(
+ () => this.currentUser()?.employment?.length || this.currentUser()?.education?.length
+ );
+
+ toProfileSettings() {
+ this.editProfile.emit();
+ }
+}

src/app/features/profile/components/profile-information/profile-information.component.ts

@@ -6,15 +6,24 @@ import { Tab, TabList, Tabs } from 'primeng/tabs';
 
 import { debounceTime, skip } from 'rxjs';
 
-import { ChangeDetectionStrategy, Component, DestroyRef, effect, inject, signal, untracked } from '@angular/core';
+import {
+ ChangeDetectionStrategy,
+ Component,
+ DestroyRef,
+ effect,
+ inject,
+ input,
+ signal,
+ untracked,
+} from '@angular/core';
 import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop';
 import { FormControl } from '@angular/forms';
 
-import { UserSelectors } from '@osf/core/store/user';
 import { SearchHelpTutorialComponent, SearchInputComponent } from '@osf/shared/components';
 import { SEARCH_TAB_OPTIONS } from '@osf/shared/constants';
 import { ResourceTab } from '@osf/shared/enums';
 import { IS_XSMALL } from '@osf/shared/helpers';
+import { User } from '@osf/shared/models';
 
 import { GetResources, ProfileSelectors, SetResourceTab, SetSearchText } from '../../store';
 import { GetAllOptions } from '../filters/store';
@@ -39,6 +48,8 @@ import { ProfileResourcesComponent } from '../profile-resources/profile-resource
 export class ProfileSearchComponent {
  readonly store = inject(Store);
 
+ currentUser = input<User | null>();
+
  protected searchControl = new FormControl<string>('');
  protected readonly isMobile = toSignal(inject(IS_XSMALL));
 
@@ -56,7 +67,6 @@ export class ProfileSearchComponent {
  protected resourcesTabStoreValue = select(ProfileSelectors.getResourceTab);
  protected sortByStoreValue = select(ProfileSelectors.getSortBy);
  readonly isMyProfilePage = select(ProfileSelectors.getIsMyProfile);
- readonly currentUser = this.store.select(UserSelectors.getCurrentUser);
 
  protected readonly resourceTabOptions = SEARCH_TAB_OPTIONS.filter((x) => x.value !== ResourceTab.Users);
  protected selectedTab: ResourceTab = ResourceTab.All;
@@ -65,8 +75,8 @@ export class ProfileSearchComponent {
  private skipInitializationEffects = 0;
 
  constructor() {
- this.currentUser.subscribe((user) => {
- if (user?.id) {
+ effect(() => {
+ if (this.currentUser()) {
  this.store.dispatch(GetAllOptions);
  this.store.dispatch(GetResources);
  }