From 205049ebbc1c65bc5d3f437fa00fda3a67b33daa Mon Sep 17 00:00:00 2001
From: tiddlygit-test <linonetwo012@gmail.com>
Date: Tue, 4 May 2021 17:02:49 +0800
Subject: [PATCH] fix: log not shown in UI

---
 src/constants/channels.ts                  |  2 ++
 src/services/git/gitWorker.ts              |  6 +++---
 src/services/libs/log/rendererTransport.ts |  4 ++--
 src/services/wiki/index.ts                 | 11 +++++------
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/constants/channels.ts b/src/constants/channels.ts
index 5616406e..b75a0c84 100644
--- a/src/constants/channels.ts
+++ b/src/constants/channels.ts
@@ -45,7 +45,9 @@ export enum WikiChannel {
   addTiddlerDone = 'wiki-add-tiddler-done',
   getTiddlerText = 'wiki-get-tiddler-text',
   getTiddlerTextDone = 'wiki-get-tiddler-text-done',
+  /** show message inside tiddlywiki to show git sync progress */
   syncProgress = 'wiki-sync-progress',
+  /** used to show wiki creation messages in the TiddlyGit UI for user to read */
   createProgress = 'wiki-create-progress',
   openTiddler = 'wiki-open-tiddler',
   sendActionMessage = 'wiki-send-action-message',
diff --git a/src/services/git/gitWorker.ts b/src/services/git/gitWorker.ts
index 1c2ef2e4..fb7a7d37 100644
--- a/src/services/git/gitWorker.ts
+++ b/src/services/git/gitWorker.ts
@@ -19,7 +19,7 @@ function initWikiGit(wikiFolderPath: string, isSyncedWiki?: boolean, remoteUrl?:
         warn: (message: string, context: ILoggerContext): unknown =>
           observer.next({ message, level: 'warn', meta: { callerFunction: 'initWikiGit', ...context } }),
         info: (message: GitStep, context: ILoggerContext): void => {
-          observer.next({ message, level: 'warn', meta: { handler: WikiChannel.syncProgress, callerFunction: 'initWikiGit', ...context } });
+          observer.next({ message, level: 'notice', meta: { handler: WikiChannel.createProgress, callerFunction: 'initWikiGit', ...context } });
         },
       },
     }).then(
@@ -47,7 +47,7 @@ function commitAndSyncWiki(wikiFolderPath: string, remoteUrl: string, userInfo:
         warn: (message: string, context: ILoggerContext): unknown =>
           observer.next({ message, level: 'warn', meta: { callerFunction: 'commitAndSync', ...context } }),
         info: (message: GitStep, context: ILoggerContext): void => {
-          observer.next({ message, level: 'warn', meta: { handler: WikiChannel.syncProgress, callerFunction: 'commitAndSync', ...context } });
+          observer.next({ message, level: 'notice', meta: { handler: WikiChannel.syncProgress, callerFunction: 'commitAndSync', ...context } });
         },
       },
     }).then(
@@ -67,7 +67,7 @@ function cloneWiki(remoteUrl: string, repoFolderPath: string, userInfo: IGitUser
         log: (message: string, context: ILoggerContext): unknown => observer.next({ message, level: 'log', meta: { callerFunction: 'clone', ...context } }),
         warn: (message: string, context: ILoggerContext): unknown => observer.next({ message, level: 'warn', meta: { callerFunction: 'clone', ...context } }),
         info: (message: GitStep, context: ILoggerContext): void => {
-          observer.next({ message, level: 'warn', meta: { handler: WikiChannel.syncProgress, callerFunction: 'clone', ...context } });
+          observer.next({ message, level: 'notice', meta: { handler: WikiChannel.createProgress, callerFunction: 'clone', ...context } });
         },
       },
     }).then(
diff --git a/src/services/libs/log/rendererTransport.ts b/src/services/libs/log/rendererTransport.ts
index 5d40708c..5f8cf1e8 100644
--- a/src/services/libs/log/rendererTransport.ts
+++ b/src/services/libs/log/rendererTransport.ts
@@ -9,12 +9,12 @@ import { WindowNames } from '@services/windows/WindowProperties';
 import { WikiChannel } from '@/constants/channels';
 
 const handlers = {
-  createWikiProgress: (message: string) => {
+  [WikiChannel.createProgress]: (message: string) => {
     const windowService = container.get<IWindowService>(serviceIdentifier.Window);
     const createWorkspaceWindow = windowService.get(WindowNames.addWorkspace);
     createWorkspaceWindow?.webContents?.send(WikiChannel.createProgress, message);
   },
-  wikiSyncProgress: async (message: string) => {
+  [WikiChannel.syncProgress]: async (message: string) => {
     const viewService = container.get<IViewService>(serviceIdentifier.View);
     const browserView = await viewService.getActiveBrowserView();
     browserView?.webContents?.send(WikiChannel.syncProgress, message);
diff --git a/src/services/wiki/index.ts b/src/services/wiki/index.ts
index 6d05277d..fe175717 100644
--- a/src/services/wiki/index.ts
+++ b/src/services/wiki/index.ts
@@ -174,13 +174,12 @@ export class Wiki implements IWikiService {
     logger.info('All wiki-worker is stopped', { function: 'stopAllWiki' });
   }
 
-  // create-wiki.ts
-
+  /**
+   * Send message to UI via WikiChannel.createProgress
+   * @param message will show in the UI
+   */
   private readonly logProgress = (message: string): void => {
-    logger.notice({
-      type: 'progress',
-      payload: { message, handler: 'createWikiProgress' },
-    });
+    logger.notice(message, { handler: WikiChannel.createProgress });
   };
 
   private readonly folderToContainSymlinks = 'subwiki';