bug 1380818 show the add-on id on about:debugging r?jdescottes
MozReview-Commit-ID: D1K0LgLX34S
--- a/devtools/client/aboutdebugging/components/addons/target.js
+++ b/devtools/client/aboutdebugging/components/addons/target.js
@@ -38,16 +38,32 @@ function filePathForTarget(target) {
// the ellipsis on the left.
dom.dd(
{ className: "addon-target-info-content file-path" },
dom.span({ className: "file-path-inner", title: path }, path),
),
];
}
+function addonIDforTarget(target) {
+ return [
+ dom.dt(
+ { className: "addon-target-info-label" },
+ Strings.GetStringFromName("extensionID"),
+ ),
+ dom.dd(
+ { className: "addon-target-info-content extension-id" },
+ dom.span(
+ { title: target.addonID },
+ target.addonID
+ )
+ ),
+ ];
+}
+
function internalIDForTarget(target) {
if (!target.manifestURL) {
return [];
}
// Strip off the protocol and rest, leaving us with just the UUID.
let uuid = /moz-extension:\/\/([^/]*)/.exec(target.manifestURL)[1];
return [
dom.dt(
@@ -139,16 +155,17 @@ module.exports = createClass({
src: target.icon
}),
dom.span({ className: "target-name", title: target.name }, target.name)
),
...temporaryID(target),
dom.dl(
{ className: "addon-target-info" },
...filePathForTarget(target),
+ ...addonIDforTarget(target),
...internalIDForTarget(target),
),
dom.div({className: "addon-target-actions"},
dom.button({
className: "debug-button addon-target-button",
onClick: this.debug,
disabled: debugDisabled,
}, Strings.GetStringFromName("debug")),
--- a/devtools/client/aboutdebugging/test/browser_addons_debug_info.js
+++ b/devtools/client/aboutdebugging/test/browser_addons_debug_info.js
@@ -41,16 +41,19 @@ add_task(function* testWebExtension() {
path: "addons/test-devtools-webextension-nobg/manifest.json",
name: addonName,
isWebExtension: true
});
let container = document.querySelector(`[data-addon-id="${addonId}"]`);
testFilePath(container, "/test/addons/test-devtools-webextension-nobg/");
+ let extensionID = container.querySelector(".extension-id span");
+ ok(extensionID.textContent === "test-devtools-webextension-nobg@mozilla.org");
+
let internalUUID = container.querySelector(".internal-uuid span");
ok(internalUUID.textContent.match(UUID_REGEX), "internalUUID is correct");
let manifestURL = container.querySelector(".manifest-url");
ok(manifestURL.href.startsWith("moz-extension://"), "href for manifestURL exists");
yield uninstallAddon({document, id: addonId, name: addonName});
@@ -69,15 +72,18 @@ add_task(function* testTemporaryWebExten
isWebExtension: true
});
let addons = document.querySelectorAll("#temporary-extensions .addon-target-container");
// Assuming that our temporary add-on is now at the top.
let container = addons[addons.length - 1];
let addonId = container.dataset.addonId;
+ let extensionID = container.querySelector(".extension-id span");
+ ok(extensionID.textContent.endsWith("@temporary-addon"));
+
let temporaryID = container.querySelector(".temporary-id-url");
ok(temporaryID, "Temporary ID message does appear");
yield uninstallAddon({document, id: addonId, name: addonName});
yield closeAboutDebugging(tab);
});
--- a/devtools/client/locales/en-US/aboutdebugging.properties
+++ b/devtools/client/locales/en-US/aboutdebugging.properties
@@ -66,16 +66,20 @@ extensions = Extensions
# This string is displayed as a header above the list of temporarily loaded add-ons.
temporaryExtensions = Temporary Extensions
# LOCALIZATION NOTE (internalUUID):
# This string is displayed as a label for the internal UUID of an extension.
# The UUID is generated for this profile on install.
internalUUID = Internal UUID
+# LOCALIZATION NOTE (extensionID):
+# This string is displayed as a label for the ID of an extension. This is not the same as the internal UUID.
+extensionID = Extension ID
+
# LOCALIZATION NOTE (manifestURL):
# This string is displayed as a link for the manifest of an extension,
# accessible in a browser, such as moz-extension://[internalUUID]/manifest.json.
manifestURL = Manifest URL
# LOCALIZATION NOTE (webExtTip):
# This string is displayed as a message below the list of temporarily loaded add-ons.
# Web-ext is a command line tool for web-extensions developers.