update trusted icons and make trusted icon appear on the editor title

.eslintrc.js

@@ -749,7 +749,6 @@ module.exports = {
         'src/client/common/utils/enum.ts',
         'src/client/common/utils/async.ts',
         'src/client/common/utils/text.ts',
-        'src/client/common/utils/localize.ts',
         'src/client/common/utils/regexp.ts',
         'src/client/common/utils/platform.ts',
         'src/client/common/utils/multiStepInput.ts',
@@ -792,7 +791,6 @@ module.exports = {
         'src/client/common/startPage/types.ts',
         'src/client/common/startPage/startPageMessageListener.ts',
         'src/client/common/application/customEditorService.ts',
-        'src/client/common/application/commands.ts',
         'src/client/common/application/applicationShell.ts',
         'src/client/common/application/languageService.ts',
         'src/client/common/application/notebook.ts',
@@ -1037,11 +1035,9 @@ module.exports = {
         'src/client/datascience/plotting/types.ts',
         'src/client/datascience/plotting/plotViewer.ts',
         'src/client/datascience/plotting/plotViewerProvider.ts',
-        'src/client/datascience/constants.ts',
         'src/client/datascience/monacoMessages.ts',
         'src/client/datascience/interactive-ipynb/nativeEditorRunByLineListener.ts',
         'src/client/datascience/interactive-ipynb/nativeEditorViewTracker.ts',
-        'src/client/datascience/interactive-ipynb/trustCommandHandler.ts',
         'src/client/datascience/interactive-ipynb/nativeEditorOldWebView.ts',
         'src/client/datascience/interactive-ipynb/nativeEditorSynchronizer.ts',
         'src/client/datascience/interactive-ipynb/nativeEditor.ts',

news/2 Fixes/4338.md

@@ -0,0 +1 @@
+Update trust icons.

news/2 Fixes/4339.md

@@ -0,0 +1 @@
+Display trusted icon when a notebook is trusted.

package.json

@@ -602,6 +602,16 @@
                 },
                 "enablement": "notebookViewType == jupyter-notebook && !jupyter.isnotebooktrusted && jupyter.trustfeatureenabled"
             },
+            {
+                "command": "jupyter.notebookeditor.trusted",
+                "title": "%DataScience.notebookIsTrusted%",
+                "category": "Jupyter",
+                "icon": {
+                    "light": "resources/light/trusted.svg",
+                    "dark": "resources/dark/trusted.svg"
+                },
+                "enablement": "false"
+            },
             {
                 "command": "jupyter.notebookeditor.runallcells",
                 "title": "%jupyter.command.jupyter.notebookeditor.runallcells.title%",
@@ -784,6 +794,12 @@
                     "group": "navigation@1",
                     "when": "resourceLangId == jupyter && notebookViewType == 'jupyter-notebook' && !jupyter.isnotebooktrusted && jupyter.trustfeatureenabled"
                 },
+                {
+                    "command": "jupyter.notebookeditor.trusted",
+                    "title": "%DataScience.notebookIsTrusted%",
+                    "group": "navigation@1",
+                    "when": "resourceLangId == jupyter && notebookViewType == 'jupyter-notebook' && jupyter.isnotebooktrusted && jupyter.trustfeatureenabled"
+                },
                 {
                     "command": "jupyter.notebookeditor.export",
                     "title": "%DataScience.notebookExportAs%",
@@ -1093,6 +1109,12 @@
                     "category": "Jupyter",
                     "when": "notebookEditorFocused && !jupyter.isnotebooktrusted && jupyter.trustfeatureenabled"
                 },
+                {
+                    "command": "jupyter.notebookeditor.trusted",
+                    "title": "%DataScience.notebookIsTrusted%",
+                    "category": "Jupyter",
+                    "when": "false"
+                },
                 {
                     "command": "jupyter.notebookeditor.runallcells",
                     "title": "%jupyter.command.jupyter.notebookeditor.runallcells.title%",

src/client/common/application/commands.ts

@@ -143,6 +143,7 @@ export interface ICommandNameArgumentTypeMapping extends ICommandNameWithoutArgu
     [DSCommands.LatestExtension]: [string];
     [DSCommands.EnableLoadingWidgetsFrom3rdPartySource]: [undefined | never];
     [DSCommands.TrustNotebook]: [undefined | never | Uri];
+    [DSCommands.NotebookTrusted]: [];
     [DSCommands.NotebookEditorExpandAllCells]: [];
     [DSCommands.NotebookEditorCollapseAllCells]: [];
     [DSCommands.CreateGitHubIssue]: [];

src/client/datascience/constants.ts

@@ -122,6 +122,7 @@ export namespace Commands {
     export const OpenNotebookNonCustomEditor = 'jupyter.notebookeditor.open';
     export const LatestExtension = 'jupyter.latestExtension';
     export const TrustNotebook = 'jupyter.notebookeditor.trust';
+    export const NotebookTrusted = 'jupyter.notebookeditor.trusted';
     export const EnableLoadingWidgetsFrom3rdPartySource = 'jupyter.enableLoadingWidgetScriptsFromThirdPartySource';
     export const NotebookEditorExpandAllCells = 'jupyter.notebookeditor.expandallcells';
     export const NotebookEditorCollapseAllCells = 'jupyter.notebookeditor.collapseallcells';

src/client/datascience/interactive-ipynb/trustCommandHandler.ts

@@ -41,6 +41,7 @@ export class TrustCommandHandler implements IExtensionSingleActivationService {
         const context = new ContextKey('jupyter.trustfeatureenabled', this.commandManager);
         context.set(true).ignoreErrors();
         this.disposables.push(this.commandManager.registerCommand(Commands.TrustNotebook, this.onTrustNotebook, this));
+        this.disposables.push(this.commandManager.registerCommand(Commands.NotebookTrusted, () => noop(), this));
     }
     @swallowExceptions('Trusting notebook')
     private async onTrustNotebook(uri?: Uri) {
@@ -64,7 +65,7 @@ export class TrustCommandHandler implements IExtensionSingleActivationService {
         traceInfo(`Displayed prompt to trust notebook & selected ${selection}`);
         switch (selection) {
             case DataScience.trustAllNotebooks():
-                commands.executeCommand('workbench.action.openSettings', 'jupyter.alwaysTrustNotebooks');
+                void commands.executeCommand('workbench.action.openSettings', 'jupyter.alwaysTrustNotebooks');
                 sendTelemetryEvent(Telemetry.TrustAllNotebooks);
                 break;
             case DataScience.trustNotebook():