From 175ee2ffb0c15d0161b046404b23a4a11f3f63c2 Mon Sep 17 00:00:00 2001
From: robin <robin@rnode.me>
Date: Tue, 11 Oct 2022 18:22:04 +0800
Subject: [PATCH] fix: fix the problem of wrong field value

---
 ui/src/pages/Questions/Ask/index.tsx        | 24 ++++++++++++---------
 ui/src/pages/Questions/EditAnswer/index.tsx |  6 ++++--
 ui/src/pages/Tags/Edit/index.tsx            |  6 ++++--
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/ui/src/pages/Questions/Ask/index.tsx b/ui/src/pages/Questions/Ask/index.tsx
index a576b520..be9ac153 100644
--- a/ui/src/pages/Questions/Ask/index.tsx
+++ b/ui/src/pages/Questions/Ask/index.tsx
@@ -279,16 +279,20 @@ const Ask = () => {
                 <Form.Group controlId="revision" className="mb-3">
                   <Form.Label>{t('form.fields.revision.label')}</Form.Label>
                   <Form.Select onChange={handleSelectedRevision}>
-                    {revisions.map(({ reason, create_at }, index) => {
-                      const date = dayjs(create_at * 1000).format(
-                        t('long_date_with_time', { keyPrefix: 'dates' }),
-                      );
-                      return (
-                        <option key={`${create_at}`} value={index}>
-                          {`${date} - robin - ${reason || t('default_reason')}`}
-                        </option>
-                      );
-                    })}
+                    {revisions.map(
+                      ({ reason, create_at, user_info }, index) => {
+                        const date = dayjs(create_at * 1000).format(
+                          t('long_date_with_time', { keyPrefix: 'dates' }),
+                        );
+                        return (
+                          <option key={`${create_at}`} value={index}>
+                            {`${date} - ${user_info.display_name} - ${
+                              reason || t('default_reason')
+                            }`}
+                          </option>
+                        );
+                      },
+                    )}
                   </Form.Select>
                 </Form.Group>
               )}
diff --git a/ui/src/pages/Questions/EditAnswer/index.tsx b/ui/src/pages/Questions/EditAnswer/index.tsx
index 9cfff684..aecb9c51 100644
--- a/ui/src/pages/Questions/EditAnswer/index.tsx
+++ b/ui/src/pages/Questions/EditAnswer/index.tsx
@@ -151,13 +151,15 @@ const Ask = () => {
               <Form.Group controlId="revision" className="mb-3">
                 <Form.Label>{t('form.fields.revision.label')}</Form.Label>
                 <Form.Select onChange={handleSelectedRevision}>
-                  {revisions.map(({ create_at, reason }, index) => {
+                  {revisions.map(({ create_at, reason, user_info }, index) => {
                     const date = dayjs(create_at * 1000).format(
                       t('long_date_with_time', { keyPrefix: 'dates' }),
                     );
                     return (
                       <option key={`${create_at}`} value={index}>
-                        {`${date} - robin - ${reason || t('default_reason')}`}
+                        {`${date} - ${user_info.display_name} - ${
+                          reason || t('default_reason')
+                        }`}
                       </option>
                     );
                   })}
diff --git a/ui/src/pages/Tags/Edit/index.tsx b/ui/src/pages/Tags/Edit/index.tsx
index c3265478..216b2a73 100644
--- a/ui/src/pages/Tags/Edit/index.tsx
+++ b/ui/src/pages/Tags/Edit/index.tsx
@@ -156,13 +156,15 @@ const Ask = () => {
               <Form.Group controlId="revision" className="mb-3">
                 <Form.Label>{t('form.fields.revision.label')}</Form.Label>
                 <Form.Select onChange={handleSelectedRevision}>
-                  {revisions.map(({ create_at, reason }, index) => {
+                  {revisions.map(({ create_at, reason, user_info }, index) => {
                     const date = dayjs(create_at * 1000).format(
                       t('long_date_with_time', { keyPrefix: 'dates' }),
                     );
                     return (
                       <option key={`${create_at}`} value={index}>
-                        {`${date} - robin - ${reason || t('default_reason')}`}
+                        {`${date} - ${user_info.display_name} - ${
+                          reason || t('default_reason')
+                        }`}
                       </option>
                     );
                   })}