added value overwriting

dashboard/src/components/values-form/KeyValueArray.tsx

@@ -155,8 +155,9 @@ export default class KeyValueArray extends Component<PropsType, StateType> {
             clusterId={this.props.externalValues?.clusterId}
             closeModal={() => this.setState({ showEnvModal: false })}
             setValues={(values) => {
-              this.props.setValues(values);
-              this.setState({ values: this.objectToValues(values) });
+              const newValues = { ...this.props.values, ...values };
+              this.props.setValues(newValues);
+              this.setState({ values: this.objectToValues(newValues) });
             }}
           />
         </Modal>

dashboard/src/main/home/modals/LoadEnvGroupModal.tsx

@@ -100,8 +100,8 @@ export default class LoadEnvGroupModal extends Component<PropsType, StateType> {
   };
 
   potentiallyOverriddenKeys(incoming: Record<string, string>): KeyValue[] {
-    return Object.entries(this.props.existingValues)
-      .filter(([key]) => incoming[key])
+    return Object.entries(incoming)
+      .filter(([key]) => this.props.existingValues[key])
       .map(([key, value]) => ({ key, value }));
   }
 
@@ -128,11 +128,11 @@ export default class LoadEnvGroupModal extends Component<PropsType, StateType> {
             </ClashingKeyTitle>
             <ClashingKeyDefinitions>
               <ClashingKeyLabel>Defined as</ClashingKeyLabel>
-              <ClashingKeyLabel>
-                {this.state.selectedEnvGroup.data[key] || emptyValue}
-              </ClashingKeyLabel>
+              <ClashingKeyValue>
+                {this.props.existingValues[key] || emptyValue}
+              </ClashingKeyValue>
               <ClashingKeyLabel>Replaced by</ClashingKeyLabel>
-              <ClashingKeyLabel>{value || emptyValue}</ClashingKeyLabel>
+              <ClashingKeyValue>{value || emptyValue}</ClashingKeyValue>
             </ClashingKeyDefinitions>
             {i !== clashingKeys.length - 1 && <ClashingKeyRowDivider />}
           </ClashingKeyRow>
@@ -287,6 +287,11 @@ const ClashingKeyLabel = styled.p`
   white-space: nowrap;
 `;
 
+const ClashingKeyValue = styled.p`
+  margin: 0px;
+  word-break: break-word;
+`;
+
 const EnvGroupList = styled.div`
   width: 100%;
   border-radius: 3px;