This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit c85e4fa41e972ab4d327039afb2985d24a196ab1 Author: Marat Gubaidullin <ma...@talismancloud.io> AuthorDate: Mon Jun 3 15:00:19 2024 -0400 Move Log UI to higher lavel --- .../src/main/webui/src/{project => }/log/ProjectLog.tsx | 4 ++-- .../src/main/webui/src/{project => }/log/ProjectLogPanel.tsx | 10 +++++----- karavan-app/src/main/webui/src/project/ProjectPage.tsx | 2 +- karavan-app/src/main/webui/src/services/ServicesPage.tsx | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/karavan-app/src/main/webui/src/project/log/ProjectLog.tsx b/karavan-app/src/main/webui/src/log/ProjectLog.tsx similarity index 95% rename from karavan-app/src/main/webui/src/project/log/ProjectLog.tsx rename to karavan-app/src/main/webui/src/log/ProjectLog.tsx index 0601c000..2265ee61 100644 --- a/karavan-app/src/main/webui/src/project/log/ProjectLog.tsx +++ b/karavan-app/src/main/webui/src/log/ProjectLog.tsx @@ -16,9 +16,9 @@ */ import React, {useState} from 'react'; -import '../../designer/karavan.css'; +import '../designer/karavan.css'; import {LogViewer} from '@patternfly/react-log-viewer'; -import {useLogStore} from "../../api/ProjectStore"; +import {useLogStore} from "../api/ProjectStore"; import {shallow} from "zustand/shallow" interface Props { diff --git a/karavan-app/src/main/webui/src/project/log/ProjectLogPanel.tsx b/karavan-app/src/main/webui/src/log/ProjectLogPanel.tsx similarity index 94% rename from karavan-app/src/main/webui/src/project/log/ProjectLogPanel.tsx rename to karavan-app/src/main/webui/src/log/ProjectLogPanel.tsx index 6e7de890..afaf4933 100644 --- a/karavan-app/src/main/webui/src/project/log/ProjectLogPanel.tsx +++ b/karavan-app/src/main/webui/src/log/ProjectLogPanel.tsx @@ -17,17 +17,17 @@ import React, {useEffect, useState} from 'react'; import {Button, Checkbox, Label, PageSection, Tooltip, TooltipPosition} from '@patternfly/react-core'; -import '../../designer/karavan.css'; +import '../designer/karavan.css'; import CloseIcon from '@patternfly/react-icons/dist/esm/icons/times-icon'; import ExpandIcon from '@patternfly/react-icons/dist/esm/icons/expand-icon'; import CollapseIcon from '@patternfly/react-icons/dist/esm/icons/compress-icon'; import CleanIcon from '@patternfly/react-icons/dist/esm/icons/trash-alt-icon'; -import {useLogStore, useStatusesStore} from "../../api/ProjectStore"; -import {KaravanApi} from "../../api/KaravanApi"; +import {useLogStore, useStatusesStore} from "../api/ProjectStore"; +import {KaravanApi} from "../api/KaravanApi"; import {shallow} from "zustand/shallow"; -import {ProjectEventBus} from "../../api/ProjectEventBus"; +import {ProjectEventBus} from "../api/ProjectEventBus"; import {ProjectLog} from "./ProjectLog"; -import {LogWatchApi} from "../../api/LogWatchApi"; +import {LogWatchApi} from "../api/LogWatchApi"; const INITIAL_LOG_HEIGHT = "50%"; diff --git a/karavan-app/src/main/webui/src/project/ProjectPage.tsx b/karavan-app/src/main/webui/src/project/ProjectPage.tsx index d96daa32..83262642 100644 --- a/karavan-app/src/main/webui/src/project/ProjectPage.tsx +++ b/karavan-app/src/main/webui/src/project/ProjectPage.tsx @@ -23,7 +23,7 @@ import { } from '@patternfly/react-core'; import '../designer/karavan.css'; import {ProjectToolbar} from "./ProjectToolbar"; -import {ProjectLogPanel} from "./log/ProjectLogPanel"; +import {ProjectLogPanel} from "../log/ProjectLogPanel"; import {Project, ProjectType} from "../api/ProjectModels"; import {useFilesStore, useFileStore, useProjectsStore, useProjectStore} from "../api/ProjectStore"; import {MainToolbar} from "../designer/MainToolbar"; diff --git a/karavan-app/src/main/webui/src/services/ServicesPage.tsx b/karavan-app/src/main/webui/src/services/ServicesPage.tsx index 48a082a5..725b2124 100644 --- a/karavan-app/src/main/webui/src/services/ServicesPage.tsx +++ b/karavan-app/src/main/webui/src/services/ServicesPage.tsx @@ -50,7 +50,7 @@ import {ProjectType} from "../api/ProjectModels"; import {KaravanApi} from "../api/KaravanApi"; import {DockerComposeService, DockerCompose, ServicesYaml} from "../api/ServiceModels"; import {shallow} from "zustand/shallow"; -import {ProjectLogPanel} from "../project/log/ProjectLogPanel"; +import {ProjectLogPanel} from "../log/ProjectLogPanel"; import {ProjectService} from "../api/ProjectService";