From 36a8599e6271c04f05e9c08e29433979b9bb164f Mon Sep 17 00:00:00 2001
From: perploug <pph@umbraco.dk>
Date: Mon, 10 Feb 2014 13:02:16 +0100
Subject: [PATCH] Adds cache bursting to production mode

Package installer bumps CDF version, we make sure to purge the angular
cache
initial js loader gets a cache burst as well
---
 .../src/common/services/util.service.js       | 18 ++++++-------
 .../umbraco/Views/Default.cshtml              | 12 +++------
 .../umbraco/developer/Packages/installer.aspx | 25 +++++++++++++++++--
 .../UI/JavaScript/JsInitialization.cs         | 16 ++++++------
 .../UI/JavaScript/Resources.Designer.cs       |  6 ++++-
 src/Umbraco.Web/UI/JavaScript/Resources.resx  |  6 ++++-
 src/Umbraco.Web/UrlHelperExtensions.cs        | 24 ++++++++++++++++++
 .../developer/Packages/installer.aspx.cs      |  7 +++++-
 8 files changed, 83 insertions(+), 31 deletions(-)
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/util.service.js b/src/Umbraco.Web.UI.Client/src/common/services/util.service.js
index 0b416a2753..64e4fa222b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/util.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/util.service.js
@@ -1,20 +1,20 @@
 /*Contains multiple services for various helper tasks */
 
-function packageHelper(assetsService, treeService, eventsService) {
+function packageHelper(assetsService, treeService, eventsService, $templateCache) {
 
     return {
 
         /** Called when a package is installed, this resets a bunch of data and ensures the new package assets are loaded in */
         packageInstalled: function () {
-            //assetsService._reloadApplicationAssets().then(function() {
-            //    treeService.clearCache();
-            //    //send event
-            //    //eventsService.emit("app.reInitialize");
 
-            //    //TODO: This doesn't work and will end in an infinite browser load loop, we can't really 
-            //    // re-bootstrap anyways since that would be the same as loading the whole browser window.
-            //    //angular.bootstrap(document, ['umbraco']);
-            //});
+            //clears the tree
+            treeService.clearCache();
+
+            //clears the template cache
+            $templateCache.removeAll();
+
+            //emit event to notify anything else
+            eventsService.emit("app.reInitialize");
         }
 
     };
diff --git a/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
index d7ce3ddb63..1f036c8609 100644
--- a/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
+++ b/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
@@ -5,15 +5,9 @@
 @using Umbraco.Web
 @using Umbraco.Web.Editors
 @using umbraco
-@inherits System.Web.Mvc.WebViewPage
-@{
-    Layout = null;
 
-    var applicationJs = Url.Action("Application", "BackOffice");
-    if (GlobalSettings.DebugMode) {
-        applicationJs = applicationJs + "?umb__rnd=" + System.DateTime.Now.Ticks;
-    }
-}
+@inherits System.Web.Mvc.WebViewPage
+
 
 <!DOCTYPE html>
 
@@ -61,7 +55,7 @@
 
     @*And finally we can load in our angular app*@
     <script type="text/javascript" src="lib/yepnope/yepnope.min.js"></script>
-    <script type="text/javascript" src="@applicationJs"></script>
+    <script type="text/javascript" src="@Url.GetUrlWithTimeStamp("Application", "BackOffice")"></script>
 
 </body>
 </html>
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx b/src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx
index 0aae25a974..1f0c4a873e 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx
@@ -28,6 +28,7 @@
     </script>
 
 </asp:Content>
+
 <asp:Content ContentPlaceHolderID="body" runat="server">
     <cc1:UmbracoPanel ID="Panel1" Text="Install package" runat="server" Width="496px"
         Height="584px">
@@ -35,6 +36,7 @@
 
         <cc1:Feedback ID="fb" Style="margin-top: 7px;" runat="server" />
         <cc1:Pane ID="pane_upload" runat="server" Text="Install from local package file">
+
             <cc1:PropertyPanel runat="server" Text="">
                 <div class="alert alert-warning">
                     <h4>
@@ -94,6 +96,7 @@
             <cc1:PropertyPanel ID="PropertyPanel2" runat="server">
                 <asp:Button ID="Button1" OnClick="fetchProtectedPackage" Text="Login" runat="server" /></cc1:PropertyPanel>
         </cc1:Pane>
+
         <asp:Panel ID="pane_acceptLicense" runat="server" Visible="false">
             <br />
             <div class="alert alert-warning">
@@ -103,6 +106,7 @@
                     notifies you the install is completed.
                 </p>
             </div>
+
             <cc1:Pane ID="pane_acceptLicenseInner" runat="server">
                 <cc1:PropertyPanel ID="PropertyPanel3" runat="server" Text="Name">
                     <asp:Label ID="LabelName" runat="server" /></cc1:PropertyPanel>
@@ -121,8 +125,8 @@
                 <cc1:PropertyPanel ID="pp_unsecureFiles" runat="server" Visible="false" Text="&nbsp;">
                     
                     <div class="alert alert-error" style="width: 370px;">
-                        <h4>
-                            Binary files in the package!</h4>
+                        <h4>Binary files in the package!</h4>
+                        
                         <a class="toggle-report" href="#">Read more...</a>
                         <div style="display:none;">
                             <p>
@@ -140,6 +144,7 @@
                             </p>
                         </div>
                     </div>
+
                 </cc1:PropertyPanel>
 
                 <cc1:PropertyPanel ID="LegacyPropertyEditorPanel" runat="server" Visible="false" Text="&nbsp;">
@@ -158,6 +163,7 @@
                         </div>
                     </div>
                 </cc1:PropertyPanel>
+
                 <cc1:PropertyPanel ID="BinaryFileErrorsPanel" runat="server" Visible="false" Text="&nbsp;">
                     <div class="alert alert-error" style="width: 370px;">
                         <h4>
@@ -198,6 +204,7 @@
                         </div>
                     </div>
                 </cc1:PropertyPanel>
+
                 <cc1:PropertyPanel ID="pp_templateConflicts" runat="server" Visible="false" Text="&nbsp;">
                     <div class="alert alert-error" style="width: 370px;">
                         <h4>
@@ -219,6 +226,7 @@
                         </div>
                     </div>
                 </cc1:PropertyPanel>
+
                 <cc1:PropertyPanel ID="pp_stylesheetConflicts" runat="server" Visible="false" Text="&nbsp;">
                     <div class="alert alert-error" style="width: 370px;">
                         <h4>
@@ -240,6 +248,7 @@
                         </div>
                     </div>
                 </cc1:PropertyPanel>
+
                 <cc1:PropertyPanel runat="server" Text=" ">
                     <br />
                     <div style="display: none;" id="installingMessage">
@@ -251,6 +260,7 @@
                         OnClick="startInstall"></asp:Button>
                 </cc1:PropertyPanel>
             </cc1:Pane>
+
         </asp:Panel>
         <cc1:Pane ID="pane_installing" runat="server" Visible="false" Text="Installing package">
             <cc1:PropertyPanel runat="server">
@@ -258,7 +268,9 @@
                 <asp:Literal ID="lit_installStatus" runat="server" />
             </cc1:PropertyPanel>
         </cc1:Pane>
+
         <cc1:Pane ID="pane_optional" runat="server" Visible="false" />
+        
         <cc1:Pane ID="pane_success" runat="server" Text="Package is installed" Visible="false">
             <cc1:PropertyPanel runat="server">
               
@@ -276,12 +288,14 @@
 
             </cc1:PropertyPanel>
         </cc1:Pane>
+
         <cc1:Pane ID="pane_refresh" runat="server" Text="Browser is reloading" Visible="false">
             <cc1:PropertyPanel runat="server">
                 
                 <div class="alert alert-block">
                     Please wait while the browser is reloaded...
                 </div>
+
                 <script type="text/javascript">
                     
                     //This is all a bit zany with double encoding because we have a URL in a hash (#) url part
@@ -291,8 +305,15 @@
                     var umbPath = "<%=GlobalSettings.Path%>";
                     setTimeout(function () {
 
+                       
+
                         var mainWindow = UmbClientMgr.mainWindow();
 
+                        //kill the tree and template cache
+                        if (mainWindow.UmbClientMgr) {
+                            mainWindow.UmbClientMgr._packageInstalled();
+                        }
+
                         var baseUrl = mainWindow.location.href.substr(0, mainWindow.location.href.indexOf("#/developer/framed/"));
                         var framedUrl = baseUrl + "#/developer/framed/";
                         var refreshUrl = framedUrl + encodeURIComponent(encodeURIComponent(umbPath + "/developer/packages/installer.aspx?" + refreshQuery));
diff --git a/src/Umbraco.Web/UI/JavaScript/JsInitialization.cs b/src/Umbraco.Web/UI/JavaScript/JsInitialization.cs
index 4ba41d931a..a2ea9d9610 100644
--- a/src/Umbraco.Web/UI/JavaScript/JsInitialization.cs
+++ b/src/Umbraco.Web/UI/JavaScript/JsInitialization.cs
@@ -41,17 +41,17 @@ namespace Umbraco.Web.UI.JavaScript
         public string GetJavascriptInitialization(HttpContextBase httpContext, JArray umbracoInit, JArray additionalJsFiles = null)
         {
             var result = GetJavascriptInitializationArray(httpContext, umbracoInit, additionalJsFiles);
-            var noCache = "";
-
+            var noCache = string.Empty;
+          
+            //if debugging, add timestamp, if in production CDF will append CDF version (and should also append umb version)
             if (httpContext.IsDebuggingEnabled)
-            {
                 noCache = Resources.JsNoCache;
-            }
 
-            return ParseMain(
-                noCache,
-                result.ToString(),
-                IOHelper.ResolveUrl(SystemDirectories.Umbraco));
+
+                return ParseMain(
+                    noCache,
+                    result.ToString(),
+                    IOHelper.ResolveUrl(SystemDirectories.Umbraco));
         }
 
         public JArray GetJavascriptInitializationArray(HttpContextBase httpContext, JArray umbracoInit, JArray additionalJsFiles = null)
diff --git a/src/Umbraco.Web/UI/JavaScript/Resources.Designer.cs b/src/Umbraco.Web/UI/JavaScript/Resources.Designer.cs
index 8ed5d7332c..e788eb2c03 100644
--- a/src/Umbraco.Web/UI/JavaScript/Resources.Designer.cs
+++ b/src/Umbraco.Web/UI/JavaScript/Resources.Designer.cs
@@ -89,11 +89,15 @@ namespace Umbraco.Web.UI.JavaScript {
         /// <summary>
         ///   Looks up a localized string similar to yepnope.addFilter(function (resourceObj) {
         ///    var url = resourceObj.url;
+        ///    var _op = &quot;?&quot;;
         ///    if(url.indexOf(&quot;lib/&quot;) === 0 || url.indexOf(&quot;js/umbraco.&quot;) === 0){
         ///        return resourceObj;
         ///    }
+        ///    if(url.indexOf(&quot;?&quot;) &gt; 0){
+        ///    	_op = &quot;&amp;&quot;;
+        ///    }
         ///
-        ///    resourceObj.url = resourceObj.url + &quot;?umb__rnd=&quot; + (new Date).getTime();
+        ///    resourceObj.url = resourceObj.url + _op + &quot;umb__rnd=&quot; + (new Date).getTime();
         ///    return resourceObj;
         ///});.
         /// </summary>
diff --git a/src/Umbraco.Web/UI/JavaScript/Resources.resx b/src/Umbraco.Web/UI/JavaScript/Resources.resx
index 40f04a0f90..fd3a72f625 100644
--- a/src/Umbraco.Web/UI/JavaScript/Resources.resx
+++ b/src/Umbraco.Web/UI/JavaScript/Resources.resx
@@ -124,11 +124,15 @@
   <data name="JsNoCache" xml:space="preserve">
     <value>yepnope.addFilter(function (resourceObj) {
     var url = resourceObj.url;
+    var _op = "?";
     if(url.indexOf("lib/") === 0 || url.indexOf("js/umbraco.") === 0){
         return resourceObj;
     }
+    if(url.indexOf("?") &gt; 0){
+    	_op = "&amp;";
+    }
 
-    resourceObj.url = resourceObj.url + "?umb__rnd=" + (new Date).getTime();
+    resourceObj.url = resourceObj.url + _op + "umb__rnd=" + (new Date).getTime();
     return resourceObj;
 });</value>
   </data>
diff --git a/src/Umbraco.Web/UrlHelperExtensions.cs b/src/Umbraco.Web/UrlHelperExtensions.cs
index df21b3ca28..eb9b47eee1 100644
--- a/src/Umbraco.Web/UrlHelperExtensions.cs
+++ b/src/Umbraco.Web/UrlHelperExtensions.cs
@@ -148,5 +148,29 @@ namespace Umbraco.Web
             return url.Action(actionName, controllerName, routeVals);
         }
 
+
+        /// <summary>
+        /// Return the Url for an action with a cache-bursting hash appended
+        /// </summary>
+        /// <param name="url"></param>
+        /// <param name="actionName"></param>
+        /// <param name="controllerName"></param>
+        /// <param name="routeVals"></param>
+        /// <returns></returns>
+        public static string GetUrlWithTimeStamp(this UrlHelper url, string actionName, string controllerName, RouteValueDictionary routeVals = null)
+        {
+            var applicationJs = url.Action(actionName, controllerName, routeVals);
+
+           //make a hash of umbraco and client dependency version
+           //in case the user bypasses the installer and just bumps the web.config or clientdep config
+           var umb_rnd = Umbraco.Core.Configuration.GlobalSettings.CurrentVersion + "_" + ClientDependency.Core.Config.ClientDependencySettings.Instance.Version;          
+          
+            //if in debug mode, always burst the cache
+           if (Umbraco.Core.Configuration.GlobalSettings.DebugMode)
+                umb_rnd += "_" + System.DateTime.Now.Ticks;
+
+            applicationJs = applicationJs + "?umb__rnd=" + umb_rnd;
+            return applicationJs;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.cs
index a429f3018f..a78e2293f0 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.cs
@@ -350,8 +350,13 @@ namespace umbraco.presentation.developer.packages
         /// <param name="packageId"></param>
         /// <param name="dir"></param>
         private void PerformPostInstallCleanup(int packageId, string dir)
-        {
+        {   
             _installer.InstallCleanUp(packageId, dir);
+
+            // Update ClientDependency version
+            var clientDependencyConfig = new Umbraco.Core.Configuration.ClientDependencyConfiguration();
+            var clientDependencyUpdated = clientDependencyConfig.IncreaseVersionNumber();
+            
             //clear the tree cache - we'll do this here even though the browser will reload, but just in case it doesn't can't hurt.
             ClientTools.ClearClientTreeCache().RefreshTree("packager");
             TreeDefinitionCollection.Instance.ReRegisterTrees();
