Merge pull request #1704 from Fryguy/vnc-viewer

Fix missing VNC viewer

Author: kavyanekkalapu

client/app/services/consoles.service.js

@@ -100,7 +100,7 @@ export function ConsolesFactory ($window, CollectionsApi, $timeout, $location, E
   }
 
   function openVnc (results) {
-    var url = '/ui/service/vendor/noVNC/vnc_auto.html' +
+    var url = '/ui/service/vendor/noVNC/vnc_lite.html' +
       '?host=' + $location.host() +
       '&port=' + $location.port() +
       '&path=' + results.url +

config/webpack.dev.js

@@ -7,6 +7,10 @@ const CopyWebpackPlugin = require('copy-webpack-plugin')
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin')
 
+// To download the noVNC viewer
+const SaveRemoteFilePlugin = require('save-remote-file-webpack-plugin')
+const execSync = require('child_process').execSync
+
 const root = path.resolve(__dirname, '../client')
 const outputPath = process.env.BUILD_OUTPUT || '../../manageiq/public/ui/service'
 const dist = path.resolve(__dirname, outputPath)
@@ -183,6 +187,14 @@ module.exports = {
       ].filter((x) => !!x),
     }),
 
+    // noVNC doesn't package the vnc_lite viewer that we need, so we have to
+    // fetch it separately.
+    new SaveRemoteFilePlugin({
+      url: `https://raw.githubusercontent.com/novnc/noVNC/v${execSync(`yarn list --silent --pattern @novnc/novnc | cut -d '@' -f 3 | tr -d '\n'`, {encoding: 'utf-8'})}/vnc_lite.html`,
+      filepath: 'vendor/noVNC/vnc_lite.html',
+      hash: false
+    }),
+
     // Generate index.html from template with script/link tags for bundles
     new HtmlWebpackPlugin({
       base: '/',

package.json

@@ -119,6 +119,7 @@
     "sass": "~1.29.0",
     "sass-lint": "~1.13.1",
     "sass-loader": "~10.0.5",
+    "save-remote-file-webpack-plugin": "^1.1.0",
     "shelljs": "~0.8.4",
     "sinon": "~9.2.1",
     "sinon-chai": "~3.5.0",