Merge pull request #566 from vlad1slove1/bug-564

#564 bug at new snippet selection
hexlet-rus · Nov 12, 2024 · 226ae9b · 226ae9b
2 parents 6864d96 + 287d488
commit 226ae9b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/frontend/src/components/Modals/NewSnippet.jsx b/frontend/src/components/Modals/NewSnippet.jsx
@@ -18,16 +18,7 @@ import routes from '../../routes';
 import { useAuth, useSnippets } from '../../hooks';
 import { snippetName } from '../../utils/validationSchemas';
 import { actions as modalActions } from '../../slices/modalSlice.js';
-import JavaScriptIcon from '../../assets/images/icons/javascript.svg';
-import HtmlIcon from '../../assets/images/icons/html.svg';
-import PhpIcon from '../../assets/images/icons/php.svg';
-import PythonIcon from '../../assets/images/icons/python.svg';
-
-const icons = new Map()
-  .set('javascript', JavaScriptIcon)
-  .set('html', HtmlIcon)
-  .set('python', PythonIcon)
-  .set('php', PhpIcon);
+import icons from '../../utils/icons';
 
 const generateGuestUserData = () => {
   const username = `guest_${faker.string.alphanumeric(5)}`;
@@ -170,11 +161,19 @@ function NewSnippet({ handleClose, isOpen }) {
   };
 
   const handleInputLng = (inputValue) => {
-    if (inputValue && inputValue.trim() !== '') {
+    const lowerInput = inputValue.trim().toLowerCase();
+
+    if (lowerInput) {
       const filteredOptions = supportedLanguages.filter((language) =>
-        language.toLowerCase().startsWith(inputValue.toLowerCase()),
+        language.toLowerCase().startsWith(lowerInput),
       );
-      setSelectedLng(filteredOptions.slice(0, 1));
+
+      const selectedLanguage =
+        filteredOptions.find(
+          (language) => language.toLowerCase() === lowerInput,
+        ) || filteredOptions[0];
+
+      setSelectedLng([selectedLanguage]);
 
       if (!once) {
         setOnce(true);

diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
@@ -193,7 +193,8 @@
     "javascript": "JavaScript",
     "php": "PHP",
     "python": "Python",
-    "html": "HTML"
+    "html": "HTML",
+    "java": "Java"
   },
   "modals": {
     "inDevelopment": {

diff --git a/frontend/src/locales/ru.json b/frontend/src/locales/ru.json
@@ -196,7 +196,8 @@
     "javascript": "JavaScript",
     "php": "PHP",
     "python": "Python",
-    "html": "HTML"
+    "html": "HTML",
+    "java": "Java"
   },
   "licAgr": {
     "city": "город Ульяновск",