Merge pull request #206 from rciam/devel

Devel
rciam · Aug 20, 2024 · d7bc8ce · d7bc8ce
2 parents 1dbc649 + 3726ca2
commit d7bc8ce
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,12 @@
+# Changelog
+All notable changes in Federation Registry will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [1.3.3]
+
+### Fixed
+- Update Values for immediate Review after editing a reconfiguration request
+- Copy Service is also available for instances with only one environment
+
diff --git a/federation-registry-frontend/src/FormHandler.js b/federation-registry-frontend/src/FormHandler.js
@@ -58,7 +58,7 @@ const EditService = (props) => {
 
     useEffect(()=>{
         // eslint-disable-next-line react-hooks/exhaustive-deps
-      if(petitionData&&service&&props.review&&!editPetition){
+      if(petitionData&&service&&props.review){
 
         let helper = calcDiff(service,petitionData.petition,tenant?.form_config,diff);
         let multivalue_attributes = [];
@@ -209,7 +209,6 @@ const EditService = (props) => {
                     <ServiceForm disableEnvironment={true} initialValues={editPetition} user={user} changes={changes} {...petitionData.metadata} {...props}/>
                   </React.Fragment>
                     :<LoadingBar loading={true}/>
-
                 }
               </React.Fragment>
             :petitionData.metadata.type==='create'?
@@ -306,7 +305,6 @@ const ViewRequest = (props) => {
 
     localStorage.removeItem('url');
     getData();
-
     // eslint-disable-next-line react-hooks/exhaustive-deps
   },[]);
 

diff --git a/federation-registry-frontend/src/ServiceForm.js b/federation-registry-frontend/src/ServiceForm.js
@@ -127,8 +127,7 @@ const ServiceForm = (props)=> {
     }
     setFormValues(props.initialValues);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  },[]);
-
+  },[props.initialValues]);
 
 
   // Returns true
@@ -984,6 +983,7 @@ const ServiceForm = (props)=> {
       initialValues={formValues}
       validateOnMount={service_id||petition_id||props.copy}
       initialTouched={getInitialTouched(formValues)}
+      enableReinitialize={true}
       validationSchema={schema}
       innerRef={formRef}
       validate={dynamicValidation}
@@ -1109,7 +1109,7 @@ const ServiceForm = (props)=> {
                           onChange={handleChange}
                           disabled={disabled||tenant.form_config.integration_environment.length===1||props.copy||props.disableEnvironment}
                           changed={props.changes?props.changes.integration_environment:null}
-                          copybuttonActive={props.owned&&props.disabled&&service_id&&tenant.form_config.integration_environment.length>1}
+                          copybuttonActive={props.owned&&props.disabled&&service_id}
                           toggleCopyDialog={toggleCopyDialog}
                         />
                       </InputRow>

diff --git a/federation-registry-frontend/src/ServiceList.js b/federation-registry-frontend/src/ServiceList.js
@@ -1036,7 +1036,7 @@ function TableItem(props) {
               </React.Fragment>}
               id="dropdown-menu-align-right"
             >
-              {props.service.service_id && props.service.state==='deployed' && props.service.owned&& tenant.form_config.integration_environment.length>1?
+              {props.service.service_id && props.service.state==='deployed' && props.service.owned?
               <Dropdown.Item as='span'>
                 <div>
                   <Link to={"#"} onClick={()=>{