diff --git a/fe-piattaforma/src/components/AccordionRow/accordionRow.tsx b/fe-piattaforma/src/components/AccordionRow/accordionRow.tsx index 11d1eea77..0c969f9e2 100644 --- a/fe-piattaforma/src/components/AccordionRow/accordionRow.tsx +++ b/fe-piattaforma/src/components/AccordionRow/accordionRow.tsx @@ -151,7 +151,18 @@ const AccordionRow: React.FC = ({ color='primary' /> - ) : null} + ) : } {((onTooltipInfo || innerInfo?.onTooltipInfo) && innerInfo?.isPresentInList) || diff --git a/fe-piattaforma/src/components/ActivityReportTable/ActivityReportTable.tsx b/fe-piattaforma/src/components/ActivityReportTable/ActivityReportTable.tsx index 076ccb729..110114669 100644 --- a/fe-piattaforma/src/components/ActivityReportTable/ActivityReportTable.tsx +++ b/fe-piattaforma/src/components/ActivityReportTable/ActivityReportTable.tsx @@ -82,9 +82,10 @@ const ActivityReportTable = forwardRef(function ActivityReportTable( const { projectId, enteId } = useParams(); const searchReports = useCallback( - (newPage: number) => { + (newPage: number, showLoaderFlag = true) => { if (projectId && (enteId || projectContext)) { - dispatch(showLoader()); + if(showLoaderFlag) + dispatch(showLoader()); searchActivityReport( newPage - 1, 10, @@ -130,7 +131,7 @@ const ActivityReportTable = forwardRef(function ActivityReportTable( searchReports(1); const interval = setInterval(() => { - searchReports(1); + searchReports(1, false); }, 30000); return () => clearInterval(interval); diff --git a/fe-piattaforma/src/components/Table/view/tableDesktop.tsx b/fe-piattaforma/src/components/Table/view/tableDesktop.tsx index 4a94c9825..5e5897cdd 100644 --- a/fe-piattaforma/src/components/Table/view/tableDesktop.tsx +++ b/fe-piattaforma/src/components/Table/view/tableDesktop.tsx @@ -5,6 +5,7 @@ import { Icon, Label, Table as TableKit, + Tooltip, UncontrolledTooltip, } from 'design-react-kit'; import clsx from 'clsx'; @@ -186,9 +187,8 @@ const TableDesktop: React.FC = (props) => { - ) : null} + ) : + + } ) : null} {((onTooltipInfo || td?.onTooltipInfo) && td?.isPresentInList) || - td?.failedCSV ? ( + td?.failedCSV ? (
= ({ clickDeleteAction: onActionClick?.[CRUDActionTypes.DELETE] ? () => onActionClick?.[CRUDActionTypes.DELETE](item) : undefined, - clickDownloadAction: onActionClick?.[CRUDActionTypes.DOWNLOAD] - ? () => onActionClick?.[CRUDActionTypes.DOWNLOAD](item) + clickDownloadAction: onActionClick?.[CRUDActionTypes.DOWNLOAD] && item.jobStatus === 'SUCCESS' + ? () => {onActionClick?.[CRUDActionTypes.DOWNLOAD](item)} : undefined, innerInfo: isEmpty(rest) ? undefined : { id, ...rest }, };