From cae657423442699d18ef660137024ff8e3068af1 Mon Sep 17 00:00:00 2001 From: Sayan Mondal Date: Thu, 8 Jul 2021 12:23:35 +0530 Subject: [PATCH] Adding data-cy for E2E and fixing Edit Scheduile View YAML (#2977) Signed-off-by: Sayan Mondal --- .../src/pages/EditSchedule/Schedule.tsx | 2 + .../frontend/src/pages/EditSchedule/index.tsx | 290 ++++++++++-------- .../frontend/src/pages/EditSchedule/styles.ts | 29 ++ .../src/pages/WorkflowDetails/index.tsx | 5 +- .../CreateWorkflow/ScheduleWorkflow/index.tsx | 1 + .../CreateWorkflow/TuneWorkflow/index.tsx | 1 + .../CreateWorkflow/TuneWorkflow/styles.ts | 1 - .../WorkflowDetails/LogsSwitcher/index.tsx | 9 +- 8 files changed, 213 insertions(+), 125 deletions(-) diff --git a/litmus-portal/frontend/src/pages/EditSchedule/Schedule.tsx b/litmus-portal/frontend/src/pages/EditSchedule/Schedule.tsx index 62edebac6..4e2e124fe 100644 --- a/litmus-portal/frontend/src/pages/EditSchedule/Schedule.tsx +++ b/litmus-portal/frontend/src/pages/EditSchedule/Schedule.tsx @@ -493,6 +493,7 @@ const ScheduleWorkflow = () => {
{ Cancel history.push({ pathname: `/workflows/schedule/${getProjectID()}/${fetchWorkflowNameFromManifest( diff --git a/litmus-portal/frontend/src/pages/EditSchedule/index.tsx b/litmus-portal/frontend/src/pages/EditSchedule/index.tsx index 39d86ab94..611c759fd 100644 --- a/litmus-portal/frontend/src/pages/EditSchedule/index.tsx +++ b/litmus-portal/frontend/src/pages/EditSchedule/index.tsx @@ -67,6 +67,7 @@ const EditSchedule: React.FC = () => { }, ]); + const [yamlOpen, setYAMLOpen] = React.useState(false); const [open, setOpen] = React.useState(false); const [finishModalOpen, setFinishModalOpen] = useState(false); const [errorModal, setErrorModal] = useState(false); @@ -204,7 +205,7 @@ const EditSchedule: React.FC = () => { const handleEditOpen = () => { setModified(false); - setOpen(true); + setYAMLOpen(true); }; const handleEditClose = () => { @@ -253,136 +254,180 @@ const EditSchedule: React.FC = () => {
- - {t('createWorkflow.verifyCommit.summary.header')} - - -
-
-
- - {t('createWorkflow.verifyCommit.summary.workflowName')}: - -
-
- - {fetchWorkflowNameFromManifest(manifest)} - -
-
- -
-
- - {t('createWorkflow.verifyCommit.summary.clustername')}: - -
- - {clustername} - -
- -
-
- - {t('createWorkflow.verifyCommit.summary.desc')}: - -
-
- {workflow.description} -
-
-
-
- - {t('createWorkflow.verifyCommit.summary.schedule')}: - -
-
- {cronSyntax === '' ? ( - - {t('createWorkflow.verifyCommit.summary.schedulingNow')} + {yamlOpen ? ( +
+
+
+ Terminal Icon + + {fetchWorkflowNameFromManifest(manifest)}.yaml - ) : ( - {cronstrue.toString(cronSyntax)} - )} +
- history.push({ - pathname: `/workflows/schedule/${projectID}/${fetchWorkflowNameFromManifest( - manifest - )}/set`, - search: `?projectID=${projectID}&projectRole=${userRole}`, - }) - } + onClick={() => setYAMLOpen(false)} + className={classes.editorCloseBtn} > - - {t('editSchedule.edit')} + x
+
-
-
- - {t('createWorkflow.verifyCommit.summary.adjustedWeights')} - : - -
- {weights.length === 0 ? ( -
- - {t('createWorkflow.verifyCommit.error')} - -
- ) : ( -
-
- {weights.map((Test) => ( - - ))} + ) : ( + <> + + {t('createWorkflow.verifyCommit.summary.header')} + + +
+
+
+ + {t( + 'createWorkflow.verifyCommit.summary.workflowName' + )} + : + +
+
+ + {fetchWorkflowNameFromManifest(manifest)} +
- )} -
-
-
- - {t('createWorkflow.verifyCommit.YAML')} - -
-
- {weights.length === 0 ? ( - - {t('createWorkflow.verifyCommit.errYaml')} + +
+
+ + {t('createWorkflow.verifyCommit.summary.clustername')} + : + +
+ + {clustername} - ) : ( - - {yamlStatus} - - {t('createWorkflow.verifyCommit.youCanMoveOn')} - - - )} -
- - {t('createWorkflow.verifyCommit.button.viewYaml')} - +
+ +
+
+ + {t('createWorkflow.verifyCommit.summary.desc')}: + +
+
+ {workflow.description} +
+
+
+
+ + {t('createWorkflow.verifyCommit.summary.schedule')}: + +
+
+ {cronSyntax === '' ? ( + + {t( + 'createWorkflow.verifyCommit.summary.schedulingNow' + )} + + ) : ( + + {cronstrue.toString(cronSyntax)} + + )} + + + history.push({ + pathname: `/workflows/schedule/${projectID}/${fetchWorkflowNameFromManifest( + manifest + )}/set`, + search: `?projectID=${projectID}&projectRole=${userRole}`, + }) + } + > + + {t('editSchedule.edit')} + +
+
+
+
+ + {t( + 'createWorkflow.verifyCommit.summary.adjustedWeights' + )} + : + +
+ {weights.length === 0 ? ( +
+ + {t('createWorkflow.verifyCommit.error')} + +
+ ) : ( +
+
+ {weights.map((Test) => ( + + ))} +
+
+ )} +
+
+
+ + {t('createWorkflow.verifyCommit.YAML')} + +
+
+ {weights.length === 0 ? ( + + {t('createWorkflow.verifyCommit.errYaml')} + + ) : ( + + {yamlStatus} + + {t('createWorkflow.verifyCommit.youCanMoveOn')} + + + )} +
+ + {t('createWorkflow.verifyCommit.button.viewYaml')} + +
+
-
-
+ + )}
{/* Cancel and Save Button */} @@ -397,7 +442,10 @@ const EditSchedule: React.FC = () => { > {t('editSchedule.cancel')} - handleNext()}> + handleNext()} + > {t('editSchedule.save')}
diff --git a/litmus-portal/frontend/src/pages/EditSchedule/styles.ts b/litmus-portal/frontend/src/pages/EditSchedule/styles.ts index 054cf57b0..94543d499 100644 --- a/litmus-portal/frontend/src/pages/EditSchedule/styles.ts +++ b/litmus-portal/frontend/src/pages/EditSchedule/styles.ts @@ -227,4 +227,33 @@ export const useStyles = makeStyles((theme: Theme) => ({ fontWeight: 'bold', margin: theme.spacing(2, 0), }, + + // Editor + editorWrapper: { + marginBottom: theme.spacing(-4), + }, + flex: { + display: 'flex', + }, + additional: { + width: '95%', + margin: '0rem auto', + justifyContent: 'space-between', + }, + name: { + margin: theme.spacing(1, 0, 2, 2), + fontWeight: 'bold', + }, + editorTopBtn: { + padding: '0.4rem', + fontSize: '0.8rem', + }, + editorCloseBtn: { + width: '0.5rem', + borderColor: theme.palette.disabledBackground, + color: theme.palette.text.disabled, + minWidth: '2rem', + padding: '0.2rem', + fontSize: '1rem', + }, })); diff --git a/litmus-portal/frontend/src/pages/WorkflowDetails/index.tsx b/litmus-portal/frontend/src/pages/WorkflowDetails/index.tsx index f8e52ef27..01e0110c5 100644 --- a/litmus-portal/frontend/src/pages/WorkflowDetails/index.tsx +++ b/litmus-portal/frontend/src/pages/WorkflowDetails/index.tsx @@ -204,7 +204,10 @@ const WorkflowDetails: React.FC = () => { -
+
{/* Argo Workflow DAG Graph */} {
{ {/* Edit Button */} {manifest !== '' && ( setEditSequence(true)} > diff --git a/litmus-portal/frontend/src/views/CreateWorkflow/TuneWorkflow/styles.ts b/litmus-portal/frontend/src/views/CreateWorkflow/TuneWorkflow/styles.ts index 1008c321c..a3eb92f61 100644 --- a/litmus-portal/frontend/src/views/CreateWorkflow/TuneWorkflow/styles.ts +++ b/litmus-portal/frontend/src/views/CreateWorkflow/TuneWorkflow/styles.ts @@ -82,7 +82,6 @@ const useStyles = makeStyles((theme) => ({ // Table table: { - minWidth: '40rem', minHeight: '23rem', }, revertChaos: { diff --git a/litmus-portal/frontend/src/views/WorkflowDetails/LogsSwitcher/index.tsx b/litmus-portal/frontend/src/views/WorkflowDetails/LogsSwitcher/index.tsx index afedff914..e7205025a 100644 --- a/litmus-portal/frontend/src/views/WorkflowDetails/LogsSwitcher/index.tsx +++ b/litmus-portal/frontend/src/views/WorkflowDetails/LogsSwitcher/index.tsx @@ -159,7 +159,7 @@ const LogsSwitcher: React.FC = ({ try { const podLogs = JSON.parse(logs); return ( -
+
{workflow !== undefined && JSON.parse(workflow?.execution_data).nodes[pod_name].type === @@ -245,7 +245,12 @@ const LogsSwitcher: React.FC = ({
- {chaosResult} + + {chaosResult} +