rancher · vincent99 · Jul 24, 2019 · Jul 24, 2019 · Jul 24, 2019 · Jul 24, 2019
diff --git a/app/application/controller.js b/app/application/controller.js
@@ -11,14 +11,13 @@ export default Controller.extend({
   tooltipService:    service('tooltip'),
 
   // GitHub auth params
-  queryParams:       ['isPopup', 'redirectTo', 'fromAuthProvider'],
+  queryParams:       ['isPopup', 'fromAuthProvider'],
 
   error:             null,
   error_description: null,
   state:             null,
   code:              null,
   isPopup:           null,
-  redirectTo:        null,
 
   tooltip:           oneWay('tooltipService.tooltipOpts.type'),
   tooltipTemplate:   oneWay('tooltipService.tooltipOpts.template'),

diff --git a/app/application/route.js b/app/application/route.js
@@ -44,18 +44,9 @@ export default Route.extend({
         state:             null,
         code:              null,
         error_description: null,
-        redirectTo:        null,
       });
     })
 
-    if ( params.redirectTo ) {
-      let path = params.redirectTo;
-
-      if ( path.substr(0, 1) === '/' ) {
-        get(this, 'session').set(C.SESSION.BACK_TO, path);
-      }
-    }
-
     if (params.isPopup) {
       this.controllerFor('application').set('isPopup', true);
     }

diff --git a/app/components/page-header/component.js b/app/components/page-header/component.js
@@ -169,7 +169,12 @@ export default Component.extend({
       return true;
     });
 
-    set(this, 'navTree', out);
+    const old = JSON.stringify(get(this, 'navTree'));
+    const neu = JSON.stringify(out);
+
+    if ( old !== neu ) {
+      set(this, 'navTree', out);
+    }
   },
 
   // Utilities you can use in the condition() function to decide if an item is shown or hidden,

diff --git a/lib/shared/addon/components/cluster-driver/driver-rke/template.hbs b/lib/shared/addon/components/cluster-driver/driver-rke/template.hbs
@@ -379,6 +379,17 @@
 
             <div class="row">
               <div class="col span-3">
+                <label class="acc-label">{{t "clusterNew.rke.etcd.backupConfig.folder.label"}}</label>
+                {{input
+                  type="text"
+                  name="folder"
+                  classNames="form-control"
+                  placeholder=(t "clusterNew.rke.etcd.backupConfig.folder.placeholder")
+                  value=cluster.rancherKubernetesEngineConfig.services.etcd.backupConfig.s3BackupConfig.folder
+                }}
+              </div>
+
+              <div class="col span-3 offset-1">
                 <label class="acc-label">{{t "clusterNew.rke.etcd.backupConfig.accessKey.label"}}</label>
                 {{input
                   type="text"

diff --git a/lib/shared/addon/cookies/service.js b/lib/shared/addon/cookies/service.js
@@ -23,10 +23,13 @@ function getAll() {
       idx = cookie.length;
     }
 
-    let name = decodeURIComponent(cookie.substr(0, idx));
-    let val = parseValue(cookie.substr(idx + 1));
+    try {
+      let name = decodeURIComponent(cookie.substr(0, idx));
+      let val = parseValue(cookie.substr(idx + 1));
 
-    ret[ name ] = val;
+      ret[ name ] = val;
+    } catch (e) {
+    }
   });
 
   return ret;

diff --git a/lib/shared/addon/growl/service.js b/lib/shared/addon/growl/service.js
@@ -2,6 +2,7 @@ import Service, { inject as service } from '@ember/service';
 import Errors from 'ui/utils/errors';
 import 'jgrowl';
 import { setProperties } from '@ember/object';
+import { escapeHtml } from 'shared/utils/util';
 
 export default Service.extend({
   app:  service(),
@@ -34,7 +35,7 @@ export default Service.extend({
       opt.header = title;
     }
 
-    return $.jGrowl(body, opt);
+    return $.jGrowl(escapeHtml(body), opt);
   },
 
   success(title, body) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ui",
-  "version": "2.2.90",
+  "version": "2.2.91",
   "private": true,
   "directories": {
     "doc": "doc",

diff --git a/translations/en-us.yaml b/translations/en-us.yaml
@@ -2838,23 +2838,26 @@ clusterNew:
           placeholder: "6"
         bucketName:
           label: S3 Bucket Name
-          placeholder: "backups"
+          placeholder: "e.g. backups"
         region:
           label: S3 Region
-          placeholder: "us-west-2"
+          placeholder: "e.g. us-west-2"
         endpoint:
           label: S3 Region Endpoint
-          placeholder: "s3.us-west-2.amazonaws.com"
-        customCa:
-          label: Custom CA Certificate
-          placeholder: "Paste in the certificate and any necessary chain certificates, starting with -----BEGIN CERTIFICATE-----"
+          placeholder: "e.g. s3.us-west-2.amazonaws.com"
+        folder:
+          label: S3 Folder
+          placeholder: "e.g. cluster-backup"
         accessKey:
           label: S3 Access Key
           placeholder: Your AWS access key
         secretKey:
           label: S3 Secret Key
           placeholder: Your AWS secret key
           provided: Provided
+        customCa:
+          label: Custom CA Certificate
+          placeholder: "Paste in the certificate and any necessary chain certificates, starting with -----BEGIN CERTIFICATE-----"
       location:
         label: etcd Snapshot Backup Target
         s3:

diff --git a/vendor/icons b/vendor/icons
+18 −2		demo.html
+1 −0		fonts/rancher-icons.svg
+ −		fonts/rancher-icons.ttf
+ −		fonts/rancher-icons.woff
+1 −1		selection.json
+6 −3		style.css
+8 −3		style.scss
+1 −0		variables.scss