Skip to content

Commit

Permalink
use scanconfig import dialog for policies
Browse files Browse the repository at this point in the history
  • Loading branch information
sarahd93 committed Jul 31, 2019
1 parent 32f68af commit 0a98c8e
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 65 deletions.
4 changes: 3 additions & 1 deletion gsa/src/web/pages/policies/component.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ import EditPolicyFamilyDialog from 'web/pages/policies/editpolicyfamilydialog';
import EditPolicyDialog from 'web/pages/policies/editdialog';
import EditNvtDetailsDialog from 'web/pages/policies/editnvtdetailsdialog';
import AuditDialog from 'web/pages/audits/dialog';
import ImportDialog from 'web/pages/policies/importdialog';
import ImportDialog from 'web/pages/scanconfigs/importdialog';
import PolicyDialog from 'web/pages/policies/dialog';

import ScheduleComponent from 'web/pages/schedules/component';
Expand Down Expand Up @@ -743,6 +743,8 @@ class PolicyComponent extends React.Component {
</EntityComponent>
{importDialogVisible && (
<ImportDialog
title={_('Import Policy')}
text={_('Import XML policy')}
onClose={this.handleCloseImportDialog}
onSave={this.handleImportPolicy}
/>
Expand Down
61 changes: 0 additions & 61 deletions gsa/src/web/pages/policies/importdialog.js

This file was deleted.

2 changes: 2 additions & 0 deletions gsa/src/web/pages/scanconfigs/component.js
Original file line number Diff line number Diff line change
Expand Up @@ -491,6 +491,8 @@ class ScanConfigComponent extends React.Component {
</EntityComponent>
{importDialogVisible && (
<ImportDialog
title={_('Import Scan Config')}
text={_('Import XML config')}
onClose={this.handleCloseImportDialog}
onSave={this.handleImportConfig}
/>
Expand Down
8 changes: 5 additions & 3 deletions gsa/src/web/pages/scanconfigs/importdialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,19 @@ import FormGroup from 'web/components/form/formgroup';

import Layout from 'web/components/layout/layout';

const ImportDialog = ({onClose, onSave}) => {
const ImportDialog = ({title, text, onClose, onSave}) => {
return (
<SaveDialog
buttonTitle={_('Import')}
title={_('Import Scan Config')}
title={title}
width="500"
onClose={onClose}
onSave={onSave}
>
{({onValueChange}) => {
return (
<Layout flex="column">
<FormGroup title={_('Import XML config')} titleSize="4">
<FormGroup title={text} titleSize="4">
<FileField name="xml_file" onChange={onValueChange} />
</FormGroup>
</Layout>
Expand All @@ -52,6 +52,8 @@ const ImportDialog = ({onClose, onSave}) => {
};

ImportDialog.propTypes = {
text: PropTypes.string,
title: PropTypes.string,
onClose: PropTypes.func.isRequired,
onSave: PropTypes.func.isRequired,
};
Expand Down

0 comments on commit 0a98c8e

Please sign in to comment.