Webportal: add pai-version attribute to <pai-plugin>

microsoft · Mar 1, 2019 · f93f882 · f93f882
1 parent 4294699
commit f93f882
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/webportal/src/app/env.js.template b/src/webportal/src/app/env.js.template
@@ -8,4 +8,10 @@ window.ENV = {
   promScrapeTime: '${PROM_SCRAPE_TIME}'
 };
 
+window.PAI_VERSION = function (src) {
+  var match = src.match(/(?:\?|&)version=(.+)(?:&|$)/) || [];
+  var version = match[1] || '';
+  return decodeURIComponent(version);
+}(document.currentScript.src);
+
 window.PAI_PLUGINS = [${WEBPORTAL_PLUGINS}][0] || [];
diff --git a/src/webportal/src/app/layout/layout.component.ejs b/src/webportal/src/app/layout/layout.component.ejs
@@ -137,6 +137,6 @@
     <div class="control-sidebar-bg"></div>
 
   </div>
-  <script src="/scripts/env.js"></script>
+  <script src="/scripts/env.js?version=<%=encodeURIComponent(htmlWebpackPlugin.options.version)%>"></script>
 </body>
 </html>
diff --git a/src/webportal/src/app/plugin/plugin.component.js b/src/webportal/src/app/plugin/plugin.component.js
@@ -46,7 +46,8 @@ $(document).ready(function() {
 
   loadScript(plugin.uri, function() {
     const $plugin = $('<pai-plugin>')
-      .attr('pai-rest-server-uri', window.ENV.restServerUri);
+      .attr('pai-rest-server-uri', window.ENV.restServerUri)
+      .attr('pai-version', window.PAI_VERSION);
     if (cookies.get('token')) {
       $plugin.attr('pai-user', cookies.get('user'))
         .attr('pai-rest-server-token', cookies.get('token'));