[prev in list] [next in list] [prev in thread] [next in thread]
List: openvas-cvs
Subject: [Openvas-commits] r29719 - in trunk/gsa: . src/html/classic/ng/src/web/pages/reports
From: scm-commit () wald ! intevation ! org
Date: 2017-09-29 12:32:56
Message-ID: 20170929123256.A9A4F90BB0A6 () wald ! intevation ! org
[Download RAW message or body]
Author: bricks
Date: 2017-09-29 14:32:56 +0200 (Fri, 29 Sep 2017)
New Revision: 29719
Modified:
trunk/gsa/ChangeLog
trunk/gsa/src/html/classic/ng/src/web/pages/reports/detailscontent.js
trunk/gsa/src/html/classic/ng/src/web/pages/reports/detailspage.js
trunk/gsa/src/html/classic/ng/src/web/pages/reports/emptyreport.js
trunk/gsa/src/html/classic/ng/src/web/pages/reports/resultstab.js
Log:
* src/html/classic/ng/src/web/pages/reports/detailscontent.js,
src/html/classic/ng/src/web/pages/reports/detailspage.js,
src/html/classic/ng/src/web/pages/reports/emptyreport.js,
src/html/classic/ng/src/web/pages/reports/resultstab.js: Allow to change
target when the report is empty.
Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog 2017-09-29 12:32:53 UTC (rev 29718)
+++ trunk/gsa/ChangeLog 2017-09-29 12:32:56 UTC (rev 29719)
@@ -1,5 +1,13 @@
2017-09-29 Björn Ricks <bjoern.ricks@greenbone.net>
+ * src/html/classic/ng/src/web/pages/reports/detailscontent.js,
+ src/html/classic/ng/src/web/pages/reports/detailspage.js,
+ src/html/classic/ng/src/web/pages/reports/emptyreport.js,
+ src/html/classic/ng/src/web/pages/reports/resultstab.js: Allow to change
+ target when the report is empty.
+
+2017-09-29 Björn Ricks <bjoern.ricks@greenbone.net>
+
* src/html/classic/ng/CMakeLists.txt,
src/html/classic/ng/src/web/entity/component.js,
src/html/classic/ng/src/web/pages/targets/component.js:: Provide reusable
Modified: trunk/gsa/src/html/classic/ng/src/web/pages/reports/detailscontent.js
===================================================================
--- trunk/gsa/src/html/classic/ng/src/web/pages/reports/detailscontent.js 2017-09-29 \
12:32:53 UTC (rev 29718)
+++ trunk/gsa/src/html/classic/ng/src/web/pages/reports/detailscontent.js 2017-09-29 \
12:32:56 UTC (rev 29719) @@ -218,6 +218,7 @@
onReportDownloadClick,
onReportFormatChange,
onTagSuccess,
+ onTargetEditClick,
}) => {
if (!is_defined(entity)) {
return (
@@ -319,6 +320,7 @@
);
return (
<Layout
+ grow
flex="column"
align={['start', 'stretch']}
>
@@ -374,6 +376,7 @@
onFilterRemoveSeverityClick={onFilterRemoveSeverityClick}
onFilterEditClick={onFilterEditClick}
onFilterResetClick={onFilterResetClick}
+ onTargetEditClick={onTargetEditClick}
/>
</TabPanel>
<TabPanel>
@@ -503,6 +506,7 @@
onReportDownloadClick: PropTypes.func.isRequired,
onReportFormatChange: PropTypes.func.isRequired,
onTagSuccess: PropTypes.func.isRequired,
+ onTargetEditClick: PropTypes.func.isRequired,
onTlsCertificateDownloadClick: PropTypes.func.isRequired,
};
Modified: trunk/gsa/src/html/classic/ng/src/web/pages/reports/detailspage.js
===================================================================
--- trunk/gsa/src/html/classic/ng/src/web/pages/reports/detailspage.js 2017-09-29 \
12:32:53 UTC (rev 29718)
+++ trunk/gsa/src/html/classic/ng/src/web/pages/reports/detailspage.js 2017-09-29 \
12:32:56 UTC (rev 29719) @@ -41,11 +41,16 @@
import Wrapper from '../../components/layout/wrapper.js';
+import TargetComponent from '../targets/component.js';
+
import Page from './detailscontent.js';
import FilterDialog from './detailsfilterdialog.js';
const log = logger.getLogger('web.pages.report.details');
+const connect = (in_func, out_func) => (...args) =>
+ in_func(...args).then(out_func);
+
class ReportDetails extends React.Component {
constructor(...args) {
@@ -75,6 +80,8 @@
this.handleTimer = this.handleTimer.bind(this);
this.handleTlsCertificateDownload = this.handleTlsCertificateDownload
.bind(this);
+
+ this.loadTarget = this.loadTarget.bind(this);
}
componentDidMount() {
@@ -386,30 +393,44 @@
}
}
+ loadTarget() {
+ const {entity} = this.state;
+ const {gmp} = this.context;
+ const {report} = entity;
+ const {task} = report;
+ const {target} = task;
+
+ return gmp.target.get(target).then(response => response.data);
+ }
+
render() {
- const {...props} = this.props;
const {filter} = this.state;
return (
<Wrapper>
- <Page
- {...props}
- {...this.state}
- onActivateTab={this.handleActivateTab}
- onAddToAssetsClick={this.handleAddToAssets}
- onTlsCertificateDownloadClick={this.handleTlsCertificateDownload}
- onError={this.handleError}
- onFilterAddLogLevelClick={this.handleFilterAddLogLevel}
- onFilterDecreaseMinQoDClick={this.handleFilterDecreaseMinQoD}
- onFilterChanged={this.handleFilterChange}
- onFilterCreated={this.handleFilterCreated}
- onFilterEditClick={this.handleFilterEditClick}
- onFilterRemoveSeverityClick={this.handleFilterRemoveSeverity}
- onFilterResetClick={this.handleFilterResetClick}
- onRemoveFromAssetsClick={this.handleRemoveFromAssets}
- onReportDownloadClick={this.handleReportDownload}
- onReportFormatChange={this.handleReportFormatChange}
- onTagSuccess={this.handleChanged}
- />
+ <TargetComponent>
+ {({edit}) => (
+ <Page
+ {...this.props}
+ {...this.state}
+ onActivateTab={this.handleActivateTab}
+ onAddToAssetsClick={this.handleAddToAssets}
+ onTlsCertificateDownloadClick={this.handleTlsCertificateDownload}
+ onError={this.handleError}
+ onFilterAddLogLevelClick={this.handleFilterAddLogLevel}
+ onFilterDecreaseMinQoDClick={this.handleFilterDecreaseMinQoD}
+ onFilterChanged={this.handleFilterChange}
+ onFilterCreated={this.handleFilterCreated}
+ onFilterEditClick={this.handleFilterEditClick}
+ onFilterRemoveSeverityClick={this.handleFilterRemoveSeverity}
+ onFilterResetClick={this.handleFilterResetClick}
+ onRemoveFromAssetsClick={this.handleRemoveFromAssets}
+ onReportDownloadClick={this.handleReportDownload}
+ onReportFormatChange={this.handleReportFormatChange}
+ onTagSuccess={this.handleChanged}
+ onTargetEditClick={connect(this.loadTarget, edit)}
+ />
+ )}
+ </TargetComponent>
<NoticeDialog
width="400px"
ref={ref => this.notice_dialog = ref}
Modified: trunk/gsa/src/html/classic/ng/src/web/pages/reports/emptyreport.js
===================================================================
--- trunk/gsa/src/html/classic/ng/src/web/pages/reports/emptyreport.js 2017-09-29 \
12:32:53 UTC (rev 29718)
+++ trunk/gsa/src/html/classic/ng/src/web/pages/reports/emptyreport.js 2017-09-29 \
12:32:56 UTC (rev 29719) @@ -91,7 +91,7 @@
EmptyReport.propTypes = {
capabilities: PropTypes.capabilities.isRequired,
progress: PropTypes.numberOrNumberString,
- onTargetEditClick: PropTypes.func,
+ onTargetEditClick: PropTypes.func.isRequired,
};
export default withCapabilities(EmptyReport);
Modified: trunk/gsa/src/html/classic/ng/src/web/pages/reports/resultstab.js
===================================================================
--- trunk/gsa/src/html/classic/ng/src/web/pages/reports/resultstab.js 2017-09-29 \
12:32:53 UTC (rev 29718)
+++ trunk/gsa/src/html/classic/ng/src/web/pages/reports/resultstab.js 2017-09-29 \
12:32:56 UTC (rev 29719) @@ -42,6 +42,7 @@
onFilterEditClick,
onFilterRemoveSeverityClick,
onFilterResetClick,
+ onTargetEditClick,
}) => {
const {counts} = results;
if (counts.filtered === 0) {
@@ -49,6 +50,7 @@
return (
<EmptyReport
progress={progress}
+ onTargetEditClick={onTargetEditClick}
/>
);
}
@@ -89,6 +91,7 @@
onFilterEditClick: PropTypes.func.isRequired,
onFilterRemoveSeverityClick: PropTypes.func.isRequired,
onFilterResetClick: PropTypes.func.isRequired,
+ onTargetEditClick: PropTypes.func.isRequired,
};
export default ResultsTab;
_______________________________________________
Openvas-commits mailing list
Openvas-commits@wald.intevation.org
https://lists.wald.intevation.org/cgi-bin/mailman/listinfo/openvas-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic