Merge pull request #2262 from Civolilah/bugfix/default-quick-actions

[Bugfix] Removing Default Quick Actions

Author: beganovich

src/common/hooks/useCommonActions.ts

@@ -124,32 +124,3 @@ export function useAllCommonActions() {
 
   return actions;
 }
-
-export function useDefaultCommonActions() {
-  const [t] = useTranslation();
-
-  const actions: Record<Entity, CommonAction[]> = {
-    invoice: [
-      { value: 'mark_sent', label: t('mark_sent') },
-      { value: 'email_invoice', label: t('email_invoice') },
-    ],
-    credit: [
-      { value: 'mark_sent', label: t('mark_sent') },
-      { value: 'email_credit', label: t('email_credit') },
-    ],
-    quote: [
-      { value: 'mark_sent', label: t('mark_sent') },
-      { value: 'email_quote', label: t('email_quote') },
-    ],
-    recurring_invoice: [
-      { value: 'start', label: t('start') },
-      { value: 'view_pdf', label: t('view_pdf') },
-    ],
-    purchase_order: [
-      { value: 'send_email', label: t('send_email') },
-      { value: 'mark_sent', label: t('mark_sent') },
-    ],
-  };
-
-  return actions;
-}

src/common/hooks/useShowActionByPreferences.ts

@@ -9,7 +9,6 @@
  */
 
 import { Entity } from '$app/components/CommonActionsPreferenceModal';
-import { useDefaultCommonActions } from './useCommonActions';
 import { useEntityPageIdentifier } from './useEntityPageIdentifier';
 import { useCurrentUser } from './useCurrentUser';
 
@@ -24,8 +23,6 @@ export function useShowActionByPreferences(params: Params) {
 
   const { isEditPage } = useEntityPageIdentifier({ entity });
 
-  const defaultCommonActions = useDefaultCommonActions();
-
   return (actionKey: string) => {
     if (!isEditPage) {
       return true;
@@ -34,7 +31,7 @@ export function useShowActionByPreferences(params: Params) {
     const commonActionsPreferences =
       user?.company_user?.react_settings.common_actions;
 
-    if (!commonActionsPreferences) {
+    if (!commonActionsSection && !commonActionsPreferences?.[entity]) {
       return true;
     }
 
@@ -46,24 +43,10 @@ export function useShowActionByPreferences(params: Params) {
       return true;
     }
 
-    if (
-      !commonActionsPreferences?.[entity] &&
-      defaultCommonActions[entity].some(({ value }) => value === actionKey) &&
-      commonActionsSection
-    ) {
-      return true;
-    }
-
-    if (commonActionsPreferences && commonActionsSection) {
+    if (commonActionsPreferences?.[entity] && commonActionsSection) {
       return commonActionsPreferences[entity]?.includes(actionKey);
     }
 
-    if (!commonActionsPreferences?.[entity] && !commonActionsSection) {
-      return !defaultCommonActions[entity]?.some(
-        ({ value }) => value === actionKey
-      );
-    }
-
     return false;
   };
 }

src/pages/invoices/edit/components/CommonActions.tsx

@@ -40,13 +40,15 @@ export function CommonActions(props: Props) {
   const [t] = useTranslation();
 
   const user = useCurrentUser();
+
   const invoiceActions = useInvoiceActions({ dropdown: false });
   const creditActions = useCreditActions({ dropdown: false });
   const quoteActions = useQuoteActions({ dropdown: false });
   const recurringInvoiceActions = useRecurringInvoiceActions({
     dropdown: false,
   });
   const purchaseOrderActions = usePurchaseOrderActions({ dropdown: false });
+
   const { resource, entity } = props;
 
   const [isPreferenceModalOpen, setIsPreferenceModalOpen] =