You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ma...@apache.org on 2023/12/07 23:27:53 UTC
(camel-karavan) branch main updated: Fix commit and push ui issues
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
The following commit(s) were added to refs/heads/main by this push:
new 71d7a0a6 Fix commit and push ui issues
71d7a0a6 is described below
commit 71d7a0a612c3312e843e89193be33d17f314bf44
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Thu Dec 7 18:27:44 2023 -0500
Fix commit and push ui issues
---
.../src/main/webui/src/api/ProjectService.ts | 24 +---------------------
.../src/main/webui/src/api/ProjectStore.ts | 1 +
.../src/main/webui/src/project/ProjectPanel.tsx | 2 +-
.../src/main/webui/src/project/files/FilesTab.tsx | 2 +-
.../src/main/webui/src/projects/ProjectsPage.tsx | 1 -
5 files changed, 4 insertions(+), 26 deletions(-)
diff --git a/karavan-web/karavan-app/src/main/webui/src/api/ProjectService.ts b/karavan-web/karavan-app/src/main/webui/src/api/ProjectService.ts
index 11f4d89b..66f9c88f 100644
--- a/karavan-web/karavan-app/src/main/webui/src/api/ProjectService.ts
+++ b/karavan-web/karavan-app/src/main/webui/src/api/ProjectService.ts
@@ -30,6 +30,7 @@ import {
import {ProjectEventBus} from './ProjectEventBus';
import {EventBus} from "../designer/utils/EventBus";
import {KameletApi} from "karavan-core/lib/api/KameletApi";
+import {AxiosResponse} from "axios";
export class ProjectService {
@@ -96,29 +97,6 @@ export class ProjectService {
});
}
- // public static getDevModeStatus(project: Project) {
- // const projectId = project.projectId;
- // KaravanApi.getDevModePodStatus(projectId, res => {
- // if (res.status === 200) {
- // unstable_batchedUpdates(() => {
- // const containerStatus = res.data;
- // if (useDevModeStore.getState().podName !== containerStatus.containerName){
- // useDevModeStore.setState({podName: containerStatus.containerName})
- // }
- // if (useDevModeStore.getState().status !== 'wip'){
- // useLogStore.setState({isRunning: true})
- // }
- // useStatusesStore.setState({containerStatus: containerStatus});
- // })
- // } else {
- // unstable_batchedUpdates(() => {
- // useDevModeStore.setState({status: 'none', podName: undefined})
- // useStatusesStore.setState({containerStatus: new ContainerStatus({})});
- // })
- // }
- // });
- // }
-
public static pushProject(project: Project, commitMessage: string) {
useProjectStore.setState({isPushing: true})
const params = {
diff --git a/karavan-web/karavan-app/src/main/webui/src/api/ProjectStore.ts b/karavan-web/karavan-app/src/main/webui/src/api/ProjectStore.ts
index d37e54d9..d0078549 100644
--- a/karavan-web/karavan-app/src/main/webui/src/api/ProjectStore.ts
+++ b/karavan-web/karavan-app/src/main/webui/src/api/ProjectStore.ts
@@ -143,6 +143,7 @@ export const useProjectStore = createWithEqualityFn<ProjectState>((set) => ({
context: {},
trace: {},
memory: {},
+ tabIndex: state.tabIndex
}));
},
setOperation: (o: "create" | "select" | "delete"| "none" | "copy") => {
diff --git a/karavan-web/karavan-app/src/main/webui/src/project/ProjectPanel.tsx b/karavan-web/karavan-app/src/main/webui/src/project/ProjectPanel.tsx
index 8a41c3da..e9c842af 100644
--- a/karavan-web/karavan-app/src/main/webui/src/project/ProjectPanel.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/project/ProjectPanel.tsx
@@ -46,7 +46,7 @@ export function ProjectPanel() {
useEffect(() => {
onRefresh();
- }, [project]);
+ }, [project.projectId]);
function onRefresh() {
if (project.projectId) {
diff --git a/karavan-web/karavan-app/src/main/webui/src/project/files/FilesTab.tsx b/karavan-web/karavan-app/src/main/webui/src/project/files/FilesTab.tsx
index 868cd0a0..4a26cd89 100644
--- a/karavan-web/karavan-app/src/main/webui/src/project/files/FilesTab.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/project/files/FilesTab.tsx
@@ -36,7 +36,7 @@ import {Table} from '@patternfly/react-table/deprecated';
import DeleteIcon from "@patternfly/react-icons/dist/js/icons/times-icon";
import SearchIcon from '@patternfly/react-icons/dist/esm/icons/search-icon';
import {useFilesStore, useFileStore, useProjectStore} from "../../api/ProjectStore";
-import {getProjectFileType, ProjectFile, ProjectFileTypes} from "../../api/ProjectModels";
+import {getProjectFileType, Project, ProjectFile, ProjectFileTypes} from "../../api/ProjectModels";
import {FileToolbar} from "./FilesToolbar";
import DownloadIcon from "@patternfly/react-icons/dist/esm/icons/download-icon";
import FileSaver from "file-saver";
diff --git a/karavan-web/karavan-app/src/main/webui/src/projects/ProjectsPage.tsx b/karavan-web/karavan-app/src/main/webui/src/projects/ProjectsPage.tsx
index 05a68026..63d980f5 100644
--- a/karavan-web/karavan-app/src/main/webui/src/projects/ProjectsPage.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/projects/ProjectsPage.tsx
@@ -61,7 +61,6 @@ export function ProjectsPage () {
const [filter, setFilter] = useState<string>('');
useEffect(() => {
- console.log("ProjectsPage", "useEffect");
KaravanApi.getProjects((projects: Project[]) => {
setProjects(projects);
});