From 34ba3dd690441a153348bfbc18d142dcde648322 Mon Sep 17 00:00:00 2001 From: Myztiq Date: Tue, 25 Apr 2017 15:19:17 -0700 Subject: [PATCH 1/3] Updated navigation logic for branch syncing. --- client/services/serviceFetch.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/client/services/serviceFetch.js b/client/services/serviceFetch.js index 2293b8875..197af4cfa 100644 --- a/client/services/serviceFetch.js +++ b/client/services/serviceFetch.js @@ -393,7 +393,12 @@ function fetchInstancesByCompose( var branchName = instance.getBranchName(); composeMasterConfig.children[branchName] = composeMasterConfig.children[branchName] || {}; var composeMasterConfigIsolationChild = composeMasterConfig.children[branchName]; - if (instance.attrs.isIsolationGroupMaster && !instance.attrs.inputClusterConfig.parentInputClusterConfigId) { + if (instance.attrs.isIsolationGroupMaster && + ( + !instance.attrs.inputClusterConfig.parentInputClusterConfigId || + instance.attrs.inputClusterConfig.parentInputClusterConfigId !== instance.attrs.inputClusterConfig._id + ) + ) { composeMasterConfigIsolationChild.master = instance; return; } From 7ffbd077d1effd81b14a08fdaf3149a406f76c35 Mon Sep 17 00:00:00 2001 From: Myztiq Date: Thu, 27 Apr 2017 18:06:05 -0700 Subject: [PATCH 2/3] Fixed left-nav issues with compose parents already existing and clobbering each other. --- client/services/serviceFetch.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/client/services/serviceFetch.js b/client/services/serviceFetch.js index 197af4cfa..b7bfe488c 100644 --- a/client/services/serviceFetch.js +++ b/client/services/serviceFetch.js @@ -399,6 +399,15 @@ function fetchInstancesByCompose( instance.attrs.inputClusterConfig.parentInputClusterConfigId !== instance.attrs.inputClusterConfig._id ) ) { + if (composeMasterConfigIsolationChild.master) { + if (instance.attrs.isTesting) { + composeMasterConfigIsolationChild.testing = composeMasterConfigIsolationChild.testing || []; + composeMasterConfigIsolationChild.testing.push(instance); + return + } + composeMasterConfigIsolationChild.testing = composeMasterConfigIsolationChild.testing || []; + composeMasterConfigIsolationChild.testing.push(composeMasterConfigIsolationChild.master); + } composeMasterConfigIsolationChild.master = instance; return; } From f824eb3bc745bde85452c733467f76b3e8e21ed2 Mon Sep 17 00:00:00 2001 From: Nathan Meyers Date: Fri, 28 Apr 2017 16:06:14 -0700 Subject: [PATCH 3/3] add ; --- client/services/serviceFetch.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/services/serviceFetch.js b/client/services/serviceFetch.js index b7bfe488c..db53b65cd 100644 --- a/client/services/serviceFetch.js +++ b/client/services/serviceFetch.js @@ -403,7 +403,7 @@ function fetchInstancesByCompose( if (instance.attrs.isTesting) { composeMasterConfigIsolationChild.testing = composeMasterConfigIsolationChild.testing || []; composeMasterConfigIsolationChild.testing.push(instance); - return + return; } composeMasterConfigIsolationChild.testing = composeMasterConfigIsolationChild.testing || []; composeMasterConfigIsolationChild.testing.push(composeMasterConfigIsolationChild.master);