patch:fix notes from accountPanel (#43)

customeros · Feb 21, 2025 · d1f5438 · d1f5438
1 parent d037f39
commit d1f5438
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 29 deletions.
diff --git a/src/domain/usecases/organization-details/edit-organization-notes.usecase.ts b/src/domain/usecases/organization-details/edit-organization-notes.usecase.ts
@@ -43,6 +43,8 @@ export class EditOrganizationNotesUsecase {
       return;
     }
 
-    this.organizationService.updateNotes(organization, this.note);
+    if (this.note !== organization.value?.notes) {
+      this.organizationService.updateNotes(organization, this.note);
+    }
   }
 }
diff --git a/src/routes/organization/src/components/Tabs/panels/AccountPanel/AccountPanel.tsx b/src/routes/organization/src/components/Tabs/panels/AccountPanel/AccountPanel.tsx
@@ -1,5 +1,4 @@
 import { useParams } from 'react-router-dom';
-import { FC, useRef, useEffect, PropsWithChildren } from 'react';
 
 import { observer } from 'mobx-react-lite';
 
@@ -25,7 +24,6 @@ import {
 const AccountPanelComponent = observer(() => {
   const store = useStore();
   const baseCurrency = store.settings.tenant.value?.baseCurrency;
-  const createButtonRef = useRef<HTMLButtonElement>(null);
 
   const id = useParams()?.id as string;
 
@@ -65,14 +63,6 @@ const AccountPanelComponent = observer(() => {
     );
   }
 
-  useEffect(() => {
-    if (createButtonRef.current) {
-      setTimeout(() => {
-        createButtonRef.current?.focus();
-      }, 10);
-    }
-  }, [createButtonRef.current]);
-
   return (
     <>
       <OrganizationPanel
@@ -85,7 +75,6 @@ const AccountPanelComponent = observer(() => {
               <IconButton
                 size='xs'
                 variant='ghost'
-                ref={createButtonRef}
                 className='text-gray-500 mr-1'
                 onClick={() => handleCreate()}
                 aria-label='Create new contract'
@@ -117,7 +106,7 @@ const AccountPanelComponent = observer(() => {
   );
 });
 
-export const AccountPanel: FC<PropsWithChildren> = () => (
+export const AccountPanel = () => (
   <AccountModalsContextProvider>
     <AccountPanelComponent />
   </AccountModalsContextProvider>

diff --git a/src/routes/organization/src/components/Tabs/panels/AccountPanel/EmptyContracts.tsx b/src/routes/organization/src/components/Tabs/panels/AccountPanel/EmptyContracts.tsx
@@ -1,22 +1,20 @@
-import { FC, useRef, useEffect, PropsWithChildren } from 'react';
-
 import { Button } from '@ui/form/Button/Button';
 import { File02 } from '@ui/media/icons/File02';
 import { FeaturedIcon } from '@ui/media/Icon/FeaturedIcon';
 import { RelationshipButton } from '@organization/components/Tabs/panels/AccountPanel/RelationshipButton';
 import { OrganizationPanel } from '@organization/components/Tabs/shared/OrganizationPanel/OrganizationPanel';
 
-export const EmptyContracts: FC<
-  PropsWithChildren<{ isPending: boolean; onCreate: () => void }>
-> = ({ children, onCreate, isPending }) => {
-  const buttonRef = useRef<HTMLButtonElement>(null);
-
-  useEffect(() => {
-    setTimeout(() => {
-      buttonRef.current?.focus();
-    }, 10);
-  }, []);
+interface EmptyContractsProps {
+  isPending: boolean;
+  onCreate: () => void;
+  children: React.ReactNode;
+}
 
+export const EmptyContracts = ({
+  children,
+  onCreate,
+  isPending,
+}: EmptyContractsProps) => {
   return (
     <OrganizationPanel title='Account' actionItem={<RelationshipButton />}>
       <article className='my-4 w-full flex flex-col items-center'>
@@ -27,7 +25,6 @@ export const EmptyContracts: FC<
 
         <Button
           size='sm'
-          ref={buttonRef}
           variant='outline'
           onClick={onCreate}
           colorScheme='primary'

diff --git a/src/routes/organization/src/components/Tabs/panels/AccountPanel/Notes/Notes.tsx b/src/routes/organization/src/components/Tabs/panels/AccountPanel/Notes/Notes.tsx
@@ -36,10 +36,12 @@ export const Notes = observer(({ id }: NotesProps) => {
             className='cursor-text'
             namespace='opportunity-next-step'
             placeholderClassName='cursor-text'
-            onBlur={() => editNotesUsecase.execute()}
             dataTest='organization-account-notes-editor'
             defaultHtmlValue={editNotesUsecase.defaultNote ?? ''}
             placeholder='Write some notes or anything related to this customer'
+            onBlur={() => {
+              editNotesUsecase.execute();
+            }}
             onChange={(html) => {
               editNotesUsecase.setNotes(html);
             }}

diff --git a/...organization/src/components/Timeline/PastZone/events/email/compose-email/ComposeEmail.tsx b/...organization/src/components/Timeline/PastZone/events/email/compose-email/ComposeEmail.tsx
@@ -3,8 +3,8 @@ import { FC, useRef, PropsWithChildren } from 'react';
 import { observer } from 'mobx-react-lite';
 import { TimelineEmailUsecase } from '@domain/usecases/email-composer/send-timeline-email.usecase.ts';
 
-import { Button } from '@ui/form/Button/Button.tsx';
-import { Editor } from '@ui/form/Editor/Editor.tsx';
+import { Button } from '@ui/form/Button/Button';
+import { Editor } from '@ui/form/Editor/Editor';
 import { ParticipantsSelectGroup } from '@organization/components/Timeline/PastZone/events/email/compose-email/ParticipantsSelectGroup';
 
 export interface ComposeEmailProps extends PropsWithChildren {