From 64c5bbae290a61c03ae12cb5f33bc150d5ea14ea Mon Sep 17 00:00:00 2001
From: Xuan Son Nguyen <son@huggingface.co>
Date: Thu, 6 Feb 2025 11:20:01 +0100
Subject: [PATCH] lint and format combined

---
 .github/workflows/server.yml                        | 3 +--
 examples/server/webui/package.json                  | 2 +-
 examples/server/webui/src/components/ChatScreen.tsx | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml
index e594c7208..3a29107d0 100644
--- a/.github/workflows/server.yml
+++ b/.github/workflows/server.yml
@@ -81,12 +81,11 @@ jobs:
         with:
           node-version: '22.11.0'
 
-      - name: WebUI - Run lint
+      - name: WebUI - Install dependencies
         id: webui_lint
         run: |
           cd examples/server/webui
           npm ci
-          npm run lint
 
       - name: WebUI - Check code format
         id: webui_format
diff --git a/examples/server/webui/package.json b/examples/server/webui/package.json
index 9d266e05d..f3c7dde43 100644
--- a/examples/server/webui/package.json
+++ b/examples/server/webui/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "dev": "vite",
     "build": "tsc -b && vite build",
-    "format": "prettier --write .",
+    "format": "eslint . && prettier --write .",
     "lint": "eslint .",
     "preview": "vite preview"
   },
diff --git a/examples/server/webui/src/components/ChatScreen.tsx b/examples/server/webui/src/components/ChatScreen.tsx
index b5518e247..63dc7341f 100644
--- a/examples/server/webui/src/components/ChatScreen.tsx
+++ b/examples/server/webui/src/components/ChatScreen.tsx
@@ -41,7 +41,7 @@ export default function ChatScreen() {
   }, [viewingConversation?.id]);
 
   const sendNewMessage = async () => {
-    if (inputMsg.trim().length === 0) return;
+    if (inputMsg.trim().length === 0 || isGenerating(currConvId)) return;
     const convId = viewingConversation?.id ?? StorageUtils.getNewConvId();
     const lastInpMsg = inputMsg;
     setInputMsg('');