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

Remove start page in favor of walkthrough #3248

Merged
merged 4 commits into from
Oct 4, 2021
Merged

Remove start page in favor of walkthrough #3248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
64c01cb
Remove start page in favor of walkthrough
bwateratmsft Sep 27, 2021
dfc2564
Unconditionally show walkthrough
bwateratmsft Sep 27, 2021
e3d7f9f
Slight simplification
bwateratmsft Sep 30, 2021
9d17a14
Put back help tree item
bwateratmsft Sep 30, 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
13 changes: 0 additions & 13 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 7 additions & 10 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"onCommand:vscode-docker.debugging.initializeForDebugging",
"onCommand:vscode-docker.help",
"onCommand:vscode-docker.help.reportIssue",
"onCommand:vscode-docker.help.openStartPage",
"onCommand:vscode-docker.help.openWalkthrough",
"onCommand:vscode-docker.images.build",
"onCommand:vscode-docker.images.configureExplorer",
"onCommand:vscode-docker.images.inspect",
Expand Down Expand Up @@ -225,6 +225,10 @@
{
"command": "vscode-docker.registries.azure.runFileAsTask",
"when": "isWorkspaceTrusted"
},
{
"command": "vscode-docker.help.openWalkthrough",
"when": "never"
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

There's already a VSCode command to open the walkthrough so I don't see a need for this to show in the palette.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

The only reason we need this command defined at all is because the tree view command can't provide an argument to workbench.action.openWalkthrough.

}
],
"editor/context": [
Expand Down Expand Up @@ -2299,11 +2303,6 @@
"type": "string",
"description": "%vscode-docker.config.docker.scaffolding.templatePath%"
},
"docker.showStartPage": {
"type": "boolean",
"default": true,
"description": "%vscode-docker.config.docker.showStartPage%"
},
"docker.dockerPath": {
"type": "string",
"default": "docker",
Expand Down Expand Up @@ -2745,8 +2744,8 @@
"category": "%vscode-docker.commands.category.docker%"
},
{
"command": "vscode-docker.help.openStartPage",
"title": "%vscode-docker.commands.help.openStartPage%",
"command": "vscode-docker.help.openWalkthrough",
"title": "%vscode-docker.commands.help.openWalkthrough%",
"category": "%vscode-docker.commands.category.docker%"
},
{
Expand Down Expand Up @@ -2838,7 +2837,6 @@
{
"id": "dockerStart",
"title": "%vscode-docker.walkthrough.dockerStart.title%",
"when": "never",
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This line makes the walkthrough no-longer-an-experiment.

"featuredFor": [
"Dockerfile",
"docker-compose.yml",
Expand Down Expand Up @@ -2997,7 +2995,6 @@
"@types/xml2js": "^0.4.8",
"@typescript-eslint/eslint-plugin": "^4.28.4",
"@typescript-eslint/parser": "^4.28.4",
"@vscode/codicons": "^0.0.22",
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Codicons package is no longer used.

"@vscode/test-electron": "^1.6.1",
"copy-webpack-plugin": "^9.0.1",
"eslint": "^7.24.0",
Expand Down
3 changes: 1 addition & 2 deletions package.nls.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@
"vscode-docker.config.docker.dockerComposeDetached": "Set to true to include --d (detached) option when docker-compose command is invoked",
"vscode-docker.config.docker.showRemoteWorkspaceWarning": "Set to true to prompt to switch from \"UI\" extension mode to \"Workspace\" extension mode if an operation is not supported in UI mode.",
"vscode-docker.config.docker.scaffolding.templatePath": "The path to use for scaffolding templates.",
"vscode-docker.config.docker.showStartPage": "Show the Docker extension Start Page when a new update is released.",
"vscode-docker.config.docker.dockerPath": "Absolute path to Docker client executable ('docker' command). If the path contains whitespace, it needs to be quoted appropriately.",
"vscode-docker.config.docker.enableDockerComposeLanguageService": "Whether or not to enable the preview Docker Compose Language Service. Changing requires restart to take effect.",
"vscode-docker.config.deprecated": "This setting has been deprecated and will be removed in a future release.",
Expand Down Expand Up @@ -225,7 +224,7 @@
"vscode-docker.commands.debugging.initializeForDebugging": "Initialize for Docker debugging",
"vscode-docker.commands.help": "Docker Help",
"vscode-docker.commands.help.reportIssue": "Report Issue",
"vscode-docker.commands.help.openStartPage": "Open Start Page",
"vscode-docker.commands.help.openWalkthrough": "Open Docker Extension Walkthrough",
"vscode-docker.commands.images.build": "Build Image...",
"vscode-docker.commands.images.configureExplorer": "Configure Explorer...",
"vscode-docker.commands.images.inspect": "Inspect",
Expand Down
212 changes: 0 additions & 212 deletions resources/startPage.html.template
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions src/commands/containers/inspectContainer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { IActionContext, openReadOnlyJson } from "vscode-azureextensionui";
import { ext } from "../../extensionVariables";
import { localize } from '../../localize';
import { ContainerTreeItem } from "../../tree/containers/ContainerTreeItem";
import { openStartPageAfterExtensionUpdate } from "../startPage/openStartPage";

export async function inspectContainer(context: IActionContext, node?: ContainerTreeItem): Promise<void> {
if (!node) {
Expand All @@ -19,6 +18,5 @@ export async function inspectContainer(context: IActionContext, node?: Container
}

const inspectInfo = await ext.dockerClient.inspectContainer(context, node.containerId);
await openStartPageAfterExtensionUpdate();
await openReadOnlyJson(node, inspectInfo);
}
2 changes: 0 additions & 2 deletions src/commands/images/inspectImage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { IActionContext, openReadOnlyJson } from "vscode-azureextensionui";
import { ext } from "../../extensionVariables";
import { localize } from '../../localize';
import { ImageTreeItem } from "../../tree/images/ImageTreeItem";
import { openStartPageAfterExtensionUpdate } from "../startPage/openStartPage";

export async function inspectImage(context: IActionContext, node?: ImageTreeItem): Promise<void> {
if (!node) {
Expand All @@ -19,6 +18,5 @@ export async function inspectImage(context: IActionContext, node?: ImageTreeItem
}

const inspectInfo = await ext.dockerClient.inspectImage(context, node.imageId);
await openStartPageAfterExtensionUpdate();
await openReadOnlyJson(node, inspectInfo);
}
3 changes: 0 additions & 3 deletions src/commands/installDocker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import * as vscode from 'vscode';
import { IActionContext } from 'vscode-azureextensionui';
import { isMac, isWindows } from '../utils/osUtils';
import { MacDockerInstaller, WindowsDockerInstaller } from './dockerInstaller';
import { openStartPageAfterExtensionUpdate } from './startPage/openStartPage';

export async function installDocker(context: IActionContext): Promise<void> {
if (isWindows()) {
Expand All @@ -17,6 +16,4 @@ export async function installDocker(context: IActionContext): Promise<void> {
} else {
await vscode.env.openExternal(vscode.Uri.parse('https://aka.ms/download-docker-linux-vscode'));
}

void openStartPageAfterExtensionUpdate();
}
Loading