MD Settings: Set all content setting values in Site Details Javascript.

chrome/browser/resources/settings/site_settings/site_details.js

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview
  * 'site-details' show the details (permissions and usage) for a given origin
  * under Site Settings.
  */
 Polymer({
   is: 'site-details',
 
   behaviors: [SiteSettingsBehavior, settings.RouteObserverBehavior],
 
   properties: {
     /**
-     * The site that this widget is showing details for.
-     * @type {SiteException}
+     * The origin that this widget is showing details for.
+     * @private
      */
-    site: {
-      type: Object,
-      observer: 'onSiteChanged_',
+    origin: {
+      type: String,
+      observer: 'onOriginChanged_',
     },
 
     /**
      * The amount of data stored for the origin.
      * @private
      */
     storedData_: {
       type: String,
       value: '',
     },
@@ skipping 19 matching lines @@
 
   /**
    * settings.RouteObserverBehavior
    * @param {!settings.Route} route
    * @protected
    */
   currentRouteChanged: function(route) {
     var site = settings.getQueryParameters().get('site');
     if (!site)
       return;
-    this.browserProxy.getSiteDetails(site).then(function(siteInfo) {
-      this.site = this.expandSiteException(siteInfo);
-    }.bind(this));
+    this.origin = site;
   },
 
   /**
    * Handler for when the origin changes.
    * @private
    */
-  onSiteChanged_: function() {
-    // origin may be initially undefined if the user follows a direct
-    // link (URL) to this page.
-    var origin = this.site.origin;
-    if (origin !== undefined)
-      this.$.usageApi.fetchUsageTotal(this.toUrl(origin).hostname);
+  onOriginChanged_: function() {
+    this.$.usageApi.fetchUsageTotal(this.toUrl(this.origin).hostname);
+
+    // Retrieve the setting for each category shown.
+    this.root.querySelectorAll('site-details-permission')
+        .forEach(function(element) {
+          this.browserProxy
+              .getCategoryPermissionForOrigin(element.category, this.origin)
+              .then(function(permissionResult) {
+                element.site = element.expandSiteException(permissionResult);
+              }.bind(element));
+        }.bind(this));

[dschuyler, 2017/06/26 22:07:05]

IIUC, this will make a couple dozen (or so) queries. Site settings in general
has made too many queries in the past - I'm not saying it was great. But, can
this be condensed down to a single query? I.e. maybe request a list of
(category, origin) pairs and get a list of results.

[Patti Lor, 2017/06/28 09:12:52]

Done! getCategoryPermissionForOrigin -> getOriginPermissions.

   },
 
   /** @private */
   onCloseDialog_: function() {
     this.$.confirmDeleteDialog.close();
   },
 
   /**
    * Confirms the deletion of storage for a site.
    * @param {!Event} e
    * @private
    */
   onConfirmClearStorage_: function(e) {
     e.preventDefault();
     this.confirmationDeleteMsg_ = loadTimeData.getStringF(
-        'siteSettingsSiteRemoveConfirmation',
-        this.toUrl(this.site.origin).href);
+        'siteSettingsSiteRemoveConfirmation', this.toUrl(this.origin).href);
     this.$.confirmDeleteDialog.showModal();
   },
 
   /**
    * Clears all data stored for the current origin.
    * @private
    */
   onClearStorage_: function() {
-    this.$.usageApi.clearUsage(
-        this.toUrl(this.site.origin).href, this.storageType_);
+    this.$.usageApi.clearUsage(this.toUrl(this.origin).href, this.storageType_);
   },
 
   /**
    * Called when usage has been deleted for an origin.
    * @param {!{detail: !{origin: string}}} event
    * @private
    */
   onUsageDeleted_: function(event) {
-    if (event.detail.origin == this.toUrl(this.site.origin).href) {
+    if (event.detail.origin == this.toUrl(this.origin).href) {
       this.storedData_ = '';
       this.navigateBackIfNoData_();
     }
   },
 
   /**
    * Resets all permissions and clears all data stored for the current origin.
    * @private
    */
   onClearAndReset_: function() {
-    Array.prototype.forEach.call(
-        this.root.querySelectorAll('site-details-permission'),
-        function(element) {
+    this.root.querySelectorAll('site-details-permission')
+        .forEach(function(element) {
           element.resetPermission();
         });

[dschuyler, 2017/06/26 22:07:05]

Again (or similarly), WDYT of making a single call to a new
resetAllPermissionForOrigin rather than looping a call to resetPermission?

[Patti Lor, 2017/06/28 09:12:52]

Good idea! I had a quick look today, but I'll send you something in a separate
CL when it's ready?

[dschuyler, 2017/06/28 23:55:52]

SG

 
     if (this.storedData_ != '')
       this.onClearStorage_();
     else
       this.navigateBackIfNoData_();
   },
 
   /**
    * Navigate back if the UI is empty (everything been cleared).
    * @private
    */
   navigateBackIfNoData_: function() {
     if (this.storedData_ == '' && !this.permissionShowing_())
       settings.navigateToPreviousRoute();
   },
 
   /**
    * Returns true if one or more permission is showing.
    * @private
    */
   permissionShowing_: function() {
     return Array.prototype.some.call(
         this.root.querySelectorAll('site-details-permission'),
         function(element) {
           return element.offsetHeight > 0;
         });
   },
 });