SONAR-22542 Fix new links for casa & stig standards

diff --git a/server/sonar-web/src/main/js/apps/issues/__tests__/utils-test.ts b/server/sonar-web/src/main/js/apps/issues/__tests__/utils-test.ts
index d931d5ee29df7c32cd0bcb869973fa54dad8d228..b740749ec9dc0e06ab6c94a9fe75a326ba2722a9 100644 (file)
--- a/server/sonar-web/src/main/js/apps/issues/__tests__/utils-test.ts
+++ b/server/sonar-web/src/main/js/apps/issues/__tests__/utils-test.ts
@@ -53,6 +53,8 @@ describe('serialize/deserialize', () => {
         createdInLast: 'a',
         cwe: ['18', '19'],
         directories: ['a', 'b'],
+        casa: ['a', 'b'],
+        'stig-ASD_V5R3': ['a', 'b'],
         files: ['a', 'b'],
         issues: ['a', 'b'],
         languages: ['a', 'b'],
@@ -92,6 +94,8 @@ describe('serialize/deserialize', () => {
       issues: 'a,b',
       languages: 'a,b',
       owaspTop10: 'a,b',
+      casa: 'a,b',
+      'stig-ASD_V5R3': 'a,b',
       'owaspTop10-2021': 'a,b',
       'pciDss-3.2': 'a,b',
       'pciDss-4.0': 'a,b',
@@ -134,6 +138,8 @@ describe('serialize/deserialize', () => {
       createdBefore: undefined,
       createdInLast: '',
       cwe: [],
+      'stig-ASD_V5R3': [],
+      casa: [],
       directories: [],
       files: [],
       impactSeverities: [SoftwareImpactSeverity.Low],

diff --git a/server/sonar-web/src/main/js/apps/issues/utils.ts b/server/sonar-web/src/main/js/apps/issues/utils.ts
index 918c638d948bdf5d3ad6d3b133597d5ed1553912..ba190bbe98df4108606ea518ab9e80e6b8a46902 100644 (file)
--- a/server/sonar-web/src/main/js/apps/issues/utils.ts
+++ b/server/sonar-web/src/main/js/apps/issues/utils.ts
@@ -61,6 +61,7 @@ export interface Query {
   assigned: boolean;
   assignees: string[];
   author: string[];
+  casa: string[];
   cleanCodeAttributeCategories: CleanCodeAttributeCategory[];
   codeVariants: string[];
   createdAfter: Date | undefined;
@@ -90,6 +91,7 @@ export interface Query {
   severities: string[];
   sonarsourceSecurity: string[];
   sort: string;
+  'stig-ASD_V5R3': string[];
   tags: string[];
   types: string[];
 }
@@ -121,6 +123,7 @@ export function parseQuery(query: RawQuery, needIssueSync = false): Query {
       query.impactSoftwareQualities,
       parseAsString,
     ),
+    'stig-ASD_V5R3': parseAsArray(query['stig-ASD_V5R3'], parseAsString),
     inNewCodePeriod: parseAsBoolean(query.inNewCodePeriod, false),
     issues: parseAsArray(query.issues, parseAsString),
     languages: parseAsArray(query.languages, parseAsString),
@@ -128,6 +131,7 @@ export function parseQuery(query: RawQuery, needIssueSync = false): Query {
     'owaspTop10-2021': parseAsArray(query['owaspTop10-2021'], parseAsString),
     'pciDss-3.2': parseAsArray(query['pciDss-3.2'], parseAsString),
     'pciDss-4.0': parseAsArray(query['pciDss-4.0'], parseAsString),
+    casa: parseAsArray(query['casa'], parseAsString),
     [OWASP_ASVS_4_0]: parseAsArray(query[OWASP_ASVS_4_0], parseAsString),
     owaspAsvsLevel: parseAsString(query['owaspAsvsLevel']),
     projects: parseAsArray(query.projects, parseAsString),
@@ -239,6 +243,8 @@ export function serializeQuery(query: Query): RawQuery {
     owaspTop10: serializeStringArray(query.owaspTop10),
     'owaspTop10-2021': serializeStringArray(query['owaspTop10-2021']),
     'pciDss-3.2': serializeStringArray(query['pciDss-3.2']),
+    casa: serializeStringArray(query['casa']),
+    'stig-ASD_V5R3': serializeStringArray(query['stig-ASD_V5R3']),
     'pciDss-4.0': serializeStringArray(query['pciDss-4.0']),
     [OWASP_ASVS_4_0]: serializeStringArray(query[OWASP_ASVS_4_0]),
     owaspAsvsLevel: serializeString(query['owaspAsvsLevel']),

diff --git a/server/sonar-web/src/main/js/components/templates/FilterBarTemplate.tsx b/server/sonar-web/src/main/js/components/templates/FilterBarTemplate.tsx
index a0ddf19618b89f3c8ec7ba735f1d1b3eee7c96bd..af9e4679bc2cd940e7cf0708953737736e924cf1 100644 (file)
--- a/server/sonar-web/src/main/js/components/templates/FilterBarTemplate.tsx
+++ b/server/sonar-web/src/main/js/components/templates/FilterBarTemplate.tsx
@@ -100,7 +100,7 @@ export default function FilterBarTemplate(props: Readonly<Props>) {
         id={id}
       >
         <Filterbar
-          className={classNames('sw--mt-8 sw-z-filterbar', {
+          className={classNames('sw-z-filterbar', {
             'sw-col-span-3': size === 'default',
             'sw-col-span-4': size === 'large',
             bordered: Boolean(header),

diff --git a/server/sonar-web/src/main/js/helpers/mocks/issues.ts b/server/sonar-web/src/main/js/helpers/mocks/issues.ts
index 0379800351b449ded3420d2c98898e94764333e9..bb57d30030329041c3631722d9ce1849cab5d621 100644 (file)
--- a/server/sonar-web/src/main/js/helpers/mocks/issues.ts
+++ b/server/sonar-web/src/main/js/helpers/mocks/issues.ts
@@ -70,6 +70,8 @@ export function mockQuery(overrides: Partial<Query> = {}): Query {
     issues: [],
     languages: [],
     owaspTop10: [],
+    casa: [],
+    'stig-ASD_V5R3': [],
     'owaspTop10-2021': [],
     'pciDss-3.2': [],
     'pciDss-4.0': [],

diff --git a/server/sonar-web/src/main/js/sonar-aligned/helpers/urls.ts b/server/sonar-web/src/main/js/sonar-aligned/helpers/urls.ts
index f7cf3ec13f88dc883766620f60b0d77e3d0a25da..deddc67a9be31bf62c0eee95f2572f59ee9c22e6 100644 (file)
--- a/server/sonar-web/src/main/js/sonar-aligned/helpers/urls.ts
+++ b/server/sonar-web/src/main/js/sonar-aligned/helpers/urls.ts
@@ -77,6 +77,8 @@ export function getComponentSecurityHotspotsUrl(
         SecurityStandard.PCI_DSS_3_2,
         SecurityStandard.PCI_DSS_4_0,
         SecurityStandard.OWASP_ASVS_4_0,
+        SecurityStandard.CASA,
+        SecurityStandard.STIG_ASD_V5R3,
         'owaspAsvsLevel',
       ]),
     }),