From e0e02e04a0f3b720808a4e3b2984b3289595117b Mon Sep 17 00:00:00 2001
From: Thomas Bouron <thomas.bouron@cloudsoftcorp.com>
Date: Tue, 21 Feb 2017 17:46:35 +0000
Subject: [PATCH] Use the "itemType" to redirect the user to the right page
 after a catalog import

---
 src/main/webapp/assets/js/view/editor.js | 25 +++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/assets/js/view/editor.js b/src/main/webapp/assets/js/view/editor.js
index 53f12f369..5d10100ce 100644
--- a/src/main/webapp/assets/js/view/editor.js
+++ b/src/main/webapp/assets/js/view/editor.js
@@ -335,7 +335,30 @@ define([
             if(succeeded){
                 log("Submit [succeeded] ... redirecting back to " + type);
                 if(type && type === 'catalog'){
-                    Backbone.history.navigate('v1/catalog', {trigger: true});
+                    var firstItem;
+                    var keys = _.keys(data);
+                    if (keys.length > 0) {
+                        firstItem = data[keys[0]];
+                    }
+                    var url = 'v1/catalog';
+                    if (firstItem) {
+                        switch (firstItem.itemType) {
+                            case 'template':
+                                url += '/applications';
+                                break;
+                            case 'entity':
+                                url += '/entities';
+                                break;
+                            case 'policy':
+                                url += '/policies';
+                                break;
+                            case 'location':
+                                url += '/locations';
+                                break;
+                        }
+                        url += '/' + firstItem.id;
+                    }
+                    Backbone.history.navigate(url, {trigger: true});
                 }else{
                     // no need to refresh apps (this.collection) because homePage route does that
                     Backbone.history.navigate('v1/home', {trigger: true});