fix(webapp): hotfix pdf request hook

fix: Universal search should auto-focus when it opens

packages/server/resources/views/modules/financial-sheet.pug

@@ -21,4 +21,5 @@ block content
         each row in table.rows
           tr(class=row.classNames)
             each cell in row.cells 
-              td(class='cell--' + cell.key)!= cell.value
+              td(class='cell--' + cell.key)
+                span!= cell.value

packages/server/src/data/options.ts

@@ -136,6 +136,11 @@ export default {
       type: 'number',
     },
   },
+  inventory: {
+    cost_compute_running: {
+      type: 'boolean',
+    },
+  },
   accounts: {
     account_code_required: {
       type: 'boolean',

packages/server/src/services/FinancialStatements/AgingSummary/AgingSummaryTable.ts

@@ -56,7 +56,7 @@ export default abstract class AgingSummaryTable extends R.compose(
     node: IAgingSummaryContact | IAgingSummaryTotal
   ): ITableColumnAccessor[] => {
     return node.aging.map((aging, index) => ({
-      key: 'aging',
+      key: 'aging_period',
       accessor: `aging[${index}].total.formattedAmount`,
     }));
   };

packages/server/src/services/FinancialStatements/AgingSummary/_constants.ts

@@ -5,8 +5,17 @@ export enum AgingSummaryRowType {
 
 export const HtmlTableCss = `
 table tr.row-type--total td{
-  font-weight: 500;
+  font-weight: 600;
   border-top: 1px solid #bbb;
   border-bottom: 3px double #333;
 }
+
+table .column--current,
+table .column--aging_period,
+table .column--total,
+table .cell--current,
+table .cell--aging_period,
+table .cell--total  {
+  text-align: right;
+}
 `;

packages/server/src/services/FinancialStatements/CustomerBalanceSummary/CustomerBalanceSummaryTableInjectable.ts

@@ -25,19 +25,18 @@ export class CustomerBalanceSummaryTableInjectable {
     tenantId: number,
     filter: ICustomerBalanceSummaryQuery
   ): Promise<ICustomerBalanceSummaryTable> {
-    
     const i18n = this.tenancy.i18n(tenantId);
     const { data, query, meta } =
       await this.customerBalanceSummaryService.customerBalanceSummary(
         tenantId,
         filter
       );
-    const tableRows = new CustomerBalanceSummaryTable(data, filter, i18n);
+    const table = new CustomerBalanceSummaryTable(data, filter, i18n);
 
     return {
       table: {
-        columns: tableRows.tableColumns(),
+        columns: table.tableColumns(),
-        rows: tableRows.tableRows(),
+        rows: table.tableRows(),
       },
       query,
       meta,

packages/server/src/services/FinancialStatements/CustomerBalanceSummary/CustomerBalanceSummaryTableRows.ts

@@ -52,7 +52,7 @@ export class CustomerBalanceSummaryTable {
    */
   private getCustomerColumnsAccessor = (): IColumnMapperMeta[] => {
     const columns = [
-      { key: 'customerName', accessor: 'customerName' },
+      { key: 'name', accessor: 'customerName' },
       { key: 'total', accessor: 'total.formattedAmount' },
     ];
     return R.compose(
@@ -85,7 +85,7 @@ export class CustomerBalanceSummaryTable {
    */
   private getTotalColumnsAccessor = (): IColumnMapperMeta[] => {
     const columns = [
-      { key: 'total', value: this.i18n.__('Total') },
+      { key: 'name', value: this.i18n.__('Total') },
       { key: 'total', accessor: 'total.formattedAmount' },
     ];
     return R.compose(

packages/server/src/services/FinancialStatements/CustomerBalanceSummary/constants.ts

@@ -3,4 +3,12 @@ table tr.row-type--total td {
   font-weight: 600;
   border-top: 1px solid #bbb;
   border-bottom: 3px double #333;
-}`;
+}
+table .column--name {
+  width: 65%;
+}
+table .column--total,
+table .cell--total {
+  text-align: right;
+}
+`;

packages/server/src/services/FinancialStatements/GeneralLedger/constants.ts

@@ -10,4 +10,20 @@ table tr.row-type--closing-balance td{
 table tr.row-type--closing-balance td {
   border-bottom: 1px solid #ececec; 
 }
-`;
+
+table .column--debit,
+table .column--credit,
+table .column--amount,
+table .column--running_balance,
+table .cell--debit,
+table .cell--credit,
+table .cell--amount,
+table .cell--running_balance{
+  text-align: right;
+}
+table tr.row-type--account .cell--date span,
+table tr.row-type--opening-balance .cell--account_name span,
+table tr.row-type--closing-balance .cell--account_name span{
+  white-space: nowrap;
+}
+`;

packages/server/src/services/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryApplication.ts

@@ -75,6 +75,6 @@ export class SalesTaxLiabilitySummaryApplication {
     tenantId: number,
     query: SalesTaxLiabilitySummaryQuery
   ): Promise<Buffer> {
-    return this.salesTaxLiabiltiyPdf.pdf(tenantId, query):
+    return this.salesTaxLiabiltiyPdf.pdf(tenantId, query);
   }
 }

packages/server/src/services/FinancialStatements/TrialBalanceSheet/_constants.ts

@@ -6,7 +6,7 @@ export enum IROW_TYPE {
 export const HtmlTableCustomCss = `
 table tr.row-type--total td{
   border-top: 1px solid #bbb;
-  font-weight: 500;
+  font-weight: 600;
   border-bottom: 3px double #000;
 }
 

packages/server/src/services/FinancialStatements/VendorBalanceSummary/VendorBalanceSummaryTableRows.ts

@@ -54,7 +54,7 @@ export class VendorBalanceSummaryTable {
    */
   private getVendorColumnsAccessor = (): IColumnMapperMeta[] => {
     const columns = [
-      { key: 'vendorName', accessor: 'vendorName' },
+      { key: 'name', accessor: 'vendorName' },
       { key: 'total', accessor: 'total.formattedAmount' },
     ];
     return R.compose(
@@ -87,7 +87,7 @@ export class VendorBalanceSummaryTable {
    */
   private getTotalColumnsAccessor = (): IColumnMapperMeta[] => {
     const columns = [
-      { key: 'total', value: this.i18n.__('Total') },
+      { key: 'name', value: this.i18n.__('Total') },
       { key: 'total', accessor: 'total.formattedAmount' },
     ];
     return R.compose(

packages/server/src/services/FinancialStatements/VendorBalanceSummary/constants.ts

@@ -3,4 +3,12 @@ table tr.row-type--total td {
   font-weight: 600;
   border-top: 1px solid #bbb;
   border-bottom: 3px double #333;
-}`;
+}
+table .column--name {
+  width: 65%;
+}
+table .column--total,
+table .cell--total {
+  text-align: right;
+}
+`;

packages/webapp/src/components/Dashboard/GlobalHotkeys.tsx

@@ -5,12 +5,16 @@ import { useHistory } from 'react-router-dom';
 import { getDashboardRoutes } from '@/routes/dashboard';
 import withDashboardActions from '@/containers/Dashboard/withDashboardActions';
 import withDialogActions from '@/containers/Dialog/withDialogActions';
+import withUniversalSearchActions from '@/containers/UniversalSearch/withUniversalSearchActions';
 
 import { compose } from '@/utils';
 
 function GlobalHotkeys({
   // #withDashboardActions
-  toggleSidebarExpend,
+  toggleSidebarExpand,
+
+  // withUniversalSearchActions
+  openGlobalSearch,
 
   // #withDialogActions
   openDialog,
@@ -24,7 +28,7 @@ function GlobalHotkeys({
     .toString();
 
   const handleSidebarToggleBtn = () => {
-    toggleSidebarExpend();
+    toggleSidebarExpand();
   };
   useHotkeys(
     globalHotkeys,
@@ -37,10 +41,26 @@ function GlobalHotkeys({
     },
     [history],
   );
-  useHotkeys('ctrl+/', (event, handle) => handleSidebarToggleBtn());
+  useHotkeys('ctrl+/', () => {
-  useHotkeys('shift+d', (event, handle) => openDialog('money-in', {}));
+    handleSidebarToggleBtn();
-  useHotkeys('shift+q', (event, handle) => openDialog('money-out', {}));
+  });
+  useHotkeys('shift+d', () => {
+    openDialog('money-in', {});
+  });
+  useHotkeys('shift+q', () => {
+    openDialog('money-out', {});
+  });
+  useHotkeys('/', () => {
+    setTimeout(() => {
+      openGlobalSearch();
+    }, 0);
+  });
+
   return <div></div>;
 }
 
-export default compose(withDashboardActions, withDialogActions)(GlobalHotkeys);
+export default compose(
+  withDashboardActions,
+  withDialogActions,
+  withUniversalSearchActions,
+)(GlobalHotkeys);

packages/webapp/src/components/UniversalSearch/UniversalSearch.tsx

@@ -152,6 +152,7 @@ function UniversalSearchBar({ isOpen, onSearchTypeChange, ...listProps }) {
             onSearchTypeChange={onSearchTypeChange}
           />
         }
+        autoFocus={true}
       />
       {listProps.itemList}
     </div>

packages/webapp/src/containers/UniversalSearch/DashboardUniversalSearch.tsx

@@ -11,11 +11,10 @@ import { compose } from '@/utils';
 import withUniversalSearchActions from './withUniversalSearchActions';
 import withUniversalSearch from './withUniversalSearch';
 
+import { useGetUniversalSearchTypeOptions } from './utils';
 import DashboardUniversalSearchItemActions from './DashboardUniversalSearchItemActions';
 import { DashboardUniversalSearchItem } from './components';
-
 import DashboardUniversalSearchHotkeys from './DashboardUniversalSearchHotkeys';
-import { useGetUniversalSearchTypeOptions } from './utils';
 
 /**
  * Dashboard universal search.

packages/webapp/src/hooks/query/creditNote.tsx

@@ -3,7 +3,7 @@ import { useQueryClient, useMutation } from 'react-query';
 import { useRequestQuery } from '../useQueryRequest';
 import { transformPagination } from '@/utils';
 import useApiRequest from '../useRequest';
-import { useRequestPdf } from '../utils';
+import { useRequestPdf } from '../useRequestPdf';
 import t from './types';
 
 const commonInvalidateQueries = (queryClient) => {
@@ -354,7 +354,5 @@ export function useRefundCreditTransaction(id, props, requestProps) {
  * Retrieve the credit note pdf document data,
  */
 export function usePdfCreditNote(creditNoteId) {
-  return useRequestPdf({
+  return useRequestPdf({ url: `sales/credit_notes/${creditNoteId}` });
-    url: `sales/credit_notes/${creditNoteId}`,
-  });
 }

packages/webapp/src/hooks/query/estimates.tsx

@@ -2,10 +2,9 @@
 import { useQueryClient, useMutation } from 'react-query';
 import { useRequestQuery } from '../useQueryRequest';
 import useApiRequest from '../useRequest';
-import { useRequestPdf } from '../utils';
-
 import { transformPagination } from '@/utils';
 import t from './types';
+import { useRequestPdf } from '../useRequestPdf';
 
 const commonInvalidateQueries = (queryClient) => {
   // Invalidate estimates.

packages/webapp/src/hooks/query/invoices.tsx

@@ -3,7 +3,7 @@ import { useQueryClient, useMutation } from 'react-query';
 import { useRequestQuery } from '../useQueryRequest';
 import { transformPagination } from '@/utils';
 import useApiRequest from '../useRequest';
-import { useRequestPdf } from '../utils';
+import { useRequestPdf } from '../useRequestPdf';
 import t from './types';
 
 // Common invalidate queries.

packages/webapp/src/hooks/query/paymentReceives.tsx

@@ -3,9 +3,9 @@ import { useMutation, useQueryClient } from 'react-query';
 import { useRequestQuery } from '../useQueryRequest';
 import useApiRequest from '../useRequest';
 import { transformPagination, saveInvoke } from '@/utils';
-import { useRequestPdf } from '../utils';
 
 import t from './types';
+import { useRequestPdf } from '../useRequestPdf';
 
 // Common invalidate queries.
 const commonInvalidateQueries = (client) => {

packages/webapp/src/hooks/query/receipts.tsx

@@ -1,9 +1,9 @@
 // @ts-nocheck
 import { useQueryClient, useMutation } from 'react-query';
 import { useRequestQuery } from '../useQueryRequest';
-import { useRequestPdf } from '../utils';
 import useApiRequest from '../useRequest';
 import { transformPagination } from '@/utils';
+import { useRequestPdf } from '../useRequestPdf';
 import t from './types';
 
 const commonInvalidateQueries = (queryClient) => {
@@ -165,9 +165,7 @@ export function useReceipt(id, props) {
  * @param {number} receiptId -
  */
 export function usePdfReceipt(receiptId: number) {
-  return useRequestPdf({
+  return useRequestPdf({ url: `sales/receipts/${receiptId}` });
-    url: `sales/receipts/${receiptId}`,
-  });
 }
 
 export function useRefreshReceipts() {

packages/webapp/src/hooks/utils/index.tsx

@@ -4,7 +4,6 @@ export * from './usePrevious';
 export * from './useUpdateEffect';
 export * from './useWatch';
 export * from './useWhen';
-export * from './useRequestPdf';
 export * from './useIntersectionObserver';
 export * from './useAbilityContext';
 export * from './useCustomCompareEffect';

packages/webapp/src/hooks/utils/useRequestPdf.tsx

@@ -1,39 +0,0 @@
-// @ts-nocheck
-import React from 'react';
-import useApiRequest from '../useRequest';
-
-export const useRequestPdf = (url) => {
-  const apiRequest = useApiRequest();
-  const [isLoading, setIsLoading] = React.useState(false);
-  const [isLoaded, setIsLoaded] = React.useState(false);
-  const [pdfUrl, setPdfUrl] = React.useState('');
-  const [response, setResponse] = React.useState(null);
-
-  React.useEffect(() => {
-    setIsLoading(true);
-    apiRequest
-      .get(url, {
-        headers: { accept: 'application/pdf' },
-        responseType: 'blob',
-      })
-      .then((response) => {
-        // Create a Blob from the PDF Stream.
-        const file = new Blob([response.data], { type: 'application/pdf' });
-
-        // Build a URL from the file
-        const fileURL = URL.createObjectURL(file);
-
-        setPdfUrl(fileURL);
-        setIsLoading(false);
-        setIsLoaded(true);
-        setResponse(response);
-      });
-  }, []);
-
-  return {
-    isLoading,
-    isLoaded,
-    pdfUrl,
-    response,
-  };
-};