[pve-devel] [PATCH manager] ui: add version to extjs script urls

[pve-devel] [PATCH manager] ui: add version to extjs script urls

[Dominik Csapak]

so that we circumvent browsers caching 6.0 extjs js/css

also depend on extjs 7.0.0 in debian control

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
this should (at least for new users upgrading) fix the browser caching
issue for extjs (we had some now in the forums)

i did it this way since we do not often change version of the extjs
package (since its a big task everytime anyway), but if wanted i can
do it differently. e.g.:
    * hardcode it in the perl code
    * generate it during the build (also for the control file)

but imho this is fine for extjs

 debian/control     |  2 +-
 www/index.html.tpl | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index ce0a54c7..7b4e1b3c 100644
--- a/debian/control
+++ b/debian/control
@@ -44,7 +44,7 @@ Depends: apt-transport-https | apt (>= 1.5~),
          libcrypt-ssleay-perl,
          libfile-readbackwards-perl,
          libfilesys-df-perl,
-         libjs-extjs (>= 6.0.1),
+         libjs-extjs (>= 7.0.0),
          libjson-perl,
          liblwp-protocol-https-perl,
          libnet-dns-perl,
diff --git a/www/index.html.tpl b/www/index.html.tpl
index fd087799..7f07ea18 100644
--- a/www/index.html.tpl
+++ b/www/index.html.tpl
@@ -7,8 +7,8 @@
     <title>[% nodename %] - Proxmox Virtual Environment</title>
     <link rel="icon" sizes="128x128" href="/pve2/images/logo-128.png" />
     <link rel="apple-touch-icon" sizes="128x128" href="/pve2/images/logo-128.png" />
-    <link rel="stylesheet" type="text/css" href="/pve2/ext6/theme-crisp/resources/theme-crisp-all.css" />
-    <link rel="stylesheet" type="text/css" href="/pve2/ext6/crisp/resources/charts-all.css" />
+    <link rel="stylesheet" type="text/css" href="/pve2/ext6/theme-crisp/resources/theme-crisp-all.css?ver=7.0.0" />
+    <link rel="stylesheet" type="text/css" href="/pve2/ext6/crisp/resources/charts-all.css?ver=7.0.0" />
     <link rel="stylesheet" type="text/css" href="/pve2/fa/css/font-awesome.css" />
     <link rel="stylesheet" type="text/css" href="/pve2/css/ext6-pve.css?ver=[% version %]" />
     <link rel="stylesheet" type="text/css" href="/pwt/css/ext6-pmx.css?ver=[% wtversion %]" />
@@ -18,11 +18,11 @@
     <script type='text/javascript'>function gettext(buf) { return buf; }</script>
     [% END %]
     [%- IF debug %]
-    <script type="text/javascript" src="/pve2/ext6/ext-all-debug.js"></script>
-    <script type="text/javascript" src="/pve2/ext6/charts-debug.js"></script>
+    <script type="text/javascript" src="/pve2/ext6/ext-all-debug.js?ver=7.0.0"></script>
+    <script type="text/javascript" src="/pve2/ext6/charts-debug.js?ver=7.0.0"></script>
     [%- ELSE %]
-    <script type="text/javascript" src="/pve2/ext6/ext-all.js"></script>
-    <script type="text/javascript" src="/pve2/ext6/charts.js"></script>
+    <script type="text/javascript" src="/pve2/ext6/ext-all.js?ver=7.0.0"></script>
+    <script type="text/javascript" src="/pve2/ext6/charts.js?ver=7.0.0"></script>
     [% END %]
     <script type="text/javascript" src="/pve2/js/u2f-api.js"></script>
     <script type="text/javascript" src="/pve2/js/qrcode.min.js"></script>
@@ -36,7 +36,7 @@
     </script>
     <script type="text/javascript" src="/proxmoxlib.js?ver=[% wtversion %]"></script>
     <script type="text/javascript" src="/pve2/js/pvemanagerlib.js?ver=[% version %]"></script>
-    <script type="text/javascript" src="/pve2/ext6/locale/locale-[% lang %].js"></script>
+    <script type="text/javascript" src="/pve2/ext6/locale/locale-[% lang %].js?ver=7.0.0"></script>
 
     <script type="text/javascript">
     if (typeof(PVE) === 'undefined') PVE = {};
-- 
2.30.2

[pve-devel] applied: [PATCH manager] ui: add version to extjs script urls

[Thomas Lamprecht]

On 06.09.21 12:19, Dominik Csapak wrote:
> so that we circumvent browsers caching 6.0 extjs js/css
> 
> also depend on extjs 7.0.0 in debian control
> 
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> this should (at least for new users upgrading) fix the browser caching
> issue for extjs (we had some now in the forums)
> 
> i did it this way since we do not often change version of the extjs
> package (since its a big task everytime anyway), but if wanted i can
> do it differently. e.g.:
>     * hardcode it in the perl code
>     * generate it during the build (also for the control file)
> 
> but imho this is fine for extjs
> 

I put above info with only slight adaptions in the commit message, IMO such
reasoning is very valuable information that should be archived in source control.

>  debian/control     |  2 +-
>  www/index.html.tpl | 14 +++++++-------
>  2 files changed, 8 insertions(+), 8 deletions(-)
> 
>

applied, thanks!