Fix filter in Report Results view cannot be saved

greenbone · Apr 24, 2019 · e4fa26d · e4fa26d
1 parent 9ea3028
commit e4fa26d
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 2 deletions.
diff --git a/gsa/jsconfig.json b/gsa/jsconfig.json
@@ -0,0 +1,14 @@
+{
+  "compilerOptions": {
+    "baseUrl": "src",
+    "paths": {
+      "gmp/*": ["./gmp/*"],
+      "web/*": ["./web/*"]
+    }
+  },
+  "exclude": ["build", "coverage", "node_modules"],
+  "typeAcquisition": {
+    "enable": true,
+    "include": ["jest"]
+  }
+}
diff --git a/gsa/src/web/pages/reports/detailsfilterdialog.js b/gsa/src/web/pages/reports/detailsfilterdialog.js
@@ -38,17 +38,25 @@ import SolutionTypeGroup from 'web/components/powerfilter/solutiontypegroup';
 import withFilterDialog from 'web/components/powerfilter/withFilterDialog';
 import FilterDialogPropTypes from 'web/components/powerfilter/dialogproptypes';
 import SeverityLevelsGroup from 'web/components/powerfilter/severitylevelsgroup';
+import CreateNamedFilterGroup from 'web/components/powerfilter/createnamedfiltergroup';
 
 /* eslint-enable */
 
 import DeltaResultsFilterGroup from './deltaresultsfiltergroup';
 
+import compose from 'web/utils/compose';
+import withCapabilities from 'web/utils/withCapabilities';
+
 const FilterDialog = ({
   delta = false,
   filter,
   filterstring,
   onFilterStringChange,
   onFilterValueChange,
+  capabilities,
+  filterName,
+  saveNamedFilter,
+  onValueChange,
 }) => {
   const result_hosts_only = filter.get('result_hosts_only');
   return (
@@ -93,12 +101,24 @@ const FilterDialog = ({
       <FirstResultGroup filter={filter} onChange={onFilterValueChange} />
 
       <ResultsPerPageGroup filter={filter} onChange={onFilterValueChange} />
+
+      {capabilities.mayCreate('filter') && (
+        <CreateNamedFilterGroup
+          filter={filter}
+          filterName={filterName}
+          saveNamedFilter={saveNamedFilter}
+          onValueChange={onValueChange}
+        />
+      )}
     </Layout>
   );
 };
 
 FilterDialog.propTypes = FilterDialogPropTypes;
 
-export default withFilterDialog()(FilterDialog);
+export default compose(
+  withCapabilities,
+  withFilterDialog(),
+)(FilterDialog);
 
 // vim: set ts=2 sw=2 tw=80:
diff --git a/gsa/src/web/pages/reports/detailspage.js b/gsa/src/web/pages/reports/detailspage.js
@@ -458,7 +458,6 @@ class ReportDetails extends React.Component {
 
   handleFilterCreated(filter) {
     this.handleInteraction();
-
     this.load(filter);
     this.props.loadFilters();
   }
@@ -607,6 +606,8 @@ class ReportDetails extends React.Component {
             delta={isDefined(report) && report.isDeltaReport()}
             onFilterChanged={this.handleFilterChange}
             onCloseClick={this.handleFilterDialogClose}
+            createFilterType="result"
+            onFilterCreated={this.handleFilterCreated}
           />
         )}
         {showDownloadReportDialog && (