Repository: opossum-tool/OpossumUI
Pull request #2473 (2024-01-08 12:28:57)

chore: rename component helpers to util
### Summary of changes

- rename component helper files from -helpers to .util

### Context and reason for change

Discussed in COP that component sidecars named "util" can be used to localize code, i.e., keep it closer together to improve code readability/discovery (aka Locality of Behavior).
We had two conflicting patterns: files ending in "-helpers" and files ending in ".util". It seems better to proceed with just the ".util" pattern:
- allow importing utils from anywhere, not just the parent component
- enforce naming via eslint (not as easily possible with "-helpers")
- using ".util" makes it even clearer that code belongs together

![image](https://github.com/opossum-tool/OpossumUI/assets/46091730/47984bd9-1018-4629-b74a-769a6e783472)

![image](https://github.com/opossum-tool/OpossumUI/assets/46091730/482eff63-00a9-4184-a636-23d1a1d08c5d)



Patch:
diff --git a/src/Frontend/Components/AccordionWithPieChart/__tests__/accordion-with-pie-chart-helpers.test.tsx b/src/Frontend/Components/AccordionWithPieChart/__tests__/AccordionWithPieChart.test.tsx
similarity index 100%
rename from src/Frontend/Components/AccordionWithPieChart/__tests__/accordion-with-pie-chart-helpers.test.tsx
rename to src/Frontend/Components/AccordionWithPieChart/__tests__/AccordionWithPieChart.test.tsx
diff --git a/src/Frontend/Components/AggregatedAttributionsPanel/accordion-panel-helpers.ts b/src/Frontend/Components/AggregatedAttributionsPanel/AccordionPanel.util.ts
similarity index 100%
rename from src/Frontend/Components/AggregatedAttributionsPanel/accordion-panel-helpers.ts
rename to src/Frontend/Components/AggregatedAttributionsPanel/AccordionPanel.util.ts
diff --git a/src/Frontend/Components/AggregatedAttributionsPanel/SyncAccordionPanel.tsx b/src/Frontend/Components/AggregatedAttributionsPanel/SyncAccordionPanel.tsx
index f9a273b1..7222daba 100644
--- a/src/Frontend/Components/AggregatedAttributionsPanel/SyncAccordionPanel.tsx
+++ b/src/Frontend/Components/AggregatedAttributionsPanel/SyncAccordionPanel.tsx
@@ -9,8 +9,8 @@ import {
 } from '../../../shared/shared-types';
 import { PackagePanelTitle } from '../../enums/enums';
 import { AttributionIdWithCount } from '../../types/types';
-import { getExternalDisplayPackageInfosWithCount } from './accordion-panel-helpers';
 import { AccordionPanel } from './AccordionPanel';
+import { getExternalDisplayPackageInfosWithCount } from './AccordionPanel.util';
 
 interface SyncAccordionPanelProps {
   title: PackagePanelTitle;
diff --git a/src/Frontend/Components/AttributionColumn/AttributionColumn.tsx b/src/Frontend/Components/AttributionColumn/AttributionColumn.tsx
index ed1e728a..17a6f626 100644
--- a/src/Frontend/Components/AttributionColumn/AttributionColumn.tsx
+++ b/src/Frontend/Components/AttributionColumn/AttributionColumn.tsx
@@ -41,7 +41,7 @@ import { WasPreferredIcon } from '../Icons/Icons';
 import {
   getResolvedToggleHandler,
   selectedPackagesAreResolved,
-} from './attribution-column-helpers';
+} from './AttributionColumn.util';
 import { AuditingOptions } from './AuditingOptions';
 import { ButtonRow } from './ButtonRow';
 import { CommentStack } from './CommentStack';
diff --git a/src/Frontend/Components/AttributionColumn/attribution-column-helpers.ts b/src/Frontend/Components/AttributionColumn/AttributionColumn.util.ts
similarity index 100%
rename from src/Frontend/Components/AttributionColumn/attribution-column-helpers.ts
rename to src/Frontend/Components/AttributionColumn/AttributionColumn.util.ts
diff --git a/src/Frontend/Components/AttributionColumn/ButtonRow.tsx b/src/Frontend/Components/AttributionColumn/ButtonRow.tsx
index 1f799bef..5dc2d773 100644
--- a/src/Frontend/Components/AttributionColumn/ButtonRow.tsx
+++ b/src/Frontend/Components/AttributionColumn/ButtonRow.tsx
@@ -24,7 +24,7 @@ import { getSelectedView } from '../../state/selectors/view-selector';
 import { Button, ButtonProps } from '../Button/Button';
 import { MenuButton } from '../MenuButton/MenuButton';
 import { SplitButton } from '../SplitButton/SplitButton';
-import { getSelectedManualAttributionIdForAuditView } from './attribution-column-helpers';
+import { getSelectedManualAttributionIdForAuditView } from './AttributionColumn.util';
 
 interface ButtonRowProps {
   areButtonsHidden?: boolean;
diff --git a/src/Frontend/Components/AttributionColumn/LicenseSubPanel.tsx b/src/Frontend/Components/AttributionColumn/LicenseSubPanel.tsx
index ea864e05..3aa50b6e 100644
--- a/src/Frontend/Components/AttributionColumn/LicenseSubPanel.tsx
+++ b/src/Frontend/Components/AttributionColumn/LicenseSubPanel.tsx
@@ -22,7 +22,7 @@ import { useAppDispatch, useAppSelector } from '../../state/hooks';
 import { getFrequentLicensesNameOrder } from '../../state/selectors/all-views-resource-selectors';
 import { Confirm } from '../ConfirmationDialog/ConfirmationDialog';
 import { TextBox } from '../InputElements/TextBox';
-import { getLicenseTextLabelText } from './attribution-column-helpers';
+import { getLicenseTextLabelText } from './AttributionColumn.util';
 import { PackageAutocomplete } from './PackageAutocomplete';
 import { attributionColumnClasses } from './shared-attribution-column-styles';
 
diff --git a/src/Frontend/Components/AttributionPropertyCountTable/__tests__/attribution-property-count-table-helpers.test.tsx b/src/Frontend/Components/AttributionPropertyCountTable/__tests__/AttributionPropertyCountTable.test.tsx
similarity index 100%
rename from src/Frontend/Components/AttributionPropertyCountTable/__tests__/attribution-property-count-table-helpers.test.tsx
rename to src/Frontend/Components/AttributionPropertyCountTable/__tests__/AttributionPropertyCountTable.test.tsx
diff --git a/src/Frontend/Components/PackageCard/PackageCard.tsx b/src/Frontend/Components/PackageCard/PackageCard.tsx
index 2e080ab1..8921e68b 100644
--- a/src/Frontend/Components/PackageCard/PackageCard.tsx
+++ b/src/Frontend/Components/PackageCard/PackageCard.tsx
@@ -53,7 +53,7 @@ import {
   getResolvedToggleHandler,
   MergeButtonDisplayState,
   selectedPackagesAreResolved,
-} from '../AttributionColumn/attribution-column-helpers';
+} from '../AttributionColumn/AttributionColumn.util';
 import { Checkbox } from '../Checkbox/Checkbox';
 import { ContextMenu, ContextMenuItem } from '../ContextMenu/ContextMenu';
 import { IconButton } from '../IconButton/IconButton';
@@ -63,7 +63,7 @@ import {
   getKey,
   getPackageCardHighlighting,
   getRightIcons,
-} from './package-card-helpers';
+} from './PackageCard.util';
 
 const classes = {
   clickableIcon,
diff --git a/src/Frontend/Components/PackagePanel/PackagePanel.tsx b/src/Frontend/Components/PackagePanel/PackagePanel.tsx
index 93a620fe..64e81803 100644
--- a/src/Frontend/Components/PackagePanel/PackagePanel.tsx
+++ b/src/Frontend/Components/PackagePanel/PackagePanel.tsx
@@ -30,7 +30,7 @@ import { PackageList } from '../PackageList/PackageList';
 import {
   getPackageCardIdsAndDisplayPackageInfosForSource,
   getSortedSourcesFromDisplayPackageInfosWithCount,
-} from './package-panel-helpers';
+} from './PackagePanel.util';
 
 const classes = {
   root: {
diff --git a/src/Frontend/Components/ProgressBar/ProgressBar.tsx b/src/Frontend/Components/ProgressBar/ProgressBar.tsx
index 6f1c71cc..2dc43bf5 100644
--- a/src/Frontend/Components/ProgressBar/ProgressBar.tsx
+++ b/src/Frontend/Components/ProgressBar/ProgressBar.tsx
@@ -15,7 +15,7 @@ import {
   getProgressBarBackground,
   getProgressBarTooltipText,
   useOnProgressBarClick,
-} from './progress-bar-helpers';
+} from './ProgressBar.util';
 
 const classes = {
   tooltip: {
diff --git a/src/Frontend/Components/ProjectStatisticsPopup/ProjectStatisticsPopup.tsx b/src/Frontend/Components/ProjectStatisticsPopup/ProjectStatisticsPopup.tsx
index a785b440..b058da78 100644
--- a/src/Frontend/Components/ProjectStatisticsPopup/ProjectStatisticsPopup.tsx
+++ b/src/Frontend/Components/ProjectStatisticsPopup/ProjectStatisticsPopup.tsx
@@ -30,7 +30,7 @@ import {
   getIncompleteAttributionsCount,
   getMostFrequentLicenses,
   getUniqueLicenseNameToAttribution,
-} from './project-statistics-popup-helpers';
+} from './ProjectStatisticsPopup.util';
 
 const classes = {
   panels: { display: 'flex' },
diff --git a/src/Frontend/Components/ReportTableItem/ReportTableItem.tsx b/src/Frontend/Components/ReportTableItem/ReportTableItem.tsx
index dbff7da2..98da6904 100644
--- a/src/Frontend/Components/ReportTableItem/ReportTableItem.tsx
+++ b/src/Frontend/Components/ReportTableItem/ReportTableItem.tsx
@@ -31,7 +31,7 @@ import {
 } from '../Icons/Icons';
 import { reportTableClasses } from '../ReportTableHeader/ReportTableHeader';
 import { TableConfig, tableConfigs } from '../Table/TableConfig';
-import { getFormattedCellData } from './report-table-item-helpers';
+import { getFormattedCellData } from './ReportTableItem.util';
 
 export const reportTableRowHeight = 190;
 const padding = 10;
diff --git a/src/Frontend/Components/ResourcePathPopup/ResourcePathPopup.tsx b/src/Frontend/Components/ResourcePathPopup/ResourcePathPopup.tsx
index 1324b776..d90ec47b 100644
--- a/src/Frontend/Components/ResourcePathPopup/ResourcePathPopup.tsx
+++ b/src/Frontend/Components/ResourcePathPopup/ResourcePathPopup.tsx
@@ -13,7 +13,7 @@ import {
 } from '../../state/selectors/all-views-resource-selectors';
 import { NotificationPopup } from '../NotificationPopup/NotificationPopup';
 import { ResourcesTree } from '../ResourcesTree/ResourcesTree';
-import { getAllResourcePathsForAttributions } from './resource-path-popup-helpers';
+import { getAllResourcePathsForAttributions } from './ResourcePathPopup.util';
 
 const POPUP_CONTENT_PADDING = 48;
 
diff --git a/src/Frontend/Components/ResourcesList/ResourcesList.tsx b/src/Frontend/Components/ResourcesList/ResourcesList.tsx
index 3ac23c42..cb348d49 100644
--- a/src/Frontend/Components/ResourcesList/ResourcesList.tsx
+++ b/src/Frontend/Components/ResourcesList/ResourcesList.tsx
@@ -15,7 +15,7 @@ import { getFileWithChildrenCheck } from '../../util/is-file-with-children';
 import { removeTrailingSlashIfFileWithChildren } from '../../util/remove-trailing-slash-if-file-with-children';
 import { List } from '../List/List';
 import { ListCard } from '../ListCard/ListCard';
-import { convertResourcesListBatchesToResourcesListItems } from './resource-list-helpers';
+import { convertResourcesListBatchesToResourcesListItems } from './ResourcesList.util';
 
 const classes = {
   root: {
diff --git a/src/Frontend/Components/ResourcesTree/ResourcesTree.tsx b/src/Frontend/Components/ResourcesTree/ResourcesTree.tsx
index c1d5244c..41211d4d 100644
--- a/src/Frontend/Components/ResourcesTree/ResourcesTree.tsx
+++ b/src/Frontend/Components/ResourcesTree/ResourcesTree.tsx
@@ -22,11 +22,11 @@ import { getSelectedResourceId } from '../../state/selectors/audit-view-resource
 import { getAttributionBreakpointCheck } from '../../util/is-attribution-breakpoint';
 import { getFileWithChildrenCheck } from '../../util/is-file-with-children';
 import { VirtualizedTree } from '../VirtualisedTree/VirtualizedTree';
-import { getGeneralTreeItemLabel } from './get-general-tree-item-label';
 import {
+  getGeneralTreeItemLabel,
   getInitialExpandedIds,
   getResourcesFromResourcePaths,
-} from './resources-tree-helpers';
+} from './ResourcesTree.util';
 
 interface ResourcesTreeProps {
   resourcePaths: Array<string>;
diff --git a/src/Frontend/Components/ResourcesTree/resources-tree-helpers.ts b/src/Frontend/Components/ResourcesTree/ResourcesTree.util.tsx
similarity index 72%
rename from src/Frontend/Components/ResourcesTree/resources-tree-helpers.ts
rename to src/Frontend/Components/ResourcesTree/ResourcesTree.util.tsx
index 5b43c5f4..b604bc8a 100644
--- a/src/Frontend/Components/ResourcesTree/resources-tree-helpers.ts
+++ b/src/Frontend/Components/ResourcesTree/ResourcesTree.util.tsx
@@ -3,6 +3,8 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 import { Resources } from '../../../shared/shared-types';
+import { PathPredicate } from '../../types/types';
+import { GeneralTreeItemLabel } from '../GeneralTreeItemLabel/GeneralTreeItemLabel';
 
 export function splitResourceIdsToCurrentAndOtherFolder(
   allResourceIds: Array<string>,
@@ -71,3 +73,30 @@ export function getInitialExpandedIds(
 
   return initialExpandedIds;
 }
+
+export function getGeneralTreeItemLabel(
+  resourceName: string,
+  resource: Resources | 1,
+  nodeId: string,
+  isAttributionBreakpoint: PathPredicate,
+  isFileWithChildren: PathPredicate,
+) {
+  const canHaveChildren = resource !== 1;
+
+  return (
+    <GeneralTreeItemLabel
+      labelText={getDisplayName(resourceName)}
+      canHaveChildren={canHaveChildren}
+      isAttributionBreakpoint={isAttributionBreakpoint(nodeId)}
+      showFolderIcon={canHaveChildren && !isFileWithChildren(nodeId)}
+    />
+  );
+}
+
+function getDisplayName(resourceName: string): string {
+  return isRootResource(resourceName) ? '/' : resourceName;
+}
+
+function isRootResource(resourceName: string): boolean {
+  return resourceName === '';
+}
diff --git a/src/Frontend/Components/ResourcesTree/get-general-tree-item-label.tsx b/src/Frontend/Components/ResourcesTree/get-general-tree-item-label.tsx
deleted file mode 100644
index a5bd8f71..00000000
--- a/src/Frontend/Components/ResourcesTree/get-general-tree-item-label.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-// SPDX-FileCopyrightText: Meta Platforms, Inc. and its affiliates
-// SPDX-FileCopyrightText: TNG Technology Consulting GmbH <https://www.tngtech.com>
-//
-// SPDX-License-Identifier: Apache-2.0
-import { ReactElement } from 'react';
-
-import { Resources } from '../../../shared/shared-types';
-import { PathPredicate } from '../../types/types';
-import { GeneralTreeItemLabel } from '../GeneralTreeItemLabel/GeneralTreeItemLabel';
-
-export function getGeneralTreeItemLabel(
-  resourceName: string,
-  resource: Resources | 1,
-  nodeId: string,
-  isAttributionBreakpoint: PathPredicate,
-  isFileWithChildren: PathPredicate,
-): ReactElement {
-  const canHaveChildren = resource !== 1;
-
-  return (
-    <GeneralTreeItemLabel
-      labelText={getDisplayName(resourceName)}
-      canHaveChildren={canHaveChildren}
-      isAttributionBreakpoint={isAttributionBreakpoint(nodeId)}
-      showFolderIcon={canHaveChildren && !isFileWithChildren(nodeId)}
-    />
-  );
-}
-
-function getDisplayName(resourceName: string): string {
-  return isRootResource(resourceName) ? '/' : resourceName;
-}
-
-function isRootResource(resourceName: string): boolean {
-  return resourceName === '';
-}
diff --git a/src/Frontend/state/actions/popup-actions/popup-actions.ts b/src/Frontend/state/actions/popup-actions/popup-actions.ts
index 443db330..853e8c52 100644
--- a/src/Frontend/state/actions/popup-actions/popup-actions.ts
+++ b/src/Frontend/state/actions/popup-actions/popup-actions.ts
@@ -7,7 +7,7 @@ import {
   DisplayPackageInfo,
   SelectedCriticality,
 } from '../../../../shared/shared-types';
-import { getLicenseNameVariants } from '../../../Components/ProjectStatisticsPopup/project-statistics-popup-helpers';
+import { getLicenseNameVariants } from '../../../Components/ProjectStatisticsPopup/ProjectStatisticsPopup.util';
 import { PackagePanelTitle, PopupType, View } from '../../../enums/enums';
 import { EMPTY_DISPLAY_PACKAGE_INFO } from '../../../shared-constants';
 import { State } from '../../../types/types';
diff --git a/src/Frontend/web-workers/scripts/get-attributions-in-folder-content.ts b/src/Frontend/web-workers/scripts/get-attributions-in-folder-content.ts
index 00a3692a..785f7fd1 100644
--- a/src/Frontend/web-workers/scripts/get-attributions-in-folder-content.ts
+++ b/src/Frontend/web-workers/scripts/get-attributions-in-folder-content.ts
@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: TNG Technology Consulting GmbH <https://www.tngtech.com>
 //
 // SPDX-License-Identifier: Apache-2.0
-import { getContainedManualDisplayPackageInfosWithCount } from '../../Components/AggregatedAttributionsPanel/accordion-panel-helpers';
+import { getContainedManualDisplayPackageInfosWithCount } from '../../Components/AggregatedAttributionsPanel/AccordionPanel.util';
 import { PackagePanelTitle } from '../../enums/enums';
 import { PanelData } from '../../types/types';
 import { PanelAttributionData } from '../../util/get-contained-packages';
diff --git a/src/Frontend/web-workers/scripts/get-signals-in-folder-content.ts b/src/Frontend/web-workers/scripts/get-signals-in-folder-content.ts
index e7de9479..0f9d2382 100644
--- a/src/Frontend/web-workers/scripts/get-signals-in-folder-content.ts
+++ b/src/Frontend/web-workers/scripts/get-signals-in-folder-content.ts
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 import { AttributionsToHashes } from '../../../shared/shared-types';
-import { getContainedExternalDisplayPackageInfosWithCount } from '../../Components/AggregatedAttributionsPanel/accordion-panel-helpers';
+import { getContainedExternalDisplayPackageInfosWithCount } from '../../Components/AggregatedAttributionsPanel/AccordionPanel.util';
 import { PackagePanelTitle } from '../../enums/enums';
 import { PanelData } from '../../types/types';
 import { PanelAttributionData } from '../../util/get-contained-packages';


Test patch:
diff --git a/src/Frontend/Components/AggregatedAttributionsPanel/__tests__/accordion-panel-helper.test.ts b/src/Frontend/Components/AggregatedAttributionsPanel/__tests__/AccordionPanel.util.test.ts
similarity index 99%
rename from src/Frontend/Components/AggregatedAttributionsPanel/__tests__/accordion-panel-helper.test.ts
rename to src/Frontend/Components/AggregatedAttributionsPanel/__tests__/AccordionPanel.util.test.ts
index da17b56c..d5e47bac 100644
--- a/src/Frontend/Components/AggregatedAttributionsPanel/__tests__/accordion-panel-helper.test.ts
+++ b/src/Frontend/Components/AggregatedAttributionsPanel/__tests__/AccordionPanel.util.test.ts
@@ -18,7 +18,7 @@ import {
   getContainedManualDisplayPackageInfosWithCount,
   getExternalDisplayPackageInfosWithCount,
   sortDisplayPackageInfosWithCountByCountAndPackageName,
-} from '../accordion-panel-helpers';
+} from '../AccordionPanel.util';
 
 describe('getExternalDisplayPackageInfosWithCount', () => {
   const testAttributionIdsWithCount: Array<AttributionIdWithCount> = [
diff --git a/src/Frontend/Components/AttributionColumn/__tests__/attribution-column-helpers.test.ts b/src/Frontend/Components/AttributionColumn/__tests__/AttributionColumn.util.test.ts
similarity index 99%
rename from src/Frontend/Components/AttributionColumn/__tests__/attribution-column-helpers.test.ts
rename to src/Frontend/Components/AttributionColumn/__tests__/AttributionColumn.util.test.ts
index d1c4c802..34b90ba5 100644
--- a/src/Frontend/Components/AttributionColumn/__tests__/attribution-column-helpers.test.ts
+++ b/src/Frontend/Components/AttributionColumn/__tests__/AttributionColumn.util.test.ts
@@ -9,7 +9,7 @@ import {
   getMergeButtonsDisplayState,
   getSelectedManualAttributionIdForAuditView,
   selectedPackagesAreResolved,
-} from '../attribution-column-helpers';
+} from '../AttributionColumn.util';
 
 describe('The AttributionColumn helpers', () => {
   it('selectedPackageIsResolved returns true', () => {
diff --git a/src/Frontend/Components/PackageCard/package-card-helpers.tsx b/src/Frontend/Components/PackageCard/PackageCard.util.tsx
similarity index 100%
rename from src/Frontend/Components/PackageCard/package-card-helpers.tsx
rename to src/Frontend/Components/PackageCard/PackageCard.util.tsx
diff --git a/src/Frontend/Components/PackageCard/__tests__/package-card-helpers.test.tsx b/src/Frontend/Components/PackageCard/__tests__/PackageCard.util.test.tsx
similarity index 96%
rename from src/Frontend/Components/PackageCard/__tests__/package-card-helpers.test.tsx
rename to src/Frontend/Components/PackageCard/__tests__/PackageCard.util.test.tsx
index 202c4e41..adca1c2b 100644
--- a/src/Frontend/Components/PackageCard/__tests__/package-card-helpers.test.tsx
+++ b/src/Frontend/Components/PackageCard/__tests__/PackageCard.util.test.tsx
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: Apache-2.0
 import { DisplayPackageInfo } from '../../../../shared/shared-types';
 import { HighlightingColor } from '../../../enums/enums';
-import { getPackageCardHighlighting } from '../package-card-helpers';
+import { getPackageCardHighlighting } from '../PackageCard.util';
 
 describe('The PackageCardHelper', () => {
   it.each([
diff --git a/src/Frontend/Components/PackagePanel/package-panel-helpers.ts b/src/Frontend/Components/PackagePanel/PackagePanel.util.ts
similarity index 100%
rename from src/Frontend/Components/PackagePanel/package-panel-helpers.ts
rename to src/Frontend/Components/PackagePanel/PackagePanel.util.ts
diff --git a/src/Frontend/Components/PackagePanel/__tests__/package-panel-helpers.test.ts b/src/Frontend/Components/PackagePanel/__tests__/PackagePanel.util.test.ts
similarity index 99%
rename from src/Frontend/Components/PackagePanel/__tests__/package-panel-helpers.test.ts
rename to src/Frontend/Components/PackagePanel/__tests__/PackagePanel.util.test.ts
index 57e3fc46..1d03412e 100644
--- a/src/Frontend/Components/PackagePanel/__tests__/package-panel-helpers.test.ts
+++ b/src/Frontend/Components/PackagePanel/__tests__/PackagePanel.util.test.ts
@@ -10,7 +10,7 @@ import {
 import {
   getPackageCardIdsAndDisplayPackageInfosForSource,
   getSortedSourcesFromDisplayPackageInfosWithCount,
-} from '../package-panel-helpers';
+} from '../PackagePanel.util';
 
 const testSortedPackageCardIds = [
   'Signals-0',
diff --git a/src/Frontend/Components/ProgressBar/progress-bar-helpers.tsx b/src/Frontend/Components/ProgressBar/ProgressBar.util.tsx
similarity index 100%
rename from src/Frontend/Components/ProgressBar/progress-bar-helpers.tsx
rename to src/Frontend/Components/ProgressBar/ProgressBar.util.tsx
diff --git a/src/Frontend/Components/ProgressBar/__tests__/progress-bar-helpers.test.tsx b/src/Frontend/Components/ProgressBar/__tests__/ProgressBar.util.test.tsx
similarity index 99%
rename from src/Frontend/Components/ProgressBar/__tests__/progress-bar-helpers.test.tsx
rename to src/Frontend/Components/ProgressBar/__tests__/ProgressBar.util.test.tsx
index eed5dd7d..72df3f00 100644
--- a/src/Frontend/Components/ProgressBar/__tests__/progress-bar-helpers.test.tsx
+++ b/src/Frontend/Components/ProgressBar/__tests__/ProgressBar.util.test.tsx
@@ -20,7 +20,7 @@ import {
   getProgressBarBackground,
   roundToAtLeastOnePercentAndNormalize,
   useOnProgressBarClick,
-} from '../progress-bar-helpers';
+} from '../ProgressBar.util';
 
 let useOnProgressBarClickHook: () => void;
 
diff --git a/src/Frontend/Components/ProjectStatisticsPopup/project-statistics-popup-helpers.ts b/src/Frontend/Components/ProjectStatisticsPopup/ProjectStatisticsPopup.util.ts
similarity index 100%
rename from src/Frontend/Components/ProjectStatisticsPopup/project-statistics-popup-helpers.ts
rename to src/Frontend/Components/ProjectStatisticsPopup/ProjectStatisticsPopup.util.ts
diff --git a/src/Frontend/Components/ProjectStatisticsPopup/__tests__/project-statistics-popup-helpers.test.tsx b/src/Frontend/Components/ProjectStatisticsPopup/__tests__/ProjectStatisticsPopup.util.test.tsx
similarity index 99%
rename from src/Frontend/Components/ProjectStatisticsPopup/__tests__/project-statistics-popup-helpers.test.tsx
rename to src/Frontend/Components/ProjectStatisticsPopup/__tests__/ProjectStatisticsPopup.util.test.tsx
index 2c472256..0c274af4 100644
--- a/src/Frontend/Components/ProjectStatisticsPopup/__tests__/project-statistics-popup-helpers.test.tsx
+++ b/src/Frontend/Components/ProjectStatisticsPopup/__tests__/ProjectStatisticsPopup.util.test.tsx
@@ -25,7 +25,7 @@ import {
   getMostFrequentLicenses,
   getStrippedLicenseName,
   getUniqueLicenseNameToAttribution,
-} from '../project-statistics-popup-helpers';
+} from '../ProjectStatisticsPopup.util';
 
 const testAttributions_1: Attributions = {
   uuid1: {
diff --git a/src/Frontend/Components/ReportTableItem/report-table-item-helpers.ts b/src/Frontend/Components/ReportTableItem/ReportTableItem.util.ts
similarity index 100%
rename from src/Frontend/Components/ReportTableItem/report-table-item-helpers.ts
rename to src/Frontend/Components/ReportTableItem/ReportTableItem.util.ts
diff --git a/src/Frontend/Components/ReportTableItem/__tests__/report-table-item-helpers.test.tsx b/src/Frontend/Components/ReportTableItem/__tests__/ReportTableItem.util.test.tsx
similarity index 98%
rename from src/Frontend/Components/ReportTableItem/__tests__/report-table-item-helpers.test.tsx
rename to src/Frontend/Components/ReportTableItem/__tests__/ReportTableItem.util.test.tsx
index 6aaf9641..9a93e809 100644
--- a/src/Frontend/Components/ReportTableItem/__tests__/report-table-item-helpers.test.tsx
+++ b/src/Frontend/Components/ReportTableItem/__tests__/ReportTableItem.util.test.tsx
@@ -5,7 +5,7 @@
 import { AttributionInfo, FollowUp } from '../../../../shared/shared-types';
 import { isImportantAttributionInformationMissing } from '../../../util/is-important-attribution-information-missing';
 import { TableConfig } from '../../Table/TableConfig';
-import { getFormattedCellData } from '../report-table-item-helpers';
+import { getFormattedCellData } from '../ReportTableItem.util';
 
 describe('The table helpers', () => {
   const testPathOfFileWithChildren = '/test/path/';
diff --git a/src/Frontend/Components/ResourcePathPopup/resource-path-popup-helpers.ts b/src/Frontend/Components/ResourcePathPopup/ResourcePathPopup.util.ts
similarity index 100%
rename from src/Frontend/Components/ResourcePathPopup/resource-path-popup-helpers.ts
rename to src/Frontend/Components/ResourcePathPopup/ResourcePathPopup.util.ts
diff --git a/src/Frontend/Components/ResourcePathPopup/__tests__/resource-path-popup-helpers.test.ts b/src/Frontend/Components/ResourcePathPopup/__tests__/ResourcePathPopup.util.test.ts
similarity index 94%
rename from src/Frontend/Components/ResourcePathPopup/__tests__/resource-path-popup-helpers.test.ts
rename to src/Frontend/Components/ResourcePathPopup/__tests__/ResourcePathPopup.util.test.ts
index 37ed8b40..0ef07f4f 100644
--- a/src/Frontend/Components/ResourcePathPopup/__tests__/resource-path-popup-helpers.test.ts
+++ b/src/Frontend/Components/ResourcePathPopup/__tests__/ResourcePathPopup.util.test.ts
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 import { AttributionsToResources } from '../../../../shared/shared-types';
-import { getAllResourcePathsForAttributions } from '../resource-path-popup-helpers';
+import { getAllResourcePathsForAttributions } from '../ResourcePathPopup.util';
 
 describe('getAllResourcePathsForAttributions', () => {
   it('gets resource paths for attributions', () => {
diff --git a/src/Frontend/Components/ResourcesList/resource-list-helpers.ts b/src/Frontend/Components/ResourcesList/ResourcesList.util.ts
similarity index 100%
rename from src/Frontend/Components/ResourcesList/resource-list-helpers.ts
rename to src/Frontend/Components/ResourcesList/ResourcesList.util.ts
diff --git a/src/Frontend/Components/ResourcesList/__tests__/resource-list-helpers.test.ts b/src/Frontend/Components/ResourcesList/__tests__/ResourcesList.util.test.ts
similarity index 98%
rename from src/Frontend/Components/ResourcesList/__tests__/resource-list-helpers.test.ts
rename to src/Frontend/Components/ResourcesList/__tests__/ResourcesList.util.test.ts
index 05430514..22bec930 100644
--- a/src/Frontend/Components/ResourcesList/__tests__/resource-list-helpers.test.ts
+++ b/src/Frontend/Components/ResourcesList/__tests__/ResourcesList.util.test.ts
@@ -3,8 +3,8 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 import { ResourcesListBatch } from '../../../types/types';
-import { convertResourcesListBatchesToResourcesListItems } from '../resource-list-helpers';
 import { ResourcesListItem } from '../ResourcesList';
+import { convertResourcesListBatchesToResourcesListItems } from '../ResourcesList.util';
 
 describe('convertResourceListBatchesToResourceListItems', () => {
   it('inserts headers correctly', () => {
diff --git a/src/Frontend/Components/ResourcesTree/__tests__/resources-tree-helpers.test.ts b/src/Frontend/Components/ResourcesTree/__tests__/ResourcesTree.util.test.ts
similarity index 98%
rename from src/Frontend/Components/ResourcesTree/__tests__/resources-tree-helpers.test.ts
rename to src/Frontend/Components/ResourcesTree/__tests__/ResourcesTree.util.test.ts
index 9b840d7c..462fdb94 100644
--- a/src/Frontend/Components/ResourcesTree/__tests__/resources-tree-helpers.test.ts
+++ b/src/Frontend/Components/ResourcesTree/__tests__/ResourcesTree.util.test.ts
@@ -6,7 +6,7 @@ import { Resources } from '../../../../shared/shared-types';
 import {
   getResourcesFromResourcePaths,
   splitResourceIdsToCurrentAndOtherFolder,
-} from '../resources-tree-helpers';
+} from '../ResourcesTree.util';
 
 describe('splitResourceItToCurrentAndOtherFolder', () => {
   it('splits resource ids correctly', () => {