From 0d4ed4982c5e6bc3b5e67b31176515bcce759367 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= Date: Tue, 4 Mar 2025 16:45:21 +0100 Subject: [PATCH] Change: Rename module containing the EntityComponent The module should be named after the component too. --- src/web/entity/{Component.jsx => EntityComponent.jsx} | 0 .../{Component.tests.jsx => EntityComponent.tests.jsx} | 2 +- src/web/pages/alerts/Component.jsx | 3 +-- src/web/pages/audits/Component.jsx | 2 +- src/web/pages/certbund/DetailsPage.jsx | 3 +-- src/web/pages/cpes/DetailsPage.jsx | 3 +-- src/web/pages/credentials/Component.jsx | 3 +-- src/web/pages/cves/DetailsPage.jsx | 3 +-- src/web/pages/dfncert/DetailsPage.jsx | 3 +-- src/web/pages/filters/Component.jsx | 2 +- src/web/pages/groups/Component.jsx | 3 +-- src/web/pages/hosts/Component.jsx | 2 +- src/web/pages/notes/Component.jsx | 3 +-- src/web/pages/nvts/Component.jsx | 2 +- src/web/pages/operatingsystems/Component.jsx | 2 +- src/web/pages/overrides/Component.jsx | 3 +-- src/web/pages/permissions/Component.jsx | 3 +-- src/web/pages/policies/Component.jsx | 3 +-- src/web/pages/portlists/Component.jsx | 2 +- src/web/pages/reportconfigs/Component.jsx | 3 +-- src/web/pages/reportformats/Component.jsx | 3 +-- src/web/pages/roles/Component.jsx | 3 +-- src/web/pages/scanconfigs/Component.jsx | 2 +- src/web/pages/scanners/Component.jsx | 3 +-- src/web/pages/schedules/Component.jsx | 3 +-- src/web/pages/tags/Component.jsx | 2 +- src/web/pages/targets/Component.jsx | 3 +-- src/web/pages/tasks/Component.jsx | 3 +-- src/web/pages/tickets/Component.jsx | 3 +-- src/web/pages/tlscertificates/Component.jsx | 2 +- src/web/pages/users/Component.jsx | 3 +-- 31 files changed, 30 insertions(+), 50 deletions(-) rename src/web/entity/{Component.jsx => EntityComponent.jsx} (100%) rename src/web/entity/__tests__/{Component.tests.jsx => EntityComponent.tests.jsx} (99%) diff --git a/src/web/entity/Component.jsx b/src/web/entity/EntityComponent.jsx similarity index 100% rename from src/web/entity/Component.jsx rename to src/web/entity/EntityComponent.jsx diff --git a/src/web/entity/__tests__/Component.tests.jsx b/src/web/entity/__tests__/EntityComponent.tests.jsx similarity index 99% rename from src/web/entity/__tests__/Component.tests.jsx rename to src/web/entity/__tests__/EntityComponent.tests.jsx index 79f15f6860..094cebf0e6 100644 --- a/src/web/entity/__tests__/Component.tests.jsx +++ b/src/web/entity/__tests__/EntityComponent.tests.jsx @@ -4,7 +4,7 @@ */ import {describe, test, expect, testing} from '@gsa/testing'; -import EntityComponent from 'web/entity/Component'; +import EntityComponent from 'web/entity/EntityComponent'; import {rendererWith, wait} from 'web/utils/Testing'; const currentSettingsResponse = { diff --git a/src/web/pages/alerts/Component.jsx b/src/web/pages/alerts/Component.jsx index de5e444fb2..ccc154cf73 100644 --- a/src/web/pages/alerts/Component.jsx +++ b/src/web/pages/alerts/Component.jsx @@ -19,7 +19,7 @@ import React from 'react'; import {connect} from 'react-redux'; import FootNote from 'web/components/footnote/Footnote'; import Layout from 'web/components/layout/Layout'; -import EntityComponent from 'web/entity/Component'; +import EntityComponent from 'web/entity/EntityComponent'; import ContentComposerDialog from 'web/pages/alerts/ContentComposerDialog'; import AlertDialog, { ATTACH_MESSAGE_DEFAULT, @@ -51,7 +51,6 @@ import PropTypes from 'web/utils/PropTypes'; import {UNSET_VALUE} from 'web/utils/Render'; import withGmp from 'web/utils/withGmp'; - const select_verinice_report_id = (report_formats, report_id) => { if (isDefined(report_id)) { for (const format of report_formats) { diff --git a/src/web/pages/audits/Component.jsx b/src/web/pages/audits/Component.jsx index 2b12acee28..97280618ce 100644 --- a/src/web/pages/audits/Component.jsx +++ b/src/web/pages/audits/Component.jsx @@ -18,7 +18,7 @@ import {isDefined} from 'gmp/utils/identity'; import React from 'react'; import {connect} from 'react-redux'; import withDownload from 'web/components/form/withDownload'; -import EntityComponent from 'web/entity/Component'; +import EntityComponent from 'web/entity/EntityComponent'; import AlertComponent from 'web/pages/alerts/Component'; import AuditDialog from 'web/pages/audits/Dialog'; import ScheduleComponent from 'web/pages/schedules/Component'; diff --git a/src/web/pages/certbund/DetailsPage.jsx b/src/web/pages/certbund/DetailsPage.jsx index 7c9725321f..7d01e23f45 100644 --- a/src/web/pages/certbund/DetailsPage.jsx +++ b/src/web/pages/certbund/DetailsPage.jsx @@ -29,7 +29,7 @@ import TableHeader from 'web/components/table/Header'; import InfoTable from 'web/components/table/InfoTable'; import TableRow from 'web/components/table/Row'; import DetailsBlock from 'web/entity/Block'; -import EntityComponent from 'web/entity/Component'; +import EntityComponent from 'web/entity/EntityComponent'; import EntityPage from 'web/entity/Page'; import EntitiesTab from 'web/entity/Tab'; import EntityTags from 'web/entity/Tags'; @@ -38,7 +38,6 @@ import CertBundAdvDetails from 'web/pages/certbund/Details'; import {selector, loadEntity} from 'web/store/entities/certbund'; import PropTypes from 'web/utils/PropTypes'; - const ToolBarIcons = ({entity, onCertBundAdvDownloadClick}) => ( diff --git a/src/web/pages/cpes/DetailsPage.jsx b/src/web/pages/cpes/DetailsPage.jsx index 5b3cd873ee..b6ab72a23a 100644 --- a/src/web/pages/cpes/DetailsPage.jsx +++ b/src/web/pages/cpes/DetailsPage.jsx @@ -31,7 +31,7 @@ import TableHeader from 'web/components/table/Header'; import TableRow from 'web/components/table/Row'; import Table from 'web/components/table/StripedTable'; import DetailsBlock from 'web/entity/Block'; -import EntityComponent from 'web/entity/Component'; +import EntityComponent from 'web/entity/EntityComponent'; import {InfoLayout} from 'web/entity/Info'; import EntityPage from 'web/entity/Page'; import EntitiesTab from 'web/entity/Tab'; @@ -41,7 +41,6 @@ import CpeDetails from 'web/pages/cpes/Details'; import {selector, loadEntity} from 'web/store/entities/cpes'; import PropTypes from 'web/utils/PropTypes'; - export const ToolBarIcons = ({entity, onCpeDownloadClick}) => ( diff --git a/src/web/pages/credentials/Component.jsx b/src/web/pages/credentials/Component.jsx index 7e5cab7e11..5726a12e33 100644 --- a/src/web/pages/credentials/Component.jsx +++ b/src/web/pages/credentials/Component.jsx @@ -9,7 +9,7 @@ import {isDefined} from 'gmp/utils/identity'; import {shorten} from 'gmp/utils/string'; import React from 'react'; import {connect} from 'react-redux'; -import EntityComponent from 'web/entity/Component'; +import EntityComponent from 'web/entity/EntityComponent'; import CredentialsDialog from 'web/pages/credentials/Dialog'; import {renewSessionTimeout} from 'web/store/usersettings/actions'; import {loadUserSettingDefaults} from 'web/store/usersettings/defaults/actions'; @@ -20,7 +20,6 @@ import PropTypes from 'web/utils/PropTypes'; import {generateFilename} from 'web/utils/Render'; import withGmp from 'web/utils/withGmp'; - class CredentialsComponent extends React.Component { constructor(...args) { super(...args); diff --git a/src/web/pages/cves/DetailsPage.jsx b/src/web/pages/cves/DetailsPage.jsx index bd0c5af309..283ece1b19 100644 --- a/src/web/pages/cves/DetailsPage.jsx +++ b/src/web/pages/cves/DetailsPage.jsx @@ -30,7 +30,7 @@ import TableHeader from 'web/components/table/Header'; import TableRow from 'web/components/table/Row'; import Table from 'web/components/table/StripedTable'; import DetailsBlock from 'web/entity/Block'; -import EntityComponent from 'web/entity/Component'; +import EntityComponent from 'web/entity/EntityComponent'; import {InfoLayout} from 'web/entity/Info'; import EntityPage from 'web/entity/Page'; import EntitiesTab from 'web/entity/Tab'; @@ -40,7 +40,6 @@ import CveDetails from 'web/pages/cves/Details'; import {selector, loadEntity} from 'web/store/entities/cves'; import PropTypes from 'web/utils/PropTypes'; - const ToolBarIcons = ({entity, onCveDownloadClick}) => ( diff --git a/src/web/pages/dfncert/DetailsPage.jsx b/src/web/pages/dfncert/DetailsPage.jsx index da19dd0904..bc8a902e96 100644 --- a/src/web/pages/dfncert/DetailsPage.jsx +++ b/src/web/pages/dfncert/DetailsPage.jsx @@ -23,7 +23,7 @@ import TabPanel from 'web/components/tab/TabPanel'; import TabPanels from 'web/components/tab/TabPanels'; import Tabs from 'web/components/tab/Tabs'; import DetailsBlock from 'web/entity/Block'; -import EntityComponent from 'web/entity/Component'; +import EntityComponent from 'web/entity/EntityComponent'; import EntityPage from 'web/entity/Page'; import EntitiesTab from 'web/entity/Tab'; import EntityTags from 'web/entity/Tags'; @@ -32,7 +32,6 @@ import DfnCertAdvDetails from 'web/pages/dfncert/Details'; import {selector, loadEntity} from 'web/store/entities/dfncerts'; import PropTypes from 'web/utils/PropTypes'; - const ToolBarIcons = ({entity, onDfnCertAdvDownloadClick}) => ( diff --git a/src/web/pages/filters/Component.jsx b/src/web/pages/filters/Component.jsx index 458e43cc9d..c7ad79e45f 100644 --- a/src/web/pages/filters/Component.jsx +++ b/src/web/pages/filters/Component.jsx @@ -8,7 +8,7 @@ import {first} from 'gmp/utils/array'; import {isDefined} from 'gmp/utils/identity'; import {shorten} from 'gmp/utils/string'; import React from 'react'; -import EntityComponent from 'web/entity/Component'; +import EntityComponent from 'web/entity/EntityComponent'; import FilterDialog from 'web/pages/filters/Dialog'; import PropTypes from 'web/utils/PropTypes'; import withCapabilities from 'web/utils/withCapabilities'; diff --git a/src/web/pages/groups/Component.jsx b/src/web/pages/groups/Component.jsx index f66c0c7ee7..beeb3a6736 100644 --- a/src/web/pages/groups/Component.jsx +++ b/src/web/pages/groups/Component.jsx @@ -6,12 +6,11 @@ import _ from 'gmp/locale'; import {isDefined} from 'gmp/utils/identity'; import React from 'react'; -import EntityComponent from 'web/entity/Component'; +import EntityComponent from 'web/entity/EntityComponent'; import GroupDialog from 'web/pages/groups/Dialog'; import PropTypes from 'web/utils/PropTypes'; import withGmp from 'web/utils/withGmp'; - class GroupComponent extends React.Component { constructor(...args) { super(...args); diff --git a/src/web/pages/hosts/Component.jsx b/src/web/pages/hosts/Component.jsx index d49180b17a..a93c4a80bd 100644 --- a/src/web/pages/hosts/Component.jsx +++ b/src/web/pages/hosts/Component.jsx @@ -8,7 +8,7 @@ import {map} from 'gmp/utils/array'; import {isDefined} from 'gmp/utils/identity'; import {shorten} from 'gmp/utils/string'; import React from 'react'; -import EntityComponent from 'web/entity/Component'; +import EntityComponent from 'web/entity/EntityComponent'; import HostDialog from 'web/pages/hosts/Dialog'; import TargetComponent from 'web/pages/targets/Component'; import PropTypes from 'web/utils/PropTypes'; diff --git a/src/web/pages/notes/Component.jsx b/src/web/pages/notes/Component.jsx index f2b9d84fb0..6775a440fc 100644 --- a/src/web/pages/notes/Component.jsx +++ b/src/web/pages/notes/Component.jsx @@ -19,12 +19,11 @@ import {hasId} from 'gmp/utils/id'; import {isDefined, isArray} from 'gmp/utils/identity'; import {shorten} from 'gmp/utils/string'; import React from 'react'; -import EntityComponent from 'web/entity/Component'; +import EntityComponent from 'web/entity/EntityComponent'; import NoteDialog from 'web/pages/notes/Dialog'; import PropTypes from 'web/utils/PropTypes'; import withGmp from 'web/utils/withGmp'; - class NoteComponent extends React.Component { constructor(...args) { super(...args); diff --git a/src/web/pages/nvts/Component.jsx b/src/web/pages/nvts/Component.jsx index c2decc0c15..25a49d1f84 100644 --- a/src/web/pages/nvts/Component.jsx +++ b/src/web/pages/nvts/Component.jsx @@ -4,7 +4,7 @@ */ import React from 'react'; -import EntityComponent from 'web/entity/Component'; +import EntityComponent from 'web/entity/EntityComponent'; import NoteComponent from 'web/pages/notes/Component'; import OverrideComponent from 'web/pages/overrides/Component'; import PropTypes from 'web/utils/PropTypes'; diff --git a/src/web/pages/operatingsystems/Component.jsx b/src/web/pages/operatingsystems/Component.jsx index 8131dc363e..88b453236a 100644 --- a/src/web/pages/operatingsystems/Component.jsx +++ b/src/web/pages/operatingsystems/Component.jsx @@ -4,7 +4,7 @@ */ import React from 'react'; -import EntityComponent from 'web/entity/Component'; +import EntityComponent from 'web/entity/EntityComponent'; const OsComponent = props => ( diff --git a/src/web/pages/overrides/Component.jsx b/src/web/pages/overrides/Component.jsx index 8b65bfbea3..8173c7826f 100644 --- a/src/web/pages/overrides/Component.jsx +++ b/src/web/pages/overrides/Component.jsx @@ -20,7 +20,7 @@ import {hasId} from 'gmp/utils/id'; import {isDefined} from 'gmp/utils/identity'; import {shorten} from 'gmp/utils/string'; import React from 'react'; -import EntityComponent from 'web/entity/Component'; +import EntityComponent from 'web/entity/EntityComponent'; import OverrideDialog from 'web/pages/overrides/Dialog'; import PropTypes from 'web/utils/PropTypes'; import { @@ -32,7 +32,6 @@ import { } from 'web/utils/severity'; import withGmp from 'web/utils/withGmp'; - const SEVERITIES_LIST = [ HIGH_VALUE, MEDIUM_VALUE, diff --git a/src/web/pages/permissions/Component.jsx b/src/web/pages/permissions/Component.jsx index 7147bcc1f9..250803a982 100644 --- a/src/web/pages/permissions/Component.jsx +++ b/src/web/pages/permissions/Component.jsx @@ -9,14 +9,13 @@ import {selectSaveId} from 'gmp/utils/id'; import {isDefined} from 'gmp/utils/identity'; import {shorten} from 'gmp/utils/string'; import React from 'react'; -import EntityComponent from 'web/entity/Component'; +import EntityComponent from 'web/entity/EntityComponent'; import PermissionDialog from 'web/pages/permissions/Dialog'; import compose from 'web/utils/Compose'; import PropTypes from 'web/utils/PropTypes'; import withCapabilities from 'web/utils/withCapabilities'; import withGmp from 'web/utils/withGmp'; - class PermissionsComponent extends React.Component { constructor(...args) { super(...args); diff --git a/src/web/pages/policies/Component.jsx b/src/web/pages/policies/Component.jsx index 377f18ae1b..109cdec41d 100644 --- a/src/web/pages/policies/Component.jsx +++ b/src/web/pages/policies/Component.jsx @@ -17,7 +17,7 @@ import {isDefined} from 'gmp/utils/identity'; import {shorten} from 'gmp/utils/string'; import React from 'react'; import {connect} from 'react-redux'; -import EntityComponent from 'web/entity/Component'; +import EntityComponent from 'web/entity/EntityComponent'; import AlertComponent from 'web/pages/alerts/Component'; import AuditDialog from 'web/pages/audits/Dialog'; import PolicyDialog from 'web/pages/policies/Dialog'; @@ -52,7 +52,6 @@ import PropTypes from 'web/utils/PropTypes'; import withCapabilities from 'web/utils/withCapabilities'; import withGmp from 'web/utils/withGmp'; - class PolicyComponent extends React.Component { constructor(...args) { super(...args); diff --git a/src/web/pages/portlists/Component.jsx b/src/web/pages/portlists/Component.jsx index db04fbb9fc..0acb79b4e8 100644 --- a/src/web/pages/portlists/Component.jsx +++ b/src/web/pages/portlists/Component.jsx @@ -8,7 +8,7 @@ import {parseInt} from 'gmp/parser'; import {isDefined} from 'gmp/utils/identity'; import {shorten} from 'gmp/utils/string'; import React from 'react'; -import EntityComponent from 'web/entity/Component'; +import EntityComponent from 'web/entity/EntityComponent'; import PortListsDialog from 'web/pages/portlists/Dialog'; import ImportPortListDialog from 'web/pages/portlists/ImportDialog'; import PortRangeDialog from 'web/pages/portlists/PortRangeDialog'; diff --git a/src/web/pages/reportconfigs/Component.jsx b/src/web/pages/reportconfigs/Component.jsx index 9338f5ee7f..df75877302 100644 --- a/src/web/pages/reportconfigs/Component.jsx +++ b/src/web/pages/reportconfigs/Component.jsx @@ -6,12 +6,11 @@ import _ from 'gmp/locale'; import {isDefined} from 'gmp/utils/identity'; import React from 'react'; -import EntityComponent from 'web/entity/Component'; +import EntityComponent from 'web/entity/EntityComponent'; import ReportConfigDialog from 'web/pages/reportconfigs/Dialog'; import PropTypes from 'web/utils/PropTypes'; import withGmp from 'web/utils/withGmp'; - class ReportConfigComponent extends React.Component { constructor(...args) { super(...args); diff --git a/src/web/pages/reportformats/Component.jsx b/src/web/pages/reportformats/Component.jsx index ee05a940da..b37fe6fa74 100644 --- a/src/web/pages/reportformats/Component.jsx +++ b/src/web/pages/reportformats/Component.jsx @@ -6,12 +6,11 @@ import _ from 'gmp/locale'; import {isDefined} from 'gmp/utils/identity'; import React from 'react'; -import EntityComponent from 'web/entity/Component'; +import EntityComponent from 'web/entity/EntityComponent'; import ReportFormatDialog from 'web/pages/reportformats/Dialog'; import PropTypes from 'web/utils/PropTypes'; import withGmp from 'web/utils/withGmp'; - class ReportFormatComponent extends React.Component { constructor(...args) { super(...args); diff --git a/src/web/pages/roles/Component.jsx b/src/web/pages/roles/Component.jsx index 537996a457..36990798d6 100644 --- a/src/web/pages/roles/Component.jsx +++ b/src/web/pages/roles/Component.jsx @@ -8,7 +8,7 @@ import Filter from 'gmp/models/filter'; import {isDefined} from 'gmp/utils/identity'; import React from 'react'; import {connect} from 'react-redux'; -import EntityComponent from 'web/entity/Component'; +import EntityComponent from 'web/entity/EntityComponent'; import RoleDialog from 'web/pages/roles/Dialog'; import { loadAllEntities as loadAllGroups, @@ -23,7 +23,6 @@ import PropTypes from 'web/utils/PropTypes'; import withCapabilities from 'web/utils/withCapabilities'; import withGmp from 'web/utils/withGmp'; - class RoleComponent extends React.Component { constructor(...args) { super(...args); diff --git a/src/web/pages/scanconfigs/Component.jsx b/src/web/pages/scanconfigs/Component.jsx index 0ffc9181e3..b3c8d5b7ec 100644 --- a/src/web/pages/scanconfigs/Component.jsx +++ b/src/web/pages/scanconfigs/Component.jsx @@ -10,7 +10,7 @@ import {selectSaveId} from 'gmp/utils/id'; import {isDefined} from 'gmp/utils/identity'; import {shorten} from 'gmp/utils/string'; import React from 'react'; -import EntityComponent from 'web/entity/Component'; +import EntityComponent from 'web/entity/EntityComponent'; import ScanConfigDialog from 'web/pages/scanconfigs/Dialog'; import EditConfigFamilyDialog from 'web/pages/scanconfigs/EditConfigFamilyDialog'; import EditScanConfigDialog from 'web/pages/scanconfigs/EditDialog'; diff --git a/src/web/pages/scanners/Component.jsx b/src/web/pages/scanners/Component.jsx index f2b08fee8f..35e97b31e4 100644 --- a/src/web/pages/scanners/Component.jsx +++ b/src/web/pages/scanners/Component.jsx @@ -9,7 +9,7 @@ import {isDefined} from 'gmp/utils/identity'; import {shorten} from 'gmp/utils/string'; import React from 'react'; import {connect} from 'react-redux'; -import EntityComponent from 'web/entity/Component'; +import EntityComponent from 'web/entity/EntityComponent'; import CredentialsDialog from 'web/pages/credentials/Dialog'; import ScannerDialog from 'web/pages/scanners/Dialog'; import {renewSessionTimeout} from 'web/store/usersettings/actions'; @@ -21,7 +21,6 @@ import PropTypes from 'web/utils/PropTypes'; import {generateFilename} from 'web/utils/Render'; import withGmp from 'web/utils/withGmp'; - class ScannerComponent extends React.Component { constructor(...args) { super(...args); diff --git a/src/web/pages/schedules/Component.jsx b/src/web/pages/schedules/Component.jsx index 88526b42d0..1997392452 100644 --- a/src/web/pages/schedules/Component.jsx +++ b/src/web/pages/schedules/Component.jsx @@ -7,12 +7,11 @@ import _ from 'gmp/locale'; import {isDefined} from 'gmp/utils/identity'; import React from 'react'; import {connect} from 'react-redux'; -import EntityComponent from 'web/entity/Component'; +import EntityComponent from 'web/entity/EntityComponent'; import ScheduleDialog from 'web/pages/schedules/Dialog'; import {getTimezone} from 'web/store/usersettings/selectors'; import PropTypes from 'web/utils/PropTypes'; - class ScheduleComponent extends React.Component { constructor(...args) { super(...args); diff --git a/src/web/pages/tags/Component.jsx b/src/web/pages/tags/Component.jsx index 661fb79d6c..ef3cc134fb 100644 --- a/src/web/pages/tags/Component.jsx +++ b/src/web/pages/tags/Component.jsx @@ -10,7 +10,7 @@ import {getEntityType, pluralizeType, typeName} from 'gmp/utils/entitytype'; import {isDefined} from 'gmp/utils/identity'; import {shorten} from 'gmp/utils/string'; import React from 'react'; -import EntityComponent from 'web/entity/Component'; +import EntityComponent from 'web/entity/EntityComponent'; import TagDialog from 'web/pages/tags/Dialog'; import compose from 'web/utils/Compose'; import PropTypes from 'web/utils/PropTypes'; diff --git a/src/web/pages/targets/Component.jsx b/src/web/pages/targets/Component.jsx index 70d3c6a882..6fcbc8a883 100644 --- a/src/web/pages/targets/Component.jsx +++ b/src/web/pages/targets/Component.jsx @@ -8,7 +8,7 @@ import {YES_VALUE} from 'gmp/parser'; import {first} from 'gmp/utils/array'; import {isDefined} from 'gmp/utils/identity'; import React from 'react'; -import EntityComponent from 'web/entity/Component'; +import EntityComponent from 'web/entity/EntityComponent'; import CredentialsDialog from 'web/pages/credentials/Dialog'; import PortListDialog from 'web/pages/portlists/Dialog'; import TargetDialog from 'web/pages/targets/Dialog'; @@ -16,7 +16,6 @@ import PropTypes from 'web/utils/PropTypes'; import {UNSET_VALUE} from 'web/utils/Render'; import withGmp from 'web/utils/withGmp'; - const DEFAULT_PORT_LIST_ID = '33d0cd82-57c6-11e1-8ed1-406186ea4fc5'; // All IANA assigned TCP 2012-02-10 const id_or__ = value => { diff --git a/src/web/pages/tasks/Component.jsx b/src/web/pages/tasks/Component.jsx index d1d4d0df94..e5c3710504 100644 --- a/src/web/pages/tasks/Component.jsx +++ b/src/web/pages/tasks/Component.jsx @@ -14,7 +14,7 @@ import {selectSaveId, hasId} from 'gmp/utils/id'; import {isDefined} from 'gmp/utils/identity'; import React from 'react'; import {connect} from 'react-redux'; -import EntityComponent from 'web/entity/Component'; +import EntityComponent from 'web/entity/EntityComponent'; import AlertComponent from 'web/pages/alerts/Component'; import ImportReportDialog from 'web/pages/reports/ImportDialog'; import ScheduleComponent from 'web/pages/schedules/Component'; @@ -61,7 +61,6 @@ import AdvancedTaskWizard from 'web/wizard/AdvancedTaskWizard'; import ModifyTaskWizard from 'web/wizard/ModifyTaskWizard'; import TaskWizard from 'web/wizard/TaskWizard'; - class TaskComponent extends React.Component { constructor(...args) { super(...args); diff --git a/src/web/pages/tickets/Component.jsx b/src/web/pages/tickets/Component.jsx index 4a2adacd86..139a93d5df 100644 --- a/src/web/pages/tickets/Component.jsx +++ b/src/web/pages/tickets/Component.jsx @@ -10,7 +10,7 @@ import {selectSaveId} from 'gmp/utils/id'; import {isDefined} from 'gmp/utils/identity'; import React from 'react'; import {connect} from 'react-redux'; -import EntityComponent from 'web/entity/Component'; +import EntityComponent from 'web/entity/EntityComponent'; import CreateTicketDialog from 'web/pages/tickets/CreateDialog'; import EditTicketDialog from 'web/pages/tickets/EditDialog'; import { @@ -21,7 +21,6 @@ import compose from 'web/utils/Compose'; import PropTypes from 'web/utils/PropTypes'; import withGmp from 'web/utils/withGmp'; - class TicketComponent extends React.Component { constructor(...args) { super(...args); diff --git a/src/web/pages/tlscertificates/Component.jsx b/src/web/pages/tlscertificates/Component.jsx index 681fd5d170..890e4b8908 100644 --- a/src/web/pages/tlscertificates/Component.jsx +++ b/src/web/pages/tlscertificates/Component.jsx @@ -6,7 +6,7 @@ import {isDefined} from 'gmp/utils/identity'; import React from 'react'; import {connect} from 'react-redux'; -import EntityComponent from 'web/entity/Component'; +import EntityComponent from 'web/entity/EntityComponent'; import {renewSessionTimeout} from 'web/store/usersettings/actions'; import {loadUserSettingDefaults} from 'web/store/usersettings/defaults/actions'; import {getUserSettingsDefaults} from 'web/store/usersettings/defaults/selectors'; diff --git a/src/web/pages/users/Component.jsx b/src/web/pages/users/Component.jsx index 1ef181ff78..83e7a9fadc 100644 --- a/src/web/pages/users/Component.jsx +++ b/src/web/pages/users/Component.jsx @@ -6,12 +6,11 @@ import _ from 'gmp/locale'; import {isDefined} from 'gmp/utils/identity'; import React from 'react'; -import EntityComponent from 'web/entity/Component'; +import EntityComponent from 'web/entity/EntityComponent'; import UserDialog from 'web/pages/users/Dialog'; import PropTypes from 'web/utils/PropTypes'; import withGmp from 'web/utils/withGmp'; - class UserComponent extends React.Component { constructor(...args) { super(...args);