Merge pull request #407 from truefoundry/ss_fix_error-toast_collectio…

…n-selection fix: frontend changes for error toast, collections
truefoundry · Nov 11, 2024 · d086977 · d086977
2 parents 3a55fe6 + 4e7ad5a
commit d086977
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/frontend/src/screens/dashboard/docsqa/NewCollection.tsx b/frontend/src/screens/dashboard/docsqa/NewCollection.tsx
@@ -18,7 +18,7 @@ import { notifyError } from '@/utils/error'
 
 interface NewCollectionProps {
   open: boolean
-  onClose: () => void
+  onClose: (collectionName?: string) => void
   onSuccess?: () => void
 }
 
@@ -105,7 +105,7 @@ const NewCollection = ({ open, onClose, onSuccess }: NewCollectionProps) => {
         }),
       )
 
-      onClose()
+      onClose(collectionName)
       resetForm()
       onSuccess?.()
       notify(

diff --git a/frontend/src/screens/dashboard/docsqa/settings/index.tsx b/frontend/src/screens/dashboard/docsqa/settings/index.tsx
@@ -80,6 +80,8 @@ const DocsQASettings = () => {
       ) {
         setSelectedCollection(collectionsNames[0])
       }
+    } else {
+      setSelectedCollection(undefined)
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [collectionsNames])
@@ -182,11 +184,14 @@ const DocsQASettings = () => {
       {newCollectionModalOpen && (
         <NewCollection
           open={newCollectionModalOpen}
-          onClose={() => {
+          onClose={(newCollectionName) => {
             if (searchParams.has('newCollectionOpen')) {
               searchParams.delete('newCollectionOpen')
               setSearchParams(searchParams)
             }
+            if (newCollectionName) {
+              setSelectedCollection(newCollectionName)
+            }
             setNewCollectionModalOpen(false)
           }}
         />

diff --git a/frontend/src/utils/error.ts b/frontend/src/utils/error.ts
@@ -6,7 +6,7 @@ export function notifyError(baseMessage: string, err?: any, defaultMessage? : st
   err?.message ||
   err?.data?.error ||
     err?.error ||
-    err?.details?.msg || defaultMessage;
+    err?.details?.msg || (typeof err?.data?.detail === 'string' && err?.data?.detail) || defaultMessage;
 
   notify('error', baseMessage, message);
 }