Bug 1590758 - Fix blank panel when changing to different pages with service workers from the same domain r=jdescottes

Differential Revision: https://phabricator.services.mozilla.com/D52147

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Belén Albeza 2019-11-08 16:58:18 +00:00
Родитель 96dcd40e06
Коммит 49be1da14e
4 изменённых файлов: 17 добавлений и 15 удалений

Просмотреть файл

@ -86,7 +86,11 @@ window.Application = {
async updateWorkers() {
const { service } = await this.client.mainRoot.listAllWorkers();
this.actions.updateWorkers(service);
// filter out workers that don't have an URL or a scope
// TODO: Bug 1595138 investigate why we lack those properties
const workers = service.filter(x => x.url && x.scope);
this.actions.updateWorkers(workers);
},
updateDomain() {

Просмотреть файл

@ -200,12 +200,10 @@ class Worker extends PureComponent {
)
: null;
const scope = worker.scope
? span(
{ title: worker.scope, className: "worker__scope js-sw-scope" },
this.formatScope(worker.scope)
)
: null;
const scope = span(
{ title: worker.scope, className: "worker__scope js-sw-scope" },
this.formatScope(worker.scope)
);
return li(
{ className: "worker js-sw-container" },

Просмотреть файл

@ -9,8 +9,8 @@ const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
const worker = {
active: PropTypes.bool,
name: PropTypes.string.isRequired,
scope: PropTypes.string,
lastUpdateTime: PropTypes.number.isRequired,
scope: PropTypes.string.isRequired,
lastUpdateTime: PropTypes.number,
url: PropTypes.string.isRequired,
// registrationFront can be missing in e10s.
registrationFront: PropTypes.object,

Просмотреть файл

@ -28,16 +28,16 @@ support-files =
[browser_application_panel_sidebar.js]
[browser_application_panel_debug-service-worker.js]
skip-if = serviceworker_e10s || debug # Bug 1559591
skip-if = debug # Bug 1559591
[browser_application_panel_list-domain-workers.js]
skip-if = serviceworker_e10s || debug # Bug 1559591
skip-if = debug # Bug 1559591
[browser_application_panel_list-several-workers.js]
skip-if = serviceworker_e10s || debug # Bug 1559591
skip-if = debug # Bug 1559591
[browser_application_panel_list-single-worker.js]
skip-if = serviceworker_e10s || debug # Bug 1559591
skip-if = debug # Bug 1559591
[browser_application_panel_list-workers-empty.js]
[browser_application_panel_list-unicode.js]
skip-if = serviceworker_e10s || debug # Bug 1559591
skip-if = debug # Bug 1559591
[browser_application_panel_manifest-display.js]
[browser_application_panel_manifest-load.js]
[browser_application_panel_manifest-open-json.js]
@ -47,4 +47,4 @@ skip-if = true # Bug 1467256, 1559591
[browser_application_panel_unregister-worker.js]
skip-if = debug # Bug 1559591
[browser_application_panel_start-service-worker.js]
skip-if = (os == 'linux' && asan) || debug || serviceworker_e10s # Bug 1559487, 1559591
skip-if = (os == 'linux' && asan) || debug || serviceworker_e10s # Bug 1559487, 1559591, 1447197