removed isGlobalAdmin

osstotalsoft · May 23, 2023 · 1627614 · 1627614
1 parent 1e7bf95
commit 1627614
Showing 8 changed files with 21,369 additions and 20,649 deletions.
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -7,7 +7,7 @@ services:
       - ES_VERSION=7
       - INDEXING_ENABLED=true
       - JAVA_OPTS=-Dpolyglot.engine.WarnInterpreterOnly=false
-    image: niemen/conductor-server:7.1.5
+    image: niemen/conductor-server:7.1.6
     networks:
       - internal
     ports:

diff --git a/gql-bff/.env b/gql-bff/.env
@@ -5,15 +5,14 @@ IDENTITY_AUTHORITY=
 ELASTIC_SEARCH_HOST=http://localhost:9200
 ELASTIC_USER=
 ELASTIC_PASSWORD=
-ELASTIC_VERSION=6
+ELASTIC_VERSION=7
 ELASTIC_PREFIX=atlas
-
+SCHEDULE_URL=http://localhost:3001
 # DEBUG, ERROR, INFO
 APOLLO_LOGGING_LEVEL=ERROR
 
-BASE_API_URL=http://localhost:8080
-IS_MULTITENANT=false
+BASE_API_URL=http://localhost:64291
+IS_MULTITENANT=true
 
-SCHEDULE_URL=http://localhost:3001
 #DEBUG=jwks
 
diff --git a/gql-bff/src/features/schedule/resolvers.js b/gql-bff/src/features/schedule/resolvers.js
@@ -4,7 +4,6 @@ const {
   getTenantIdFromDescription,
   userCanEditResource,
   filterResourcesByTenant,
-  isGlobalAdmin,
 } = require("../common/functions");
 
 const isMultiTenant = JSON.parse(process.env.IS_MULTITENANT);
@@ -39,7 +38,7 @@ const scheduleResolvers = {
         ...scheduleInput,
         workflowContext: {
           ...scheduleInput?.workflowContext,
-          tenantId: isGlobalAdmin(externalUser) ? null : externalUser?.tenantId,
+          tenantId: externalUser?.tenantId,
         },
       };
 

diff --git a/gql-bff/src/features/task/resolvers.js b/gql-bff/src/features/task/resolvers.js
@@ -4,7 +4,6 @@ const {
   getTenantIdFromDescription,
   userCanEditResource,
   filterResourcesByTenant,
-  isGlobalAdmin,
 } = require("../common/functions");
 
 const isMultiTenant = JSON.parse(process.env.IS_MULTITENANT);
@@ -57,9 +56,7 @@ const taskResolvers = {
           ...t,
           description: JSON.stringify({
             description: t?.description,
-            tenantId: isGlobalAdmin(externalUser)
-              ? null
-              : externalUser?.tenantId,
+            tenantId: externalUser?.tenantId,
           }),
         };
       });

diff --git a/gql-bff/src/features/workflow/resolvers.js b/gql-bff/src/features/workflow/resolvers.js
@@ -6,7 +6,6 @@ const {
   getTenantIdFromDescription,
   userCanEditResource,
   filterResourcesByTenant,
-  isGlobalAdmin,
 } = require("../common/functions");
 
 const workflowResolvers = {
@@ -61,7 +60,7 @@ const workflowResolvers = {
           tenantId: isGlobalAdmin(externalUser) ? null : externalUser?.tenantId,
         }),
       };
-      
+
       //Create or Update workflow in Conductor
       await dataSources.workflowApi.createOrUpdateWorkflow(
         JSON.stringify([body])

diff --git a/gql-bff/yarn.lock b/gql-bff/yarn.lock
diff --git a/react-ui/package.json b/react-ui/package.json
@@ -9,6 +9,7 @@
   "dependencies": {
     "@apollo/client": "^3.5.6",
     "@axa-fr/react-oidc-context": "3.1.6",
+    "@bit/totalsoft_oss.react-mui.date-time": "2.9.61",
     "@bit/totalsoft_oss.react-mui.kit.core": "^2.9.61",
     "@bit/totalsoft_oss.react-mui.styles": "^2.9.61",
     "@bit/totalsoft_oss.react-mui.themes.blue-theme": "^2.9.61",
@@ -18,7 +19,7 @@
     "@bit/totalsoft_oss.react-mui.themes.orange-theme": "^2.9.61",
     "@bit/totalsoft_oss.react-mui.themes.red-theme": "^2.9.61",
     "@bit/totalsoft_oss.react-mui.themes.vivid-orange-theme": "^2.9.61",
-    "@bit/totalsoft_oss.react-mui.date-time": "2.9.61",
+    "@date-io/moment": "^2.16.1",
     "@emotion/react": "^11.1.5",
     "@emotion/styled": "^11.1.5",
     "@material-ui/core": "^4.12.2",
@@ -37,6 +38,7 @@
     "closest": "0.0.1",
     "d3": "5.9.7",
     "dagre-d3": "0.6.4",
+    "date-fns": "2.29.3",
     "deep-sort-object": "^1.0.2",
     "file-saver": "^2.0.5",
     "graphql": "^16.2.0",
@@ -50,9 +52,9 @@
     "moment": "2.29.1",
     "oidc-client": "^1.11.5",
     "omit-deep-lodash": "^1.1.5",
+    "parse-svg-path": "0.1.2",
     "pathfinding": "^0.4.18",
     "paths-js": "^0.4.11",
-    "parse-svg-path": "0.1.2",
     "ramda": "^0.28.0",
     "react": "^17.0.2",
     "react-ace": "^9.4.0",
@@ -72,8 +74,7 @@
     "styled-components": "^5.3.1",
     "subscriptions-transport-ws": "^0.11.0",
     "url-search-params-polyfill": "^8.1.1",
-    "use-debounce": "^7.0.0",
-    "date-fns": "2.29.3"
+    "use-debounce": "^7.0.0"
   },
   "resolutions": {
     "@projectstorm/react-diagrams-core": "6.5.0",