corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1952508: Part 3 - Show number of items in file content analysis busy dialog r=dlp-reviewers,fluent-reviewers,bolsson,gstoll

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D242224
This commit is contained in:
David P
2025-03-25 18:25:20 +00:00
parent 762e06f051
commit 6f9ad4538e
2 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
browser/components/contentanalysis/content/ContentAnalysis.sys.mjs
View File

@@ -422,7 +422,10 @@ export const ContentAnalysis = {
entry.notification = this._showSlowCAMessage(
analysisType,
aRequest,
aResourceNameOrOperationType,
this._getSlowDialogMessage(
aResourceNameOrOperationType,
aRequest.userActionRequestsCount
),
aBrowsingContext
);
}, slowTimeoutMs);
@@ -460,17 +463,9 @@ export const ContentAnalysis = {
* Show a message to the user to indicate that a CA request is taking
* a long time.
*/
_showSlowCAMessage(
aOperation,
aRequest,
aResourceNameOrOperationType,
aBrowsingContext
) {
_showSlowCAMessage(aOperation, aRequest, aBodyMessage, aBrowsingContext) {
if (!this._shouldShowBlockingNotification(aOperation)) {
return this._showMessage(
this._getSlowDialogMessage(aResourceNameOrOperationType),
aBrowsingContext
);
return this._showMessage(aBodyMessage, aBrowsingContext);
}
if (!aRequest) {
@@ -483,16 +478,22 @@ export const ContentAnalysis = {
aBrowsingContext,
aRequest.userActionId,
aRequest.requestToken,
aResourceNameOrOperationType
aBodyMessage
);
},
_getSlowDialogMessage(aResourceNameOrOperationType) {
_getSlowDialogMessage(aResourceNameOrOperationType, aNumRequests) {
if (aResourceNameOrOperationType.name) {
return this.l10n.formatValueSync(
"contentanalysis-slow-agent-dialog-body-file",
{ agent: lazy.agentName, filename: aResourceNameOrOperationType.name }
);
let label =
aNumRequests > 1
? "contentanalysis-slow-agent-dialog-body-file-and-more"
: "contentanalysis-slow-agent-dialog-body-file";
return this.l10n.formatValueSync(label, {
agent: lazy.agentName,
filename: aResourceNameOrOperationType.name,
count: aNumRequests - 1,
});
}
let l10nId = undefined;
switch (aResourceNameOrOperationType.operationType) {
@@ -548,9 +549,8 @@ export const ContentAnalysis = {
aBrowsingContext,
aUserActionId,
aRequestToken,
aResourceNameOrOperationType
aBodyMessage
) {
let bodyMessage = this._getSlowDialogMessage(aResourceNameOrOperationType);
// Note that TabDialogManager maintains a list of displaying dialogs, and so
// we can pop up multiple of these and the first one will keep displaying until
// it is closed, at which point the next one will display, etc.
@@ -558,7 +558,7 @@ export const ContentAnalysis = {
aBrowsingContext,
Ci.nsIPromptService.MODAL_TYPE_TAB,
this.l10n.formatValueSync("contentanalysis-slow-agent-dialog-header"),
bodyMessage,
aBodyMessage,
Ci.nsIPromptService.BUTTON_POS_0 *
Ci.nsIPromptService.BUTTON_TITLE_CANCEL +
Ci.nsIPromptService.BUTTON_POS_1_DEFAULT +

9
toolkit/locales/en-US/toolkit/contentanalysis/contentanalysis.ftl
View File

@@ -15,6 +15,15 @@ contentanalysis-slow-agent-dialog-header = Scan in progress
contentanalysis-slow-agent-dialog-body-file = { $agent } is reviewing “{ $filename }” against your organization’s data policies. This may take a moment.
# Variables:
# $agent - The name of the DLP agent doing the analysis
# $filename - Name of a file being analyzed, such as "aFile.txt"
# $count (number) - The number of additional items in the request for analysis
contentanalysis-slow-agent-dialog-body-file-and-more =
{ $count ->
[one] { $agent } is reviewing “{ $filename }” and { $count } additional item against your organization’s data policies. This may take a moment.
*[other] { $agent } is reviewing “{ $filename }” and { $count } additional items against your organization’s data policies. This may take a moment.
}
# Variables:
# $agent - The name of the DLP agent doing the analysis
contentanalysis-slow-agent-dialog-body-clipboard = { $agent } is reviewing what you pasted against your organization’s data policies. This may take a moment.
# Note that this is shown when the user drag and drops text into the browser.
# Variables: