Skip to content

Fix: [EBE-85] fix alert#87

Merged
dariopelliccioli merged 7 commits intodevelopfrom
EBE-85-Conflicts
Aug 8, 2025
Merged

Fix: [EBE-85] fix alert#87
dariopelliccioli merged 7 commits intodevelopfrom
EBE-85-Conflicts

Conversation

@Emanuele-Stazzi
Copy link
Collaborator

Description:

Fix error and success alert

List of change:

Readd show not show logic

asioleLab and others added 7 commits July 31, 2025 19:15
* Refactor pagina panoramica

* Cambiarto redirect

* Refactor button

* Ebe35 refinement and fix (#61)

* Modificato box censimento punti vendita

* Fix routing

* Refactor struttura form
* [EBE-63]: first setup stores page

* [EBE-63]: fixed filters labels

* [EBE- 66] : create table ,filters and store detail components and update merchant transactions component

* [EBE-63]: added dataGrid component

* [EBE-63]: updated initiative stores page and fixed dataTable and filtersForm components

* [EBE-63]: Updated initiative stores page and fixed routing

* [EBE-63]: fixed table parameters in initiative stores page

* [EBE-63]: fixed columns sorting in initiative stores page

* [EBE-63]: fixed side menu and fixed pagination in initiative stores page

* [EBE-63]: deleted duplicate line in sideMenu component

* Refactor pagina panoramica

* Cambiarto redirect

* Refactor button

* [EBE-63]: fixed transaction history filters layout

* [EBE-63]: setted store detail page

* Ebe35 refinement and fix (#61)

* Modificato box censimento punti vendita

* Fix routing

* Refactor struttura form

* [EBE-63]: modified store detail page

* FEAT: finished store detail page (#63)

* [EBE-63]: first setup stores page

* [EBE-63]: fixed filters labels

* [EBE- 66] : create table ,filters and store detail components and update merchant transactions component

* [EBE-63]: added dataGrid component

* [EBE-63]: updated initiative stores page and fixed dataTable and filtersForm components

* [EBE-63]: Updated initiative stores page and fixed routing

* [EBE-63]: fixed table parameters in initiative stores page

* [EBE-63]: fixed columns sorting in initiative stores page

* [EBE-63]: fixed side menu and fixed pagination in initiative stores page

* [EBE-63]: deleted duplicate line in sideMenu component

* [EBE-63]: fixed transaction history filters layout

* [EBE-63]: setted store detail page

* [EBE-63]: modified store detail page

---------

Co-authored-by: Mattia Laurenzana <mattia.laurenzana@beije.it>
Co-authored-by: Emanuele Stazzi <>

* [DEV]: bug fix

* [FIX]: bug fix (#64)

* [EBE-63]: first setup stores page

* [EBE-63]: fixed filters labels

* [EBE- 66] : create table ,filters and store detail components and update merchant transactions component

* [EBE-63]: added dataGrid component

* [EBE-63]: updated initiative stores page and fixed dataTable and filtersForm components

* [EBE-63]: Updated initiative stores page and fixed routing

* [EBE-63]: fixed table parameters in initiative stores page

* [EBE-63]: fixed columns sorting in initiative stores page

* [EBE-63]: fixed side menu and fixed pagination in initiative stores page

* [EBE-63]: deleted duplicate line in sideMenu component

* [EBE-63]: fixed transaction history filters layout

* [EBE-63]: setted store detail page

* [EBE-63]: modified store detail page

* [DEV]: bug fix

---------

Co-authored-by: Mattia Laurenzana <mattia.laurenzana@beije.it>
Co-authored-by: Emanuele Stazzi <>

* [EBE-63]: fixed labels

* [EBE-63]: fixed logs

* [EBE-63]: fixed columns sort

* [EBE-63]: fixed routing

* [EBE-63]: pushed constants file

* [EBE-63]: added constant

* FIX: fixed store upload form (#69)

* Fix button

* [EBE-fix-to-release]: fixed store upload form

---------

Co-authored-by: escarsel <eloisa.scarsella@nttdata.com>
Co-authored-by: Mattia Laurenzana <mattia.laurenzana@beije.it>

* fix path (#70)

---------

Co-authored-by: Mattia Laurenzana <mattia.laurenzana@beije.it>
Co-authored-by: Emanuele Stazzi <>
Co-authored-by: mattialaurenzana21 <Mattia.Laurenzana@nttdata.com>
…nflicts

# Conflicts:
#	src/components/labelValuePair/labelValuePair.tsx
#	src/components/pointsOfSaleForm/PointsOfSaleForm.tsx
#	src/locale/it.json
#	src/pages/initiativeDiscounts/MerchantTransactions.tsx
#	src/pages/initiativeStores/InitiativeStores.tsx
#	src/pages/initiativeStores/initiativeStoreDetail.tsx
@github-actions
Copy link

github-actions bot commented Aug 8, 2025

Coverage report

St.
Category Percentage Covered / Total
🔴 Statements 47.01% 683/1453
🔴 Branches 36.35% 209/575
🔴 Functions 41.51% 193/465
🔴 Lines 47.51% 659/1387
Show files with reduced coverage 🔻
St.
File Statements Branches Functions Lines
🔴
... / initiativeStoreDetail.tsx
0.85% 0% 0% 0.9%

Test suite run success

134 tests passing in 49 suites.

Report generated by 🧪jest coverage report action from 0374d9a

@sonarqubecloud
Copy link

sonarqubecloud bot commented Aug 8, 2025

@dariopelliccioli dariopelliccioli merged commit 361f0d4 into develop Aug 8, 2025
5 checks passed
@dariopelliccioli dariopelliccioli deleted the EBE-85-Conflicts branch August 8, 2025 10:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants