Move 'Create Service' context menu item to project level in Applicati…

…on Explorer redhat-developer#3666

Fixes: redhat-developer#3666

Signed-off-by: Victor Rubezhny <vrubezhny@redhat.com>

package.json

@@ -1480,12 +1480,12 @@
 			"view/item/context/createService": [
 				{
 					"command": "openshift.helm.openView",
-					"when": "view == openshiftProjectExplorer && viewItem == openshift.k8sContext && isLoggedIn",
+					"when": "view == openshiftProjectExplorer && isLoggedIn && viewItem =~ /openshift.project.*/i",
 					"group": "c2"
 				},
 				{
 					"command": "openshift.service.create",
-					"when": "view == openshiftProjectExplorer && viewItem == openshift.k8sContext && isLoggedIn",
+					"when": "view == openshiftProjectExplorer && isLoggedIn && viewItem =~ /openshift.project.*/i",
 					"group": "c2"
 				}
 			],
@@ -1570,11 +1570,6 @@
 					"when": "view == openshiftProjectExplorer && viewItem == openshift.k8sContext && canCreateNamespace",
 					"group": "c1"
 				},
-				{
-					"submenu": "view/item/context/createService",
-					"when": "view == openshiftProjectExplorer && viewItem == openshift.k8sContext && isLoggedIn",
-					"group": "c2"
-				},
 				{
 					"command": "openshift.explorer.logout",
 					"when": "view == openshiftProjectExplorer && viewItem == openshift.k8sContext && isLoggedIn",
@@ -1590,9 +1585,14 @@
 					"when": "view == openshiftProjectExplorer && viewItem == openshift.k8sContext",
 					"group": "c5"
 				},
+				{
+					"submenu": "view/item/context/createService",
+					"when": "view == openshiftProjectExplorer && viewItem =~ /openshift.project.*/i && isLoggedIn",
+					"group": "p2"
+				},
 				{
 					"command": "openshift.project.delete",
-					"when": "view == openshiftProjectExplorer && viewItem =~ /openshift\\.project.*\\.canDelete*/",
+					"when": "view == openshiftProjectExplorer && viewItem =~ /openshift.project.*.can-delete/i",
 					"group": "p3"
 				},
 				{
@@ -1713,7 +1713,7 @@
 				},
 				{
 					"command": "openshift.project.set",
-					"when": "view == openshiftProjectExplorer && (viewItem == openshift.k8sContext || viewItem =~ /openshift\\.project.*/) && canCreateNamespace",
+					"when": "view == openshiftProjectExplorer && (viewItem == openshift.k8sContext || viewItem =~ /openshift.project.*/i) && canCreateNamespace",
 					"group": "inline"
 				},
 				{

src/explorer.ts

@@ -112,7 +112,7 @@ export class OpenShiftExplorer implements TreeDataProvider<ExplorerItem>, Dispos
     private static generateOpenshiftProjectContextValue(namespace: string): Thenable<string> {
         const contextValue = `openshift.project.${namespace}`;
         return Oc.Instance.canDeleteNamespace(namespace)
-            .then(result => (result ? `${contextValue}.canDelete` : contextValue));
+            .then(result => (result ? `${contextValue}.can-delete` : contextValue));
     }
 
     // eslint-disable-next-line class-methods-use-this