Skip to content

Don't show trust message for IW #13414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joyceerhl merged 2 commits into from
Aug 13, 2020
Merged

Don't show trust message for IW #13414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be1b443
Don't show trust message for IW
joyceerhl Aug 13, 2020
4e1a8df
Add a test to enforce no trust message on IW
joyceerhl Aug 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions src/datascience-ui/interactive-common/jupyterInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,15 @@ export class JupyterInfo extends React.Component<IJupyterInfoProps> {
}

private renderTrustMessage() {
return (
<TrustMessage
shouldShowTrustMessage={this.props.shouldShowTrustMessage}
isNotebookTrusted={this.props.isNotebookTrusted}
launchNotebookTrustPrompt={this.props.launchNotebookTrustPrompt}
/>
);
if (this.props.shouldShowTrustMessage) {
return (
<TrustMessage
shouldShowTrustMessage={this.props.shouldShowTrustMessage}
isNotebookTrusted={this.props.isNotebookTrusted}
launchNotebookTrustPrompt={this.props.launchNotebookTrustPrompt}
/>
);
}
}

private selectKernel() {
Expand Down
6 changes: 6 additions & 0 deletions src/test/datascience/interactivePanel.functional.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { CellState } from '../../client/datascience/types';
import { InteractiveCellComponent } from '../../datascience-ui/history-react/interactiveCell';
import { IInteractivePanelProps, InteractivePanel } from '../../datascience-ui/history-react/interactivePanel';
import { CursorPos, DebugState, ServerStatus } from '../../datascience-ui/interactive-common/mainState';
import { TrustMessage } from '../../datascience-ui/interactive-common/trustMessage';
import { noop } from '../core';
import { mountComponent } from './testHelpers';

Expand Down Expand Up @@ -133,4 +134,9 @@ suite('DataScience Interactive Panel', () => {

assert.equal(wrapper.find(InteractiveCellComponent).length, 0);
});
test('Trust message is not displayed', () => {
const wrapper = mountComponent('interactive', <InteractivePanel {...props}></InteractivePanel>);

assert.equal(wrapper.find(TrustMessage).length, 0);
});
Copy link
Author

@joyceerhl joyceerhl Aug 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ran this test locally before and after the fix, and this will fail without the changes made in jupyterInfo.tsx (and it passes now), so it's testing what it claims to.

});