fixed select type for obs and bible

bible-technology · Oct 26, 2023 · 03efb41 · 03efb41
1 parent cf98e15
commit 03efb41
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/renderer/src/components/Resources/ResourceUtils/CustomMultiComboBox.js b/renderer/src/components/Resources/ResourceUtils/CustomMultiComboBox.js
@@ -12,7 +12,7 @@ function CustomMultiComboBox({
   // eslint-disable-next-line no-unused-vars
   const [isActive, setIsActive] = useState(false);
   if (customData.length === 1) {
-    setSelectedList(customData);
+    setSelectedList(customData[0]);
   } else if (customData.length > 1) {
     // eslint-disable-next-line no-nested-ternary
     filteredData = (query === '')

diff --git a/renderer/src/components/Resources/ResourceUtils/DownloadResourcePopUp.js b/renderer/src/components/Resources/ResourceUtils/DownloadResourcePopUp.js
@@ -171,7 +171,8 @@ function DownloadResourcePopUp({ selectResource, isOpenDonwloadPopUp, setIsOpenD
     logger.debug('DownloadResourcePopUp.js', 'save filter and call fetch');
     if (!downloadStarted) {
       // setLoadFilterDiv(!loadFilterDiv);
-      if (selectedLangFilter.length > 0 && selectedTypeFilter.length > 0) {
+      if (selectedLangFilter.length > 0
+        && (Array.isArray(selectedTypeFilter) ? selectedTypeFilter.length > 0 : selectedTypeFilter?.name)) {
         await fetchResource(true);
       } else {
         setOpenSnackBar(true);
@@ -346,7 +347,7 @@ function DownloadResourcePopUp({ selectResource, isOpenDonwloadPopUp, setIsOpenD
             multiSelect
           />
           <div className="flex flex-wrap gap-2 mt-2 mb-2">
-            { selectResource === 'bible' && selectedTypeFilter.map((type, idx) => (
+            { selectResource === 'bible' && selectedTypeFilter?.map((type, idx) => (
               <div
                 key={idx}
                 className="flex items-center justify-center gap-2 px-3 py-1 bg-gray-200 rounded-full"