diff --git a/src/app/pages/explore/explore.component.html b/src/app/pages/explore/explore.component.html index a212ab5c..e8f9750b 100644 --- a/src/app/pages/explore/explore.component.html +++ b/src/app/pages/explore/explore.component.html @@ -53,7 +53,11 @@

{{ 'Explore' | translate }}

{{ 'Open' | translate }} @if (selectedTab() === 'objects') { - @@ -101,32 +105,44 @@

{{ 'Explore' | translate }}

- - @if (isAuthenticated$ | observableValue | async; as isAuthenticated) { - @if (isAuthenticated.value) { - - @if (userCompilations$ | async; as userCompilations) { - @if (userCompilations.length > 0) { - @for (compilation of userCompilations; track compilation._id) { - - } + + + + @if (isAuthenticated()) { + + @for (compilation of userCompilations(); track compilation._id) { + + } + } @else { +
+

{{ 'You have to login to create and modify collections.' | translate }}

}
diff --git a/src/app/pages/explore/explore.component.scss b/src/app/pages/explore/explore.component.scss index 6569cfec..64e56464 100644 --- a/src/app/pages/explore/explore.component.scss +++ b/src/app/pages/explore/explore.component.scss @@ -151,3 +151,11 @@ div.loading-overlay { user-select: none; } } + +.pseudo-disabled { + color: rgba(0, 0, 0, 0.38); +} + +.pseudo-disabled mat-icon { + opacity: 0.38; +} diff --git a/src/app/pages/explore/explore.component.ts b/src/app/pages/explore/explore.component.ts index 56250158..3fb7d07d 100644 --- a/src/app/pages/explore/explore.component.ts +++ b/src/app/pages/explore/explore.component.ts @@ -3,7 +3,7 @@ import { Meta, Title } from '@angular/platform-browser'; import { NavigationEnd, Router, RouterModule } from '@angular/router'; import { AsyncPipe } from '@angular/common'; -import { toObservable } from '@angular/core/rxjs-interop'; +import { toObservable, toSignal } from '@angular/core/rxjs-interop'; import { MatAutocompleteModule } from '@angular/material/autocomplete'; import { MatButtonModule } from '@angular/material/button'; import { MatOptionModule } from '@angular/material/core'; @@ -75,7 +75,6 @@ type Pagination = { AsyncPipe, RouterModule, TranslatePipe, - ObservableValuePipe, MathPipe, TabsComponent, SearchBarComponent, @@ -283,14 +282,16 @@ export class ExploreComponent implements OnInit { }); } - get isAuthenticated$() { - return this.account.isAuthenticated$; - } + isAuthenticated = toSignal(this.account.isAuthenticated$); userCompilations$ = this.account.compilations$.pipe( map(compilations => compilations.filter(isCompilation)), ); + userCompilations = toSignal( + this.account.compilations$.pipe(map(compilations => compilations.filter(isCompilation))), + ); + public async openCompilationWizard(_id?: string) { const element = this.filteredResults.find(e => e._id === _id); this.dialogHelper.openCompilationWizard(element); diff --git a/src/app/pages/profile-page/profile-page.component.html b/src/app/pages/profile-page/profile-page.component.html index a384e610..222f2455 100644 --- a/src/app/pages/profile-page/profile-page.component.html +++ b/src/app/pages/profile-page/profile-page.component.html @@ -13,9 +13,10 @@ #tabs > @switch (tabs.selectedTab()?.value) { @case ('objects') { @@ -27,9 +28,9 @@ @case ('collections') { } - @case ('groups') { + } diff --git a/src/app/pages/profile-page/profile-page.component.ts b/src/app/pages/profile-page/profile-page.component.ts index 030f3cef..0662b64b 100644 --- a/src/app/pages/profile-page/profile-page.component.ts +++ b/src/app/pages/profile-page/profile-page.component.ts @@ -19,7 +19,7 @@ import { TranslatePipe } from 'src/app/pipes'; import { AccountService, DialogHelperService, SnackbarService } from 'src/app/services'; import { ProfileCompilationsComponent } from './compilations/compilations.component'; import { ProfileEntitiesComponent } from './entities/entities.component'; -import { ProfileGroupsComponent } from './groups/groups.component'; +// import { ProfileGroupsComponent } from './groups/groups.component'; import { ProfilePageHeaderComponent } from './profile-page-header/profile-page-header.component'; import { ProfilePageHelpComponent } from './profile-page-help.component'; @@ -39,7 +39,7 @@ import { ProfilePageHelpComponent } from './profile-page-help.component'; MatProgressSpinnerModule, TranslatePipe, ProfileEntitiesComponent, - ProfileGroupsComponent, + // ProfileGroupsComponent, ProfileCompilationsComponent, ProfilePageHeaderComponent, TabsComponent, @@ -61,7 +61,7 @@ export class ProfilePageComponent implements OnInit { { label: 'Objects', value: 'objects' }, { label: 'Drafts', value: 'drafts' }, { label: 'Collections', value: 'collections' }, - { label: 'Groups', value: 'groups' }, + // { label: 'Groups', value: 'groups' }, ] as const satisfies Tab[]; selectedTab = signal('objects');