feat: promote to main (#350)

Author: and-mora

openApi/openapi.merchants.portal.yml

@@ -496,6 +496,14 @@ paths:
             type: string
             maxLength: 14
             pattern: ^[a-zA-Z0-9]{1,14}$
+        - name: trxCode
+          in: query
+          description: "ENG: The transaction's code - IT: Codice della transazione"
+          required: false
+          schema:
+            type: string
+            maxLength: 100
+            pattern: '^[A-Z0-9]+$'
       responses:
         "200":
           description: Ok
@@ -1145,6 +1153,14 @@ paths:
           required: false
           schema:
             type: string
+        - name: trxCode
+          in: query
+          description: "ENG: The transaction's code - IT: Codice della transazione"
+          required: false
+          schema:
+            type: string
+            maxLength: 100
+            pattern: '^[A-Z0-9]+$'
       responses:
         '200':
           description: Ok
@@ -2008,8 +2024,10 @@ components:
         rewardBatchTrxStatus:
           $ref: "#/components/schemas/RewardBatchTrxStatus"
         rewardBatchRejectionReason:
-          type: string
-          description: Reason why the transaction was rejected from the reward batch, if any
+          type: array
+          items:
+            $ref: "#/components/schemas/ReasonDTO"
+          description: "ENG: Reason associated with TRX status - IT: Motivo associato allo stato della trx"
         rewardBatchInclusionDate:
           type: string
           format: date-time
@@ -2689,16 +2707,16 @@ components:
           format: date-time
           description: 'ENG: The date of the transaction - IT: La data della transazione'
           maxLength: 255
-        trxCode:
-          type: string
-          description: "ENG: Transaction code - IT: Il codice della transazione"
-          maxLength: 100
-          pattern: "^[a-zA-Z0-9]+$"
         trxChargeDate:
           type: string
           format: date-time
           description: "ENG: Payment authorization date - IT: La data di autorizzazione del pagamento"
           maxLength: 255
+        trxCode:
+          type: string
+          description: "ENG: Transaction code - IT: Il codice della transazione"
+          maxLength: 100
+          pattern: "^[a-zA-Z0-9]+$"
         updateDate:
           type: string
           format: date-time
@@ -2966,10 +2984,20 @@ components:
       required:
         - franchiseName
         - pointOfSaleId
+    ReasonDTO:
+      type: object
+      properties:
+        date:
+          type: string
+          format: date-time
+          example: "2026-01-30T10:00:00Z"
+        reason:
+          type: string
+          example: "Invoice error"
   securitySchemes:
     Bearer:
       type: apiKey
       name: Authorization
       in: header
 security:
-  - Bearer: []
+  - Bearer: []

src/__tests__/helpers.test.ts

@@ -8,6 +8,9 @@ import {
   isValidEmail,
   isValidUrl,
   generateUniqueId,
+  handlePromptMessage,
+  truncateString,
+  formatEuro
 } from '../helpers';
 import { MISSING_DATA_PLACEHOLDER, MISSING_EURO_PLACEHOLDER } from '../utils/constants';
 
@@ -202,3 +205,40 @@ describe('generateUniqueId', () => {
     expect(generateUniqueId()).toBe('17000000000004f25k6o');
   });
 });
+
+describe('handlePromptMessage', () => {
+  test('should handle prompt message', () => {
+    sessionStorage.setItem('storesPagination', 'test')
+    const pathName1 = { pathname: "path-name-test" }
+    const targetPage1 = "target-page-test"
+
+    const pathName2 = { pathname: "path-name-test" }
+    const targetPage2 = "path-name-test"
+
+    handlePromptMessage(pathName2, targetPage2)
+    expect(sessionStorage.getItem('storesPagination')).toBe('test')
+
+    handlePromptMessage(pathName1, targetPage1)
+    expect(sessionStorage.getItem('storesPagination')).toBeNull
+  });
+});
+
+describe('formatEuro', () => {
+  test('should formatEuro', () => {
+    const amountCents = 4500
+    const amount = formatEuro(amountCents)
+    expect(amount).toBe("45,00€")
+  });
+});
+
+describe('truncateString', () => {
+  test('should truncateString', () => {
+    const initialText = "Initial text excess"
+    const finalText = truncateString(initialText, 7)
+    const fullText = truncateString(initialText)
+    const emptyText = truncateString()
+    expect(finalText).toBe("Initial...")
+    expect(fullText).toBe("Initial text excess")
+    expect(emptyText).toBe("-")
+  });
+});

src/api/MerchantsApiClient.ts

@@ -87,6 +87,7 @@ export const MerchantApi = {
       rewardBatchId?: string;
       rewardBatchTrxStatus?: string;
       pointOfSaleId?: string;
+      trxCode?: string;
     }
   ): Promise<MerchantTransactionsListDTO> => {
     const result = await apiClient.getMerchantTransactionsProcessed({

src/api/__tests__/MerchantsApiClient.test.ts

@@ -1,13 +1,17 @@
 import { extractResponse } from '@pagopa/selfcare-common-frontend/utils/api-utils';
 import { createClient } from '../generated/merchants/client';
+import { store } from '../../redux/store';
 
 jest.mock('@pagopa/selfcare-common-frontend/utils/storage', () => ({
   storageTokenOps: { read: jest.fn().mockReturnValue('mocked-token') },
 }));
 
 jest.mock('@pagopa/selfcare-common-frontend/redux/slices/appStateSlice', () => ({
   appStateActions: { addError: jest.fn((e) => e) },
-  appStateReducer: (state = {}, action: any) => state,
+}));
+
+jest.mock('../../redux/store', () => ({
+  store: { dispatch: jest.fn() },
 }));
 
 jest.mock('@pagopa/selfcare-common-frontend/utils/api-utils', () => ({
@@ -21,6 +25,8 @@ jest.mock('../generated/merchants/client', () => ({
 
 let mockApiClient: any;
 
+store.dispatch = jest.fn();
+
 describe('MerchantApi', () => {
   beforeEach(() => {
     mockApiClient = {
@@ -35,6 +41,7 @@ describe('MerchantApi', () => {
       putPointOfSales: jest.fn(),
       getPointOfSales: jest.fn(),
       getPointOfSale: jest.fn(),
+      getPointOfSalesWithTransactions: jest.fn(),
       getPointOfSaleTransactionsProcessed: jest.fn(),
       downloadInvoiceFile: jest.fn(),
       getReportedUser: jest.fn(),
@@ -43,6 +50,7 @@ describe('MerchantApi', () => {
       sendRewardBatches: jest.fn(),
       postponeTransaction: jest.fn(),
       approveDownloadRewardBatch: jest.fn(),
+      getAllRewardBatches: jest.fn()
     };
 
     (createClient as jest.Mock).mockReturnValue(mockApiClient);
@@ -272,6 +280,42 @@ describe('MerchantApi', () => {
     expect(result).toBe('extracted');
   });
 
+  it('getMerchantPointOfSalesWithTransactions resolved', async () => {
+    const json = jest.fn().mockResolvedValue("test");
+    global.fetch = jest.fn().mockResolvedValue({ok: true, json});
+
+    const MerchantApi = loadApi();
+
+    const resolvedResult = await MerchantApi.getMerchantPointOfSalesWithTransactions('batch-id');
+
+    expect(global.fetch).toHaveBeenCalledWith(expect.any(String), {
+      method: 'GET',
+        headers: {
+          Authorization: `Bearer mocked-token`,
+          Accept: 'application/json',
+        },
+    });
+    expect(json).toHaveBeenCalled()
+    expect(resolvedResult).toBe("test")
+  });
+
+  it('getMerchantPointOfSalesWithTransactions rejected', async () => {
+    global.fetch = jest.fn().mockResolvedValue({ok: false});
+
+    const MerchantApi = loadApi();
+
+    const rejectedResult = await MerchantApi.getMerchantPointOfSalesWithTransactions('batch-id');
+
+    expect(global.fetch).toHaveBeenCalledWith(expect.any(String), {
+      method: 'GET',
+        headers: {
+          Authorization: `Bearer mocked-token`,
+          Accept: 'application/json',
+        },
+    });
+    expect(rejectedResult).toStrictEqual([])
+  });
+
   it('getMerchantPointOfSaleTransactionsProcessed', async () => {
     mockApiClient.getPointOfSaleTransactionsProcessed.mockResolvedValue({ right: 'data' });
     const MerchantApi = loadApi();
@@ -437,17 +481,15 @@ describe('MerchantApi', () => {
     expect(result).toBe('extracted');
   });
 
-  it.skip('sendRewardBatches - error with REWARD_BATCH_PREVIOUS_NOT_SENT', async () => {
+  it('sendRewardBatches - error with REWARD_BATCH_PREVIOUS_NOT_SENT', async () => {
     mockApiClient.sendRewardBatches.mockResolvedValue({
-      left: [{ value: 'REWARD_BATCH_PREVIOUS_NOT_SENT' }],
+      right: { value: {code: 'REWARD_BATCH_PREVIOUS_NOT_SENT'}, status: 400 },
     });
     const MerchantApi = loadApi();
 
     const result = await MerchantApi.sendRewardBatches('init1', 'batch1');
 
-    expect(result).toEqual({
-      code: 'REWARD_BATCH_PREVIOUS_NOT_SENT',
-    });
+    expect(result).toBe('REWARD_BATCH_PREVIOUS_NOT_SENT');
   });
 
   it('sendRewardBatches - error with other code', async () => {

src/components/Footer/__tests__/Footer.test.tsx

@@ -1,15 +1,48 @@
 import React from 'react';
-import { render, screen, act, fireEvent } from '@testing-library/react';
+import { render, screen, act } from '@testing-library/react';
 import Footer from '../Footer';
 import { LangCode } from '@pagopa/mui-italia';
 import { pagoPALink } from '../FooterConfig';
+import { ReactI18NextChild } from 'react-i18next';
 
 let mockedMuiFooterProps: any;
 
 const mockedPagoPALink = { ...pagoPALink };
 
 jest.mock('@pagopa/mui-italia/dist/components/Footer/Footer', () => ({
-  Footer: (props) => {
+  Footer: (props: {
+    loggedUser: {
+      toString: () =>
+        | boolean
+        | React.ReactChild
+        | React.ReactFragment
+        | React.ReactPortal
+        | Iterable<ReactI18NextChild>
+        | null
+        | undefined;
+    };
+    preLoginLinks: any;
+    postLoginLinks: any;
+    companyLink: any;
+    onLanguageChanged: (arg0: string) => void;
+    onExit: (arg0: () => void) => void;
+    currentLangCode:
+      | boolean
+      | React.ReactChild
+      | React.ReactFragment
+      | React.ReactPortal
+      | Iterable<ReactI18NextChild>
+      | null
+      | undefined;
+    productsJsonUrl:
+      | boolean
+      | React.ReactChild
+      | React.ReactFragment
+      | React.ReactPortal
+      | Iterable<ReactI18NextChild>
+      | null
+      | undefined;
+  }) => {
     mockedMuiFooterProps = props;
     return (
       <div data-testid="mui-italia-footer-mock">
@@ -39,7 +72,7 @@ jest.mock('react-i18next', () => ({
   useTranslation: () => ({
     t: (key: string) => key,
   }),
-  Trans: ({ i18nKey, children }: { i18nKey: string; children: React.ReactNode }) => (
+  Trans: ({ children }: { i18nKey: string; children: React.ReactNode }) => (
     <div data-testid="trans-component">{children}</div>
   ),
 }));
@@ -271,6 +304,30 @@ describe('<Footer />', () => {
     expect(window.open).toHaveBeenCalledWith('#workwithus');
   });
 
+  test('should call onClickNavigate when certifications link is clicked', () => {
+    jest.spyOn(window, 'open');
+    render(<Footer loggedUser={false} />);
+
+    const certificationsLink = mockedMuiFooterProps.preLoginLinks.resources.links.find(
+      (link: any) => link.label === 'common.footer.preLoginLinks.resources.links.certifications'
+    );
+    certificationsLink?.onClick();
+
+    expect(window.open).toHaveBeenCalledWith('#certifications');
+  });
+
+  test('should call onClickNavigate when information security link is clicked', () => {
+    jest.spyOn(window, 'open');
+    render(<Footer loggedUser={false} />);
+
+    const infoSecurityLink = mockedMuiFooterProps.preLoginLinks.resources.links.find(
+      (link: any) => link.label === 'common.footer.preLoginLinks.resources.links.informationsecurity'
+    );
+    infoSecurityLink?.onClick();
+
+    expect(window.open).toHaveBeenCalledWith('#infosecurity');
+  });
+
   test('should have correct aria labels for all pre-login links', () => {
     render(<Footer loggedUser={false} />);
 
@@ -298,9 +355,7 @@ describe('<Footer />', () => {
 
   test('should render legal info with Trans component', () => {
     render(<Footer loggedUser={false} />);
-    // Verify legalInfo contains the expected content structure
     expect(mockedMuiFooterProps.legalInfo).toBeDefined();
-    // The Trans component wraps the legal info content
     expect(mockedMuiFooterProps.legalInfo.props.i18nKey).toBe('common.footer.legalInfoText');
   });
 
@@ -345,6 +400,26 @@ describe('<Footer />', () => {
     expect(postLoginLinks[3].label).toBe('common.footer.postLoginLinks.accessibility');
   });
 
+  test('should call onClickNavigate for post-login privacy link', () => {
+    jest.spyOn(window, 'open');
+    render(<Footer loggedUser={true} />);
+
+    const privacyLink = mockedMuiFooterProps.postLoginLinks[0];
+    privacyLink.onClick();
+
+    expect(window.open).toHaveBeenCalledWith(undefined);
+  });
+
+  test('should call onClickNavigate for post-login terms link', () => {
+    jest.spyOn(window, 'open');
+    render(<Footer loggedUser={true} />);
+
+    const termsLink = mockedMuiFooterProps.postLoginLinks[2];
+    termsLink.onClick();
+
+    expect(window.open).toHaveBeenCalledWith(undefined);
+  });
+
   test('should call onClickNavigate for post-login protection link', () => {
     jest.spyOn(window, 'open');
     render(<Footer loggedUser={true} />);
@@ -424,4 +499,11 @@ describe('<Footer />', () => {
       expect(social.ariaLabel).toBeDefined();
     });
   });
-});
+
+  test('should apply pagoPALink href to logo button', () => {
+    render(<Footer loggedUser={false} />);
+
+    const logoButton = screen.getByTestId('logo-btn');
+    expect(logoButton).toHaveAttribute('href', 'https://www.pagopa.it');
+  });
+});