diff --git a/src/components/register/types.ts b/src/components/register/types.ts
new file mode 100644
index 0000000..cdbf3d1
--- /dev/null
+++ b/src/components/register/types.ts
@@ -0,0 +1,5 @@
+import { LoginStatus } from "@/layouts/constants";
+
+export interface RegisterProps {
+ isLoggedIn: LoginStatus
+}
\ No newline at end of file
diff --git a/src/components/RunWorkflow.js b/src/components/run-workflow/index.tsx
similarity index 95%
rename from src/components/RunWorkflow.js
rename to src/components/run-workflow/index.tsx
index 069553f..f40411d 100644
--- a/src/components/RunWorkflow.js
+++ b/src/components/run-workflow/index.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { FC, useEffect, useState } from 'react';
// import validator from "validator";
import yaml from 'js-yaml';
import { useNavigate } from 'react-router-dom';
@@ -6,13 +6,14 @@ import axios from 'axios';
import CodeEditor from '@uiw/react-textarea-code-editor';
import Files from 'react-files';
import Marquee from 'react-fast-marquee';
-import { host_uri_wes } from '../config';
+import { HOST_URI_WES } from '@/config/constants';
import { confirmAlert } from 'react-confirm-alert';
import { Document, Page, pdfjs } from 'react-pdf';
import 'react-pdf/dist/Page/AnnotationLayer.css';
import 'react-pdf/dist/Page/TextLayer.css';
+import { RunWorkflowProps } from './types';
-const RunWorkflow = ({ isLoggedIn, showToast }) => {
+const RunWorkflow: FC
= ({ isLoggedIn, showToast }) => {
// Pdfjs worker
pdfjs.GlobalWorkerOptions.workerSrc = `//cdnjs.cloudflare.com/ajax/libs/pdf.js/${pdfjs.version}/pdf.worker.js`;
@@ -22,15 +23,13 @@ const RunWorkflow = ({ isLoggedIn, showToast }) => {
const [workflow_url_error, set_workflow_url_error] = useState('');
const [workflow_params, set_workflow_params] = useState('');
const [workflow_params_error, set_workflow_params_error] = useState('');
- const [workflow_attachments, set_workflow_attachments] = useState([]);
- const [workflow_attachments_error, set_workflow_attachments_error] =
- useState('');
+ const [workflow_attachments, set_workflow_attachments] = useState([]);
+ const [workflow_attachments_error, set_workflow_attachments_error] = useState('');
const [showAdvance, setShowAdvance] = useState(false);
const [workflow_engine_params, set_workflow_engine_params] = useState('');
- const [workflow_engine_params_error, set_workflow_engine_params_error] =
- useState('');
- const [tags, setTags] = useState([]);
- const [tags_error, set_tags_error] = useState([]);
+ const [workflow_engine_params_error, set_workflow_engine_params_error] = useState('');
+ const [tags, setTags] = useState<{key: string, value: string}[]>([]);
+ const [tags_error, set_tags_error] = useState([]);
const [loading, setLoading] = useState(false);
const navigate = useNavigate();
@@ -38,9 +37,9 @@ const RunWorkflow = ({ isLoggedIn, showToast }) => {
if (isLoggedIn === 'false') {
return navigate('/');
}
- }, [isLoggedIn]);
+ }, [isLoggedIn, navigate]);
- const handleTypeChange = (e) => {
+ const handleTypeChange = (e: any) => {
set_workflow_type(e.target.value);
if (e.target.value === 'CWL') {
set_workflow_version('v1.0');
@@ -106,7 +105,7 @@ const RunWorkflow = ({ isLoggedIn, showToast }) => {
);
};
- const handleChangeTag = (isKey, i, e) => {
+ const handleChangeTag = (isKey: boolean, i: number, e: any) => {
let tempTags = tags;
if (isKey) {
tempTags[i].key = e.target.value;
@@ -124,18 +123,16 @@ const RunWorkflow = ({ isLoggedIn, showToast }) => {
set_tags_error([...tags_error, '']);
};
- const handleRemoveTag = (i) => {
+ const handleRemoveTag = (i: number) => {
let tempTags = tags;
tempTags.splice(i, 1);
tempTags = [...tempTags];
setTags(tempTags);
- tempTags = tags_error;
- tempTags.splice(i, 1);
- tempTags = [...tempTags];
- set_tags_error(tempTags);
+ const tempTagErrors= tags_error.splice(i, 1);
+ set_tags_error([...tempTagErrors]);
};
- const handleAttachmentChange = (e) => {
+ const handleAttachmentChange = (e: any) => {
const tempAttachment = [...workflow_attachments, ...e];
set_workflow_attachments(tempAttachment);
};
@@ -157,7 +154,7 @@ const RunWorkflow = ({ isLoggedIn, showToast }) => {
// console.log(res);
// };
- const handleSubmit = async (e) => {
+ const handleSubmit = async (e: React.MouseEvent) => {
e.preventDefault();
set_workflow_url_error('');
set_workflow_params_error('');
@@ -192,12 +189,12 @@ const RunWorkflow = ({ isLoggedIn, showToast }) => {
set_workflow_params_error('Workflow parameters is required!');
return;
}
- let workflow_params_json = '';
+ let workflow_params_json : any= '';
try {
// console.log(workflow_params);
workflow_params_json = await yaml.load(workflow_params);
// console.log(workflow_params_json);
- } catch (e) {
+ } catch (_e: any) {
set_workflow_params_error('Workflow parameters is not a valid YAML!');
return;
}
@@ -227,7 +224,7 @@ const RunWorkflow = ({ isLoggedIn, showToast }) => {
// workflow_attachment end
// workflow_engine_params
- let workflow_engine_params_json = '';
+ let workflow_engine_params_json: any = '';
if (workflow_engine_params !== '') {
try {
workflow_engine_params_json = await yaml.load(workflow_engine_params);
@@ -239,7 +236,7 @@ const RunWorkflow = ({ isLoggedIn, showToast }) => {
'workflow_engine_parameters',
workflow_engine_params_json
);
- } catch (e) {
+ } catch (_e: any) {
setShowAdvance(true);
set_workflow_engine_params_error(
'Workflow engine parameters is not a valid YAML!'
@@ -250,33 +247,30 @@ const RunWorkflow = ({ isLoggedIn, showToast }) => {
// workflow_engine_params end
// workflow_tag
- let tags_json = {};
+ let tags_json: {[key : string]: string} = {};
for (let i = 0; i < tags.length; i++) {
+ const temp_tags_error: string[] = Array.from({length: tags.length}, ()=> '')
if (tags[i].key === '') {
- // eslint-disable-next-line no-var
- var temp_tags_error = Array.from({ length: tags.length }, (v, k) => '');
temp_tags_error[i] = 'Tag key is required!';
setShowAdvance(true);
set_tags_error(temp_tags_error);
return;
}
if (tags[i].value === '') {
- temp_tags_error = Array.from({ length: tags.length }, (v, k) => '');
temp_tags_error[i] = 'Tag value is required!';
setShowAdvance(true);
set_tags_error(temp_tags_error);
return;
}
- temp_tags_error = Array.from({ length: tags.length }, (v, k) => '');
set_tags_error(temp_tags_error);
tags_json = Object.assign(
- ...tags.map((tag) => ({ [tag.key]: tag.value }))
+ tags.map((tag) => ({ [tag.key]: tag.value }))
);
}
- tags_json = JSON.stringify(tags_json);
+ const tags_json_string = JSON.stringify(tags_json);
if (tags.length > 0) {
// console.log("tags", tags_json);
- formData.append('tags', tags_json);
+ formData.append('tags', tags_json_string);
}
// workflow_tag end
@@ -287,7 +281,7 @@ const RunWorkflow = ({ isLoggedIn, showToast }) => {
// for (var pair of formData.entries()) {
// console.log(pair[0] + ", " + pair[1]);
// }
- const res = await axios.post(`${host_uri_wes}/runs`, formData, {
+ const res = await axios.post(`${HOST_URI_WES}/runs`, formData, {
headers: {
'content-type': 'multipart/form-data',
Accept: 'application/json',
@@ -324,13 +318,13 @@ const RunWorkflow = ({ isLoggedIn, showToast }) => {
);
}
});
- } catch (e) {
+ } catch (_e: any) {
// console.log(e);
showToast('error', 'Server Error!');
}
};
- const handleFileRemove = (i) => {
+ const handleFileRemove = (i: number) => {
const tempAttachment = workflow_attachments;
tempAttachment.splice(i, 1);
set_workflow_attachments([...tempAttachment]);
@@ -488,7 +482,7 @@ const RunWorkflow = ({ isLoggedIn, showToast }) => {