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.

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

Allow to configure node label in catalog #176

Merged
merged 5 commits into from
Oct 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added

- Configure node by clicking in workflow config toml text ([#20](https://github.com/i-VRESSE/workflow-builder/issues/20))
- Allow to configure node legend in catalog ([#151](https://github.com/i-VRESSE/workflow-builder/issues/151))

## @i-vresse/wb-core 3.2.1 - 2024-08-26

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ The catalog is a YAML formatted file which tells the app what nodes are availabl
4. examples: Title and link to example workflows
* map with title as key and link as value
5. title: Title of the catalog
6. nodeLegend: Legend of the node in the app. Default is 'Node'

### schema

Expand Down
1 change: 1 addition & 0 deletions packages/core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ function App() {
useEffect(() => {
const catalog = {
title: "Some title",
nodeLegend: "Workflow node",
global: {
schema: {
type: "object",
Expand Down
16 changes: 16 additions & 0 deletions packages/core/src/CatalogPanel.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,19 @@ export const WithExample: ComponentStory<typeof CatalogPanel> = () => {
})
return <CatalogPanel />
}

export const WithNodeLegend: ComponentStory<typeof CatalogPanel> = () => {
const setCatalog = useSetCatalog()
setCatalog({
title: 'Some title',
nodeLegend: 'My custom node label',
categories: [],
global: {
schema: {},
uiSchema: {}
},
nodes: [],
examples: {}
})
return <CatalogPanel />
}
2 changes: 1 addition & 1 deletion packages/core/src/CatalogPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export const CatalogPanel = ({ children }: PropsWithChildren<{}>): JSX.Element =
<legend>Catalog</legend>
<React.Suspense fallback={<span>Loading catalog...</span>}>
{children}
<h4>Nodes</h4>
<h4>{catalog.nodeLegend ?? 'Node'}s</h4>
<ul style={{ lineHeight: '2.5em' }}>
{catalog.categories.map((category) => (
<CatalogCategory key={category.name} {...category} />
Expand Down
29 changes: 29 additions & 0 deletions packages/core/src/NodePanel.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,32 @@ export const NodeSelected: ComponentStory<typeof NodePanel> = () => {
}, [])
return <NodePanel />
}

export const CustomNodeLegend: ComponentStory<typeof NodePanel> = () => {
const setCatalog = useSetCatalog()
// const { setEditingGlobal } = useWorkflow()
useEffect(() => {
const catalog = prepareCatalog({
title: 'Some title',
nodeLegend: 'My custom node label',
categories: [],
global: {
schema: {
type: 'object',
properties: {
parameter1: {
type: 'string'
}
},
additionalProperties: false
},
uiSchema: {}
},
nodes: [],
examples: {}
})
setCatalog(catalog)
// toggleGlobalEdit()
}, [])
return <NodePanel />
}
5 changes: 3 additions & 2 deletions packages/core/src/NodePanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@ import React from 'react'
import { FormProps } from './FormProps'
import { GlobalForm } from './GlobalForm'
import { NodeForm } from './NodeForm'
import { useSelectNodeIndex } from './store'
import { useCatalog, useSelectNodeIndex } from './store'

/**
* Panel which renders the form for the selected node or the global parameters.
*
*/
export const NodePanel = ({ fields, widgets }: FormProps): JSX.Element => {
const selectedNodeIndex = useSelectNodeIndex()
const { nodeLegend } = useCatalog()

const legend = 'Node'
const legend = nodeLegend ?? 'Node'

return (
<fieldset>
Expand Down
1 change: 1 addition & 0 deletions packages/core/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ export interface IGlobal {

export interface ICatalog {
title: string
nodeLegend?: string
global: IGlobal
categories: ICategory[]
nodes: ICatalogNode[]
Expand Down
1 change: 1 addition & 0 deletions packages/haddock3_catalog/generate_haddock3_catalog.py
Original file line number Diff line number Diff line change
Expand Up @@ -534,6 +534,7 @@ def process_level(level_fn: Path, level: str):

catalog = {
"title": f"Haddock 3 on {level} level",
"nodeLegend": "Module",
"categories": categories,
'global': process_global(level),
"nodes": nodes,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
title: Haddock 3 on easy level
nodeLegend: Module
categories:
- name: topology
description: HADDOCK3 modules to create topologies.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
title: Haddock 3 on expert level
nodeLegend: Module
categories:
- name: topology
description: HADDOCK3 modules to create topologies.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
title: Haddock 3 on guru level
nodeLegend: Module
categories:
- name: topology
description: HADDOCK3 modules to create topologies.
Expand Down
Loading