diff --git a/public/app.tsx b/public/app.tsx index fa80d217..f2a352c8 100644 --- a/public/app.tsx +++ b/public/app.tsx @@ -5,7 +5,12 @@ import React from 'react'; import { Route, RouteComponentProps, Switch } from 'react-router-dom'; -import { EuiPageSideBar, EuiSideNav, EuiPageTemplate } from '@elastic/eui'; +import { + EuiPageSideBar, + EuiSideNav, + EuiFlexGroup, + EuiFlexItem, +} from '@elastic/eui'; import { Navigation, APP_PATH } from './utils'; import { Workflows, @@ -14,6 +19,9 @@ import { WorkflowsRouterProps, } from './pages'; +// styling +import './global-styles.scss'; + interface Props extends RouteComponentProps {} export const FlowFrameworkDashboardsApp = (props: Props) => { @@ -41,44 +49,44 @@ export const FlowFrameworkDashboardsApp = (props: Props) => { // Render the application DOM. return ( - - - - ) => } - /> - ) => ( - - )} - /> - {/* + {sidebar} + + + + ) => } + /> + ) => ( + + )} + /> + {/* Defaulting to Workflows page. The pathname will need to be updated to handle the redirection and get the router props consistent. */} - ) => { - if (props.history.location.pathname !== APP_PATH.WORKFLOWS) { - props.history.replace({ - ...history, - pathname: APP_PATH.WORKFLOWS, - }); - } - return ; - }} - /> - - + ) => { + if (props.history.location.pathname !== APP_PATH.WORKFLOWS) { + props.history.replace({ + ...history, + pathname: APP_PATH.WORKFLOWS, + }); + } + return ; + }} + /> + + + ); }; diff --git a/public/global-styles.scss b/public/global-styles.scss new file mode 100644 index 00000000..9920b2f2 --- /dev/null +++ b/public/global-styles.scss @@ -0,0 +1,13 @@ +// Maximize space given its relative position +.stretch-relative { + position: relative; + height: 100%; + width: 100%; +} + +// Maximize space given its absolute position +.stretch-absolute { + position: absolute; + height: 100%; + width: 100%; +} diff --git a/public/pages/workflow_detail/workflow_detail.tsx b/public/pages/workflow_detail/workflow_detail.tsx index 8406e34d..cc795ecb 100644 --- a/public/pages/workflow_detail/workflow_detail.tsx +++ b/public/pages/workflow_detail/workflow_detail.tsx @@ -25,10 +25,11 @@ import { NEW_WORKFLOW_ID_URL, } from '../../../common'; import { Resources } from './resources'; +import { Prototype } from './prototype'; // styling import './workflow-detail-styles.scss'; -import { Prototype } from './prototype'; +import '../../global-styles.scss'; export interface WorkflowDetailRouterProps { workflowId: string; @@ -161,7 +162,7 @@ export function WorkflowDetail(props: WorkflowDetailProps) { return ( - + { + // This is so our base element stretches to fit the entire webpage + element.className = 'stretch-absolute'; ReactDOM.render(