diff --git a/package.json b/package.json index 01b925c..acee36f 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "checking-extension", "displayName": "checking-extension", "description": "A vscode extension to open tn_check and twl_check files for checking verses", - "version": "0.9.12", + "version": "0.9.13", "publisher": "unfoldingWord", "engines": { "vscode": "^1.91.0" diff --git a/src/utilities/network.ts b/src/utilities/network.ts index 0dfccba..c105c3a 100644 --- a/src/utilities/network.ts +++ b/src/utilities/network.ts @@ -636,7 +636,7 @@ async function updateFilesAndMergeToMaster(localRepoPath: string, server: string fs.outputJsonSync(path.join(localRepoPath, dcsStatusFile, owner), newStatus); } - sendUpdateUploadStatus(`updateFilesAndMergeToMaster`, ` upload complete`) + sendUpdateUploadStatus(`updateFilesAndMergeToMaster`, ` upload complete - saving state`) // @ts-ignore return { diff --git a/webview-ui/package.json b/webview-ui/package.json index 8d6262d..2870f32 100644 --- a/webview-ui/package.json +++ b/webview-ui/package.json @@ -1,6 +1,6 @@ { "name": "checking-extension-webview", - "version": "0.9.12", + "version": "0.9.13", "private": true, "scripts": { "start": "vite", @@ -17,7 +17,7 @@ "@material-ui/lab": "4.0.0-alpha.61", "@mui/lab": "5.0.0-alpha.89", "@vscode/webview-ui-toolkit": "^1.4.0", - "checking-tool-rcl": "0.9.21", + "checking-tool-rcl": "0.9.22-beta.2", "deep-equal": "1.0.1", "dompurify": "^3.0.9", "gitea-react-toolkit": "2.4.1", diff --git a/webview-ui/pnpm-lock.yaml b/webview-ui/pnpm-lock.yaml index 8fac45b..b207ae7 100644 --- a/webview-ui/pnpm-lock.yaml +++ b/webview-ui/pnpm-lock.yaml @@ -27,8 +27,8 @@ importers: specifier: ^1.4.0 version: 1.4.0(react@18.3.1) checking-tool-rcl: - specifier: 0.9.21 - version: 0.9.21(@types/react@18.3.3)(prop-types@15.8.1)(react-dom@18.3.1(react@18.3.1))(react-redux@7.2.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)(webpack@5.93.0) + specifier: 0.9.22-beta.2 + version: 0.9.22-beta.2(@types/react@18.3.3)(prop-types@15.8.1)(react-dom@18.3.1(react@18.3.1))(react-redux@7.2.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)(webpack@5.93.0) deep-equal: specifier: 1.0.1 version: 1.0.1 @@ -1008,8 +1008,8 @@ packages: charenc@0.0.2: resolution: {integrity: sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==, tarball: https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz} - checking-tool-rcl@0.9.21: - resolution: {integrity: sha512-loYM21aY6IuwHFJtGw2km2bEYJ2Lpii0nWkNNtJOamtwcAY8AGxrq6ATDD20M0UyCrvhtDhowte8hJM/0+BtBg==, tarball: https://registry.npmjs.org/checking-tool-rcl/-/checking-tool-rcl-0.9.21.tgz} + checking-tool-rcl@0.9.22-beta.2: + resolution: {integrity: sha512-BQamEBNKHLkUFyRDEYMZCTSuqEUA8krw27+GtysL/0ZeVZFQEFh/xdzmMPDw/EgvBXyP2i6E4NY0eB6+WQwK8Q==, tarball: https://registry.npmjs.org/checking-tool-rcl/-/checking-tool-rcl-0.9.22-beta.2.tgz} peerDependencies: prop-types: ^15.x react: 18.3.1 @@ -3219,7 +3219,7 @@ snapshots: charenc@0.0.2: {} - checking-tool-rcl@0.9.21(@types/react@18.3.3)(prop-types@15.8.1)(react-dom@18.3.1(react@18.3.1))(react-redux@7.2.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)(webpack@5.93.0): + checking-tool-rcl@0.9.22-beta.2(@types/react@18.3.3)(prop-types@15.8.1)(react-dom@18.3.1(react@18.3.1))(react-redux@7.2.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)(webpack@5.93.0): dependencies: '@material-ui/core': 4.12.4(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@material-ui/icons': 4.11.3(@material-ui/core@4.12.4(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) diff --git a/webview-ui/src/components/TranslationCheckingPane.tsx b/webview-ui/src/components/TranslationCheckingPane.tsx index 22982c0..57380f5 100644 --- a/webview-ui/src/components/TranslationCheckingPane.tsx +++ b/webview-ui/src/components/TranslationCheckingPane.tsx @@ -209,7 +209,21 @@ const TranslationCheckingPane: React.FC = ({ showDialogContent && showDialogContent(params) } - function uploadToDCS(server:string, owner: string, token: string) { + function getLogDiv(log: string[]) { + return ( +
+ { + log.map((item: string) => ( + <> + {item}
+ + )) + } +
+ ) + } + + function uploadToDCS(server:string, owner: string, token: string) { _showDialogContent({ message: 'Doing Upload to DCS' }) let log: string[] = [] const dcsUpdateCallback = (update: object) => { @@ -225,11 +239,7 @@ const TranslationCheckingPane: React.FC = ({ {`Current Status: ${status}`}
Log:
- {log.map((item: string) => ( - <> - {item}
- - ))} + {getLogDiv(log)} }) } @@ -251,11 +261,7 @@ const TranslationCheckingPane: React.FC = ({ {`Current Status: ${message}`}
Log:
- {log.map((item: string) => ( - <> - {item}
- - ))} + {getLogDiv(log)} ) _showDialogContent({ message: dialogContent }); @@ -273,11 +279,7 @@ const TranslationCheckingPane: React.FC = ({ {`Current Status: ${message}`}
Log:
- {log.map((item: string) => ( - <> - {item}
- - ))} + {getLogDiv(log)} ) _showDialogContent({ message: dialogContent });