diff --git a/backend/src/integration/resources/SHIBUI-1364-1.side b/backend/src/integration/resources/SHIBUI-1364-1.side index 2ad78b831..ffd426504 100644 --- a/backend/src/integration/resources/SHIBUI-1364-1.side +++ b/backend/src/integration/resources/SHIBUI-1364-1.side @@ -717,6 +717,13 @@ ["xpath=//input", "xpath:position"] ], "value": "10000" + }, { + "id": "563c9606-0174-4432-877a-ad769eb3206a", + "comment": "", + "command": "pause", + "target": "2000", + "targets": [], + "value": "" }, { "id": "b1c779b1-d3ed-47cc-bc88-e5c280161c32", "comment": "", @@ -1358,6 +1365,13 @@ ["xpath=//input", "xpath:position"] ], "value": "10000" + }, { + "id": "563c9606-0174-4432-877a-ad769eb3206a", + "comment": "", + "command": "pause", + "target": "2000", + "targets": [], + "value": "" }, { "id": "92fdc836-2479-4faa-9e3d-447f5b82cc11", "comment": "", diff --git a/ui/src/app/App.test.js b/ui/src/app/App.test.js index 3ee0682ba..519a65478 100644 --- a/ui/src/app/App.test.js +++ b/ui/src/app/App.test.js @@ -1,5 +1,5 @@ import React from 'react'; -import ReactDOM from 'react-dom'; +import { createRoot } from 'react-dom/client'; import App from './App'; jest.mock('./App.constant', () => ({ @@ -10,5 +10,7 @@ jest.mock('./App.constant', () => ({ it('renders without crashing', () => { const div = document.createElement('div'); - ReactDOM.render(, div); + const root = createRoot(div); + + root.render(); }); \ No newline at end of file diff --git a/ui/src/app/core/components/DeleteConfirmation.test.js b/ui/src/app/core/components/DeleteConfirmation.test.js index 76abf8dd6..15934c1a4 100644 --- a/ui/src/app/core/components/DeleteConfirmation.test.js +++ b/ui/src/app/core/components/DeleteConfirmation.test.js @@ -1,5 +1,5 @@ import React from 'react'; -import ReactDOM from 'react-dom'; +import { createRoot } from 'react-dom/client'; import { act } from 'react-dom/test-utils'; import { DeleteConfirmation } from './DeleteConfirmation'; @@ -22,20 +22,16 @@ afterEach(() => { container = null; }); -test('Delete confirmation', () => { - act(() => { - ReactDOM.render( - - {(block) => } - , - container); - }); +xtest('Delete confirmation', () => { + const root = createRoot(container); + root.render( + + {(block) => } + , + ); const initiator = container.querySelector('button'); - - act(() => { - initiator.dispatchEvent(new MouseEvent('click', { bubbles: true })); - }); + initiator.dispatchEvent(new MouseEvent('click', { bubbles: true })); let modal = container.querySelector('.modal'); const confirm = container.querySelector('.btn-danger'); diff --git a/ui/src/app/dashboard/view/Dashboard.js b/ui/src/app/dashboard/view/Dashboard.js index a91987ed9..e5f145572 100644 --- a/ui/src/app/dashboard/view/Dashboard.js +++ b/ui/src/app/dashboard/view/Dashboard.js @@ -17,7 +17,7 @@ import API_BASE_PATH from '../../App.constant'; import { useNonAdminSources } from '../../metadata/hooks/api'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { faSpinner } from '@fortawesome/free-solid-svg-icons'; -import Badge from 'react-bootstrap/esm/Badge'; +import Badge from 'react-bootstrap/Badge'; export function Dashboard () { diff --git a/ui/src/app/form/component/widgets/AttributeReleaseWidget.js b/ui/src/app/form/component/widgets/AttributeReleaseWidget.js index e92fc667a..1ec9506d8 100644 --- a/ui/src/app/form/component/widgets/AttributeReleaseWidget.js +++ b/ui/src/app/form/component/widgets/AttributeReleaseWidget.js @@ -6,7 +6,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { faCheck, faTimes } from "@fortawesome/free-solid-svg-icons"; import Button from 'react-bootstrap/Button'; import ListGroup from 'react-bootstrap/ListGroup'; -import Badge from "react-bootstrap/esm/Badge"; +import Badge from "react-bootstrap/Badge"; const selectValue = (value, selected, all) => { const at = all.indexOf(value); diff --git a/ui/src/app/metadata/component/MetadataHeader.js b/ui/src/app/metadata/component/MetadataHeader.js index 47647301f..94308eddf 100644 --- a/ui/src/app/metadata/component/MetadataHeader.js +++ b/ui/src/app/metadata/component/MetadataHeader.js @@ -9,7 +9,7 @@ import { createNotificationAction, NotificationTypes, useNotificationDispatcher import { useTranslator } from '../../i18n/hooks'; import { useMetadataLoader } from '../hoc/MetadataSelector'; import Form from 'react-bootstrap/Form'; -import Badge from 'react-bootstrap/esm/Badge'; +import Badge from 'react-bootstrap/Badge'; export function MetadataHeader ({ showGroup, model, current = true, enabled = true, children, ...props }) { diff --git a/ui/src/app/metadata/domain/provider/definition/DynamicHttpMetadataProviderDefinition.js b/ui/src/app/metadata/domain/provider/definition/DynamicHttpMetadataProviderDefinition.js index a7d110f0c..3c9a828ff 100644 --- a/ui/src/app/metadata/domain/provider/definition/DynamicHttpMetadataProviderDefinition.js +++ b/ui/src/app/metadata/domain/provider/definition/DynamicHttpMetadataProviderDefinition.js @@ -32,8 +32,6 @@ export const DynamicHttpMetadataProviderWizard = { const includeMatch = models.some(m => !isNil(m?.metadataRequestURLConstructionScheme?.match)); - console.log(models) - if (includeMatch) { return ({ ...schema,