1 files changed, 20 insertions, 10 deletions
diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/dependencies/SoftwareProductDependenciesReducer.js b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/dependencies/SoftwareProductDependenciesReducer.js
index 3fb479eedc..3edd3b899a 100644
--- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/dependencies/SoftwareProductDependenciesReducer.js
+++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/dependencies/SoftwareProductDependenciesReducer.js
@@ -15,21 +15,31 @@
  * permissions and limitations under the License.
  */
 
-import {actionTypes, relationTypes} from './SoftwareProductDependenciesConstants.js';
+import {actionTypes, relationTypes, NEW_RULE_TEMP_ID} from './SoftwareProductDependenciesConstants.js';
 import {checkCyclesAndMarkDependencies} from './SoftwareProductDependenciesUtils.js';
-import uuid from 'uuid-js';
 
-export default (state = [], action) => {
+let newRowObject = {id: NEW_RULE_TEMP_ID, targetId: null, sourceId: null, relationType: relationTypes.DEPENDS_ON};
+
+export default (state = [Object.assign({}, newRowObject) ], action) => {
 	switch (action.type) {
 		case actionTypes.SOFTWARE_PRODUCT_DEPENDENCIES_LIST_UPDATE:
+			// copying the entity with the data for the row that is in the 'add' mode
+			let newDependency = state.find(dependency => dependency.id === NEW_RULE_TEMP_ID);
+			action.dependenciesList.push(newDependency);
+			// returning list from the server with our 'new entity' row
 			return checkCyclesAndMarkDependencies(action.dependenciesList);
-		case actionTypes.ADD_SOFTWARE_PRODUCT_DEPENDENCY:
-			return [...state, {
-				sourceId: null,
-				relationType: relationTypes.DEPENDS_ON,
-				targetId: null,
-				id: uuid.create()
-			}];
+		case actionTypes.ADD_SOFTWARE_PRODUCT_DEPENDENCY :
+			// resetting the entity with the data for the 'add' mode for a new entity
+			let newArray = state.filter(dependency => dependency.id !== NEW_RULE_TEMP_ID);
+			newArray.push(Object.assign({}, newRowObject));
+			return newArray;
+		case actionTypes.UPDATE_NEW_SOFTWARE_PRODUCT_DEPENDENCY :
+			// we really only need this for the 'new' row since we need to change the state to get
+			// everything updated
+			let updateArrayIndex = state.findIndex(dependency => dependency.id === NEW_RULE_TEMP_ID);
+			let updateArray = state.slice();
+			updateArray.splice(updateArrayIndex, 1, action.item);
+			return checkCyclesAndMarkDependencies(updateArray);
 		default:
 			return state;
 	}