Merge pull request #604 from BloomBooks/BL15822_FixAppHostedLanguageFiltering

Fix filtering when searching for languages in app-hosted mode (BL-15822) (#604)

Author: JohnThomson

src/components/appHosted/AppHostedLanguageGroup.tsx

@@ -104,9 +104,16 @@ export const AppHostedLanguageGroup: React.FunctionComponent = () => {
         getItemProps: (options: GetItemPropsOptions<any>) => {},
         getMenuProps: (options: GetMenuPropsOptions) => {}
     ) => {
-        languagesToDisplay = getLanguagesMatchingSearchTerm(searchTerm).filter(
-            (lang) => preferredLangCodes.indexOf(lang.isoCode) < 0
-        );
+        const matchingLanguages = getLanguagesMatchingSearchTerm(searchTerm);
+        languagesToDisplay = matchingLanguages;
+        if (showPreferredLangs) {
+            // Filter out favorites from the main list so we don't show the same language twice.
+            // Note: it is important not to do this when favorites are hidden; else they won't show at all. BL-15822
+            languagesToDisplay = matchingLanguages.filter(
+                (lang) => !preferredLangCodes.includes(lang.isoCode)
+            );
+        }
+
         const prefColor = commonUI.colors.bloomRed;
         // if (!showAll && languagesToDisplay.length > 10) {
         //     languagesToDisplay.splice(10);