ATLAS-3513 : Classic UI: Sidebar not rendered on refresh if url has…

dashboardv2/public/js/router/Router.js

@@ -295,8 +295,9 @@ define([
                         }, that.preFetchedCollectionLists, that.sharedObj)
                     ));
                 } else {
-                    App.rNContent.$el.html("");
-                    App.rNContent.destroy();
+                    if (App.rNContent.currentView) {
+                        App.rNContent.currentView.destroy();
+                    }
                 }
             });
         },

dashboardv2/public/js/utils/CommonViewFunction.js

@@ -37,7 +37,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
                                 skipDefaultError: true,
                                 success: function(data) {
                                     Utils.notifySuccess({
-                                        content: "Classification " + options.tagName + Messages.getAbbreviationMsg(abbrev, 'removeSuccessMessage')
+                                        content: "Classification " + options.tagName + Messages.getAbbreviationMsg(false, 'removeSuccessMessage')
                                     });
                                     if (options.callback) {
                                         options.callback();

dashboardv2/public/js/utils/Enums.js

@@ -35,9 +35,7 @@ define(['require'], function(require) {
         ENTITY_IMPORT_UPDATE: "Entity Updated by import",
         ENTITY_IMPORT_DELETE: "Entity Deleted by import",
         TERM_ADD: "Term Added",
-        TERM_DELETE: "Term Deleted",
-        LABEL_ADD: "Label Added",
-        LABEL_DELETE: "Label Deleted"
+        TERM_DELETE: "Term Deleted"
     }
 
     Enums.entityStateReadOnly = {

dashboardv2/public/js/views/site/SideNavLayoutView.js

@@ -127,7 +127,7 @@ define(['require',
                     view = "search";
                 if (queryParams && queryParams.from) {
                     if (queryParams.from == "classification") {
-                        view = "tag";
+                        view = "classification";
                     } else if (queryParams.from == "glossary") {
                         view = "glossary";
                     }

dashboardv3/public/js/router/Router.js

@@ -268,7 +268,7 @@ define([
             var that = this;
             require(["views/site/Header", "views/search/SearchDefaultLayoutView", "views/site/SideNavLayoutView"], function(Header, SearchDefaultLayoutView, SideNavLayoutView) {
                 var paramObj = Utils.getUrlState.getQueryParams();
-                if (paramObj && (paramObj.type || paramObj.tag || paramObj.term || paramObj.query) === undefined) {
+                if (paramObj && (paramObj.type || paramObj.tag || paramObj.term || paramObj.query || paramObj.udKeys || paramObj.udLabels) === undefined) {
                     Utils.setUrl({
                         url: "#!/search",
                         mergeBrowserUrl: false,
@@ -581,8 +581,9 @@ define([
                         )
                     );
                 } else {
-                    App.rContent.$el.html("");
-                    App.rContent.destroy();
+                    if (App.rNContent.currentView) {
+                        App.rNContent.currentView.destroy();
+                    }
                 }
             });
         },
@@ -599,4 +600,4 @@ define([
         }
     });
     return AppRouter;
-});
+});
\ No newline at end of file