Apply review remarks.

greenbone · Jul 3, 2024 · 2311adb · 2311adb
1 parent 22b87c8
commit 2311adb
Show file tree

Hide file tree

Showing 28 changed files with 81 additions and 184 deletions.
diff --git a/src/gmp/capabilities/capabilities.js b/src/gmp/capabilities/capabilities.js
@@ -54,7 +54,7 @@ const convertType = type => {
   if (isDefined(ctype)) {
     type = ctype;
   }
-  return subtypes[type] ? subtypes[type] : type;
+  return subtypes[type] || type;
 };
 
 class Capabilities {

diff --git a/src/gmp/commands/auditreports.js b/src/gmp/commands/auditreports.js
@@ -137,5 +137,3 @@ export class AuditReportCommand extends EntityCommand {
 
 registerCommand('auditreport', AuditReportCommand);
 registerCommand('auditreports', AuditReportsCommand);
-
-// vim: set ts=2 sw=2 tw=80:
diff --git a/src/gmp/models/auditreport.js b/src/gmp/models/auditreport.js
@@ -49,7 +49,7 @@ class AuditReport extends Model {
     copy.task = parseModelFromElement(task, 'task');
 
     copy.reportType = type;
-    copy.contentType = content_type; // revert ?
+    copy.contentType = content_type;
 
     copy.scan_start = parseDate(scan_start);
     copy.timestamp = parseDate(timestamp);
@@ -63,5 +63,3 @@ class AuditReport extends Model {
 }
 
 export default AuditReport;
-
-// vim: set ts=2 sw=2 tw=80:
diff --git a/src/gmp/models/report/auditreport.js b/src/gmp/models/report/auditreport.js
@@ -49,8 +49,6 @@ class AuditReportReport extends Model {
 
     copy.reportType = element._type;
 
-    // copy.scanRunStatus = element.scan_run_status;
-
     delete copy.filters;
 
     if (isDefined(compliance)) {
@@ -140,5 +138,3 @@ class AuditReportReport extends Model {
 }
 
 export default AuditReportReport;
-
-// vim: set ts=2 sw=2 tw=80:
diff --git a/src/web/components/bar/compliancebar.jsx b/src/web/components/bar/compliancebar.jsx
@@ -41,6 +41,4 @@ ComplianceBar.propTypes = {
   toolTip: PropTypes.string,
 };
 
-export default ComplianceBar;
-
-// vim: set ts=2 sw=2 tw=80:
+export default ComplianceBar;
diff --git a/src/web/components/label/compliancestate.jsx b/src/web/components/label/compliancestate.jsx
@@ -4,15 +4,11 @@
  */
 
 import styled from 'styled-components';
-
+import PropTypes from 'web/utils/proptypes';
 import useTranslation from 'web/hooks/useTranslation';
-import {styledExcludeProps} from 'web/utils/styledConfig';
 import Theme from 'web/utils/theme';
 
-const Label = styledExcludeProps(styled.div, [
-  'backgroundColor',
-  'borderColor',
-])`
+const Label = styled.div`
   text-align: center;
   font-weight: normal;
   font-style: normal;
@@ -22,62 +18,32 @@ const Label = styledExcludeProps(styled.div, [
   width: 70px;
   height: 1.5em;
   font-size: 0.8em;
-  background-color: ${props => props.backgroundColor};
-  border-color: ${props => props.borderColor};
+  background-color: ${props => props.$backgroundColor};
+  border-color: ${props => props.$borderColor};
 `;
 
-
-const YesLabel = props => {
+const ComplianceLabel = ({text, color, ...props}) => {
   const [_] = useTranslation();
   return (
   <Label
     {...props}
-    backgroundColor={Theme.complianceYes}
-    borderColor={Theme.complianceYes}
+    $backgroundColor={Theme[color]}
+    $borderColor={Theme[color]}
   >
-    {_('Yes')}
+    {_(text)}
   </Label>
   )
 };
 
-const NoLabel = props => {
-  const [_] = useTranslation();
-  return (
-  <Label
-    {...props}
-    backgroundColor={Theme.complianceNo}
-    borderColor={Theme.complianceNo}
-  >
-    {_('No')}
-  </Label>
-  )
+ComplianceLabel.propTypes = {
+  text: PropTypes.string,
+  color: PropTypes.string,
 };
 
-const IncompleteLabel = props => {
-  const [_] = useTranslation(); 
-  return (
-  <Label
-    {...props}
-    backgroundColor={Theme.complianceIncomplete}
-    borderColor={Theme.complianceIncomplete}
-  >
-    {_('Incomplete')}
-  </Label>
-  )
-};
-
-const UndefinedLabel = props => {
-  const [_] = useTranslation(); 
-  return (
-  <Label
-    {...props}
-    backgroundColor={Theme.complianceUndefined}
-    borderColor={Theme.complianceUndefined}
-  >
-    {_('Undefined')}
-  </Label>
-  )
-};
+const YesLabel = props => <ComplianceLabel {...props} text="Yes" color="complianceYes" />;
+const NoLabel = props => <ComplianceLabel {...props} text='No' color='complianceNo' />;
+const IncompleteLabel = props => <ComplianceLabel {...props} text='Incomplete' color='complianceIncomplete' />;
+const UndefinedLabel = props => <ComplianceLabel {...props} text='Undefined' color='complianceUndefined' />;
 
 export const ComplianceStateLabels = {
   Yes: YesLabel,
@@ -86,6 +52,4 @@ export const ComplianceStateLabels = {
   Undefined: UndefinedLabel,
 };
 
-export default ComplianceStateLabels;
-
-// vim: set ts=2 sw=2 tw=80:
+export default ComplianceStateLabels;
diff --git a/src/web/components/powerfilter/compliancelevelsgroup.jsx b/src/web/components/powerfilter/compliancelevelsgroup.jsx
@@ -28,63 +28,63 @@ const ComplianceLevelsFilterGroup = ({
   const [_] = useTranslation();
 
   const handleComplianceChange = (value, level) => {
-    const filter_name = isResult
+    const filterName = isResult
       ? 'compliance_levels'
       : 'report_compliance_levels';
 
-    let compliance = filter.get(filter_name);
+    let compliance = filter.get(filterName);
 
     if (!compliance) {
       compliance = '';
     }
 
     if (value && !compliance.includes(level)) {
       compliance += level;
-      onChange(compliance, filter_name);
+      onChange(compliance, filterName);
     } else if (!value && compliance.includes(level)) {
       compliance = compliance.replace(level, '');
 
       if (compliance.trim().length === 0) {
         onRemove();
       } else {
-        onChange(compliance, filter_name);
+        onChange(compliance, filterName);
       }
     }
   };
 
-  let compliance_levels = filter.get(
+  let complianceLevels = filter.get(
     isResult ? 'compliance_levels' : 'report_compliance_levels',
   );
 
-  if (!isDefined(compliance_levels)) {
-    compliance_levels = '';
+  if (!isDefined(complianceLevels)) {
+    complianceLevels = '';
   }
   return (
     <FormGroup title={_('Compliance')}>
       <IconDivider>
         <Checkbox
-          checked={compliance_levels.includes('y')}
+          checked={complianceLevels.includes('y')}
           name="y"
           onChange={handleComplianceChange}
         >
           <ComplianceStateLabels.Yes />
         </Checkbox>
         <Checkbox
-          checked={compliance_levels.includes('n')}
+          checked={complianceLevels.includes('n')}
           name="n"
           onChange={handleComplianceChange}
         >
           <ComplianceStateLabels.No />
         </Checkbox>
         <Checkbox
-          checked={compliance_levels.includes('i')}
+          checked={complianceLevels.includes('i')}
           name="i"
           onChange={handleComplianceChange}
         >
           <ComplianceStateLabels.Incomplete />
         </Checkbox>
         <Checkbox
-          checked={compliance_levels.includes('u')}
+          checked={complianceLevels.includes('u')}
           name="u"
           onChange={handleComplianceChange}
         >
@@ -102,6 +102,4 @@ ComplianceLevelsFilterGroup.propTypes = {
   onRemove: PropTypes.func.isRequired,
 };
 
-export default ComplianceLevelsFilterGroup;
-
-// vim: set ts=2 sw=2 tw=80:
+export default ComplianceLevelsFilterGroup;
diff --git a/src/web/entities/filterprovider.jsx b/src/web/entities/filterprovider.jsx
@@ -22,7 +22,6 @@ const FilterProvider = ({
     fallbackFilter,
     locationQueryFilterString: locationQuery?.filter,
   });
-
   return (
     <React.Fragment>
       {isLoadingFilter ? <Loading /> : children({filter: returnedFilter})}

diff --git a/src/web/pages/reports/__mocks__/mockauditdeltareport.jsx b/src/web/pages/reports/__mocks__/mockauditdeltareport.jsx
@@ -3,12 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import {setLocale} from 'gmp/locale/lang';
-
 import AuditReport from 'gmp/models/auditreport';
 
-setLocale('en');
-
 // Task
 const task1 = {
   _id: '314',

diff --git a/src/web/pages/reports/__mocks__/mockauditreport.jsx b/src/web/pages/reports/__mocks__/mockauditreport.jsx
@@ -3,12 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import {setLocale} from 'gmp/locale/lang';
-
 import AuditReport from 'gmp/models/auditreport';
 
-setLocale('en');
-
 // Task
 const task1 = {
   _id: '314',

diff --git a/src/web/pages/reports/__tests__/auditdeltadetailspage.jsx b/src/web/pages/reports/__tests__/auditdeltadetailspage.jsx
@@ -7,7 +7,6 @@ import {describe, test, expect, testing} from '@gsa/testing';
 import React from 'react';
 
 import Capabilities from 'gmp/capabilities/capabilities';
-import {setLocale} from 'gmp/locale/lang';
 
 import Filter from 'gmp/models/filter';
 
@@ -19,8 +18,6 @@ import {getMockAuditDeltaReport} from 'web/pages/reports/__mocks__/mockauditdelt
 
 import DeltaDetailsContent from 'web/pages/reports/deltadetailscontent';
 
-setLocale('en');
-
 const filter = Filter.fromString(
   'apply_overrides=0 compliance_levels=ynui rows=10 min_qod=70 first=1 sort=compliant',
 );

diff --git a/src/web/pages/reports/__tests__/auditdetailscontent.jsx b/src/web/pages/reports/__tests__/auditdetailscontent.jsx
@@ -7,7 +7,6 @@ import {describe, test, expect, testing} from '@gsa/testing';
 import React from 'react';
 
 import Capabilities from 'gmp/capabilities/capabilities';
-import {setLocale} from 'gmp/locale/lang';
 
 import Filter from 'gmp/models/filter';
 
@@ -19,8 +18,6 @@ import {getMockAuditReport} from 'web/pages/reports/__mocks__/mockauditreport';
 
 import DetailsContent from 'web/pages/reports/auditdetailscontent';
 
-setLocale('en');
-
 const filter = Filter.fromString(
   'apply_overrides=0 compliance_levels=ynui rows=10 min_qod=70 first=1 sort=compliant',
 );

diff --git a/src/web/pages/reports/__tests__/auditfilterdialog.jsx b/src/web/pages/reports/__tests__/auditfilterdialog.jsx
@@ -7,16 +7,13 @@ import {describe, test, expect, testing} from '@gsa/testing';
 import React from 'react';
 
 import Capabilities from 'gmp/capabilities/capabilities';
-import {setLocale} from 'gmp/locale/lang';
 
 import Filter from 'gmp/models/filter';
 
 import {rendererWith} from 'web/utils/testing';
 
 import AuditReportFilter from 'web/pages/reports/auditfilterdialog';
 
-setLocale('en');
-
 const caps = new Capabilities(['everything']);
 
 const manualUrl = 'test/';

diff --git a/src/web/pages/reports/__tests__/auditreportslistpage.jsx b/src/web/pages/reports/__tests__/auditreportslistpage.jsx
@@ -7,8 +7,6 @@ import {describe, test, expect, testing} from '@gsa/testing';
 import React from 'react';
 import {act} from 'react-dom/test-utils';
 
-import {setLocale} from 'gmp/locale/lang';
-
 import CollectionCounts from 'gmp/collection/collectioncounts';
 
 import Filter from 'gmp/models/filter';
@@ -22,8 +20,6 @@ import {rendererWith, waitFor, fireEvent} from 'web/utils/testing';
 import {getMockAuditReport} from 'web/pages/reports/__mocks__/mockauditreport';
 import AuditReportsPage from '../auditreportslistpage';
 
-setLocale('en');
-
 window.URL.createObjectURL = testing.fn();
 
 const {entity} = getMockAuditReport();

diff --git a/src/web/pages/reports/__tests__/detailsfilterdialog.jsx b/src/web/pages/reports/__tests__/detailsfilterdialog.jsx
@@ -7,16 +7,13 @@ import {describe, test, expect, testing} from '@gsa/testing';
 import React from 'react';
 
 import Capabilities from 'gmp/capabilities/capabilities';
-import {setLocale} from 'gmp/locale/lang';
 
 import Filter from 'gmp/models/filter';
 
 import {rendererWith} from 'web/utils/testing';
 
 import FilterDialog from 'web/pages/reports/detailsfilterdialog';
 
-setLocale('en');
-
 const caps = new Capabilities(['everything']);
 
 const manualUrl = 'test/';

diff --git a/src/web/pages/reports/auditdashboard/index.jsx b/src/web/pages/reports/auditdashboard/index.jsx
@@ -33,6 +33,4 @@ const AuditReportsDashboard = props => (
   />
 );
 
-export default AuditReportsDashboard;
-
-// vim: set ts=2 sw=2 tw=80:
+export default AuditReportsDashboard;
diff --git a/src/web/pages/reports/auditdashboard/loaders.jsx b/src/web/pages/reports/auditdashboard/loaders.jsx
@@ -27,6 +27,4 @@ export const ReportCompianceLoader = ({children, filter}) => (
   </Loader>
 );
 
-ReportCompianceLoader.propTypes = loaderPropTypes;
-
-// vim: set ts=2 sw=2 tw=80:
+ReportCompianceLoader.propTypes = loaderPropTypes;
diff --git a/src/web/pages/reports/auditdashboard/statusdisplay.jsx b/src/web/pages/reports/auditdashboard/statusdisplay.jsx
@@ -86,6 +86,4 @@ registerDisplay(
   {
     title: _l('Table: Audit Reports by Compliance'),
   },
-);
-
-// vim: set ts=2 sw=2 tw=80:
+);
diff --git a/src/web/pages/reports/auditdeltadetailspage.jsx b/src/web/pages/reports/auditdeltadetailspage.jsx
@@ -549,6 +549,4 @@ DeltaAuditReportDetailsWrapper.propTypes = {
 export default compose(
   withDialogNotification,
   withDownload,
-)(DeltaAuditReportDetailsWrapper);
-
-// vim: set ts=2 sw=2 tw=80:
+)(DeltaAuditReportDetailsWrapper);