From 832137517853ab99e3acaa5e4eddfcd01c701505 Mon Sep 17 00:00:00 2001 From: wj23027 <62098023+wj23027@users.noreply.github.com> Date: Wed, 22 May 2024 05:53:44 +0000 Subject: [PATCH 1/2] fix: modify the timestamp format of oss-gpt --- package.json | 1 + .../ContentScripts/features/oss-gpt/view.tsx | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/package.json b/package.json index c7adddc5..fc800043 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "github-url-detection": "^8.1.0", "jquery": "^3.6.0", "lodash-es": "^4.17.21", + "moment": "^2.30.1", "react": "^17.0.2", "react-chat-widget": "^3.1.4", "react-dom": "^17.0.2", diff --git a/src/pages/ContentScripts/features/oss-gpt/view.tsx b/src/pages/ContentScripts/features/oss-gpt/view.tsx index f9d6742f..71dfc858 100644 --- a/src/pages/ContentScripts/features/oss-gpt/view.tsx +++ b/src/pages/ContentScripts/features/oss-gpt/view.tsx @@ -1,11 +1,13 @@ import React, { useState, useEffect, useRef } from 'react'; import $ from 'jquery'; +import moment from 'moment'; import { Widget, addResponseMessage, deleteMessages, toggleMsgLoader, toggleInputDisabled, + renderCustomComponent, } from 'react-chat-widget'; import { getAnswer } from './service'; @@ -23,21 +25,40 @@ interface Props { currentDocsName: string | null; } +const ResponseTimeStamp: React.FC = () => { + return ( +
+ {moment().format('LT')} +
+ ); +}; + +const UserTimeStamp: React.FC = () => { + return ( +
+ {moment().format('LT')} +
+ ); +}; + const displayWelcome = (repoName: string, locale: string) => { addResponseMessage( getMessageByLocale('OSS_GPT_welcome', locale).replace('%v', repoName) ); + renderCustomComponent(ResponseTimeStamp, {}); }; const displayNotAvailable = (repoName: string, locale: string) => { addResponseMessage( getMessageByLocale('OSS_GPT_notAvailable', locale).replace('%v', repoName) ); + renderCustomComponent(ResponseTimeStamp, {}); }; // Due to cost reasons, backend is not available now. This part can be removed when the backend is restored. const backendNotAvailable = (locale: string) => { addResponseMessage(getMessageByLocale('OSS_GPT_errorMessage', locale)); + renderCustomComponent(ResponseTimeStamp, {}); }; const View = ({ theme, currentRepo, currentDocsName }: Props): JSX.Element => { @@ -132,6 +153,7 @@ const View = ({ theme, currentRepo, currentDocsName }: Props): JSX.Element => { ).replace('%v', currentRepo); const handleNewUserMessage = async (newMessage: string) => { + renderCustomComponent(UserTimeStamp, {}); toggleMsgLoader(); toggleInputDisabled(); @@ -141,6 +163,8 @@ const View = ({ theme, currentRepo, currentDocsName }: Props): JSX.Element => { backendNotAvailable(options.locale); } else { addResponseMessage(answer); + renderCustomComponent(ResponseTimeStamp, {}); + setHistory([newMessage, answer]); // update history } } else { @@ -160,6 +184,7 @@ const View = ({ theme, currentRepo, currentDocsName }: Props): JSX.Element => { handleNewUserMessage={handleNewUserMessage} showBadge={false} profileAvatar={chrome.runtime.getURL('main.png')} + showTimeStamp={false} /> ); From 12b38d6ede1c319027521891e900645ff3f1af23 Mon Sep 17 00:00:00 2001 From: wj23027 <809711241@qq.com> Date: Thu, 23 May 2024 15:06:14 +0800 Subject: [PATCH 2/2] add yarn.lock file --- yarn.lock | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/yarn.lock b/yarn.lock index 28f20cca..d3e5e620 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4162,6 +4162,11 @@ mkdirp@^1.0.4: resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== +moment@^2.30.1: + version "2.30.1" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae" + integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how== + mri@^1.2.0: version "1.2.0" resolved "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b"