From f8ac1b0378e2937e11ca263b6d42d4fd450e84ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Tue, 7 Nov 2023 21:00:35 +0100
Subject: [PATCH] fix logviewer context

---
 .../create-observable-part.function.ts        |  4 +-
 .../log-viewer/workspace/logviewer.context.ts | 38 +++++++++----------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/libs/observable-api/create-observable-part.function.ts b/src/Umbraco.Web.UI.Client/src/libs/observable-api/create-observable-part.function.ts
index 446f8517df..e1c63ded17 100644
--- a/src/Umbraco.Web.UI.Client/src/libs/observable-api/create-observable-part.function.ts
+++ b/src/Umbraco.Web.UI.Client/src/libs/observable-api/create-observable-part.function.ts
@@ -15,11 +15,11 @@ import { distinctUntilChanged, map, Observable, shareReplay } from '@umbraco-cms
  */
 
 export function createObservablePart<R, T>(
-	source$: Observable<T>,
+	source: Observable<T>,
 	mappingFunction: MappingFunction<T, R>,
 	memoizationFunction?: MemoizationFunction<R>
 ): Observable<R> {
-	return source$.pipe(
+	return source.pipe(
 		map(mappingFunction),
 		distinctUntilChanged(memoizationFunction || defaultMemoization),
 		shareReplay(1)
diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/logviewer.context.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/logviewer.context.ts
index ce20d85c0a..85f19d7ce8 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/logviewer.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/logviewer.context.ts
@@ -2,8 +2,6 @@ import { UmbLogViewerRepository } from '../repository/log-viewer.repository.js';
 import {
 	UmbBasicState,
 	UmbArrayState,
-	createObservablePart,
-	UmbDeepState,
 	UmbObjectState,
 	UmbStringState,
 } from '@umbraco-cms/backoffice/observable-api';
@@ -73,41 +71,41 @@ export class UmbLogViewerWorkspaceContext extends UmbBaseController implements U
 	};
 
 	#savedSearches = new UmbObjectState<PagedSavedLogSearchResponseModel | undefined>(undefined);
-	savedSearches = createObservablePart(this.#savedSearches, (data) => data?.items);
+	savedSearches = this.#savedSearches.asObservablePart((data) => data?.items);
 
-	#logCount = new UmbDeepState<LogLevelCountsReponseModel | null>(null);
-	logCount = createObservablePart(this.#logCount, (data) => data);
+	#logCount = new UmbObjectState<LogLevelCountsReponseModel | null>(null);
+	logCount = this.#logCount.asObservable();
 
-	#dateRange = new UmbDeepState<LogViewerDateRange>(this.defaultDateRange);
-	dateRange = createObservablePart(this.#dateRange, (data) => data);
+	#dateRange = new UmbObjectState<LogViewerDateRange>(this.defaultDateRange);
+	dateRange = this.#dateRange.asObservable();
 
-	#loggers = new UmbDeepState<PagedLoggerResponseModel | null>(null);
-	loggers = createObservablePart(this.#loggers, (data) => data?.items);
+	#loggers = new UmbObjectState<PagedLoggerResponseModel | null>(null);
+	loggers = this.#loggers.asObservablePart((data) => data?.items);
 
 	#canShowLogs = new UmbBasicState<boolean | null>(null);
-	canShowLogs = createObservablePart(this.#canShowLogs, (data) => data);
+	canShowLogs = this.#canShowLogs.asObservable();
 
 	#isLoadingLogs = new UmbBasicState<boolean | null>(null);
-	isLoadingLogs = createObservablePart(this.#isLoadingLogs, (data) => data);
+	isLoadingLogs = this.#isLoadingLogs.asObservable();
 
 	#filterExpression = new UmbStringState<string>('');
-	filterExpression = createObservablePart(this.#filterExpression, (data) => data);
+	filterExpression = this.#filterExpression.asObservable();
 
-	#messageTemplates = new UmbDeepState<PagedLogTemplateResponseModel | null>(null);
-	messageTemplates = createObservablePart(this.#messageTemplates, (data) => data);
+	#messageTemplates = new UmbObjectState<PagedLogTemplateResponseModel | null>(null);
+	messageTemplates = this.#messageTemplates.asObservable();
 
 	#logLevelsFilter = new UmbArrayState<LogLevelModel>([]);
-	logLevelsFilter = createObservablePart(this.#logLevelsFilter, (data) => data);
+	logLevelsFilter = this.#logLevelsFilter.asObservable();
 
-	#logs = new UmbDeepState<PagedLogMessageResponseModel | null>(null);
-	logs = createObservablePart(this.#logs, (data) => data?.items);
-	logsTotal = createObservablePart(this.#logs, (data) => data?.total);
+	#logs = new UmbObjectState<PagedLogMessageResponseModel | null>(null);
+	logs = this.#logs.asObservablePart((data) => data?.items);
+	logsTotal = this.#logs.asObservablePart((data) => data?.total);
 
 	#polling = new UmbObjectState<PoolingCOnfig>({ enabled: false, interval: 2000 });
-	polling = createObservablePart(this.#polling, (data) => data);
+	polling = this.#polling.asObservable();
 
 	#sortingDirection = new UmbBasicState<DirectionModel>(DirectionModel.ASCENDING);
-	sortingDirection = createObservablePart(this.#sortingDirection, (data) => data);
+	sortingDirection = this.#sortingDirection.asObservable();
 
 	#intervalID: number | null = null;