From a017000ad716bac02b7b41375a2835b1a587fbb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= Date: Wed, 19 Jun 2024 11:43:22 +0200 Subject: [PATCH] Change: Move useCapabilities hook to hooks directory --- src/web/components/powerfilter/dialog.jsx | 3 +-- src/web/{utils => hooks}/__tests__/useCapabilities.jsx | 4 ++-- src/web/{utils => hooks}/useCapabilities.js | 0 src/web/pages/extras/trashcanpage.jsx | 2 +- src/web/pages/portlists/listpage.jsx | 2 +- src/web/pages/results/detailspage.jsx | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) rename src/web/{utils => hooks}/__tests__/useCapabilities.jsx (92%) rename src/web/{utils => hooks}/useCapabilities.js (100%) diff --git a/src/web/components/powerfilter/dialog.jsx b/src/web/components/powerfilter/dialog.jsx index 0dc53614f9..4406115e0e 100644 --- a/src/web/components/powerfilter/dialog.jsx +++ b/src/web/components/powerfilter/dialog.jsx @@ -3,13 +3,12 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import React from 'react'; import Layout from 'web/components/layout/layout'; import withFilterDialog from 'web/components/powerfilter/withFilterDialog'; -import useCapabilities from 'web/utils/useCapabilities'; +import useCapabilities from 'web/hooks/useCapabilities'; import CreateNamedFilterGroup from './createnamedfiltergroup'; import FilterStringGroup from './filterstringgroup'; diff --git a/src/web/utils/__tests__/useCapabilities.jsx b/src/web/hooks/__tests__/useCapabilities.jsx similarity index 92% rename from src/web/utils/__tests__/useCapabilities.jsx rename to src/web/hooks/__tests__/useCapabilities.jsx index 429bc13c69..48984f602d 100644 --- a/src/web/utils/__tests__/useCapabilities.jsx +++ b/src/web/hooks/__tests__/useCapabilities.jsx @@ -7,7 +7,7 @@ import {describe, test, expect} from '@gsa/testing'; import Capabilities from 'gmp/capabilities/capabilities'; -import {rendererWith} from '../testing'; +import {rendererWith} from 'web/utils/testing'; import useCapabilities from '../useCapabilities'; @@ -19,7 +19,7 @@ const TestUseCapabilities = () => { return Not allowed to create a task; }; -describe('useCapabilties tests', () => { +describe('useCapabilities tests', () => { test('should be allowed to create a task', () => { const capabilities = new Capabilities(['create_task']); const {render} = rendererWith({capabilities}); diff --git a/src/web/utils/useCapabilities.js b/src/web/hooks/useCapabilities.js similarity index 100% rename from src/web/utils/useCapabilities.js rename to src/web/hooks/useCapabilities.js diff --git a/src/web/pages/extras/trashcanpage.jsx b/src/web/pages/extras/trashcanpage.jsx index a76d5f393a..48bcc9a428 100644 --- a/src/web/pages/extras/trashcanpage.jsx +++ b/src/web/pages/extras/trashcanpage.jsx @@ -42,7 +42,7 @@ import {renewSessionTimeout} from 'web/store/usersettings/actions'; import compose from 'web/utils/compose'; import PropTypes from 'web/utils/proptypes'; import withGmp from 'web/utils/withGmp'; -import useCapabilities from 'web/utils/useCapabilities'; +import useCapabilities from 'web/hooks/useCapabilities'; import AlertsTable from '../alerts/table'; import ScanConfigsTable from '../scanconfigs/table'; diff --git a/src/web/pages/portlists/listpage.jsx b/src/web/pages/portlists/listpage.jsx index e8d0479d5e..f5593efdc1 100644 --- a/src/web/pages/portlists/listpage.jsx +++ b/src/web/pages/portlists/listpage.jsx @@ -11,7 +11,7 @@ import {PORTLISTS_FILTER_FILTER} from 'gmp/models/filter'; import {isDefined, hasValue} from 'gmp/utils/identity'; -import useCapabilities from 'web/utils/useCapabilities'; +import useCapabilities from 'web/hooks/useCapabilities'; import useUserSessionTimeout from 'web/utils/useUserSessionTimeout'; import useGmp from 'web/utils/useGmp'; diff --git a/src/web/pages/results/detailspage.jsx b/src/web/pages/results/detailspage.jsx index b08526539d..e378e873e9 100644 --- a/src/web/pages/results/detailspage.jsx +++ b/src/web/pages/results/detailspage.jsx @@ -69,7 +69,7 @@ import {getUsername} from 'web/store/usersettings/selectors'; import compose from 'web/utils/compose'; import {generateFilename} from 'web/utils/render'; import PropTypes from 'web/utils/proptypes'; -import useCapabilities from 'web/utils/useCapabilities'; +import useCapabilities from 'web/hooks/useCapabilities'; import NoteComponent from '../notes/component';