ci: gitleaks arm64, maven wrapper, MessageUtil, CodeQL x64, devcontainer Playwright, DetailContact tests

apps/frontend/src/screens/contact/screens/create/__tests__/CreateContact.test.js

@@ -172,11 +172,9 @@ describe('CreateContact Component', () => {
   it('should render create contact form', async () => {
     renderComponent();
 
-    // Wait for form to load
-    await waitFor(() => {
-      expect(screen.getByText(/create.*contact/i)).toBeInTheDocument();
-    });
-  });
+    const heading = await screen.findByText(/create.*contact/i, {}, { timeout: 15000 });
+    expect(heading).toBeInTheDocument();
+  }, 20000);
 
   it('should display name input field', async () => {
     renderComponent();

apps/frontend/src/screens/contact/screens/detail/__tests__/DetailContact.test.js

@@ -45,6 +45,7 @@ vi.mock('../../actions', () => ({
   checkValidation: () => () => Promise.resolve({ status: 200, data: { exist: false } }),
 }));
 
+// Module mock: thunk must return Promise so dispatch(thunk) resolves when connect() is used (inline data; vi.mock is hoisted)
 vi.mock('./actions', () => ({
   getContactById: () => () =>
     Promise.resolve({
@@ -55,6 +56,32 @@ vi.mock('./actions', () => ({
         lastName: 'Doe',
         email: 'john.doe@example.com',
         isActive: true,
+        taxTreatmentId: '',
+        billingEmail: '',
+        city: '',
+        countryId: '',
+        addressLine1: '',
+        postZipCode: '',
+        stateId: '',
+        billingTelephone: '',
+        fax: '',
+        shippingCity: '',
+        shippingCountryId: '',
+        addressLine2: '',
+        shippingPostZipCode: '',
+        shippingStateId: '',
+        shippingTelephone: '',
+        shippingFax: '',
+        contactType: '',
+        currencyCode: '',
+        middleName: '',
+        website: '',
+        mobileNumber: '',
+        organization: '',
+        telephone: '',
+        vatRegistrationNumber: '',
+        isRegisteredForVat: false,
+        isBillingAndShippingAddressSame: false,
       },
     }),
   updateContact: () => () => Promise.resolve({ status: 200 }),
@@ -113,26 +140,55 @@ vi.mock('screens/contact/sections', () => ({
 // Import component AFTER mocks are set up
 import DetailContact from '../screen';
 
-// Mock prop action objects
+// Contact data returned by getContactById - component expects this shape to leave loading state
+const mockContactData = {
+  contactId: 1,
+  firstName: 'John',
+  lastName: 'Doe',
+  email: 'john.doe@example.com',
+  isActive: true,
+  taxTreatmentId: '',
+  billingEmail: '',
+  city: '',
+  countryId: '',
+  addressLine1: '',
+  postZipCode: '',
+  stateId: '',
+  billingTelephone: '',
+  fax: '',
+  shippingCity: '',
+  shippingCountryId: '',
+  addressLine2: '',
+  shippingPostZipCode: '',
+  shippingStateId: '',
+  shippingTelephone: '',
+  shippingFax: '',
+  contactType: '',
+  currencyCode: '',
+  middleName: '',
+  website: '',
+  mobileNumber: '',
+  organization: '',
+  telephone: '',
+  vatRegistrationNumber: '',
+  isRegisteredForVat: false,
+  isBillingAndShippingAddressSame: false,
+};
+
+// Mock prop action objects. getContactById must return a Promise (not a thunk) so component's .then() runs and setLoading(false).
 const mockActions = {
-  getContactById: vi.fn(
-    () => () =>
-      Promise.resolve({
-        status: 200,
-        data: {
-          contactId: 1,
-          firstName: 'John',
-          lastName: 'Doe',
-          email: 'john.doe@example.com',
-          isActive: true,
-        },
-      })
+  getContactById: vi.fn(() =>
+    Promise.resolve({
+      status: 200,
+      data: mockContactData,
+    })
   ),
   getTaxTreatment: vi.fn(() => () => Promise.resolve({ status: 200, data: [] })),
   getCountryList: vi.fn(() => () => Promise.resolve({ data: [] })),
   getStateList: vi.fn(() => () => Promise.resolve({ data: [] })),
   getCityList: vi.fn(() => () => Promise.resolve({ data: [] })),
   getContactTypeList: vi.fn(() => () => Promise.resolve({ data: [] })),
+  getInvoicesCountContact: vi.fn(() => Promise.resolve({ data: 0 })),
   updateContact: vi.fn(() => () => Promise.resolve({ status: 200 })),
   deleteContact: vi.fn(() => () => Promise.resolve({ status: 200 })),
   checkValidation: vi.fn(() => () => Promise.resolve({ status: 200, data: { exist: false } })),
@@ -217,12 +273,10 @@ describe('DetailContact Component', () => {
   it('should render detail contact form', async () => {
     renderComponent();
 
-    // Wait for form to load - use getAllByText since "Update Contact" appears in breadcrumb and header
-    await waitFor(() => {
-      const updateContactElements = screen.getAllByText('Update Contact');
-      expect(updateContactElements.length).toBeGreaterThan(0);
-    });
-  });
+    // Wait for form to load (button appears after getContactById resolves); avoid relying on localized heading
+    const updateButton = await screen.findByRole('button', { name: /update/i }, { timeout: 15000 });
+    expect(updateButton).toBeInTheDocument();
+  }, 20000);
 
   it('should display form inputs', async () => {
     renderComponent();
@@ -245,44 +299,31 @@ describe('DetailContact Component', () => {
   it('should display update button', async () => {
     renderComponent();
 
-    await waitFor(() => {
-      const updateButton = screen.getByRole('button', { name: /update/i });
-      expect(updateButton).toBeInTheDocument();
-    });
+    const updateButton = await screen.findByRole('button', { name: /update/i }, { timeout: 15000 });
+    expect(updateButton).toBeInTheDocument();
   });
 
   it('should display cancel button', async () => {
     renderComponent();
 
-    await waitFor(() => {
-      const cancelButton = screen.getByRole('button', { name: /cancel/i });
-      expect(cancelButton).toBeInTheDocument();
-    });
+    const cancelButton = await screen.findByRole('button', { name: /cancel/i }, { timeout: 15000 });
+    expect(cancelButton).toBeInTheDocument();
   });
 
   it('should navigate back on cancel', async () => {
-    // Clear mockNavigate before this test
     mockNavigate.mockClear();
-
     renderComponent();
 
-    // Wait for component to load - use getAllByText since "Update Contact" appears in breadcrumb and header
-    await waitFor(() => {
-      const updateContactElements = screen.getAllByText('Update Contact');
-      expect(updateContactElements.length).toBeGreaterThan(0);
-    });
-
-    const cancelButton = screen.getByRole('button', { name: /cancel/i });
+    const cancelButton = await screen.findByRole('button', { name: /cancel/i }, { timeout: 15000 });
     fireEvent.click(cancelButton);
 
-    // Cancel button uses navigate('/admin/master/contact') from useNavigate hook
     await waitFor(
       () => {
         expect(mockNavigate).toHaveBeenCalledWith('/admin/master/contact');
       },
-      { timeout: 2000 }
+      { timeout: 3000 }
     );
-  });
+  }, 20000);
 
   it('should display address components', async () => {
     renderComponent();