Skip to content

Commit 5eb4973

Browse files
nturinskiejizba
authored andcommitted
Fix getting templates when offline and clean up getting templates (#373)
1 parent b07f725 commit 5eb4973

File tree

6 files changed

+169
-180
lines changed

6 files changed

+169
-180
lines changed

src/constants.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ export const projectRuntimeSetting: string = 'projectRuntime';
1111
export const templateFilterSetting: string = 'templateFilter';
1212
export const deploySubpathSetting: string = 'deploySubpath';
1313
export const templateVersionSetting: string = 'templateVersion';
14+
export const v1ReleaseVersion: string = '1.0.12'; // known stable version
15+
export const betaReleaseVersion: string = '2.0.1-beta.25'; // known stable version
1416

1517
export enum ProjectLanguage {
1618
Bash = 'Bash',

src/extension.ts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,13 @@ import { restartFunctionApp } from './commands/restartFunctionApp';
3636
import { startFunctionApp } from './commands/startFunctionApp';
3737
import { stopFunctionApp } from './commands/stopFunctionApp';
3838
import { ext } from './extensionVariables';
39-
import { getTemplateDataFromBackup, tryGetLatestTemplateData, tryGetTemplateDataFromCache } from './templates/TemplateData';
39+
import { getTemplateData } from './templates/TemplateData';
4040
import { FunctionAppProvider } from './tree/FunctionAppProvider';
4141
import { FunctionAppTreeItem } from './tree/FunctionAppTreeItem';
4242
import { FunctionTreeItem } from './tree/FunctionTreeItem';
4343
import { ProxyTreeItem } from './tree/ProxyTreeItem';
4444
import { dotnetUtils } from './utils/dotnetUtils';
4545
import { functionRuntimeUtils } from './utils/functionRuntimeUtils';
46-
import { cliFeedJsonResponse, getCliFeedJson } from './utils/getCliFeedJson';
4746

4847
export function activate(context: vscode.ExtensionContext): void {
4948
let reporter: TelemetryReporter | undefined;
@@ -83,7 +82,7 @@ export function activate(context: vscode.ExtensionContext): void {
8382
await validateFunctionProjects(this, ui, outputChannel, event.added);
8483
});
8584

86-
const templateDataTask: Promise<void> = getTemplateData(reporter, context);
85+
const templateDataTask: Promise<void> = getTemplateDataTask(context);
8786

8887
actionHandler.registerCommand('azureFunctions.selectSubscriptions', () => vscode.commands.executeCommand('azure-account.selectSubscriptions'));
8988
actionHandler.registerCommand('azureFunctions.refresh', async (node?: IAzureNode) => await tree.refresh(node));
@@ -125,10 +124,8 @@ export function activate(context: vscode.ExtensionContext): void {
125124
});
126125
}
127126

128-
async function getTemplateData(reporter: TelemetryReporter | undefined, context: vscode.ExtensionContext): Promise<void> {
129-
const cliFeedJson: cliFeedJsonResponse = await getCliFeedJson();
130-
// tslint:disable-next-line:strict-boolean-expressions
131-
ext.templateData = await tryGetTemplateDataFromCache(reporter, context.globalState, cliFeedJson) || await tryGetLatestTemplateData(reporter, cliFeedJson, context.globalState) || await getTemplateDataFromBackup(reporter, cliFeedJson);
127+
async function getTemplateDataTask(context: vscode.ExtensionContext): Promise<void> {
128+
ext.templateData = await getTemplateData(context.globalState);
132129
}
133130

134131
// tslint:disable-next-line:no-empty

0 commit comments

Comments
 (0)