[DevTools] Introduce Unregister/Start/Stop/Inspect buttons to ServiceWorkersView [2/2 blink]

Source/devtools/front_end/resources/ServiceWorkersView.js

 // Copyright (c) 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.
 
 /**
  * @constructor
  * @extends {WebInspector.VBox}
  * @implements {WebInspector.TargetManager.Observer}
  */
 WebInspector.ServiceWorkersView = function()
@@ skipping 67 matching lines @@
      * @param {!ServiceWorkerAgent.ServiceWorkerRegistration} registration
      */
     _updateRegistration: function(registration)
     {
         var parsedURL = registration.scopeURL.asParsedURL();
         if (!parsedURL)
           return;
         var originHost = parsedURL.host;
         var originElement = this._originHostToOriginElementMap.get(originHost);
         if (!originElement) {
-            originElement = new WebInspector.ServiceWorkerOriginElement(originHost);
+            originElement = new WebInspector.ServiceWorkerOriginElement(this._manager, originHost);
             if (this._securityOriginHosts.has(originHost))
                 this._appendOriginNode(originElement);
             this._originHostToOriginElementMap.set(originHost, originElement);
         }
         this._registrationIdToOriginElementMap.set(registration.registrationId, originElement);
         originElement._updateRegistration(registration);
     },
 
     /**
      * @param {!WebInspector.Event} event
@@ skipping 101 matching lines @@
     _removeOriginNode: function(originElement)
     {
         this.root.removeChild(originElement.element);
     },
 
     __proto__: WebInspector.VBox.prototype
 }
 
 /**
  * @constructor
+ * @param {!WebInspector.ServiceWorkerManager} manager
  * @param {string} originHost
  */
-WebInspector.ServiceWorkerOriginElement = function(originHost)
+WebInspector.ServiceWorkerOriginElement = function(manager, originHost)
 {
+    this._manager = manager;
     /** @type {!Map.<string, !WebInspector.SWRegistrationElement>} */
     this._registrationElements = new Map();
     this.originHost = originHost;
     this.element = createElementWithClass("div", "service-workers-origin");
     this._listItemNode = this.element.createChild("li", "service-workers-origin-title");
     this._listItemNode.createChild("div").createTextChild(originHost);
     this._childrenListNode = this.element.createChild("ol");
 }
 
 WebInspector.ServiceWorkerOriginElement.prototype = {
     /**
      * @return {boolean}
      */
     _hasRegistration: function()
     {
         return this._registrationElements.size != 0;
     },
 
     /**
      * @param {!ServiceWorkerAgent.ServiceWorkerRegistration} registration
      */
     _updateRegistration: function(registration)
     {
         var swRegistrationElement = this._registrationElements.get(registration.registrationId);
         if (swRegistrationElement) {
             swRegistrationElement._updateRegistration(registration);
             return;
         }
-        swRegistrationElement = new WebInspector.SWRegistrationElement(registration);
+        swRegistrationElement = new WebInspector.SWRegistrationElement(this._manager, registration);
         this._registrationElements.set(registration.registrationId, swRegistrationElement);
         this._childrenListNode.appendChild(swRegistrationElement.element);
     },
 
     /**
      * @param {!ServiceWorkerAgent.ServiceWorkerRegistration} registration
      */
     _deleteRegistration: function(registration)
     {
         var swRegistrationElement = this._registrationElements.get(registration.registrationId);
@@ skipping 21 matching lines @@
     {
         var swRegistrationElement = this._registrationElements.get(version.registrationId);
         if (!swRegistrationElement)
             return;
         swRegistrationElement._deleteVersion(version);
     }
 }
 
 /**
  * @constructor
+ * @param {!WebInspector.ServiceWorkerManager} manager
  * @param {!ServiceWorkerAgent.ServiceWorkerRegistration} registration
  */
-WebInspector.SWRegistrationElement = function(registration)
+WebInspector.SWRegistrationElement = function(manager, registration)
 {
+    this._manager = manager;
     /** @type {!ServiceWorkerAgent.ServiceWorkerRegistration} */
     this._registration = registration;
     /** @type {!Map.<string, !ServiceWorkerAgent.ServiceWorkerVersion>} */
     this._versions = new Map();
     this.element = createElementWithClass("div", "service-workers-registration");
-    this._titleNode = this.element.createChild("li").createChild("div", "service-workers-registration-title");
+    var headerNode = this.element.createChild("li").createChild("div", "service-workers-registration-header");
+    this._titleNode = headerNode.createChild("div", "service-workers-registration-title");
+    this._unregisterButton = headerNode.createChild("button", "service-workers-button service-workers-unregister-button");
+    this._unregisterButton.addEventListener("click", this._unregisterButtonClicked.bind(this), false);
+    this._unregisterButton.title = WebInspector.UIString("Unregister");
     this._childrenListNode = this.element.createChild("ol");
     this._updateRegistration(registration);
 }
 
 /** @enum {string} */
 WebInspector.SWRegistrationElement.VersionMode = {
     Installing: "installing",
     Waiting: "waiting",
     Active: "active",
     Redundant: "redundant",
 }
 
 /** @type {!Map.<string, string>} */
 WebInspector.SWRegistrationElement.VersionStausToModeMap = new Map([
     [ServiceWorkerAgent.ServiceWorkerVersionStatus.New, WebInspector.SWRegistrationElement.VersionMode.Installing],
     [ServiceWorkerAgent.ServiceWorkerVersionStatus.Installing, WebInspector.SWRegistrationElement.VersionMode.Installing],
     [ServiceWorkerAgent.ServiceWorkerVersionStatus.Installed, WebInspector.SWRegistrationElement.VersionMode.Waiting],
     [ServiceWorkerAgent.ServiceWorkerVersionStatus.Activating, WebInspector.SWRegistrationElement.VersionMode.Active],
     [ServiceWorkerAgent.ServiceWorkerVersionStatus.Activated, WebInspector.SWRegistrationElement.VersionMode.Active],
     [ServiceWorkerAgent.ServiceWorkerVersionStatus.Redundant, WebInspector.SWRegistrationElement.VersionMode.Redundant]]);
 
 WebInspector.SWRegistrationElement.prototype = {
     /**
      * @param {!ServiceWorkerAgent.ServiceWorkerRegistration} registration
      */
     _updateRegistration: function(registration)
     {
         this._registration = registration;
         var text = WebInspector.UIString("Scope: ") + registration.scopeURL.asParsedURL().path;
-        if (registration.isDeleted)
-          text += " - deleted";
+        if (registration.isDeleted) {
+            this._unregisterButton.style.display = "none";
+            text += " - deleted";

[pfeldman, 2015/03/23 10:51:09]

WebInspector.UIString supports message format %s, etc.

var text = WebInspector.UIString(registration.isDeleted ? "Scope: %s" : "Scope:
%s - deleted", url);

[horo, 2015/03/23 11:22:24]

Done.

+        } else {
+            this._unregisterButton.style.display = "block";
+        }
         this._titleNode.textContent = text;
+        this._updateVersionList();
     },
 
     /**
      * @param {!ServiceWorkerAgent.ServiceWorkerVersion} version
      */
     _updateVersion: function(version)
     {
         this._versions.set(version.versionId, version);
         this._updateVersionList();
     },
@@ skipping 38 matching lines @@
         this._childrenListNode.appendChild(fragment);
     },
 
     /**
      * @param {!Map.<string, !Array.<!ServiceWorkerAgent.ServiceWorkerVersion>>} modeVersionArrayMap
      * @param {string} mode
      */
     _createVersionModeRow: function(modeVersionArrayMap, mode) {
         var versionList = /** @type {!Array.<!ServiceWorkerAgent.ServiceWorkerVersion>} */(modeVersionArrayMap.get(mode));
         var modeRowElement = createElementWithClass("div", "service-workers-version-mode-row  service-workers-version-mode-row-" + mode);
-        modeRowElement.createChild("div", "service-workers-version-mode").createTextChild(mode);
-        var versionsElement = modeRowElement.createChild("div", "service-workers-versions" + mode);
+        modeRowElement.createChild("div", "service-workers-version-mode").createChild("div", "service-workers-version-mode-text").createTextChild(mode);
+        var versionsElement = modeRowElement.createChild("div", "service-workers-versions");
         for (var version of versionList) {
             var stateRowElement = versionsElement.createChild("div", "service-workers-version-row");
-            stateRowElement.createChild("div", "service-workers-version-status").createTextChild(version.status);
-            stateRowElement.createChild("div", "service-workers-version-running-status").createTextChild(version.runningStatus);
-            stateRowElement.createChild("div", "service-workers-version-script-url").createTextChild(version.scriptURL.asParsedURL().path);
+            var statusDiv = stateRowElement.createChild("div", "service-workers-version-status");
+            statusDiv.createChild("div", "service-workers-version-status-text").createTextChild(version.status);
+            var runningStatusDiv = stateRowElement.createChild("div", "service-workers-version-running-status");
+            if (version.runningStatus == ServiceWorkerAgent.ServiceWorkerVersionRunningStatus.Running || version.runningStatus == ServiceWorkerAgent.ServiceWorkerVersionRunningStatus.Starting) {
+                var stopButton = runningStatusDiv.createChild("button", "service-workers-button service-workers-stop-button service-workers-version-running-status-button");
+                stopButton.addEventListener("click", this._stopButtonClicked.bind(this, version.versionId), false);
+                stopButton.title = WebInspector.UIString("Stop");
+            } else if (version.runningStatus == ServiceWorkerAgent.ServiceWorkerVersionRunningStatus.Stopped && !this._registration.isDeleted) {
+                var startButton = runningStatusDiv.createChild("button", "service-workers-button service-workers-start-button service-workers-version-running-status-button");
+                startButton.addEventListener("click", this._startButtonClicked.bind(this), false);
+                startButton.title = WebInspector.UIString("Start");
+            }
+            runningStatusDiv.createChild("div", "service-workers-version-running-status-text").createTextChild(version.runningStatus);
+            var scriptURLDiv = stateRowElement.createChild("div", "service-workers-version-script-url");
+            scriptURLDiv.createChild("div", "service-workers-version-script-url-text").createTextChild(version.scriptURL.asParsedURL().path);
+            if (version.runningStatus == ServiceWorkerAgent.ServiceWorkerVersionRunningStatus.Running || version.runningStatus == ServiceWorkerAgent.ServiceWorkerVersionRunningStatus.Starting) {
+                var inspectButton = scriptURLDiv.createChild("span", "service-workers-version-inspect");
+                inspectButton.createTextChild(WebInspector.UIString("inspect"));
+                inspectButton.addEventListener("click", this._inspectButtonClicked.bind(this, version.versionId), false);
+            }
         }
         if (versionList.length == 0) {
             var stateRowElement = versionsElement.createChild("div", "service-workers-version-row");
             stateRowElement.createChild("div", "service-workers-version-status");
             stateRowElement.createChild("div", "service-workers-version-running-status");
             stateRowElement.createChild("div", "service-workers-version-script-url");
         }
         return modeRowElement;
+    },
+
+    /**
+     * @param {!Event} event
+     */
+    _unregisterButtonClicked: function(event) {

[pfeldman, 2015/03/23 10:51:09]

{ goes to the next line.

[horo, 2015/03/23 11:22:24]

Done.

+        this._manager.target().serviceWorkerAgent().unregister(this._registration.scopeURL);

[pfeldman, 2015/03/23 10:51:09]

You should not talk to the agent from here, all agents calls should be
encapsulated in the ServiceWorkerManager.

[horo, 2015/03/23 11:22:24]

Done.

+    },
+
+    /**
+     * @param {!Event} event
+     */
+    _startButtonClicked: function(event) {
+        this._manager.target().serviceWorkerAgent().startWorker(this._registration.scopeURL);
+    },
+
+    /**
+     * @param {string} versionId
+     * @param {!Event} event
+     */
+    _stopButtonClicked: function(versionId, event) {
+        this._manager.target().serviceWorkerAgent().stopWorker(versionId);
+    },
+
+    /**
+     * @param {string} versionId
+     * @param {!Event} event
+     */
+    _inspectButtonClicked: function(versionId, event) {
+        this._manager.target().serviceWorkerAgent().inspectWorker(versionId);
     }
 }