Improve columns

JiawenZou · Mar 11, 2024 · 8abae84 · 8abae84
1 parent 3862e31
commit 8abae84
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/web/src/ChatListPage.js b/web/src/ChatListPage.js
@@ -412,7 +412,16 @@ class ChatListPage extends React.Component {
     }
 
     if (!this.props.account || this.props.account.name !== "admin") {
-      columns = columns.filter(column => column.key !== "price");
+      columns = columns.filter(column => column.key !== "name" && column.key !== "price" && column.key !== "clientIp");
+
+      const tokenCountIndex = columns.findIndex(column => column.key === "tokenCount");
+      if (tokenCountIndex !== -1) {
+        const [tokenCountElement] = columns.splice(tokenCountIndex, 1);
+
+        const actionIndex = columns.findIndex(column => column.key === "action");
+        const insertIndex = actionIndex !== -1 ? actionIndex : columns.length;
+        columns.splice(insertIndex, 0, tokenCountElement);
+      }
     }
 
     const sumFields = (chats, field) => {

diff --git a/web/src/MessageListPage.js b/web/src/MessageListPage.js
@@ -174,10 +174,9 @@ class MessageListPage extends React.Component {
         width: "100px",
         sorter: (a, b) => a.replyTo.localeCompare(b.replyTo),
         render: (text, record, index) => {
-          const textTemp = text.split("/")[1];
           return (
-            <Link to={`/messages/${textTemp}`}>
-              {textTemp}
+            <Link to={`/messages/${text}`}>
+              {text}
             </Link>
           );
         },
@@ -303,7 +302,16 @@ class MessageListPage extends React.Component {
     ];
 
     if (!this.props.account || this.props.account.name !== "admin") {
-      columns = columns.filter(column => column.key !== "price");
+      columns = columns.filter(column => column.key !== "name" && column.key !== "price");
+
+      const tokenCountIndex = columns.findIndex(column => column.key === "tokenCount");
+      if (tokenCountIndex !== -1) {
+        const [tokenCountElement] = columns.splice(tokenCountIndex, 1);
+
+        const actionIndex = columns.findIndex(column => column.key === "action");
+        const insertIndex = actionIndex !== -1 ? actionIndex : columns.length;
+        columns.splice(insertIndex, 0, tokenCountElement);
+      }
     }
 
     return (