From: KIRAN KASHALKAR <kiran.kashalkar@riftio.com>
Date: Fri, 24 Feb 2017 11:24:18 +0000 (+0100)
Subject: RIFT-15638, RIFT-15642: Leafref feature bugs
X-Git-Tag: v2.0.0~47
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=commitdiff_plain;h=a9692c7fd0460929788a24c0d2137180ac1b28c2

RIFT-15638, RIFT-15642: Leafref feature bugs

Signed-off-by: KIRAN KASHALKAR <kiran.kashalkar@riftio.com>
---

diff --git a/skyquake/plugins/composer/src/src/libraries/utils.js b/skyquake/plugins/composer/src/src/libraries/utils.js
index ee4163cd2..418540fdc 100644
--- a/skyquake/plugins/composer/src/src/libraries/utils.js
+++ b/skyquake/plugins/composer/src/src/libraries/utils.js
@@ -237,6 +237,10 @@ export default {
 					} else {
 						// contains no predicate
 						objectCopy = objectCopy[fragment];
+						if (!objectCopy) {
+							// contains no value
+							break;
+						}
 					}
 				}
 			}
@@ -319,9 +323,9 @@ export default {
 						let found = _.find(catalogs[key][subKey], {id: fieldKeyArray[0]});
 						if (found) {
 							for (let foundKey in found) {
-								let topLevel = _.find(found[foundKey], {id: fieldKeyArray[1]});
-								if (topLevel) {
-									results = this.getAbsoluteResults(topLevel, pathArray.splice(-i, i));
+								// let topLevel = _.find(found[foundKey], {id: fieldKeyArray[1]});
+								if (foundKey == fieldKeyArray[1]) {
+									results = this.getAbsoluteResults(found[foundKey], pathArray.splice(-i, i));
 									return results;
 								}
 							}