Merge pull request #195 from rciam/devel

Devel
rciam · Oct 16, 2023 · 19e01e2 · 19e01e2
2 parents 31fbd86 + f0f5ca8
commit 19e01e2
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 75 deletions.
diff --git a/federation-registry-backend-api/JavaScript/db/repos/service_state.js b/federation-registry-backend-api/JavaScript/db/repos/service_state.js
@@ -84,7 +84,7 @@ class ServiceStateRepository {
         }
         if((deployed || decoded_message.state==='error')&&done){
           updateState.push({id:decoded_message.id,state:decoded_message.state,outdated:false});
-          if(deployed){
+          if(deployed&&decoded_message.state!=='error'){
             ids.push(decoded_message.id); 
           }
           if(decoded_message.state==='error'){

diff --git a/federation-registry-backend-api/package-lock.json b/federation-registry-backend-api/package-lock.json
diff --git a/federation-registry-backend-api/package.json b/federation-registry-backend-api/package.json
@@ -40,7 +40,7 @@
     "mz": "^2.7.0",
     "nodemailer": "^6.6.0",
     "nodemailer-express-handlebars": "^5.0.0",
-    "nodemon": "^2.0.19",
+    "nodemon": "^3.0.1",
     "openid-client": "^5.0.2",
     "pg-monitor": "1.3.1",
     "pg-promise": "11.5.0",

diff --git a/federation-registry-frontend/package-lock.json b/federation-registry-frontend/package-lock.json
diff --git a/federation-registry-frontend/src/ServiceList.js b/federation-registry-frontend/src/ServiceList.js
@@ -990,7 +990,7 @@ function TableItem(props) {
               }
               {
                 (user.review||
-                  (props.service.owned&&tenant.config.test_env.included(props.service.integration_environment)))
+                  (props.service.owned&&tenant.config.test_env.includes(props.service.integration_environment)))
                 &&props.service.petition_id
                 &&!(props.service.status==='changes')
                 &&(props.service.status!=='request_review'||(props.service.status==='request_review'&&user.review_restricted))?

diff --git a/federation-registry-frontend/src/initialValues.json b/federation-registry-frontend/src/initialValues.json
@@ -28,7 +28,8 @@
     "profile",
     "email",
     "voperson_id",
-    "eduperson_entitlement"
+    "eduperson_entitlement",
+    "voperson_external_affiliation"
   ],
   "grant_types": [
     "authorization_code"