Fixed merge issues

Fixed merge issues that broke the behavior of the plugins development

Change-Id: I6333944939628f745eb36c4619be33780881d27d
Issue-ID: SDC-1126
Signed-off-by: Idan Amit <ia096e@intl.att.com>

3 files changed, 9 insertions, 3 deletions

diff --git a/catalog-ui/src/app/ng2/components/layout/top-nav/top-nav.component.ts b/catalog-ui/src/app/ng2/components/layout/top-nav/top-nav.component.ts
index 12f8df8296..a0b6b2b543 100644
--- a/catalog-ui/src/app/ng2/components/layout/top-nav/top-nav.component.ts
+++ b/catalog-ui/src/app/ng2/components/layout/top-nav/top-nav.component.ts
@@ -143,9 +143,9 @@ export class TopNavComponent {
         }
     }
 
-    goToState(state:string, params:Array<any>):Promise<boolean> {
+    goToState(state:string, params:any):Promise<boolean> {
         return new Promise((resolve, reject) => {
-            this.$state.go(state, params && params.length > 0 ? [0] : undefined);
+            this.$state.go(state, params || undefined);
             resolve(true);
         });
     }
diff --git a/catalog-ui/src/app/ng2/components/ui/plugin/plugin-frame.component.ts b/catalog-ui/src/app/ng2/components/ui/plugin/plugin-frame.component.ts
index eb7d138232..fc0af53a44 100644
--- a/catalog-ui/src/app/ng2/components/ui/plugin/plugin-frame.component.ts
+++ b/catalog-ui/src/app/ng2/components/ui/plugin/plugin-frame.component.ts
@@ -48,7 +48,7 @@ export class PluginFrameComponent implements OnInit {
         // Listening to the stateChangeStart event in order to notify the plugin about it being closed
         // before moving to a new state
         this.$scope.$on('$stateChangeStart', (event, toState, toParams, fromState, fromParams) => {
-            if (fromState.name !== toState.name) {
+            if ((fromState.name !== toState.name) || (fromState.name === toState.name) && (toParams.path !== fromParams.path)) {
                 if (!this.isClosed) {
                     event.preventDefault();
 
diff --git a/catalog-ui/src/app/ng2/services/plugins.service.ts b/catalog-ui/src/app/ng2/services/plugins.service.ts
index 12432256d7..4ec90d1ac4 100644
--- a/catalog-ui/src/app/ng2/services/plugins.service.ts
+++ b/catalog-ui/src/app/ng2/services/plugins.service.ts
@@ -13,5 +13,11 @@ export class PluginsService {
         });
 
         return PluginsConfiguration.plugins[pluginKey];
+    };
+
+    public isPluginDisplayedInContext = (plugin: Plugin ,userRole: string, contextType: string) => {
+        return plugin.pluginDisplayOptions["context"] &&
+               plugin.pluginDisplayOptions["context"].displayRoles.includes(userRole) &&
+               plugin.pluginDisplayOptions["context"].displayContext.indexOf(contextType) !== -1
     }
 }