Merge pull request #2568 from alexzurbonsen/fix-displayed-original-li…

…cense-info fix: don't show original license info if signal is of type first party
opossum-tool · Feb 14, 2024 · 296cef6 · 296cef6
2 parents 7f18b88 + 61e655e
commit 296cef6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/src/Frontend/Components/DiffPopup/DiffPopup.tsx b/src/Frontend/Components/DiffPopup/DiffPopup.tsx
@@ -16,7 +16,10 @@ import {
 import { AttributionForm } from '../AttributionColumn/AttributionForm';
 import { NotificationPopup } from '../NotificationPopup/NotificationPopup';
 import { DiffPopupContainer } from './DiffPopup.style';
-import { useAttributionFormConfigs } from './DiffPopup.util';
+import {
+  stripLicenseInfoIfFirstParty,
+  useAttributionFormConfigs,
+} from './DiffPopup.util';
 
 interface DiffPopupProps {
   original: PackageInfo;
@@ -38,8 +41,8 @@ export function DiffPopup({
     bufferPackageInfo,
     setBufferPackageInfo,
   } = useAttributionFormConfigs({
-    original,
-    current,
+    original: stripLicenseInfoIfFirstParty(original),
+    current: stripLicenseInfoIfFirstParty(current),
   });
 
   function handleApplyChanges({
@@ -120,7 +123,7 @@ export function DiffPopup({
     return (
       <DiffPopupContainer>
         <AttributionForm
-          packageInfo={original}
+          packageInfo={stripLicenseInfoIfFirstParty(original)}
           variant={'diff'}
           label={'original'}
           config={originalFormConfig}

diff --git a/src/Frontend/Components/DiffPopup/DiffPopup.util.tsx b/src/Frontend/Components/DiffPopup/DiffPopup.util.tsx
@@ -19,16 +19,7 @@ export function useAttributionFormConfigs({
   original: PackageInfo;
   current: PackageInfo;
 }) {
-  const [bufferPackageInfo, setBufferPackageInfo] = useState(
-    current.firstParty
-      ? {
-          ...current,
-          copyright: undefined,
-          licenseName: undefined,
-          licenseText: undefined,
-        }
-      : current,
-  );
+  const [bufferPackageInfo, setBufferPackageInfo] = useState(current);
 
   const getEndIcon = useCallback(
     ({
@@ -213,3 +204,14 @@ export function useAttributionFormConfigs({
     setBufferPackageInfo,
   };
 }
+
+export function stripLicenseInfoIfFirstParty(packageInfo: PackageInfo) {
+  return packageInfo.firstParty
+    ? {
+        ...packageInfo,
+        copyright: undefined,
+        licenseName: undefined,
+        licenseText: undefined,
+      }
+    : packageInfo;
+}