Skip to content

Commit

Permalink
Change: Rename module containing the EntityComponent
Browse files Browse the repository at this point in the history
The module should be named after the component too.
  • Loading branch information
bjoernricks committed Mar 5, 2025
1 parent c8828fb commit 0d4ed49
Show file tree
Hide file tree
Showing 31 changed files with 30 additions and 50 deletions.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
3 changes: 1 addition & 2 deletions src/web/pages/alerts/Component.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion src/web/pages/audits/Component.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
3 changes: 1 addition & 2 deletions src/web/pages/certbund/DetailsPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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}) => (
<Divider margin="10px">
<IconDivider>
Expand Down
3 changes: 1 addition & 2 deletions src/web/pages/cpes/DetailsPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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}) => (
<Divider margin="10px">
<IconDivider>
Expand Down
3 changes: 1 addition & 2 deletions src/web/pages/credentials/Component.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions src/web/pages/cves/DetailsPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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}) => (
<Divider margin="10px">
<IconDivider>
Expand Down
3 changes: 1 addition & 2 deletions src/web/pages/dfncert/DetailsPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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}) => (
<Divider margin="10px">
<IconDivider>
Expand Down
2 changes: 1 addition & 1 deletion src/web/pages/filters/Component.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
3 changes: 1 addition & 2 deletions src/web/pages/groups/Component.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/web/pages/hosts/Component.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
3 changes: 1 addition & 2 deletions src/web/pages/notes/Component.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/web/pages/nvts/Component.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/web/pages/operatingsystems/Component.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

import React from 'react';
import EntityComponent from 'web/entity/Component';
import EntityComponent from 'web/entity/EntityComponent';

const OsComponent = props => (
<EntityComponent {...props} name="operatingsystem" />
Expand Down
3 changes: 1 addition & 2 deletions src/web/pages/overrides/Component.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -32,7 +32,6 @@ import {
} from 'web/utils/severity';
import withGmp from 'web/utils/withGmp';


const SEVERITIES_LIST = [
HIGH_VALUE,
MEDIUM_VALUE,
Expand Down
3 changes: 1 addition & 2 deletions src/web/pages/permissions/Component.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions src/web/pages/policies/Component.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/web/pages/portlists/Component.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
3 changes: 1 addition & 2 deletions src/web/pages/reportconfigs/Component.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions src/web/pages/reportformats/Component.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions src/web/pages/roles/Component.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/web/pages/scanconfigs/Component.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
3 changes: 1 addition & 2 deletions src/web/pages/scanners/Component.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions src/web/pages/schedules/Component.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/web/pages/tags/Component.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
3 changes: 1 addition & 2 deletions src/web/pages/targets/Component.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,14 @@ 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';
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 => {
Expand Down
3 changes: 1 addition & 2 deletions src/web/pages/tasks/Component.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions src/web/pages/tickets/Component.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/web/pages/tlscertificates/Component.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Loading

0 comments on commit 0d4ed49

Please sign in to comment.