Merge pull request #273 from rakeshnpatel/1.1.9

optimizations to support product configuration
openanthem · Nov 13, 2018 · 91daf0a · 91daf0a
2 parents a330223 + 9e289ed
commit 91daf0a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/...java/com/antheminc/oss/nimbus/domain/model/state/extension/DefaultParamValuesHandler.java b/...java/com/antheminc/oss/nimbus/domain/model/state/extension/DefaultParamValuesHandler.java
@@ -70,6 +70,7 @@ public List<ParamValue> buildParamValues(Values values, Param<?> srcParam, Param
 				return srcValues.getValues(targetParam.getConfig().getCode());
 			} else {
 				String valuesUrl = getPathVariableResolver().resolve(srcParam, values.url());
+				valuesUrl = srcParam.getRootExecution().getRootCommand().getRelativeUri(valuesUrl);
 				Command cmd = CommandBuilder.withUri(valuesUrl).getCommand();
 				cmd.setAction(Action._search);
 

diff --git a/nimbus-test/src/main/java/com/antheminc/oss/nimbus/test/scenarios/s7/view/S7V_ViewMain.java b/nimbus-test/src/main/java/com/antheminc/oss/nimbus/test/scenarios/s7/view/S7V_ViewMain.java
@@ -47,18 +47,18 @@ public class S7V_ViewMain {
 
 	@Path
 	@ValuesConditionals({ @ValuesConditional(targetPath = "../v_attr_values_2", condition = {
-			@Condition(when = "state == 'test_0'", then = @Values(url = "/hooli/box/p/s7c_main/_search?fn=lookup&where=s7c_main.attr1_clone.eq('test_0')&projection.mapsTo=code:attr1,label:attr1")),
-			@Condition(when = "state != null && state != 'test_0'", then = @Values(url = "/hooli/box/p/s7c_main/_search?fn=lookup&where=s7c_main.attr1_clone.eq('<!/.d/attr1!>')&projection.mapsTo=code:attr1,label:attr1")) }) })
+			@Condition(when = "state == 'test_0'", then = @Values(url = "/p/s7c_main/_search?fn=lookup&where=s7c_main.attr1_clone.eq('test_0')&projection.mapsTo=code:attr1,label:attr1")),
+			@Condition(when = "state != null && state != 'test_0'", then = @Values(url = "/p/s7c_main/_search?fn=lookup&where=s7c_main.attr1_clone.eq('<!/.d/attr1!>')&projection.mapsTo=code:attr1,label:attr1")) }) })
 	private String attr1;
 
 	private String v_attr_values_2;
 
 	@Radio
-	@Values(url="/hooli/box/p/s7c_main/_search?fn=lookup&where=s7c_main.attr1_clone.eq('<!/.d/.m/attr1_clone!>')&projection.mapsTo=code:attr1_clone,label:attr1_clone")
+	@Values(url="/p/s7c_main/_search?fn=lookup&where=s7c_main.attr1_clone.eq('<!/.d/.m/attr1_clone!>')&projection.mapsTo=code:attr1_clone,label:attr1_clone")
 	private String attr3;
 
 	@Radio
-	@Values(url="/hooli/box/p/s7c_corestatic/_search?fn=lookup&where=s7c_corestatic.staticAttr.eq('test_01')&projection.mapsTo=code:staticAttr,label:staticAttr")
+	@Values(url="/p/s7c_corestatic/_search?fn=lookup&where=s7c_corestatic.staticAttr.eq('test_01')&projection.mapsTo=code:staticAttr,label:staticAttr")
 	private String attr4;
 
 }