Author: bricks
Date: 2017-10-23 16:58:36 +0200 (Mon, 23 Oct 2017)
New Revision: 29895
Modified:
trunk/gsa/ChangeLog
trunk/gsa/src/html/classic/ng/src/web/entity/page.js
trunk/gsa/src/html/classic/ng/src/web/entity/permissions.js
trunk/gsa/src/html/classic/ng/src/web/pages/cves/detailspage.js
trunk/gsa/src/html/classic/ng/src/web/pages/hosts/detailspage.js
trunk/gsa/src/html/classic/ng/src/web/pages/notes/detailspage.js
trunk/gsa/src/html/classic/ng/src/web/pages/nvts/detailspage.js
trunk/gsa/src/html/classic/ng/src/web/pages/os/detailspage.js
trunk/gsa/src/html/classic/ng/src/web/pages/overrides/detailspage.js
trunk/gsa/src/html/classic/ng/src/web/pages/tasks/detailspage.js
Log:
* src/html/classic/ng/src/web/entity/page.js,
src/html/classic/ng/src/web/entity/permissions.js,
src/html/classic/ng/src/web/pages/cves/detailspage.js,
src/html/classic/ng/src/web/pages/hosts/detailspage.js,
src/html/classic/ng/src/web/pages/notes/detailspage.js,
src/html/classic/ng/src/web/pages/nvts/detailspage.js,
src/html/classic/ng/src/web/pages/os/detailspage.js,
src/html/classic/ng/src/web/pages/overrides/detailspage.js,
src/html/classic/ng/src/web/pages/tasks/detailspage.js: Refactor
EntityPermissions to use PermissionComponent instead of
withPermissionComponent HOC.
Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog 2017-10-23 14:58:33 UTC (rev 29894)
+++ trunk/gsa/ChangeLog 2017-10-23 14:58:36 UTC (rev 29895)
@@ -1,3 +1,17 @@
+2017-10-23 Bj�rn Ricks <bjoern.ri...@greenbone.net>
+
+ * src/html/classic/ng/src/web/entity/page.js,
+ src/html/classic/ng/src/web/entity/permissions.js,
+ src/html/classic/ng/src/web/pages/cves/detailspage.js,
+ src/html/classic/ng/src/web/pages/hosts/detailspage.js,
+ src/html/classic/ng/src/web/pages/notes/detailspage.js,
+ src/html/classic/ng/src/web/pages/nvts/detailspage.js,
+ src/html/classic/ng/src/web/pages/os/detailspage.js,
+ src/html/classic/ng/src/web/pages/overrides/detailspage.js,
+ src/html/classic/ng/src/web/pages/tasks/detailspage.js: Refactor
+ EntityPermissions to use PermissionComponent instead of
+ withPermissionComponent HOC.
+
2017-10-23 Timo Pollmeier <timo.pollme...@greenbone.net>
* src/html/classic/graphics.xsl (init-d3charts): Remove gsa_polyfill.js
Modified: trunk/gsa/src/html/classic/ng/src/web/entity/page.js
===================================================================
--- trunk/gsa/src/html/classic/ng/src/web/entity/page.js 2017-10-23
14:58:33 UTC (rev 29894)
+++ trunk/gsa/src/html/classic/ng/src/web/entity/page.js 2017-10-23
14:58:36 UTC (rev 29895)
@@ -146,9 +146,9 @@
entity,
permissions,
permissionsComponent: PermissionsComponent = EntityPermissions,
- onChanged,
- onDownloaded,
- onError,
+ onPermissionChanged,
+ onPermissionDownloaded,
+ onPermissionDownloadError,
} = this.props;
if (PermissionsComponent === false) {
@@ -159,9 +159,9 @@
<PermissionsComponent
entity={entity}
permissions={permissions}
- onChanged={onChanged}
- onDownloaded={onDownloaded}
- onError={onError}
+ onChanged={onPermissionChanged}
+ onDownloaded={onPermissionDownloaded}
+ onError={onPermissionDownloadError}
/>
);
}
@@ -206,14 +206,14 @@
title: PropTypes.string,
toolBarIcons: PropTypes.component,
onAddTag: PropTypes.func.isRequired,
- onChanged: PropTypes.func,
onDeleteTag: PropTypes.func.isRequired,
onDisableTag: PropTypes.func.isRequired,
- onDownloaded: PropTypes.func,
onEditTagClick: PropTypes.func.isRequired,
onEnableTag: PropTypes.func.isRequired,
- onError: PropTypes.func,
onNewTagClick: PropTypes.func.isRequired,
+ onPermissionChanged: PropTypes.func,
+ onPermissionDownloadError: PropTypes.func,
+ onPermissionDownloaded: PropTypes.func,
};
export default EntityPage;
Modified: trunk/gsa/src/html/classic/ng/src/web/entity/permissions.js
===================================================================
--- trunk/gsa/src/html/classic/ng/src/web/entity/permissions.js 2017-10-23
14:58:33 UTC (rev 29894)
+++ trunk/gsa/src/html/classic/ng/src/web/entity/permissions.js 2017-10-23
14:58:36 UTC (rev 29895)
@@ -44,7 +44,7 @@
INCLUDE_RELATED_RESOURCES,
} from '../pages/permissions/multipledialog.js';
import PermissionsTable from '../pages/permissions/table.js';
-import withPermissionsComponent from
'../pages/permissions/withPermissionsComponent.js'; // eslint-disable-line
max-len
+import PermissionComponent from '../pages/permissions/component.js';
const SectionElementDivider = glamorous(IconDivider)({
marginBottom: '3px',
@@ -90,7 +90,7 @@
this.state = {};
- this.handleSave = this.handleSave.bind(this);
+ this.handleMultipleSave = this.handleMultipleSave.bind(this);
this.openMultiplePermissionDialog = this.openMultiplePermissionDialog
.bind(this);
this.openPermissionDialog = this.openPermissionDialog.bind(this);
@@ -146,7 +146,7 @@
});
}
- handleSave(data) {
+ handleMultipleSave(data) {
const {onChanged} = this.props;
const {gmp} = this.context;
return gmp.permissions.create(data).then(onChanged);
@@ -189,7 +189,7 @@
}
<MultiplePermissionDialog
ref={ref => this.dialog = ref}
- onSave={this.handleSave}
+ onSave={this.handleMultipleSave}
/>
</Section>
</Wrapper>
@@ -203,6 +203,9 @@
permissions: PropTypes.arrayLike,
relatedResourcesLoaders: PropTypes.arrayOf(PropTypes.func),
onChanged: PropTypes.func.isRequired,
+ onPermissionCloneClick: PropTypes.func.isRequired,
+ onPermissionDeleteClick: PropTypes.func.isRequired,
+ onPermissionDownloadClick: PropTypes.func.isRequired,
onPermissionEditClick: PropTypes.func.isRequired,
};
@@ -210,15 +213,48 @@
gmp: PropTypes.gmp.isRequired,
};
-export default withPermissionsComponent({
- onCloned: 'onChanged',
- onCreated: 'onChanged',
- onDeleted: 'onChanged',
- onSaved: 'onChanged',
- onSaveError: 'onError',
- onDeleteError: 'onError',
- onDownloadError: 'onError',
- onCloneError: 'onError',
-})(EntityPermissions);
+const Permissions = ({
+ onChanged,
+ onDownloaded,
+ onError,
+ ...props
+}) => (
+ <PermissionComponent
+ onDownloaded={onDownloaded}
+ onDownloadError={onError}
+ onCloned={onChanged}
+ onCloneError={onError}
+ onCreated={onChanged}
+ onDeleted={onChanged}
+ onDeleteError={onError}
+ onSaved={onChanged}
+ >
+ {({
+ clone,
+ create,
+ delete: delete_func,
+ download,
+ edit,
+ }) => (
+ <EntityPermissions
+ {...props}
+ onChanged={onChanged}
+ onPermissionCreateClick={create}
+ onPermissionCloneClick={clone}
+ onPermissionDeleteClick={delete_func}
+ onPermissionDownloadClick={download}
+ onPermissionEditClick={edit}
+ />
+ )}
+ </PermissionComponent>
+);
+Permissions.propTypes = {
+ onChanged: PropTypes.func.isRequired,
+ onDownloaded: PropTypes.func.isRequired,
+ onError: PropTypes.func.isRequired,
+};
+
+export default Permissions;
+
// vim: set ts=2 sw=2 tw=80:
Modified: trunk/gsa/src/html/classic/ng/src/web/pages/cves/detailspage.js
===================================================================
--- trunk/gsa/src/html/classic/ng/src/web/pages/cves/detailspage.js
2017-10-23 14:58:33 UTC (rev 29894)
+++ trunk/gsa/src/html/classic/ng/src/web/pages/cves/detailspage.js
2017-10-23 14:58:36 UTC (rev 29895)
@@ -210,7 +210,12 @@
name="cve"
permissionsComponent={false}
>
- {cprops => (
+ {({
+ onChanged,
+ onDownloaded,
+ onError,
+ ...cprops
+ }) => (
<EntityPage
{...props}
{...cprops}
@@ -219,6 +224,9 @@
detailsComponent={Details}
infoComponent={EntityInfo}
toolBarIcons={ToolBarIcons}
+ onPermissionChanged={onChanged}
+ onPermissionDownloaded={onDownloaded}
+ onPermissionDownloadError={onError}
/>
)}
</EntityContainer>
Modified: trunk/gsa/src/html/classic/ng/src/web/pages/hosts/detailspage.js
===================================================================
--- trunk/gsa/src/html/classic/ng/src/web/pages/hosts/detailspage.js
2017-10-23 14:58:33 UTC (rev 29894)
+++ trunk/gsa/src/html/classic/ng/src/web/pages/hosts/detailspage.js
2017-10-23 14:58:36 UTC (rev 29895)
@@ -308,6 +308,9 @@
onHostDownloadClick={download}
onHostEditClick={edit}
onHostIdentifierDeleteClick={deleteidentifier}
+ onPermissionChanged={onChanged}
+ onPermissionDownloaded={onDownloaded}
+ onPermissionDownloadError={onError}
/>
)}
</HostComponent>
Modified: trunk/gsa/src/html/classic/ng/src/web/pages/notes/detailspage.js
===================================================================
--- trunk/gsa/src/html/classic/ng/src/web/pages/notes/detailspage.js
2017-10-23 14:58:33 UTC (rev 29894)
+++ trunk/gsa/src/html/classic/ng/src/web/pages/notes/detailspage.js
2017-10-23 14:58:36 UTC (rev 29895)
@@ -211,6 +211,9 @@
onNoteDownloadClick={download}
onNoteEditClick={edit}
onNoteSaveClick={save}
+ onPermissionChanged={onChanged}
+ onPermissionDownloaded={onDownloaded}
+ onPermissionDownloadError={onError}
/>
)}
</NoteComponent>
Modified: trunk/gsa/src/html/classic/ng/src/web/pages/nvts/detailspage.js
===================================================================
--- trunk/gsa/src/html/classic/ng/src/web/pages/nvts/detailspage.js
2017-10-23 14:58:33 UTC (rev 29894)
+++ trunk/gsa/src/html/classic/ng/src/web/pages/nvts/detailspage.js
2017-10-23 14:58:36 UTC (rev 29895)
@@ -242,6 +242,8 @@
const Page = ({
onChanged,
+ onDownloaded,
+ onError,
...props
}) => (
<NoteComponent
@@ -267,6 +269,9 @@
onChanged={onChanged}
onNoteCreateClick={nvt => open_dialog(nvt, notecreate)}
onOverrideCreateClick={nvt => open_dialog(nvt, overridecreate)}
+ onPermissionChanged={onChanged}
+ onPermissionDownloaded={onDownloaded}
+ onPermissionDownloadError={onError}
/>
)}
</OverrideComponent>
@@ -276,6 +281,7 @@
Page.propTypes = {
onChanged: PropTypes.func.isRequired,
+ onDownloaded: PropTypes.func.isRequired,
onError: PropTypes.func.isRequired,
};
Modified: trunk/gsa/src/html/classic/ng/src/web/pages/os/detailspage.js
===================================================================
--- trunk/gsa/src/html/classic/ng/src/web/pages/os/detailspage.js
2017-10-23 14:58:33 UTC (rev 29894)
+++ trunk/gsa/src/html/classic/ng/src/web/pages/os/detailspage.js
2017-10-23 14:58:36 UTC (rev 29895)
@@ -181,6 +181,7 @@
const Page = ({
onDownloaded,
+ onChanged,
onError,
...props
}) => (
@@ -202,12 +203,16 @@
toolBarIcons={ToolBarIcons}
onOperatingSystemDeleteClick={delete_func}
onOperatingSystemDownloadClick={download}
+ onPermissionChanged={onChanged}
+ onPermissionDownloaded={onDownloaded}
+ onPermissionDownloadError={onError}
/>
)}
</OsComponent>
);
Page.propTypes = {
+ onChanged: PropTypes.func.isRequired,
onDownloaded: PropTypes.func.isRequired,
onError: PropTypes.func.isRequired,
};
Modified: trunk/gsa/src/html/classic/ng/src/web/pages/overrides/detailspage.js
===================================================================
--- trunk/gsa/src/html/classic/ng/src/web/pages/overrides/detailspage.js
2017-10-23 14:58:33 UTC (rev 29894)
+++ trunk/gsa/src/html/classic/ng/src/web/pages/overrides/detailspage.js
2017-10-23 14:58:36 UTC (rev 29895)
@@ -211,6 +211,9 @@
onOverrideDownloadClick={download}
onOverrideEditClick={edit}
onOverrideSaveClick={save}
+ onPermissionChanged={onChanged}
+ onPermissionDownloaded={onDownloaded}
+ onPermissionDownloadError={onError}
/>
)}
</OverrideComponent>
Modified: trunk/gsa/src/html/classic/ng/src/web/pages/tasks/detailspage.js
===================================================================
--- trunk/gsa/src/html/classic/ng/src/web/pages/tasks/detailspage.js
2017-10-23 14:58:33 UTC (rev 29894)
+++ trunk/gsa/src/html/classic/ng/src/web/pages/tasks/detailspage.js
2017-10-23 14:58:36 UTC (rev 29895)
@@ -380,6 +380,7 @@
toolBarIcons={ToolBarIcons}
detailsComponent={Details}
onChanged={onChanged}
+ onError={onError}
onContainerTaskCreateClick={createcontainer}
onReportImportClick={reportimport}
onTaskCloneClick={clone}
@@ -390,6 +391,9 @@
onTaskResumeClick={resume}
onTaskStartClick={start}
onTaskStopClick={stop}
+ onPermissionChanged={onChanged}
+ onPermissionDownloaded={onDownloaded}
+ onPermissionDownloadError={onError}
/>
)}
</TaskComponent>
_______________________________________________
Openvas-commits mailing list
Openvas-commits@wald.intevation.org
https://lists.wald.intevation.org/cgi-bin/mailman/listinfo/openvas-commits
