Merge pull request #309 from AppQuality/incoming-bugs-fixes

Incoming bugs fixes

Author: d-beezee

src/pages/Campaign/widgets/TotalBugsByOsAndDevices/getChildrenValue.tsx renamed to src/pages/Campaign/widgets/TotalBugsByOsAndDevices/ChartTotalBugsByDevice/getChildrenValue.tsx

@@ -2,8 +2,8 @@ import { Skeleton, XL } from '@appquality/unguess-design-system';
 import { useEffect, useMemo, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { theme } from 'src/app/theme';
-import { List } from '../List';
-import { ListItem } from '../List/ListItem';
+import { List } from '../../List';
+import { ListItem } from '../../List/ListItem';
 import { useListBugsByDevice } from './useListBugsByDevice';
 
 export const ListTotalBugsByDevice = ({
@@ -16,9 +16,9 @@ export const ListTotalBugsByDevice = ({
 
   const [currentPage, setCurrentPage] = useState<number>(1);
   const [paginatedItems, setPaginatedItems] = useState(items);
-  const pageSize = 6;
+  const pageSize = 4;
   const maxPages = useMemo(
-    () => Math.ceil(total / pageSize),
+    () => Math.ceil(items.length / pageSize),
     [items, pageSize]
   );
 

src/pages/Campaign/widgets/TotalBugsByOsAndDevices/ChartTotalBugsByDevice.tsx renamed to src/pages/Campaign/widgets/TotalBugsByOsAndDevices/ChartTotalBugsByDevice/index.tsx

@@ -21,9 +21,7 @@ const useListBugsByDevice = (campaignId: number) => {
   useEffect(() => {
     if (results && kind === 'bugsByDevice') {
       const bugsByDevice: {
-        [key: string]: {
-          bugs: number;
-        };
+        [key: string]: number;
       } = {};
 
       // Desktops
@@ -33,10 +31,10 @@ const useListBugsByDevice = (campaignId: number) => {
             item.type === 'desktop'
         )
         .forEach((item) => {
-          bugsByDevice[`${item.desktop_type}`] = {
-            ...bugsByDevice[`${item.desktop_type}`],
-            ...item,
-          };
+          if (!(item.desktop_type in bugsByDevice)) {
+            bugsByDevice[item.desktop_type] = 0;
+          }
+          bugsByDevice[item.desktop_type] += item.bugs;
         });
 
       // Non desktops
@@ -46,17 +44,17 @@ const useListBugsByDevice = (campaignId: number) => {
             item.type === 'smartphone' || item.type === 'tablet'
         )
         .forEach((item) => {
-          bugsByDevice[`${item.manufacturer} ${item.model}`] = {
-            ...bugsByDevice[`${item.manufacturer} ${item.model}`],
-            ...item,
-          };
+          if (!(`${item.manufacturer} ${item.model}` in bugsByDevice)) {
+            bugsByDevice[`${item.manufacturer} ${item.model}`] = 0;
+          }
+          bugsByDevice[`${item.manufacturer} ${item.model}`] += item.bugs;
         });
 
       // Transform the object into an array [ device: string; bugs: number; ]
       const formattedBugs = Object.entries(bugsByDevice).map(
-        ([device, meta]) => ({
+        ([device, bugs]) => ({
           device,
-          bugs: meta.bugs,
+          bugs,
         })
       );
 

src/pages/Campaign/widgets/TotalBugsByOsAndDevices/types.ts renamed to src/pages/Campaign/widgets/TotalBugsByOsAndDevices/ChartTotalBugsByDevice/types.ts

@@ -15,7 +15,6 @@ const WidgetCardFaceContent = styled.div`
 
   background-color: white;
   width: 100%;
-  height: 100%;
   display: flex;
   flex-direction: column;
   align-items: center;