Skip to content
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

Port surveys #4804

Merged
merged 3 commits into from
Feb 16, 2021
Merged

Port surveys #4804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a413a82
Refactor surveys and add a new one (#4794)
Feb 13, 2021
b1e9840
update changelog
Feb 13, 2021
70feea1
Fix IJupyterExtensionBanner service identifier (#4825)
joyceerhl Feb 16, 2021
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
3 changes: 0 additions & 3 deletions .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,6 @@ module.exports = {
'src/client/providers/referenceProvider.ts',
'src/client/providers/terminalProvider.ts',
'src/client/providers/signatureProvider.ts',
'src/client/activation/serviceRegistry.ts',
'src/client/activation/languageServer/manager.ts',
'src/client/activation/languageServer/languageServerExtension.ts',
'src/client/activation/languageServer/languageServerProxy.ts',
Expand Down Expand Up @@ -881,8 +880,6 @@ module.exports = {
'src/client/datascience/data-viewing/dataViewerMessageListener.ts',
'src/client/datascience/data-viewing/dataViewerDependencyService.ts',
'src/client/datascience/data-viewing/dataViewerFactory.ts',
'src/client/datascience/shiftEnterBanner.ts',
'src/client/datascience/dataScienceSurveyBanner.ts',
'src/client/datascience/webviews/webViewHost.ts',
'src/client/datascience/progress/progressReporter.ts',
'src/client/datascience/progress/messages.ts',
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
([#4550](https://github.com/Microsoft/vscode-jupyter/issues/4550))
1. Improved Tensor tooltips in Python files which have been run in the interactive window.
([#302](https://github.com/Microsoft/vscode-jupyter/issues/302))
1. Add do not show again option to the native notebook insiders survey banner.
([#4658](https://github.com/microsoft/vscode-jupyter/issues/4658))
1. Minimize number of icons on the notebook toolbar (put the rest in overflow).
([#4730](https://github.com/Microsoft/vscode-jupyter/issues/4730))
1. Add survey for the new Notebooks experience experiment.
([#4726](https://github.com/microsoft/vscode-jupyter/issues/4726))
Copy link
Contributor

Choose a reason for hiding this comment

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

I thought we already had a survey for native notebooks & #4726 was just an update to the uri.
Or am i mistaken?

Copy link
Author

Choose a reason for hiding this comment

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

Its a different survey, the old one is for native notebooks in insiders, this one is for the experiment. We want to have both.


### Fixes

Expand Down
9 changes: 3 additions & 6 deletions src/client/activation/serviceRegistry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

import { BANNER_NAME_DS_SURVEY, BANNER_NAME_INTERACTIVE_SHIFTENTER, IJupyterExtensionBanner } from '../common/types';
import { BANNER_NAME_INTERACTIVE_SHIFTENTER, IJupyterExtensionBanner, ISurveyBanner } from '../common/types';
import { DataScienceSurveyBanner } from '../datascience/dataScienceSurveyBanner';
import { RecommendPythonExtensionBanner } from '../datascience/recommendPythonExtensionBanner';
import { InteractiveShiftEnterBanner } from '../datascience/shiftEnterBanner';
Expand All @@ -18,11 +18,8 @@ export function registerTypes(serviceManager: IServiceManager) {
IExtensionActivationService,
MigrateDataScienceSettingsService
);
serviceManager.addSingleton<IJupyterExtensionBanner>(
IJupyterExtensionBanner,
DataScienceSurveyBanner,
BANNER_NAME_DS_SURVEY
);
serviceManager.addSingleton<ISurveyBanner>(ISurveyBanner, DataScienceSurveyBanner);
serviceManager.addBinding(ISurveyBanner, IExtensionSingleActivationService);
serviceManager.addSingleton<IJupyterExtensionBanner>(
IJupyterExtensionBanner,
InteractiveShiftEnterBanner,
Expand Down
10 changes: 7 additions & 3 deletions src/client/common/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ import {
Uri,
WorkspaceEdit
} from 'vscode';
import { IExtensionSingleActivationService } from '../activation/types';
import { BannerType } from '../datascience/dataScienceSurveyBanner';
import { LogLevel } from '../logging/levels';
import { CommandsWithoutArgs } from './application/commands';
import { Experiments } from './experiments/groups';
Expand Down Expand Up @@ -325,12 +327,14 @@ export interface IBrowserService {

export const IJupyterExtensionBanner = Symbol('IJupyterExtensionBanner');
export interface IJupyterExtensionBanner {
enabled: boolean;
showBanner(): Promise<void>;
isEnabled(type: BannerType): boolean;
showBanner(type: BannerType): Promise<void>;
}
export const BANNER_NAME_DS_SURVEY: string = 'DSSurveyBanner';
export const BANNER_NAME_INTERACTIVE_SHIFTENTER: string = 'InteractiveShiftEnterBanner';

export const ISurveyBanner = Symbol('ISurveyBanner');
export interface ISurveyBanner extends IExtensionSingleActivationService, IJupyterExtensionBanner {}

export type DeprecatedSettingAndValue = {
setting: string;
values?: {}[];
Expand Down
Loading