fix: post-rebase cleanup

Author: PhilippMa

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

@@ -6,7 +6,7 @@ import { EMPTY_PROJECT_CONFIG } from '../../../Frontend/shared-constants';
 import {
   Attributions,
   PackageInfo,
-  RawClassifications,
+  RawClassificationsConfig,
   RawProjectConfig,
 } from '../../../shared/shared-types';
 import { faker } from '../../../testing/Faker';
@@ -29,7 +29,7 @@ function fakePackagesWithClassifications(
 function fakeConfigWithClassificationIds(
   ...classificationIds: Array<number>
 ): RawProjectConfig {
-  const classifications: RawClassifications = {};
+  const classifications: RawClassificationsConfig = {};
   classificationIds.forEach((classificationId) => {
     classifications[classificationId] = faker.word.words();
   });

src/ElectronBackend/input/refineConfiguration.ts

@@ -6,13 +6,13 @@ import { EMPTY_RAW_PROJECT_CONFIG } from '../../Frontend/shared-constants';
 import {
   Attributions,
   PackageInfo,
-  RawClassifications,
+  RawClassificationsConfig,
   RawProjectConfig,
 } from '../../shared/shared-types';
 import logger from '../main/logger';
 
 function addUnconfiguredClassifications(
-  classifications: RawClassifications,
+  classifications: RawClassificationsConfig,
   externalAttributions: Attributions,
 ) {
   const configuredAttributionKeys = Object.keys(classifications).map(Number);

src/Frontend/Components/AttributionCountPerSourcePerLicenseTable/AttributionCountPerSourcePerLicenseTableRow/AttributionCountPerSourcePerLicenseTableRow.tsx

@@ -94,7 +94,8 @@ const RowCellContent: React.FC<RowCellContentProps> = (props) => {
     );
   } else if (props.column.columnType === SingleColumn.CLASSIFICATION) {
     return props.licenseClassification
-      ? (classifications[props.licenseClassification] ?? componentText.none)
+      ? (classifications[props.licenseClassification]?.description ??
+          componentText.none)
       : componentText.none;
   } else if (props.column.columnType === SingleColumn.TOTAL) {
     return props.totalSignalCount;

src/Frontend/Components/AttributionForm/AuditingOptions/AuditingOptions.util.tsx

@@ -225,7 +225,7 @@ export function useAuditingOptions({
           <ClassificationIcon
             noTooltip
             classification={packageInfo.classification}
-            classification_mapping={classifications}
+            classificationsConfig={classifications}
           />
         ),
         selected: !!packageInfo.classification,

src/Frontend/Components/ProjectStatisticsPopup/ProjectStatisticsPopup.util.ts

@@ -357,7 +357,7 @@ export function getSignalCountByClassification(
   const pieChartData = Object.keys(classifications)
     .map(Number)
     .map<ChartDataItem>((classification) => {
-      const classificationName = classifications[classification];
+      const classificationName = classifications[classification].description;
       const classificationCount =
         classificationCounts[toNumber(classification)] ?? 0;
 

src/Frontend/state/actions/resource-actions/load-actions.ts

@@ -6,10 +6,10 @@ import chroma from 'chroma-js';
 
 import {
   ClassificationEntry,
-  Classifications,
+  ClassificationsConfig,
   ParsedFileContent,
   ProjectConfig,
-  RawClassifications,
+  RawClassificationsConfig,
   RawProjectConfig,
 } from '../../../../shared/shared-types';
 import { OpossumColors } from '../../../shared-styles';
@@ -42,7 +42,7 @@ function interpolateBetweenRedAndWhite(
 
 function getClassificationColor(
   classificationId: string,
-  classifications: RawClassifications,
+  classifications: RawClassificationsConfig,
 ) {
   const configuredClassificationIds = Object.keys(classifications).toReversed();
   const numberOfClassifications = configuredClassificationIds.length;
@@ -55,7 +55,7 @@ function getClassificationColor(
 function addColorsToClassifications(
   rawProjectConfig: RawProjectConfig,
 ): ProjectConfig {
-  const classifications: Classifications =
+  const classifications: ClassificationsConfig =
     Object.fromEntries<ClassificationEntry>(
       Object.entries(rawProjectConfig.classifications).map(
         ([classificationId, classificationEntry]) => {

src/Frontend/state/helpers/progress-bar-data-helpers.ts

@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: Apache-2.0
 import {
   Attributions,
-  Classifications,
+  ClassificationsConfig,
   Criticality,
   Resources,
   ResourcesToAttributions,
@@ -265,7 +265,7 @@ export function getUpdatedProgressBarData(args: {
   resolvedExternalAttributions: Set<string>;
   attributionBreakpoints: Set<string>;
   filesWithChildren: Set<string>;
-  classifications: Classifications;
+  classifications: ClassificationsConfig;
 }): ProgressBarData {
   const progressBarData = getEmptyProgressBarData(args.classifications);
 
@@ -287,7 +287,7 @@ export function getUpdatedProgressBarData(args: {
 }
 
 export function getEmptyProgressBarData(
-  classifications: Classifications,
+  classifications: ClassificationsConfig,
 ): ProgressBarData {
   const classificationStatistics: ClassificationStatistics = {};
   if (classifications) {

src/Frontend/test-helpers/general-test-helpers.ts

@@ -10,7 +10,7 @@ import {
   AttributionsToResources,
   ExternalAttributionSources,
   ParsedFileContent,
-  ProjectConfig,
+  RawProjectConfig,
   Resources,
   ResourcesToAttributions,
 } from '../../shared/shared-types';
@@ -45,7 +45,7 @@ const EMPTY_PARSED_FILE_CONTENT: ParsedFileContent = {
 
 export function getParsedInputFileEnrichedWithTestData(testData: {
   resources?: Resources;
-  config?: ProjectConfig;
+  config?: RawProjectConfig;
   manualAttributions?: Attributions;
   resourcesToManualAttributions?: ResourcesToAttributions;
   externalAttributions?: Attributions;

src/Frontend/web-workers/scripts/get-progress-data.ts

@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: Apache-2.0
 import {
   AttributionData,
-  Classifications,
+  ClassificationsConfig,
   Resources,
 } from '../../../shared/shared-types';
 import { getUpdatedProgressBarData } from '../../state/helpers/progress-bar-data-helpers';
@@ -17,7 +17,7 @@ interface Props {
   manualData: AttributionData;
   resolvedExternalAttributions: Set<string>;
   resources: Resources;
-  classifications: Classifications;
+  classifications: ClassificationsConfig;
 }
 
 export function getProgressData({

src/Frontend/web-workers/signals-worker.ts

@@ -5,7 +5,7 @@
 import {
   AttributionData,
   Attributions,
-  Classifications,
+  ClassificationsConfig,
   Resources,
 } from '../../shared/shared-types';
 import { text } from '../../shared/text';
@@ -85,7 +85,7 @@ interface State {
   signalSearch?: string;
   signalSelectedLicense?: string;
   signalSorting?: Sorting;
-  classifications?: Classifications;
+  classifications?: ClassificationsConfig;
 }
 
 export type SignalsWorkerInput = Unionize<State>;

src/shared/shared-types.ts

@@ -157,7 +157,7 @@ export interface ClassificationEntry {
 
 export type ClassificationsConfig = Record<Classification, ClassificationEntry>;
 
-export type RawClassificationsConfig = Record<Classification, string>
+export type RawClassificationsConfig = Record<Classification, string>;
 
 export interface ProjectConfig {
   classifications: ClassificationsConfig;