feat(lambda): web-view functionality and fixes for serverless land #6687
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Vandita2020
force-pushed
the
bug_bash_changes
branch
from
36dc419 to
1010f9c
Compare
| let createResult: Result = 'Succeeded' | ||
| let reason: string | undefined | ||
| let metadataManager: MetadataManager | ||
|
|
||
| try { | ||
| metadataManager = MetadataManager.getInstance() | ||
| // Launch the project creation wizard | ||
| const config = await launchProjectCreationWizard(extContext) | ||
| const config = await launchProjectCreationWizard(extContext, ctx) |
There was a problem hiding this comment.
you can just use globals.context instead of plumbing it through everywhere
| @@ -32,14 +32,14 @@ export const templateToOpenAppComposer = 'aws.toolkit.appComposer.templateToOpen | |||
| * IMPORTANT: Views that should work in all vscode environments (node or web) | |||
| * should be setup in {@link activateViewsShared}. | |||
| */ | |||
| export async function activate(context: ExtContext): Promise<void> { | |||
| export async function activate(context: ExtContext, ctx: vscode.ExtensionContext): Promise<void> { | |||
There was a problem hiding this comment.
Context should already have this
| @@ -36,15 +37,15 @@ const serverlessLandRepo = 'serverless-patterns' | |||
| * 5. Opens the README.md file if available | |||
| * 6. Handles errors and emits telemetry | |||
| */ | |||
| export async function createNewServerlessLandProject(extContext: ExtContext): Promise<void> { | |||
| export async function createNewServerlessLandProject(extContext: ExtContext, ctx: ExtensionContext): Promise<void> { | |||
There was a problem hiding this comment.
extContext should already have this ctx
| export class WebviewService { | ||
| constructor() {} | ||
|
|
||
| public static getWebviewContent(url: string) { |
There was a problem hiding this comment.
could you help to add a scrnshot for webview?
| @@ -142,6 +144,43 @@ export function createQuickPick<T>( | |||
| const mergedOptions = { ...defaultQuickpickOptions, ...options } | |||
| assign(mergedOptions, picker) | |||
| picker.buttons = mergedOptions.buttons ?? [] | |||
| let serverlessPanel: vscode.WebviewPanel | undefined | |||
|
|
|||
| picker.onDidTriggerItemButton(async (event) => { | |||
There was a problem hiding this comment.
consider something like this to avoid these if/else indents
picker.onDidTriggerItemButton(async (event) => {
const { button, item: selectedPattern } = event
const metadataManager = MetadataManager.getInstance()
// Early return if not handling GitHub or Serverless Land buttons
if (!['Open in GitHub', 'Open in Serverless Land'].includes(button.tooltip)) {
return
}
// Early return if no pattern is selected
if (!selectedPattern) {
return
}
const patternUrl = metadataManager.getUrl(selectedPattern.label)
if (!patternUrl) {
return
}
// Handle GitHub button click
if (button.tooltip === 'Open in GitHub') {
await vscode.env.openExternal(vscode.Uri.parse(patternUrl.githubUrl))
return
}
// Handle Serverless Land button click
if (!serverlessPanel) {
serverlessPanel = createServerlessPanel(selectedPattern.label)
} else {
serverlessPanel.title = selectedPattern.label
}
serverlessPanel.webview.html = WebviewService.getWebviewContent(patternUrl.previewUrl)
serverlessPanel.reveal()
})
| @@ -1327,24 +1327,29 @@ | |||
| "group": "1_account@3" | |||
| }, | |||
| { | |||
| "command": "aws.lambda.createNewSamApp", | |||
| "command": "aws.toolkit.lambda.createServerlessLandProject", | |||
There was a problem hiding this comment.
why changing all these? Seem you just need to add an entry for "aws.toolkit.lambda.createServerlessLandProject"
| 'serverlessLand', | ||
| 'metadata.json' | ||
| ), | ||
| destination: path.join('src', 'serverlessLand', 'metadata.json'), |
There was a problem hiding this comment.
it there a reason why we can't put this file directly in this destination?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
This PR adds the web view functionality for patterns. It addresses an issue with the
metadata.jsonfile path for the extension by specifying the path after the build step in thecopyFile.tsfile.Solution
feature/xbranches will not be squash-merged at release time.