Signal count by classification pie chart

src/ElectronBackend/input/__tests__/importFromFile.test.ts

@@ -68,8 +68,8 @@ const inputFileContent: ParsedOpossumInputFile = {
   },
   config: {
     classifications: {
-      0: 'UNKNOWN',
-      1: 'CRITICAL',
+      0: 'GOOD',
+      1: 'BAD',
     },
   },
   externalAttributions: {
@@ -115,8 +115,8 @@ const expectedFileContent: ParsedFileContent = {
   resources: { a: 1, folder: {} },
   config: {
     classifications: {
-      0: 'UNKNOWN',
-      1: 'CRITICAL',
+      0: 'GOOD',
+      1: 'BAD',
     },
   },
   manualAttributions: {
@@ -376,8 +376,8 @@ describe('Test of loading function', () => {
           },
           config: {
             classifications: {
-              0: 'UNKNOWN',
-              1: 'CRITICAL',
+              0: 'GOOD',
+              1: 'BAD',
             },
           },
           externalAttributions: {
@@ -438,8 +438,8 @@ describe('Test of loading function', () => {
         resources: { a: 1 },
         config: {
           classifications: {
-            0: 'UNKNOWN',
-            1: 'CRITICAL',
+            0: 'GOOD',
+            1: 'BAD',
           },
         },
         manualAttributions: {

src/ElectronBackend/input/__tests__/parseFile.test.ts

@@ -27,8 +27,8 @@ const correctInput: ParsedOpossumInputFile = {
   },
   config: {
     classifications: {
-      0: 'UNKNOWN',
-      1: 'CRITICAL',
+      0: 'GOOD',
+      1: 'BAD',
     },
   },
   externalAttributions: {

src/Frontend/Components/AccordionWithPieChart/AccordionWithPieChart.tsx

@@ -8,10 +8,6 @@ import MuiAccordionDetails from '@mui/material/AccordionDetails';
 import MuiAccordionSummary from '@mui/material/AccordionSummary';
 import MuiTypography from '@mui/material/Typography';
 
-import {
-  PieChartCriticalityNames,
-  ProjectStatisticsPopupTitle,
-} from '../../enums/enums';
 import { OpossumColors } from '../../shared-styles';
 import { PieChartData } from '../../types/types';
 import { PieChart } from '../PieChart/PieChart';
@@ -37,34 +33,18 @@ interface AccordionProps {
   data: Array<PieChartData>;
   title: string;
   defaultExpanded?: boolean;
+  pieChartColorMap?: { [segmentName: string]: string };
 }
 
 export function getColorsForPieChart(
   pieChartData: Array<PieChartData>,
-  pieChartTitle: string,
+  pieChartColorMap?: { [segmentName: string]: string },
 ): Array<string> | undefined {
-  const pieChartColors: Array<string> = [];
-
-  if (
-    pieChartTitle === ProjectStatisticsPopupTitle.CriticalSignalsCountPieChart
-  ) {
-    for (const pieChartSegment of pieChartData) {
-      switch (pieChartSegment.name) {
-        case PieChartCriticalityNames.HighCriticality:
-          pieChartColors.push(OpossumColors.orange);
-          break;
-        case PieChartCriticalityNames.MediumCriticality:
-          pieChartColors.push(OpossumColors.mediumOrange);
-          break;
-        default:
-          pieChartColors.push(OpossumColors.darkBlue);
-          break;
-      }
-    }
-  } else {
+  if (pieChartColorMap === undefined) {
     return;
   }
-  return pieChartColors;
+
+  return pieChartData.map(({ name }) => pieChartColorMap[name]);
 }
 
 export const AccordionWithPieChart: React.FC<AccordionProps> = (props) => {
@@ -87,7 +67,7 @@ export const AccordionWithPieChart: React.FC<AccordionProps> = (props) => {
       <MuiAccordionDetails sx={classes.accordionDetails}>
         <PieChart
           segments={props.data}
-          colors={getColorsForPieChart(props.data, props.title)}
+          colors={getColorsForPieChart(props.data, props.pieChartColorMap)}
         />
       </MuiAccordionDetails>
     </MuiAccordion>

src/Frontend/Components/ProjectStatisticsPopup/ProjectStatisticsPopup.tsx

@@ -6,10 +6,12 @@ import MuiBox from '@mui/material/Box';
 import MuiTypography from '@mui/material/Typography';
 
 import { text } from '../../../shared/text';
-import { ProjectStatisticsPopupTitle } from '../../enums/enums';
+import { PieChartCriticalityNames } from '../../enums/enums';
+import { OpossumColors } from '../../shared-styles';
 import { closePopup } from '../../state/actions/view-actions/view-actions';
 import { useAppDispatch, useAppSelector } from '../../state/hooks';
 import {
+  getClassifications,
   getExternalAttributionSources,
   getManualAttributions,
   getUnresolvedExternalAttributions,
@@ -27,6 +29,7 @@ import {
   getCriticalSignalsCount,
   getIncompleteAttributionsCount,
   getMostFrequentLicenses,
+  getSignalCountByClassification,
   getUniqueLicenseNameToAttribution,
 } from './ProjectStatisticsPopup.util';
 
@@ -41,6 +44,7 @@ export const ProjectStatisticsPopup: React.FC = () => {
 
   const manualAttributions = useAppSelector(getManualAttributions);
   const attributionSources = useAppSelector(getExternalAttributionSources);
+  const classifications = useAppSelector(getClassifications);
 
   const unresolvedExternalAttribution = useAppSelector(
     getUnresolvedExternalAttributions,
@@ -50,12 +54,15 @@ export const ProjectStatisticsPopup: React.FC = () => {
     unresolvedExternalAttribution,
   );
 
-  const { licenseCounts, licenseNamesWithCriticality } =
-    aggregateLicensesAndSourcesFromAttributions(
-      unresolvedExternalAttribution,
-      strippedLicenseNameToAttribution,
-      attributionSources,
-    );
+  const {
+    licenseCounts,
+    licenseNamesWithCriticality,
+    licenseNamesWithClassification,
+  } = aggregateLicensesAndSourcesFromAttributions(
+    unresolvedExternalAttribution,
+    strippedLicenseNameToAttribution,
+    attributionSources,
+  );
 
   const mostFrequentLicenseCountData = getMostFrequentLicenses(licenseCounts);
 
@@ -64,6 +71,18 @@ export const ProjectStatisticsPopup: React.FC = () => {
     licenseNamesWithCriticality,
   );
 
+  const criticalSignalsCountColors = {
+    [PieChartCriticalityNames.HighCriticality]: OpossumColors.orange,
+    [PieChartCriticalityNames.MediumCriticality]: OpossumColors.mediumOrange,
+    [PieChartCriticalityNames.NoCriticality]: OpossumColors.darkBlue,
+  };
+
+  const signalCountByClassification = getSignalCountByClassification(
+    licenseCounts,
+    licenseNamesWithClassification,
+    classifications,
+  );
+
   const manualAttributionPropertyCounts =
     aggregateAttributionPropertiesFromAttributions(manualAttributions);
 
@@ -73,6 +92,7 @@ export const ProjectStatisticsPopup: React.FC = () => {
   const isThereAnyPieChartData =
     mostFrequentLicenseCountData.length > 0 ||
     criticalSignalsCountData.length > 0 ||
+    signalCountByClassification.length > 0 ||
     incompleteAttributionsData.length > 0;
 
   function close(): void {
@@ -93,44 +113,60 @@ export const ProjectStatisticsPopup: React.FC = () => {
                   manualAttributionPropertyCounts,
                 )}
                 title={
-                  ProjectStatisticsPopupTitle.AttributionPropertyCountTable
+                  text.projectStatisticsPopup.charts
+                    .attributionPropertyCountTable
                 }
               />
               <CriticalLicensesTable
                 totalAttributionsPerLicense={
                   licenseCounts.totalAttributionsPerLicense
                 }
                 licenseNamesWithCriticality={licenseNamesWithCriticality}
-                title={ProjectStatisticsPopupTitle.CriticalLicensesTable}
+                title={text.projectStatisticsPopup.charts.criticalLicensesTable}
               />
             </MuiBox>
             <MuiBox style={classes.rightPanel}>
               <MuiTypography variant="subtitle1">
                 {isThereAnyPieChartData
-                  ? ProjectStatisticsPopupTitle.PieChartsSectionHeader
+                  ? text.projectStatisticsPopup.charts.pieChartsSectionHeader
                   : null}
               </MuiTypography>
               <AccordionWithPieChart
                 data={mostFrequentLicenseCountData}
                 title={
-                  ProjectStatisticsPopupTitle.MostFrequentLicenseCountPieChart
+                  text.projectStatisticsPopup.charts
+                    .mostFrequentLicenseCountPieChart
                 }
                 defaultExpanded={true}
               />
               <AccordionWithPieChart
                 data={criticalSignalsCountData}
-                title={ProjectStatisticsPopupTitle.CriticalSignalsCountPieChart}
+                title={
+                  text.projectStatisticsPopup.charts
+                    .criticalSignalsCountPieChart
+                }
+                pieChartColorMap={criticalSignalsCountColors}
+              />
+              <AccordionWithPieChart
+                data={signalCountByClassification}
+                title={
+                  text.projectStatisticsPopup.charts
+                    .signalCountByClassificationPieChart
+                }
               />
               <AccordionWithPieChart
                 data={incompleteAttributionsData}
-                title={ProjectStatisticsPopupTitle.IncompleteLicensesPieChart}
+                title={
+                  text.projectStatisticsPopup.charts
+                    .incompleteAttributionsPieChart
+                }
               />
             </MuiBox>
           </MuiBox>
           <AttributionCountPerSourcePerLicenseTable
             licenseCounts={licenseCounts}
             licenseNamesWithCriticality={licenseNamesWithCriticality}
-            title={ProjectStatisticsPopupTitle.LicenseCountsTable}
+            title={text.projectStatisticsPopup.charts.licenseCountsTable}
           />
         </>
       }