Merge pull request #3006 from opossum-tool/fix/spdx-validation

fix: remove licenseRef autocomplete and show the same license in the autocomplete as well

Author: mariusAsaTNG

src/Frontend/Components/AttributionForm/LicenseSubPanel/LicenseSubPanelAutocomplete.tsx

@@ -128,10 +128,7 @@ export function LicenseSubPanelAutocomplete({
   ): Array<LicenseOption> {
     const [beforeLast, lastLicense] = splitAtLastExpression(inputValue);
     const hasExpressionBeforeLastWord = beforeLast !== '';
-    return options.filter((option) => {
-      if (option.shortName === lastLicense.trim()) {
-        return false;
-      }
+    const autocompleteOptions = options.filter((option) => {
       // Selecting signals or attributions replaces everything, so you have to filter on the full input and not just the last part.
       if (option.replaceEntireSearch) {
         return option.shortName
@@ -144,6 +141,13 @@ export function LicenseSubPanelAutocomplete({
       }
       return false;
     });
+    if (
+      autocompleteOptions.length === 1 &&
+      autocompleteOptions[0].shortName === lastLicense.trim()
+    ) {
+      return [];
+    }
+    return autocompleteOptions;
   }
 
   const validationResult = validateSpdxExpression({

src/Frontend/util/spdx/__test__/validate-spdx.test.ts

@@ -25,8 +25,6 @@ describe('validateSpdxExpression', () => {
     ['parentheses', '(MIT OR Apache-2.0) AND BSD-3-Clause'],
     ['nested parentheses', '((MIT OR Apache-2.0) AND BSD-3-Clause)'],
     ['extra whitespace', 'MIT  AND  Apache-2.0'],
-    ['LicenseRef', 'LicenseRef-MyLicense'],
-    ['DocumentRef', 'DocumentRef-ext:LicenseRef-MyLicense'],
   ])('returns valid for %s', (_, spdxExpression) => {
     expect(validateSpdxExpression({ spdxExpression, knownLicenseIds })).toEqual(
       {
@@ -93,33 +91,6 @@ describe('validateSpdxExpression', () => {
       'mit AND Apache-2.0',
       { unknownId: 'mit', suggestion: 'MIT', fix: 'MIT AND Apache-2.0' },
     ],
-    [
-      'LicenseRef with incorrect casing',
-      'licenseref-MyLicense',
-      {
-        unknownId: 'licenseref-MyLicense',
-        suggestion: 'LicenseRef-MyLicense',
-        fix: 'LicenseRef-MyLicense',
-      },
-    ],
-    [
-      'LicenseRef with space',
-      'LicenseRef MyLicense',
-      {
-        unknownId: 'LicenseRef MyLicense',
-        suggestion: 'LicenseRef-MyLicense',
-        fix: 'LicenseRef-MyLicense',
-      },
-    ],
-    [
-      'DocumentRef with incorrect casing',
-      'documentref-ext',
-      {
-        unknownId: 'documentref-ext',
-        suggestion: 'DocumentRef-ext',
-        fix: 'DocumentRef-ext',
-      },
-    ],
   ])('detects %s', (_, spdxExpression, expectedUnknown) => {
     expect(validateSpdxExpression({ spdxExpression, knownLicenseIds })).toEqual(
       {

src/Frontend/util/spdx/validate-spdx.ts

@@ -86,7 +86,7 @@ const spdxGrammar = grammar(`
     // The conjunctions contain spaces so we don't match MITANDAPACHE
     // We need the #'s here so we don't consume the spaces before trying to match them, which would fail
     CompoundExpression
-      = LicenseId #with LicenseId
+      = LicenseExpression #with LicenseExpression
       | LicenseExpression #and LicenseExpression
       | LicenseExpression #or LicenseExpression
       | "(" LicenseExpression ")"
@@ -171,24 +171,13 @@ function getUnknownLicenseIdsWithSuggestions({
   )) {
     let suggestion: string | undefined = undefined;
 
-    if (id.match(/^LicenseRef/i) || id.match(/^DocumentRef/i)) {
-      suggestion = id
-        .replace(/^LicenseRef/i, 'LicenseRef')
-        .replace(/^DocumentRef/i, 'DocumentRef')
-        .replaceAll(' ', '-');
-
-      if (suggestion === id) {
-        continue;
-      }
-    } else {
-      try {
-        const spdxCorrection = spdxCorrect(id);
-        if (spdxCorrection && knownLicenseIds.has(spdxCorrection)) {
-          suggestion = spdxCorrection;
-        }
-      } catch {
-        // If spxdCorrect fails, we have no suggestion
+    try {
+      const spdxCorrection = spdxCorrect(id);
+      if (spdxCorrection && knownLicenseIds.has(spdxCorrection)) {
+        suggestion = spdxCorrection;
       }
+    } catch {
+      // If spxdCorrect fails, we have no suggestion
     }
 
     const fix = suggestion