Merge pull request #4849 from NCI-Agency/AB-1115-fix-process-board

Fix process board
NCI-Agency · Jul 4, 2024 · d4fdfd6 · d4fdfd6
2 parents 4ac0955 + 7171a1c
commit d4fdfd6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/client/package.json b/client/package.json
@@ -181,7 +181,8 @@
     "yup": "1.4.0"
   },
   "resolutions": {
-    "chromedriver": "link:./node_modules/.cache/null"
+    "chromedriver": "link:./node_modules/.cache/null",
+    "react": "18.2.0"
   },
   "packageManager": "yarn@4.3.1",
   "scripts": {

diff --git a/client/src/pages/dashboards/BoardDashboard.js b/client/src/pages/dashboards/BoardDashboard.js
@@ -14,7 +14,9 @@ import {
   SelectionBoxLayerFactory
 } from "@projectstorm/react-diagrams"
 import { DEFAULT_PAGE_PROPS } from "actions"
-import MultiTypeAdvancedSelectComponent from "components/advancedSelectWidget/MultiTypeAdvancedSelectComponent"
+import MultiTypeAdvancedSelectComponent, {
+  ALL_ENTITY_TYPES
+} from "components/advancedSelectWidget/MultiTypeAdvancedSelectComponent"
 import LinkTo from "components/LinkTo"
 import {
   mapPageDispatchersToProps,
@@ -65,7 +67,7 @@ const createEngine = options => {
 }
 
 const PrototypeNode = ({ name, model, onClick }) => (
-  <Badge style={{ margin: 10, background: "white", color: "#106ba3" }}>
+  <Badge style={{ margin: 10 }}>
     <div
       draggable
       onClick={onClick}
@@ -281,7 +283,7 @@ const BoardDashboard = ({ pageDispatchers }) => {
                   const instance = new Model()
                   const modelName = instance.constructor.resourceName
                   return (
-                    instance.iconUrl() && (
+                    instance.iconUrl && (
                       <PrototypeNode
                         key={`palette-${modelName}`}
                         model={instance}
@@ -340,6 +342,7 @@ const BoardDashboard = ({ pageDispatchers }) => {
                       setSelectingEntity(false)
                     }}
                     objectType={editedNode?.options.anetObjectType}
+                    entityTypes={ALL_ENTITY_TYPES}
                   />
                 </Modal.Body>
               </Modal>

diff --git a/client/yarn.lock b/client/yarn.lock
@@ -17079,15 +17079,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react@npm:^18.2.0":
-  version: 18.3.1
-  resolution: "react@npm:18.3.1"
-  dependencies:
-    loose-envify: "npm:^1.1.0"
-  checksum: 10c0/283e8c5efcf37802c9d1ce767f302dd569dd97a70d9bb8c7be79a789b9902451e0d16334b05d73299b20f048cbc3c7d288bbbde10b701fa194e2089c237dbea3
-  languageName: node
-  linkType: hard
-
 "read-pkg-up@npm:10.0.0":
   version: 10.0.0
   resolution: "read-pkg-up@npm:10.0.0"