(camel-karavan) branch main updated: Fix for #1114 and a couple of additional small fixes (#1118)

[marat]

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 4382d567 Fix for #1114 and a couple of additional small fixes (#1118)
4382d567 is described below

commit 4382d5676895d53901b1fb132e4da97a5a169a70
Author: Mario Volf <mv...@users.noreply.github.com>
AuthorDate: Mon Feb 12 20:47:19 2024 +0100

    Fix for #1114 and a couple of additional small fixes (#1118)
---
 .../src/main/webui/src/project/files/CreateFileModal.tsx         | 9 +++++++++
 .../src/main/webui/src/project/files/UploadFileModal.tsx         | 5 ++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git 
a/karavan-web/karavan-app/src/main/webui/src/project/files/CreateFileModal.tsx 
b/karavan-web/karavan-app/src/main/webui/src/project/files/CreateFileModal.tsx
index 8c08be7f..cd2538fe 100644
--- 
a/karavan-web/karavan-app/src/main/webui/src/project/files/CreateFileModal.tsx
+++ 
b/karavan-web/karavan-app/src/main/webui/src/project/files/CreateFileModal.tsx
@@ -41,6 +41,7 @@ import {yupResolver} from "@hookform/resolvers/yup";
 import {useResponseErrorHandler} from 
"../../shared/error/UseResponseErrorHandler";
 import {EventBus} from "../../designer/utils/EventBus";
 import {AxiosError} from "axios";
+import {isEmpty} from "../../util/StringUtils";
 
 interface Props {
     types: string[],
@@ -134,6 +135,13 @@ export function CreateFileModal(props: Props) {
         registerResponseErrors(error);
     }
 
+    function onKeyDown(event: React.KeyboardEvent<HTMLDivElement>): void {
+        if (event.key === 'Enter' && !isEmpty(name)) {
+            handleFormSubmit();
+            event.preventDefault();
+        }
+    }
+
     function getCode(): string {
         if (fileType === 'INTEGRATION') {
             return 
CamelDefinitionYaml.integrationToYaml(Integration.createNew(name, 'plain'));
@@ -191,6 +199,7 @@ export function CreateFileModal(props: Props) {
             variant={ModalVariant.small}
             isOpen={["create", "copy"].includes(operation)}
             onClose={closeModal}
+            onKeyDown={onKeyDown}
             actions={[
                 <Button key="confirm" variant="primary" 
onClick={handleSubmit(handleFormSubmit)}>Save</Button>,
                 <Button key="cancel" variant="secondary" 
onClick={closeModal}>Cancel</Button>
diff --git 
a/karavan-web/karavan-app/src/main/webui/src/project/files/UploadFileModal.tsx 
b/karavan-web/karavan-app/src/main/webui/src/project/files/UploadFileModal.tsx
index 70ba3715..f68f423b 100644
--- 
a/karavan-web/karavan-app/src/main/webui/src/project/files/UploadFileModal.tsx
+++ 
b/karavan-web/karavan-app/src/main/webui/src/project/files/UploadFileModal.tsx
@@ -82,6 +82,8 @@ export function UploadFileModal(props: Props) {
 
     function closeModal () {
         setFile("none");
+        setFilename('');
+        setData('');
         resetForm();
     }
 
@@ -175,15 +177,12 @@ export function UploadFileModal(props: Props) {
                         isLoading={isLoading}
                         onFileInputChange={(_event, fileHandle: File) => {
                             handleFileInputChange(fileHandle);
-                            register('upload').onChange(_event);
                         }}
                         onDataChange={(_event, data) => {
                             handleTextOrDataChange(data);
-                            register('upload').onChange(_event);
                         }}
                         onTextChange={(_event, text) => {
                             handleTextOrDataChange(data);
-                            register('upload').onChange(_event);
                         }}
                         onReadStarted={(_event, fileHandle: File) => 
handleFileReadStarted(fileHandle)}
                         onReadFinished={(_event, fileHandle: File) => 
handleFileReadFinished(fileHandle)}