From 5c085ef40a674b028a6d52d72984e603a5a626da Mon Sep 17 00:00:00 2001 From: Dinesh Singh Date: Wed, 19 Apr 2023 19:50:08 +0530 Subject: [PATCH 1/4] Inherit groupBy & entities from Parent View --- .../Components/Views/ViewRenderer/KanbanView.tsx | 13 ++++++++++++- apps/webapp/src/Hooks/todo/useTodoFilters.tsx | 1 - apps/webapp/src/Hooks/useCreateNewMenu.tsx | 4 +++- libs/shared/src/Components/AIPreview/index.tsx | 11 ++++++----- libs/shared/src/Components/AIPreview/styled.tsx | 2 +- 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/apps/webapp/src/Components/Views/ViewRenderer/KanbanView.tsx b/apps/webapp/src/Components/Views/ViewRenderer/KanbanView.tsx index 8bd04b24e..974bd8f68 100644 --- a/apps/webapp/src/Components/Views/ViewRenderer/KanbanView.tsx +++ b/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 = (props) => { ) } + if (!board?.columns?.length) + return ( + + + Could not find any results for your search, please try again with different search terms. + + + ) + return ( {!!board && ( diff --git a/apps/webapp/src/Hooks/todo/useTodoFilters.tsx b/apps/webapp/src/Hooks/todo/useTodoFilters.tsx index 5927e30aa..c40896aea 100644 --- a/apps/webapp/src/Hooks/todo/useTodoFilters.tsx +++ b/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]) } diff --git a/apps/webapp/src/Hooks/useCreateNewMenu.tsx b/apps/webapp/src/Hooks/useCreateNewMenu.tsx index a64a7f0fa..5f4da65c4 100644 --- a/apps/webapp/src/Hooks/useCreateNewMenu.tsx +++ b/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 } }) } diff --git a/libs/shared/src/Components/AIPreview/index.tsx b/libs/shared/src/Components/AIPreview/index.tsx index 60043ae26..06bdc5337 100644 --- a/libs/shared/src/Components/AIPreview/index.tsx +++ b/libs/shared/src/Components/AIPreview/index.tsx @@ -53,12 +53,12 @@ const AIPreviewContainer: React.FC = (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) } @@ -92,6 +92,7 @@ const AIPreviewContainer: React.FC = (props) => { } else { const deserializedContent = getContent(content) props.onInsert?.(deserializedContent, id) + setFloatingElement(undefined) } } diff --git a/libs/shared/src/Components/AIPreview/styled.tsx b/libs/shared/src/Components/AIPreview/styled.tsx index dc0f1816c..9d434d200 100644 --- a/libs/shared/src/Components/AIPreview/styled.tsx +++ b/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; ` From 6ec82db1fa4de80be802903b4bce44c5c04a3dd9 Mon Sep 17 00:00:00 2001 From: Dinesh Singh Date: Wed, 19 Apr 2023 19:53:27 +0530 Subject: [PATCH 2/4] Changeset added --- .changeset/proud-apples-do.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/proud-apples-do.md diff --git a/.changeset/proud-apples-do.md b/.changeset/proud-apples-do.md new file mode 100644 index 000000000..549e62a31 --- /dev/null +++ b/.changeset/proud-apples-do.md @@ -0,0 +1,5 @@ +--- +'mexit-webapp': patch +--- + +Inherit Extra Fields From Parent View From d371077d2160b9cdf755ff5733d5253fe1d016e7 Mon Sep 17 00:00:00 2001 From: Dinesh Singh Date: Wed, 19 Apr 2023 20:09:09 +0530 Subject: [PATCH 3/4] Disable Live User Socket Connection --- apps/webapp/src/Hooks/useSocket.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/webapp/src/Hooks/useSocket.ts b/apps/webapp/src/Hooks/useSocket.ts index eb1ac7ef6..2af9e1be1 100644 --- a/apps/webapp/src/Hooks/useSocket.ts +++ b/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 From 395e623046af47f21d55a32389e0f92d7504f423 Mon Sep 17 00:00:00 2001 From: Dinesh Singh Date: Wed, 19 Apr 2023 20:33:49 +0530 Subject: [PATCH 4/4] Await for chrome runtime response added in append note --- apps/extension/src/Hooks/useSaveChanges.ts | 57 ++++++++++--------- .../shared/src/Components/AIPreview/index.tsx | 1 - 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/apps/extension/src/Hooks/useSaveChanges.ts b/apps/extension/src/Hooks/useSaveChanges.ts index 2475635ea..edcd23c70 100644 --- a/apps/extension/src/Hooks/useSaveChanges.ts +++ b/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 { diff --git a/libs/shared/src/Components/AIPreview/index.tsx b/libs/shared/src/Components/AIPreview/index.tsx index 06bdc5337..4130584ea 100644 --- a/libs/shared/src/Components/AIPreview/index.tsx +++ b/libs/shared/src/Components/AIPreview/index.tsx @@ -92,7 +92,6 @@ const AIPreviewContainer: React.FC = (props) => { } else { const deserializedContent = getContent(content) props.onInsert?.(deserializedContent, id) - setFloatingElement(undefined) } }