[FIX] Mini icon in node modal consistent with configuration (#890)

TouK · Apr 28, 2020 · c0c0f02 · c0c0f02
1 parent 7ae979c
commit c0c0f02
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/ui/client/components/graph/EspNode.js b/ui/client/components/graph/EspNode.js
@@ -149,8 +149,8 @@ joint.shapes.devs.EspNode =  joint.shapes.devs.Model.extend({
   }, joint.shapes.devs.Model.prototype.defaults),
 })
 
-export function getIconHref(node, nodesSettings) {
-  const iconFromConfig = nodesSettings?.[ProcessUtils.findNodeConfigName(node)]?.icon
+export function getIconHref(node, nodeSettings) {
+  const iconFromConfig = nodeSettings?.icon
   const defaultIconName = `${node.type}.svg`
   return absoluteBePath(`/assets/nodes/${iconFromConfig || defaultIconName}`)
 }
@@ -161,7 +161,8 @@ export function makeElement(node, processCounts, nodesSettings) {
   const hasCounts = !_.isEmpty(processCounts)
   const width = rectWidth
   const height = rectHeight
-  const iconHref = getIconHref(node, nodesSettings)
+  const nodeSettings = nodesSettings?.[ProcessUtils.findNodeConfigName(node)]
+  const iconHref = getIconHref(node, nodeSettings)
   const testResultsHeight = 24
   const pxPerChar = 8
   const countsPadding = 8

diff --git a/ui/client/components/graph/node-modal/NodeDetailsModal.js b/ui/client/components/graph/node-modal/NodeDetailsModal.js
@@ -142,7 +142,7 @@ class NodeDetailsModal extends React.Component {
   }
 
   render() {
-    const {nodeErrors, nodeToDisplay, nodeSetting, readOnly, showNodeDetailsModal, testResults} = this.props
+    const {nodeErrors, nodeToDisplay, nodeSettings, readOnly, showNodeDetailsModal, testResults} = this.props
     const isOpen = !_.isEmpty(nodeToDisplay) && showNodeDetailsModal
     const nodeTestResults = (id) => TestResultUtils.resultsForNode(testResults, id)
 
@@ -157,7 +157,7 @@ class NodeDetailsModal extends React.Component {
           <div className="draggable-container">
             <Draggable bounds="parent" handle=".modal-draggable-handle">
               <div className="espModal">
-                <NodeDetailsModalHeader node={nodeToDisplay} docsUrl={nodeSetting.docsUrl}/>
+                <NodeDetailsModalHeader node={nodeToDisplay} nodeSettings={nodeSettings}/>
                 <div className="modalContentDark" id="modal-content">
                   <Scrollbars
                     hideTracksWhenNotNeeded={true}
@@ -215,7 +215,7 @@ function mapState(state) {
 
   return {
     nodeToDisplay: nodeToDisplay,
-    nodeSetting: _.get(processDefinitionData.nodesConfig, ProcessUtils.findNodeConfigName(nodeToDisplay)) || {},
+    nodeSettings: _.get(processDefinitionData.nodesConfig, ProcessUtils.findNodeConfigName(nodeToDisplay)) || {},
     processId: state.graphReducer.processToDisplay.id,
     subprocessVersions: state.graphReducer.processToDisplay.properties.subprocessVersions,
     nodeErrors: errors,

diff --git a/ui/client/components/graph/node-modal/NodeDetailsModalHeader.js b/ui/client/components/graph/node-modal/NodeDetailsModalHeader.js
@@ -45,7 +45,7 @@ const Docs = (props) => {
 
 Docs.propTypes = {
   className: PropTypes.string.isRequired,
-  docsUrl: PropTypes.string.isRequired,
+  nodeSettings: PropTypes.object.isRequired,
   nodeClass: PropTypes.string,
 }
 
@@ -76,13 +76,15 @@ const renderNodeClassDocs = (nodeClass, docsUrl) => {
 }
 
 const NodeDetailsModalHeader = (props) => {
-  const {docsUrl, node} = props
+  const {nodeSettings, node} = props
+  const docsUrl = nodeSettings.docsUrl
+
   const attributes = getNodeAttributes(node)
   const titleStyles = EspModalStyles.headerStyles(attributes.styles.fill, attributes.styles.color)
-  const variableLanguage = _.get(node, "value.language")
+  const variableLanguage = node?.value?.language
   const header = (_.isEmpty(variableLanguage) ? "" : `${variableLanguage} `) + attributes.name
 
-  const nodeIcon = _.has(node, "type") ? getIconHref(node) : null
+  const nodeIcon = _.has(node, "type") ? getIconHref(node, nodeSettings) : null
   const nodeClass = findNodeClass(node)
 
   return (

diff --git a/ui/client/components/graph/node-modal/editors/expression/Formatter.ts b/ui/client/components/graph/node-modal/editors/expression/Formatter.ts
@@ -58,7 +58,7 @@ const periodFormatter: Formatter = {
 }
 
 //FIXME: this should not work this way. We should either provide some helper, or (even better) create mini-expression-languages for those types and do not try
-//to convert to/from spel
+//to convert to/from spel. Also: this is probably *not* performant enough to be used on per-event basis
 const spelCronFormatter: Formatter = {
   encode: (value: CronExpression) => `new com.cronutils.parser.CronParser(T(com.cronutils.model.definition.CronDefinitionBuilder).instanceDefinitionFor(T(com.cronutils.model.CronType).QUARTZ)).parse('${value}')`,
   decode: value => {