Support for GitOpsTemplates and UI improvements. Feature flags.

Author: juozasg

.vscodeignore

@@ -16,14 +16,14 @@ node_modules
 **/*.ts
 
 
-webview-ui/.vscode/**
-webview-ui/.vscode-test/**
-webview-ui/out/**
-webview-ui/node_modules/**
-webview-ui/src/**
-webview-ui/test
-webview-ui/node_modules
-webview-ui/**/tsconfig.json
-webview-ui/**/.eslintrc.json
-webview-ui/**/*.map
-webview-ui/**/*.ts
+webview-ui/**/.vscode/**
+webview-ui/**/.vscode-test/**
+webview-ui/**/out/**
+webview-ui/**/node_modules/**
+webview-ui/**/src/**
+webview-ui/**/test
+webview-ui/**/node_modules
+webview-ui/**/**/tsconfig.json
+webview-ui/**/**/.eslintrc.json
+webview-ui/**/**/*.map
+webview-ui/**/**/*.ts

configureGitOps/package-lock.json

@@ -52,10 +52,8 @@
 		"pretest": "npm run compile-tests && npm run compile && npm run lint",
 		"lint": "eslint src --ext ts",
 		"test": "node ./out/test/runTest.js",
-		"start:webview": "npm --prefix ./webview-ui run start",
-		"install:webview": "npm --prefix ./webview-ui install",
-		"build:webview": "npm --prefix ./webview-ui run build",
-		"watch:webview": "npm --prefix ./webview-ui run watch"
+		"install:webview": "npm --prefix ./webview-ui run install",
+		"build:webview": "npm --prefix ./webview-ui run build"
 	},
 	"contributes": {
 		"commands": [
@@ -142,7 +140,7 @@
 			},
 			{
 				"command": "gitops.views.refreshResourcesTreeView",
-				"title": "Refresh Sources View",
+				"title": "Refresh Resources Views",
 				"category": "GitOps",
 				"icon": "$(refresh)"
 			},
@@ -217,6 +215,11 @@
 				"command": "gitops.dev.showGlobalState",
 				"title": "Show Global State",
 				"category": "GitOps"
+			},
+			{
+				"command": "gitops.views.createFromTemplate",
+				"title": "Create from Template",
+				"category": "GitOps"
 			}
 		],
 		"viewsContainers": {
@@ -242,12 +245,27 @@
 					"id": "gitops.views.workloads",
 					"name": "Workloads"
 				},
+				{
+					"id": "gitops.views.templates",
+					"name": "Templates",
+					"when": "config.gitops.weaveGitopsEnterprise"
+				},
 				{
 					"id": "gitops.views.documentation",
 					"name": "Documentation"
 				}
 			]
 		},
+		"configuration": {
+			"title": "GitOps Tools",
+			"properties": {
+				"gitops.weaveGitopsEnterprise": {
+					"type": "boolean",
+					"default": false,
+					"description": "Enable WGE GitOpsTemplates feature"
+				}
+			}
+		},
 		"viewsWelcome": [
 			{
 				"view": "gitops.views.clusters",
@@ -341,6 +359,11 @@
 					"group": "navigation@1",
 					"when": "view == gitops.views.workloads"
 				},
+				{
+					"command": "gitops.views.refreshResourcesTreeView",
+					"group": "navigation@1",
+					"when": "view == gitops.views.templates"
+				},
 				{
 					"command": "gitops.views.showWorkloadsHelpMessage",
 					"group": "navigation@2",
@@ -426,6 +449,11 @@
 					"command": "gitops.flux.trace",
 					"when": "view == gitops.views.workloads && viewItem != Namespace;",
 					"group": "navigation@4"
+				},
+				{
+					"command": "gitops.views.createFromTemplate",
+					"group": "1",
+					"when": "view == gitops.views.templates"
 				}
 			],
 			"explorer/context": [
@@ -532,6 +560,7 @@
 		"@types/node": "14.x",
 		"@types/semver": "^7.3.9",
 		"@types/shelljs": "^0.8.11",
+		"@types/uuid": "^9.0.1",
 		"@types/vscode": "^1.59.0",
 		"@types/vscode-webview": "^1.57.0",
 		"@types/which": "^2.0.1",
@@ -559,6 +588,7 @@
 		"shell-escape-tag": "^2.0.2",
 		"shelljs": "^0.8.5",
 		"tinytim": "^0.1.1",
+		"uuid": "^9.0.0",
 		"vscode-kubernetes-tools-api": "^1.3.0"
 	},
 	"activationEvents": [],

package-lock.json

@@ -29,6 +29,7 @@ import { telemetry } from './extension';
 import { showOutputChannel } from './output';
 import { TelemetryErrorEventNames } from './telemetry';
 import { refreshAllTreeViews, refreshResourcesTreeViews } from './views/treeViews';
+import { createFromTemplate } from './commands/createFromTemplate';
 
 /**
  * Command ids registered by this extension
@@ -41,6 +42,7 @@ export const enum CommandId {
 	 * Opens the provided resource in the editor. Can be a text or binary file, or an http(s) URL.
 	 */
 	VSCodeOpen = 'vscode.open',
+	VSCodeReload = 'workbench.action.reloadWindow',
 	/**
 	 * Set vscode context to use in keybindings/menus/welcome views
 	 * @see https://code.visualstudio.com/api/references/when-clause-contexts
@@ -90,6 +92,7 @@ export const enum CommandId {
 	ShowInstalledVersions = 'gitops.showInstalledVersions',
 	InstallFluxCli = 'gitops.installFluxCli',
 	ShowGlobalState = 'gitops.dev.showGlobalState',
+	CreateFromTemplate = 'gitops.views.createFromTemplate',
 }
 
 let _context: ExtensionContext;
@@ -148,6 +151,7 @@ export function registerCommands(context: ExtensionContext) {
 	registerCommand(CommandId.ShowInstalledVersions, showInstalledVersions);
 	registerCommand(CommandId.InstallFluxCli, installFluxCli);
 	registerCommand(CommandId.ShowGlobalState, showGlobalState);
+	registerCommand(CommandId.CreateFromTemplate, createFromTemplate);
 }
 
 /**

package.json

@@ -1,4 +1,4 @@
-import { openConfigureGitOpsPanel } from '../webview-backend/configureGitOps/openPanel';
+import { openConfigureGitOpsWebview } from '../webview-backend/configureGitOps/openWebview';
 import { SourceNode } from '../views/nodes/sourceNode';
 import { FluxSourceKinds } from '../kubernetes/types/flux/object';
 
@@ -16,5 +16,5 @@ export async function addKustomization(sourceNode?: SourceNode) {
 		sourceObject = undefined;
 	}
 
-	openConfigureGitOpsPanel(true, sourceObject);
+	openConfigureGitOpsWebview(true, sourceObject);
 }

src/commands.ts

@@ -1,8 +1,8 @@
-import { openConfigureGitOpsPanel } from '../webview-backend/configureGitOps/openPanel';
+import { openConfigureGitOpsWebview } from '../webview-backend/configureGitOps/openWebview';
 
 /**
  * Open ConfigureGitops webview with 'New Source' tab open
  */
 export async function addSource() {
-	openConfigureGitOpsPanel(false);
+	openConfigureGitOpsWebview(false);
 }

src/commands/addKustomization.ts

@@ -0,0 +1,14 @@
+import * as vscode from 'vscode';
+import { GitOpsTemplateNode } from '../views/nodes/gitOpsTemplateNode';
+import { openCreateFromTemplatePanel } from '../webview-backend/createFromTemplate/openWebview';
+
+export async function createFromTemplate(templateNode?: GitOpsTemplateNode) {
+	// const name = await window.showQuickPick(['cluster-template-development', 'cluster-template-development-plus-kubelogin']);
+
+	if(!templateNode || !templateNode.resource) {
+		return;
+	}
+
+	// TODO: const resource = yaml.parseDocument(yourYamlFile);
+	openCreateFromTemplatePanel(templateNode.resource);
+}

src/commands/addSource.ts

@@ -4,7 +4,7 @@ import { failed } from '../errorable';
 import { getFolderGitInfo } from '../git/gitInfo';
 import { checkGitVersion } from '../install';
 import { getCurrentClusterInfo } from '../views/treeViews';
-import { openConfigureGitOpsPanel } from '../webview-backend/configureGitOps/openPanel';
+import { openConfigureGitOpsWebview } from '../webview-backend/configureGitOps/openWebview';
 
 /**
  * Add git repository source whether from an opened folder
@@ -57,5 +57,5 @@ export async function createGitRepositoryForPath(fileExplorerUri?: Uri) {
 		gitInfo = await getFolderGitInfo(gitFolderFsPath);
 	}
 
-	openConfigureGitOpsPanel(false, '', {createWorkload: false}, gitInfo);
+	openConfigureGitOpsWebview(false, '', {createWorkload: false}, gitInfo);
 }

src/commands/createFromTemplate.ts

@@ -4,7 +4,7 @@ import { failed } from '../errorable';
 import { getFolderGitInfo, getGitRepositoryforGitInfo } from '../git/gitInfo';
 import { namespacedObject } from '../kubernetes/types/flux/object';
 import { getCurrentClusterInfo } from '../views/treeViews';
-import { openConfigureGitOpsPanel } from '../webview-backend/configureGitOps/openPanel';
+import { openConfigureGitOpsWebview } from '../webview-backend/configureGitOps/openWebview';
 
 /**
  * Create kustomization from File Explorer context menu
@@ -55,7 +55,7 @@ export async function createKustomizationForPath(fileExplorerUri?: Uri): Promise
 	const selectSource = !!gr;
 	let sourceName = namespacedObject(gr) || '';
 
-	openConfigureGitOpsPanel(selectSource, sourceName, {
+	openConfigureGitOpsWebview(selectSource, sourceName, {
 		kustomization: {
 			path: relativeKustomizationPath,
 		},