Inherit Extra Fields From Parent View (#414)

#414

* Inherit groupBy & entities from Parent View

* Changeset added

* Disable Live User Socket Connection

* Await for chrome runtime response added in append note

Author: dineshsingh1

.changeset/proud-apples-do.md

@@ -0,0 +1,5 @@
+---
+'mexit-webapp': patch
+---
+
+Inherit Extra Fields From Parent View

apps/extension/src/Hooks/useSaveChanges.ts

@@ -13,6 +13,7 @@ import {
   useAuthStore,
   useContentStore,
   useDataStore,
+  useFloatingStore,
   useHighlightStore,
   useRecentsStore
 } from '@mexit/core'
@@ -48,6 +49,7 @@ export function useSaveChanges() {
   const setActiveItem = useSputlitStore((s) => s.setActiveItem)
   const ilinks = useDataStore((s) => s.ilinks)
   const sharedNodes = useDataStore((s) => s.sharedNodes)
+  const setFloatingElement = useFloatingStore((store) => store.setFloatingElement)
 
   const setContent = useContentStore((s) => s.setContent)
   const appendContent = useContentStore((s) => s.appendContent)
@@ -262,35 +264,36 @@ export function useSaveChanges() {
     setActiveItem()
     // mog('Request and things', { request, node, nodeContent, content })
     // TODO: Merge this with the savit request call. DRY
-    chrome.runtime.sendMessage(request, (response) => {
-      const { message, error } = response
+    const response = await chrome.runtime.sendMessage(request)
 
-      if (error && notification) {
-        toast.error('An Error Occured. Please try again.')
-      } else {
-        // mog('Response and things', { response })
-        const bulkCreateRequest = request.subType === 'BULK_CREATE_NODES'
-        const nodeid = !bulkCreateRequest ? message.id : message.node.id
-        const content = message.content ?? request.body.content
-        appendContent(node.nodeid, content)
-        const title = !bulkCreateRequest ? message.title : message.node.title
-        updateBlocks({
-          id: node.nodeid,
-          contents: content,
-          title
-        })
-
-        if (notification) {
-          toast.success('Saved to Cloud')
-        }
-
-        if (saveAndExit) {
-          setVisualState(VisualState.animatingOut)
-          // So that sputlit opens with preview true when it opens the next time
-          setPreviewMode(true)
-        }
+    const { message, error } = response
+
+    if (error && notification) {
+      toast.error('An Error Occured. Please try again.')
+    } else {
+      // mog('Response and things', { response })
+      const bulkCreateRequest = request.subType === 'BULK_CREATE_NODES'
+      const nodeid = !bulkCreateRequest ? message.id : message.node.id
+      const content = message.content ?? request.body.content
+      appendContent(node.nodeid, content)
+      const title = !bulkCreateRequest ? message.title : message.node.title
+      updateBlocks({
+        id: node.nodeid,
+        contents: content,
+        title
+      })
+
+      if (notification) {
+        toast.success('Saved to Cloud')
       }
-    })
+
+      if (saveAndExit) {
+        setVisualState(VisualState.animatingOut)
+        // So that sputlit opens with preview true when it opens the next time
+        setPreviewMode(true)
+        setFloatingElement(undefined)
+      }
+    }
   }
 
   return {

apps/webapp/src/Components/Views/ViewRenderer/KanbanView.tsx

@@ -21,12 +21,14 @@ import {
 } from '@mexit/core'
 import {
   Count,
+  Description,
   Group,
   GroupHeader,
   IconDisplay,
   OverlaySidebarWindowWidth,
   StyledTasksKanban,
-  TaskColumnHeader
+  TaskColumnHeader,
+  TaskListWrapper
 } from '@mexit/shared'
 
 import { useViewFilterStore } from '../../../Hooks/todo/useTodoFilters'
@@ -315,6 +317,15 @@ const KanbanView: React.FC<any> = (props) => {
     )
   }
 
+  if (!board?.columns?.length)
+    return (
+      <TaskListWrapper>
+        <Description>
+          Could not find any results for your search, please try again with different search terms.
+        </Description>
+      </TaskListWrapper>
+    )
+
   return (
     <StyledTasksKanban sidebarExpanded={sidebar.show && sidebar.expanded && !overlaySidebar}>
       {!!board && (

apps/webapp/src/Hooks/todo/useTodoFilters.tsx

@@ -76,7 +76,6 @@ export const useViewFilters = () => {
   }
 
   const addCurrentFilter = (filter: Filter) => {
-    mog('Change Current Filter: ', { s: currentFilters, f: filter })
     setCurrentFilters([...currentFilters, filter])
   }
 

apps/webapp/src/Hooks/useCreateNewMenu.tsx

@@ -213,7 +213,9 @@ export const useCreateNewMenu = () => {
           viewType: view.viewType,
           sortOrder: view.sortOrder,
           sortType: view.sortType,
-          globalJoin: view.globalJoin
+          globalJoin: view.globalJoin,
+          entities: view.entities,
+          groupBy: view.groupBy
         }
       })
     }

apps/webapp/src/Hooks/useSocket.ts

@@ -58,7 +58,7 @@ const useSocket = () => {
       queryParams: { userId, Authorizer: idToken },
       share: true
     },
-    !!(idToken && userId)
+    false // !!(idToken && userId)
   )
 
   return utilFunctions

libs/shared/src/Components/AIPreview/index.tsx

@@ -53,12 +53,12 @@ const AIPreviewContainer: React.FC<AIPreviewProps> = (props) => {
     if (Array.isArray(deserializedContent) && deserializedContent.length > 0) {
       const at = replace ? editor?.selection : getPointAfter(editor, editor.selection)
 
-      insertNodes(editor, deserializedContent, {
-        at
-      })
-
       try {
-        focusEditor(editor)
+        insertNodes(editor, deserializedContent, {
+          at,
+          select: true
+        })
+        focusEditor(editor, at)
       } catch (err) {
         console.error('Unable to focus editor', err)
       }

libs/shared/src/Components/AIPreview/styled.tsx

@@ -107,7 +107,7 @@ export const FloaterContainer = styled.div`
   backdrop-filter: blur(2rem);
   border: 1px solid ${({ theme }) => theme.tokens.surfaces.app};
   transform-origin: top;
-  z-index: 10;
+  z-index: 11;
   border: 1px solid ${({ theme }) => theme.tokens.surfaces.s[3]};
   animation: ${float} 150ms ease-out;
 `