sxhundred/ISA-Frontend
1
0
Fork 0
mirror of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend synced 2025-12-31 09:37:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/3.0' into develop

Browse Source
This commit is contained in:
Nino
2023-12-01 17:04:02 +01:00
parent f8c4d4a842 ea4d036066
commit f04705b659
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/page/catalog/src/lib/article-search/article-search.store.ts
View File

@@ -160,7 +160,7 @@ export class ArticleSearchService extends ComponentStore<ArticleSearchState> {
}
}
search = this.effect((options$: Observable<{ clear?: boolean; orderBy?: boolean }>) =>
search = this.effect((options$: Observable<{ clear?: boolean; orderBy?: boolean; doNotTrack?: boolean }>) =>
options$.pipe(
tap((options) => {
this.searchStarted.next({ clear: options?.clear });
@@ -178,6 +178,7 @@ export class ArticleSearchService extends ComponentStore<ArticleSearchState> {
take: 25,
friendlyName: this.friendlyName,
stockId: selectedBranch?.id,
doNotTrack: options?.doNotTrack,
}).pipe(
tapResponse(
(res) => {

7
apps/page/catalog/src/lib/article-search/search-main/search-main.component.ts
View File

@@ -4,7 +4,7 @@ import { BreadcrumbService } from '@core/breadcrumb';
import { ApplicationService } from '@core/application';
import { DomainCatalogService } from '@domain/catalog';
import { combineLatest, NEVER, Subscription } from 'rxjs';
import { catchError, debounceTime, first, switchMap, map } from 'rxjs/operators';
import { catchError, debounceTime, first, switchMap, map, tap } from 'rxjs/operators';
import { ArticleSearchService } from '../article-search.store';
import { isEqual } from 'lodash';
import { EnvironmentService } from '@core/environment';
@@ -17,7 +17,10 @@ import { Filter, FilterInputGroupMainComponent } from 'apps/shared/components/fi
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class ArticleSearchMainComponent implements OnInit, OnDestroy {
readonly history$ = this.catalog.getSearchHistory({ take: 7 }).pipe(catchError(() => NEVER));
readonly history$ = this.catalog.getSearchHistory({ take: 7 }).pipe(
map((history) => history.filter((h) => !!h.friendlyName)),
catchError(() => NEVER)
);
fetching$ = this.searchService.fetching$;

2
apps/page/catalog/src/lib/article-search/search-results/search-results.component.ts
View File

@@ -302,7 +302,7 @@ export class ArticleSearchResultsComponent implements OnInit, OnDestroy, AfterVi
this.sharedFilterInputGroupMain.cancelAutocomplete();
}
this.searchService.search({ clear, orderBy });
this.searchService.search({ clear, orderBy, doNotTrack: true });
}
scrollTop(scrollPos: number) {

4
apps/shared/shell/src/lib/side-menu/side-menu.component.ts
View File

@@ -193,6 +193,10 @@ export class ShellSideMenuComponent {
map((breadcrumbs) => {
const lastCrumb = breadcrumbs
.filter((breadcrumb) => !breadcrumb?.params?.hasOwnProperty('view'))
.filter((breadcrumb) => !breadcrumb?.tags?.includes('reservation'))
.filter((breadcrumb) => !breadcrumb?.tags?.includes('cleanup'))
.filter((breadcrumb) => !breadcrumb?.tags?.includes('wareneingangsliste'))
.filter((breadcrumb) => !breadcrumb?.tags?.includes('preview'))
.reduce((last, current) => {
if (!last) return current;