Skip to content

Commit d226d31

Browse files
author
Vandita Patidar
committed
removing wwebview
1 parent 56bc627 commit d226d31

File tree

5 files changed

+16
-91
lines changed

5 files changed

+16
-91
lines changed

packages/core/src/awsService/appBuilder/serverlessLand/main.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ async function openReadmeFile(config: CreateServerlessLandWizardForm): Promise<v
115115
getLogger().warn('README.md file not found in the project directory')
116116
return
117117
}
118-
await new Promise((resolve) => setTimeout(resolve, 1000))
118+
await new Promise((resolve) => setTimeout(resolve, 2000))
119119

120120
await vscode.commands.executeCommand('workbench.action.focusFirstEditorGroup')
121121
await vscode.commands.executeCommand('markdown.showPreview', readmeUri)

packages/core/src/awsService/appBuilder/serverlessLand/metadataManager.ts

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ interface PatternData {
1818
implementation: Implementation[]
1919
}
2020

21-
interface PatternUrls {
22-
githubUrl: string
23-
previewUrl: string
24-
}
2521
export interface ProjectMetadata {
2622
patterns: Record<string, PatternData>
2723
}
@@ -119,22 +115,14 @@ export class MetadataManager {
119115
}))
120116
}
121117

122-
public getUrl(pattern: string): PatternUrls {
118+
public getUrl(pattern: string): string {
123119
const patternData = this.metadata?.patterns?.[pattern]
124120
if (!patternData || !patternData.implementation) {
125-
return {
126-
githubUrl: '',
127-
previewUrl: '',
128-
}
121+
return ''
129122
}
130123
const asset = patternData.implementation[0].assetName
131124

132-
return {
133-
// GitHub URL for the pattern
134-
githubUrl: `https://github.com/aws-samples/serverless-patterns/tree/main/${asset}`,
135-
// Serverless Land preview URL
136-
previewUrl: `https://serverlessland.com/patterns/${asset}`,
137-
}
125+
return `https://serverlessland.com/patterns/${asset}`
138126
}
139127

140128
/**

packages/core/src/awsService/appBuilder/serverlessLand/webViewManager.ts

Lines changed: 0 additions & 37 deletions
This file was deleted.

packages/core/src/awsService/appBuilder/serverlessLand/wizard.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,7 @@ function promptPattern(metadataManager: MetadataManager) {
3838
data: p.label,
3939
buttons: [
4040
{
41-
iconPath: new vscode.ThemeIcon('github'),
42-
tooltip: 'Open in GitHub',
43-
},
44-
{
45-
iconPath: new vscode.ThemeIcon('open-preview'),
41+
iconPath: new vscode.ThemeIcon('link-external'),
4642
tooltip: 'Open in Serverless Land',
4743
},
4844
],

packages/core/src/shared/ui/pickerPrompter.ts

Lines changed: 11 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import { assign, isAsyncIterable } from '../utilities/collectionUtils'
1313
import { recentlyUsed } from '../localizedText'
1414
import { getLogger } from '../logger/logger'
1515
import { MetadataManager } from '../../awsService/appBuilder/serverlessLand/metadataManager'
16-
import { WebviewService } from '../../awsService/appBuilder/serverlessLand/webViewManager'
1716

1817
const localize = nls.loadMessageBundle()
1918

@@ -144,42 +143,21 @@ export function createQuickPick<T>(
144143
const mergedOptions = { ...defaultQuickpickOptions, ...options }
145144
assign(mergedOptions, picker)
146145
picker.buttons = mergedOptions.buttons ?? []
147-
let serverlessPanel: vscode.WebviewPanel | undefined
148146

149147
picker.onDidTriggerItemButton(async (event) => {
150148
const metadataManager = MetadataManager.getInstance()
151-
if (event.button.tooltip === 'Open in GitHub' || event.button.tooltip === 'Open in Serverless Land') {
152-
const selectedPattern = event.item
153-
if (selectedPattern) {
154-
const patternUrl = metadataManager.getUrl(selectedPattern.label)
155-
if (patternUrl) {
156-
if (event.button.tooltip === 'Open in GitHub') {
157-
await vscode.env.openExternal(vscode.Uri.parse(patternUrl.githubUrl))
158-
} else if (event.button.tooltip === 'Open in Serverless Land') {
159-
if (!serverlessPanel) {
160-
serverlessPanel = vscode.window.createWebviewPanel(
161-
'serverlessLandPreview',
162-
`${selectedPattern.label}`,
163-
vscode.ViewColumn.One,
164-
{
165-
enableScripts: true,
166-
retainContextWhenHidden: true,
167-
enableCommandUris: false,
168-
enableFindWidget: true,
169-
}
170-
)
171-
serverlessPanel.onDidDispose(() => {
172-
serverlessPanel = undefined
173-
})
174-
} else {
175-
serverlessPanel.title = `${selectedPattern.label}`
176-
}
177-
serverlessPanel.webview.html = WebviewService.getWebviewContent(patternUrl.previewUrl)
178-
serverlessPanel.reveal()
179-
}
180-
}
181-
}
149+
if (event.button.tooltip !== 'Open in Serverless Land') {
150+
return
151+
}
152+
const selectedPattern = event.item
153+
if (!selectedPattern) {
154+
return
155+
}
156+
const patternUrl = metadataManager.getUrl(selectedPattern.label)
157+
if (!patternUrl) {
158+
return
182159
}
160+
await vscode.env.openExternal(vscode.Uri.parse(patternUrl))
183161
})
184162

185163
const prompter =

0 commit comments

Comments
 (0)