Merge pull request #27 from osstotalsoft/acr

Acr
osstotalsoft · Jul 21, 2023 · b326a4d · b326a4d
2 parents 793c60c + 85741cf
commit b326a4d
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/gql-bff/helm/atlas-gql-mesh/values.yaml b/gql-bff/helm/atlas-gql-mesh/values.yaml
@@ -40,7 +40,6 @@ gql:
   env:
     ELASTIC_SEARCH_LOGGING_LEVEL: "[ELASTIC_SEARCH_LOGGING_LEVEL]"
     ELASTIC_SEARCH_HOST: "[ELASTIC_SEARCH_HOST]"
-    ELASTIC_SEARCH_API_VERSION: "[ELASTIC_SEARCH_API_VERSION]"
     IDENTITY_AUTHORITY: "[IDENTITY_AUTHORITY_URL]"
     APOLLO_LOGGING_LEVEL: "[APOLLO_LOGGING_LEVEL]"
     ELASTIC_VERSION: 6

diff --git a/react-ui/.env b/react-ui/.env
@@ -4,6 +4,7 @@ REACT_APP_VERSION=0.0.0
 REACT_APP_IDENTITY_CLIENT_ID=Atlas
 REACT_APP_IDENTITY_SCOPE=IdentityServerApi roles
 REACT_APP_IDENTITY_AUTHORITY=
+REACT_APP_IDENTITY_ACR=
 
 REACT_APP_GQL=localhost:5000
 REACT_APP_GQL_HTTP_PROTOCOL=http

diff --git a/react-ui/src/features/designer/components/TrayWidgetFilter.js b/react-ui/src/features/designer/components/TrayWidgetFilter.js
@@ -27,8 +27,8 @@ const TrayWidgetFilter = ({ filters, setFilters, activeTask }) => {
   const classes = useStyles()
 
   const handleFilterChange = useCallback(
-    event => {
-      setFilters(event?.target?.value)
+    value => {
+      setFilters(value)
     },
     [setFilters]
   )

diff --git a/react-ui/src/features/designer/constants/NodeConfig.js b/react-ui/src/features/designer/constants/NodeConfig.js
@@ -12,7 +12,7 @@ import { includes } from 'ramda'
 import SubworkflowNodeModel from '../nodeModels/subworkflowNode/SubworkflowNodeModel'
 import TaskNodeModel from '../nodeModels/taskNode/TaskNodeModel'
 
-export const nodeConfig = {
+const nodeConfigData = {
   START: {
     name: 'START',
     type: 'START',
@@ -113,6 +113,15 @@ export const nodeConfig = {
     getInstance: () => new EndNodeModel()
   }
 }
+
+const handler = {
+  get(nodeConfigData, prop, _receiver) {
+    return nodeConfigData[prop] ?? nodeConfigData['TASK']
+  }
+}
+
+export const nodeConfig = new Proxy(nodeConfigData, handler);
+
 export const isDefault = type =>
   includes(type, [
     nodeConfig.LAMBDA.type,

diff --git a/react-ui/src/features/designer/diagram/WorkflowGraph.js b/react-ui/src/features/designer/diagram/WorkflowGraph.js
@@ -92,8 +92,8 @@ const WorkflowGraph = ({ style, className, dag, executionMode, onClick }) => {
 
   const drawGraph = () => {
     if (inner) inner.remove()
-    if (!svg.select("g").selectAll("g.node").empty()) {
-      svg.select("g").remove()
+    if (!svg.select('g').selectAll('g.node').empty()) {
+      svg.select('g').remove()
     }
     inner = svg.append('g')
 
@@ -205,7 +205,7 @@ const WorkflowGraph = ({ style, className, dag, executionMode, onClick }) => {
   }
 
   const handleClick = e => {
-    const taskRef = e
+    const taskRef = e.currentTarget.id
     const node = graph.node(taskRef)
     inner.selectAll('g.node').classed('selected', false)
     if (node.type === 'DF_TASK_PLACEHOLDER') {
@@ -218,7 +218,7 @@ const WorkflowGraph = ({ style, className, dag, executionMode, onClick }) => {
       return null // No-op for click on unexecuted DF card-pile or terminal nodes
     } else {
       // Non-DF, or unexecuted DF vertex
-      const node = dag.graph.node(e)
+      const node = dag.graph.node(taskRef)
       onClick({ ref: node })
       if (taskRef) {
         inner.select(`g[id='${taskRef}']`).classed('selected', true)

diff --git a/react-ui/src/utils/auth/authConfig.js b/react-ui/src/utils/auth/authConfig.js
@@ -8,7 +8,7 @@ const AUTH = {
 }
 
 const getAuthenticationConfiguration = tenant => {
-  const acr_values = isNullOrWhitespace(tenant) ? undefined : `tenant:${tenant}`
+  const acr_values = isNullOrWhitespace(tenant) ? env.REACT_APP_IDENTITY_ACR : `tenant:${tenant}`
   return {
     client_id: env.REACT_APP_IDENTITY_CLIENT_ID,
     authority: env.REACT_APP_IDENTITY_AUTHORITY,