From ee574104773d3040247d1ba05b34d9b6cac7de72 Mon Sep 17 00:00:00 2001
From: Kawika Avilla <kavilla414@gmail.com>
Date: Wed, 23 Oct 2024 00:01:01 +0000
Subject: [PATCH] memoization plus not setting the user query language

Signed-off-by: Kawika Avilla <kavilla414@gmail.com>
---
 .../ui/query_editor/language_selector.tsx     | 95 +++++++++++--------
 1 file changed, 53 insertions(+), 42 deletions(-)

diff --git a/src/plugins/data/public/ui/query_editor/language_selector.tsx b/src/plugins/data/public/ui/query_editor/language_selector.tsx
index 28ab7cf1acd..8a52542bbc9 100644
--- a/src/plugins/data/public/ui/query_editor/language_selector.tsx
+++ b/src/plugins/data/public/ui/query_editor/language_selector.tsx
@@ -10,7 +10,7 @@ import {
   EuiSmallButtonEmpty,
   PopoverAnchorPosition,
 } from '@elastic/eui';
-import React, { useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { Query } from '../..';
 import { LanguageConfig } from '../../query';
 import { getQueryService } from '../../services';
@@ -36,12 +36,14 @@ export const QueryLanguageSelector = (props: QueryLanguageSelectorProps) => {
   const queryString = getQueryService().queryString;
   const languageService = queryString.getLanguageService();
 
-  const datasetSupportedLanguages = props.query.dataset
-    ? queryString
-        .getDatasetService()
-        .getType(props.query.dataset.type)
-        ?.supportedLanguages(props.query.dataset)
-    : undefined;
+  const datasetSupportedLanguages = useMemo(() => {
+    const dataset = props.query.dataset;
+    if (!dataset) {
+      return undefined;
+    }
+    const datasetType = queryString.getDatasetService().getType(dataset.type);
+    return datasetType?.supportedLanguages(dataset);
+  }, [props.query.dataset, queryString]);
 
   useEffect(() => {
     const subscription = queryString.getUpdates$().subscribe((query: Query) => {
@@ -59,51 +61,60 @@ export const QueryLanguageSelector = (props: QueryLanguageSelectorProps) => {
     setPopover(!isPopoverOpen);
   };
 
-  const languageOptions: Array<{ label: string; value: string }> = [];
-
-  languageService.getLanguages().forEach((language) => {
-    if (
-      (language && props.appName && !language.editorSupportedAppNames?.includes(props.appName)) ||
-      languageService.getUserQueryLanguageBlocklist().includes(language?.id) ||
-      (datasetSupportedLanguages && !datasetSupportedLanguages.includes(language.id))
-    )
-      return;
-    languageOptions.unshift(mapExternalLanguageToOptions(language));
-  });
-
-  const selectedLanguage = {
-    label:
-      (languageOptions.find(
-        (option) => (option.value as string).toLowerCase() === currentLanguage.toLowerCase()
-      )?.label as string) ?? languageOptions[0].label,
-  };
+  const languageOptions = useMemo(() => {
+    const options: Array<{ label: string; value: string }> = [];
 
-  const handleLanguageChange = (newLanguage: string) => {
-    setCurrentLanguage(newLanguage);
-    props.onSelectLanguage(newLanguage);
-  };
+    languageService.getLanguages().forEach((language) => {
+      const isSupported =
+        !datasetSupportedLanguages || datasetSupportedLanguages.includes(language.id);
+      const isBlocklisted = languageService.getUserQueryLanguageBlocklist().includes(language?.id);
+      const isAppSupported =
+        !props.appName || language?.editorSupportedAppNames?.includes(props.appName);
+
+      if (!isSupported || isBlocklisted || !isAppSupported) return;
 
-  languageService.setUserQueryLanguage(currentLanguage);
+      options.unshift(mapExternalLanguageToOptions(language));
+    });
+
+    return options.sort((a, b) => a.label.localeCompare(b.label));
+  }, [languageService, props.appName, datasetSupportedLanguages]);
+
+  const selectedLanguage = useMemo(
+    () => ({
+      label:
+        languageOptions.find(
+          (option) => option.value.toLowerCase() === currentLanguage.toLowerCase()
+        )?.label ?? languageOptions[0]?.label,
+    }),
+    [languageOptions, currentLanguage]
+  );
 
-  const languageOptionsMenu = languageOptions
-    .sort((a, b) => {
-      return a.label.localeCompare(b.label);
-    })
-    .map((language) => {
-      return (
+  const handleLanguageChange = useCallback(
+    (newLanguage: string) => {
+      setCurrentLanguage(newLanguage);
+      props.onSelectLanguage(newLanguage);
+      languageService.setUserQueryLanguage(newLanguage);
+      setPopover(false);
+    },
+    [props, languageService]
+  );
+
+  // languageService.setUserQueryLanguage(currentLanguage);
+
+  const languageOptionsMenu = useMemo(
+    () =>
+      languageOptions.map((language) => (
         <EuiContextMenuItem
           key={language.label}
           className="languageSelector__menuItem"
           icon={language.label === selectedLanguage.label ? 'check' : 'empty'}
-          onClick={() => {
-            setPopover(false);
-            handleLanguageChange(language.value);
-          }}
+          onClick={() => handleLanguageChange(language.value)}
         >
           {language.label}
         </EuiContextMenuItem>
-      );
-    });
+      )),
+    [languageOptions, selectedLanguage.label, handleLanguageChange]
+  );
 
   return (
     <EuiPopover