Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update/add graph related stories #493

Merged
merged 4 commits into from
May 23, 2022
+158 −8
Merged

fix: update/add graph related stories #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b67652e
fix: graph related stories
olga-union May 20, 2022
332b2b5
fix: update stories
olga-union May 20, 2022
0e70ee8
fix: trigger checks
olga-union May 20, 2022
4205272
fix: min height
olga-union May 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions packages/zapp/console/src/components/WorkflowGraph/__stories__/WorkflowGraph.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const workflow: Workflow = {
};

const onNodeSelectionChanged = action('nodeSelected');
const onMapTaskSelectionChanged = action('mapTaskSelected');
const onPhaseSelectionChanged = action('phaseSelected');

const cache = createCache();
const taskTemplates = extractTaskTemplates(workflow);
Expand All @@ -38,6 +38,7 @@ stories.addDecorator((story) => (
right: '35vw',
left: 0,
bottom: 0,
height: '450px',
}}
>
<CacheContext.Provider value={cache}>{story()}</CacheContext.Provider>
Expand All @@ -49,7 +50,8 @@ stories.addDecorator((story) => (
stories.add('TaskNodeRenderer', () => (
<WorkflowGraph
onNodeSelectionChanged={onNodeSelectionChanged}
onMapTaskSelectionChanged={onMapTaskSelectionChanged}
onPhaseSelectionChanged={onPhaseSelectionChanged}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like it's need to be scaled or something.
When I just open it I don't see anything
Screen Shot 2022-05-21 at 10 14 47 PM
If I scale whole page with "-" Zoom Out icon in storybook I can see a glimpse of it.
Screen Shot 2022-05-21 at 10 16 36 PM

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed height
Screen Shot 2022-05-23 at 10 52 13 AM

workflow={workflow}
isDetailsTabClosed={true}
/>
));
1 change: 1 addition & 0 deletions packages/zapp/console/src/components/flytegraph/ReactFlow/ReactFlowGraphComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ const ReactFlowGraphComponent = (props) => {
flexDirection: 'column',
minHeight: '100px',
minWidth: '200px',
height: '100%',
};

const renderGraph = () => {
Expand Down
10 changes: 4 additions & 6 deletions packages/zapp/console/src/components/flytegraph/ReactFlow/utils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,14 +154,17 @@ export const getGraphNodeStyle = (
type: dTypes,
nodeExecutionStatus?: NodeExecutionPhase,
): CSSProperties => {
// getStatusColor accepts undefined, and falls back to default gray color
const nodePrimaryColor = getStatusColor(nodeExecutionStatus);

/** Base styles for displaying graph nodes */
const baseStyle = {
boxShadow: '1px 3px 5px rgba(0,0,0,.2)',
padding: '.25rem .75rem',
fontSize: '.6rem',
color: '#323232',
borderRadius: '.25rem',
border: '.15rem solid #555',
border: `.15rem solid ${nodePrimaryColor}`,
background: '#fff',
minWidth: '.5rem',
minHeight: '.5rem',
Expand All @@ -186,11 +189,6 @@ export const getGraphNodeStyle = (
color: '#fff',
};

let nodePrimaryColor = '';
if (nodeExecutionStatus) {
nodePrimaryColor = getStatusColor(nodeExecutionStatus);
}

/** Override the base styles with node-type specific styles */
const overrideStyles = {
start: {
Expand Down
149 changes: 149 additions & 0 deletions packages/zapp/console/src/components/flytegraph/__stories__/CustomNodes.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
import { action } from '@storybook/addon-actions';
import { storiesOf } from '@storybook/react';
import { RENDER_ORDER } from 'components/Executions/TaskExecutionsList/constants';
import { NodeExecutionDisplayType } from 'components/Executions/types';
import { getTaskExecutionPhaseConstants } from 'components/Executions/utils';
import { CatalogCacheStatus, NodeExecutionPhase } from 'models/Execution/enums';
import { TaskType } from 'models/Task/constants';
import * as React from 'react';
import { ReactFlowProvider } from 'react-flow-renderer';
import { ReactFlowCustomTaskNode } from '../ReactFlow/customNodeComponents';

const stories = storiesOf('CustomNodes', module);
stories.addDecorator((story) => (
<>
<ReactFlowProvider>{story()}</ReactFlowProvider>
</>
));

const commonData = {
onNodeSelectionChanged: action('nodeSelected'),
onPhaseSelectionChanged: action('phaseSelected'),
scopedId: 'n0',
};

const taskData = {
...commonData,
nodeType: NodeExecutionDisplayType.PythonTask,
taskType: TaskType.PYTHON,
cacheStatus: 0,
};

stories.add('Task Node', () => (
<>
{RENDER_ORDER.map((phase, i) => (
<div
style={{
position: 'absolute',
top: 40 * i + 20,
left: 20,
}}
key={phase}
>
<ReactFlowCustomTaskNode
data={{
...taskData,
nodeExecutionStatus: phase,
text: getTaskExecutionPhaseConstants(phase).text,
}}
/>
</div>
))}
</>
));

const cachedTaskData = {
...commonData,
nodeType: NodeExecutionDisplayType.PythonTask,
nodeExecutionStatus: NodeExecutionPhase.SUCCEEDED,
taskType: TaskType.PYTHON,
};

const CACHE_STATUSES = [
{ status: CatalogCacheStatus.CACHE_DISABLED, text: 'cache disabled' },
{ status: CatalogCacheStatus.CACHE_HIT, text: 'cache hit' },
{ status: CatalogCacheStatus.CACHE_LOOKUP_FAILURE, text: 'cache lookup failure' },
{ status: CatalogCacheStatus.CACHE_MISS, text: 'cache miss' },
{ status: CatalogCacheStatus.CACHE_POPULATED, text: 'cache populated' },
{ status: CatalogCacheStatus.CACHE_PUT_FAILURE, text: 'cache put failure' },
];

stories.add('Task Node by Cache Status', () => (
<>
{CACHE_STATUSES.map((cacheStatus, i) => (
<div
style={{
position: 'absolute',
top: 40 * i + 20,
left: 20,
}}
key={cacheStatus.text}
>
<ReactFlowCustomTaskNode
data={{
...cachedTaskData,
cacheStatus: cacheStatus.status,
text: cacheStatus.text,
}}
/>
</div>
))}
</>
));

const logsByPhase = new Map();
logsByPhase.set(5, [
{
uri: '#',
name: 'Kubernetes Logs #0-0-1',
messageFormat: 2,
},
{
uri: '#',
name: 'Kubernetes Logs #0-1',
messageFormat: 2,
},
]);
logsByPhase.set(2, [
{
uri: '#',
name: 'Kubernetes Logs #0-2-1',
messageFormat: 2,
},
]);
logsByPhase.set(6, [
{
name: 'ff21a6480a4c84742ad4-n0-0-3',
},
]);

const mapTaskData = {
...commonData,
nodeType: NodeExecutionDisplayType.MapTask,
taskType: TaskType.ARRAY,
cacheStatus: 0,
nodeLogsByPhase: logsByPhase,
};

stories.add('Map Task Node', () => (
<>
{RENDER_ORDER.map((phase, i) => (
<div
style={{
position: 'absolute',
top: 45 * i + 20,
left: 20,
}}
key={phase}
>
<ReactFlowCustomTaskNode
data={{
...mapTaskData,
nodeExecutionStatus: phase,
text: getTaskExecutionPhaseConstants(phase).text,
}}
/>
</div>
))}
</>
));