From 1127d2400db2ee968ff0b7abfebfb418f156edb9 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Tue, 11 Dec 2018 01:45:58 +0100
Subject: [PATCH] Minor refactor for readability.

---
 src/webview_controller.js | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/webview_controller.js b/src/webview_controller.js
index de6a67a..408ff7e 100644
--- a/src/webview_controller.js
+++ b/src/webview_controller.js
@@ -43,27 +43,36 @@ const getIndexPath = () => {
   return isDev ? 'src/webview/public/dev.html' : 'src/webview/public/index.html';
 }
 
-async function create(issuable) {
-  const title = `${issuable.title.slice(0, 20)}...`;
-  const panel = vscode.window.createWebviewPanel('glWorkflow', title, vscode.ViewColumn.One, {
-    enableScripts: true,
-    localResourceRoots: [
-      vscode.Uri.file(path.join(context.extensionPath, 'src'))
-    ]
-  });
-
+const replaceResources = () => {
   const { appScriptUri, vendorUri, styleUri, devScriptUri } = getResources();
-  let html = fs
+
+  return fs
     .readFileSync(path.join(context.extensionPath, getIndexPath()), 'UTF-8')
     .replace(/{{nonce}}/gm, getNonce())
     .replace('{{styleUri}}', styleUri)
     .replace('{{vendorUri}}', vendorUri)
     .replace('{{appScriptUri}}', appScriptUri)
     .replace('{{devScriptUri}}', devScriptUri);
+}
 
-  const discussions = await gitLabService.fetchDiscussions(issuable);
+const createPanel = (issuable) => {
+  const title = `${issuable.title.slice(0, 20)}...`;
 
+  return vscode.window.createWebviewPanel('glWorkflow', title, vscode.ViewColumn.One, {
+    enableScripts: true,
+    localResourceRoots: [
+      vscode.Uri.file(path.join(context.extensionPath, 'src')),
+    ]
+  });
+}
+
+async function create(issuable) {
+  const panel = createPanel(issuable);
+  const html = replaceResources();
   panel.webview.html = html;
+
+  const discussions = await gitLabService.fetchDiscussions(issuable);
+
   panel.webview.postMessage({ type: 'issuableFetch', issuable, discussions });
   panel.webview.onDidReceiveMessage(async (message) => {
     if (message.command === 'renderMarkdown') {
-- 
GitLab