From 461c26f976d9221845b6fcdbda22288483292488 Mon Sep 17 00:00:00 2001 From: Alexey Rodionov Date: Mon, 26 Jun 2017 12:46:22 -0700 Subject: [PATCH 01/21] Key and URL on Get Function URL tooltip do not match.Fixes #1489 --- .../src/app/function-dev/function-dev.component.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/AzureFunctions.AngularClient/src/app/function-dev/function-dev.component.ts b/AzureFunctions.AngularClient/src/app/function-dev/function-dev.component.ts index 2775f9f2d8..198d7a7664 100644 --- a/AzureFunctions.AngularClient/src/app/function-dev/function-dev.component.ts +++ b/AzureFunctions.AngularClient/src/app/function-dev/function-dev.component.ts @@ -612,7 +612,12 @@ export class FunctionDevComponent implements OnChanges, OnDestroy { } setShowFunctionInvokeUrlModal(value: boolean) { + var allKeys = this.functionKeys.keys.concat(this.hostKeys.keys); + if (allKeys) { + this.onChangeKey(allKeys[0].value); + } this.showFunctionInvokeUrlModal = value; + } setShowFunctionKeyModal(value: boolean) { From e9b66794139e6cf4a65f575da39e24cfde83e4d0 Mon Sep 17 00:00:00 2001 From: Alexey Rodionov Date: Tue, 27 Jun 2017 14:34:42 -0700 Subject: [PATCH 02/21] WebHooks UI needs to account for clientid requirement. Fixes #1490 --- .../function-dev/function-dev.component.html | 5 +-- .../function-dev/function-dev.component.ts | 40 ++++++++++++++----- .../src/app/shared/models/portal-resources.ts | 2 +- .../ResourcesPortal/Resources.Designer.cs | 9 ----- AzureFunctions/ResourcesPortal/Resources.resx | 3 -- 5 files changed, 34 insertions(+), 25 deletions(-) diff --git a/AzureFunctions.AngularClient/src/app/function-dev/function-dev.component.html b/AzureFunctions.AngularClient/src/app/function-dev/function-dev.component.html index 32779108ea..6693776a18 100644 --- a/AzureFunctions.AngularClient/src/app/function-dev/function-dev.component.html +++ b/AzureFunctions.AngularClient/src/app/function-dev/function-dev.component.html @@ -6,7 +6,7 @@ {{'keysDialog_getFunctionUrl' | translate}}
-
+
{{'keysDialog_key' | translate}}
-
{{'keysDialog_url' | translate}}
-
{{'keysDialog_urlAndAdminKey' | translate}}
+
{{'keysDialog_url' | translate}}
diff --git a/AzureFunctions.AngularClient/src/app/function-dev/function-dev.component.ts b/AzureFunctions.AngularClient/src/app/function-dev/function-dev.component.ts index 198d7a7664..3266685f4c 100644 --- a/AzureFunctions.AngularClient/src/app/function-dev/function-dev.component.ts +++ b/AzureFunctions.AngularClient/src/app/function-dev/function-dev.component.ts @@ -374,15 +374,37 @@ export class FunctionDevComponent implements OnChanges, OnDestroy { } private setFunctionInvokeUrl(key?: string) { if (this.isHttpFunction) { - var code = ''; - if (this.webHookType === 'github' || this.authLevel === 'anonymous') { - code = ''; - } else if (key) { - code = `?code=${key}`; + + //No webhook https://xxx.azurewebsites.net/api/HttpTriggerCSharp1?code=[keyvalue] + //WebhookType = "Generic JSON" https://xxx.azurewebsites.net/api/HttpTriggerCSharp1?code=[keyvalue]&clientId=[keyname] + //WebhookType = "GitHub" or "Slack" https://xxx.azurewebsites.net/api/HttpTriggerCSharp1?clientId=[keyname] + let code = ''; + let clientId = ''; + let queryParams = ''; + if (key) { + code = key; } else if (this.isHttpFunction && this.secrets && this.secrets.key) { - code = `?code=${this.secrets.key}`; + code = this.secrets.key; } else if (this.isHttpFunction && this.functionApp.HostSecrets && !this._isClientCertEnabled) { - code = `?code=${this.functionApp.HostSecrets}`; + code = this.functionApp.HostSecrets; + } + + if (this.webHookType && key) { + var allKeys = this.functionKeys.keys.concat(this.hostKeys.keys); + var keyWithValue = allKeys.find(k => k.value == key); + if (keyWithValue) { + clientId = keyWithValue.name; + } + + if (this.webHookType.toLowerCase() !== 'genericjson') { + code = ''; + } + } + if (code) { + queryParams = `?code=${code}`; + } + if (clientId) { + queryParams = queryParams ? `${queryParams}&clientId=${clientId}` : `?clientId=${clientId}`; } this.functionApp.getHostJson().subscribe((jsonObj) => { @@ -402,7 +424,7 @@ export class FunctionDevComponent implements OnChanges, OnDestroy { var find = '//'; var re = new RegExp(find, 'g'); path = path.replace(re, '/'); - path = path.replace('/?', '?') + code; + path = path.replace('/?', '?') + queryParams; this.functionInvokeUrl = this.functionApp.getMainSiteUrl() + path; this.runValid = true; @@ -613,7 +635,7 @@ export class FunctionDevComponent implements OnChanges, OnDestroy { setShowFunctionInvokeUrlModal(value: boolean) { var allKeys = this.functionKeys.keys.concat(this.hostKeys.keys); - if (allKeys) { + if (allKeys.length > 0) { this.onChangeKey(allKeys[0].value); } this.showFunctionInvokeUrlModal = value; diff --git a/AzureFunctions.AngularClient/src/app/shared/models/portal-resources.ts b/AzureFunctions.AngularClient/src/app/shared/models/portal-resources.ts index e7c2e51335..e0107ff165 100644 --- a/AzureFunctions.AngularClient/src/app/shared/models/portal-resources.ts +++ b/AzureFunctions.AngularClient/src/app/shared/models/portal-resources.ts @@ -532,7 +532,6 @@ export class PortalResources public static keysDialog_getFunctionUrl: string = "keysDialog_getFunctionUrl"; public static keysDialog_key: string = "keysDialog_key"; public static keysDialog_url: string = "keysDialog_url"; - public static keysDialog_urlAndAdminKey: string = "keysDialog_urlAndAdminKey"; public static downloadFunctionAppContent: string = "downloadFunctionAppContent"; public static functionKeys_renewConfirmation: string = "functionKeys_renewConfirmation"; public static emptyBrowse: string = "emptyBrowse"; @@ -581,6 +580,7 @@ export class PortalResources public static serviceBusPicker_serviceBus: string = "serviceBusPicker_serviceBus"; public static bindingInput_appSettingNotFound: string = "bindingInput_appSettingNotFound"; public static bindingInput_show: string = "bindingInput_show"; + public static appSettingPicker_add: string = "appSettingPicker_add"; public static download: string = "download"; public static downloadFunctionAppContent_includeAppSettings: string = "downloadFunctionAppContent_includeAppSettings"; public static downloadFunctionAppContent_includeAppSettingsHelp: string = "downloadFunctionAppContent_includeAppSettingsHelp"; diff --git a/AzureFunctions/ResourcesPortal/Resources.Designer.cs b/AzureFunctions/ResourcesPortal/Resources.Designer.cs index 32436e5fbd..62740fb301 100644 --- a/AzureFunctions/ResourcesPortal/Resources.Designer.cs +++ b/AzureFunctions/ResourcesPortal/Resources.Designer.cs @@ -3516,15 +3516,6 @@ internal static string keysDialog_url { } } - /// - /// Looks up a localized string similar to URL and admin key. - /// - internal static string keysDialog_urlAndAdminKey { - get { - return ResourceManager.GetString("keysDialog_urlAndAdminKey", resourceCulture); - } - } - /// /// Looks up a localized string similar to Location. /// diff --git a/AzureFunctions/ResourcesPortal/Resources.resx b/AzureFunctions/ResourcesPortal/Resources.resx index fb7083d92b..6a40ccc62a 100644 --- a/AzureFunctions/ResourcesPortal/Resources.resx +++ b/AzureFunctions/ResourcesPortal/Resources.resx @@ -1711,9 +1711,6 @@ Set to "External URL" to use an API definition that is hosted elsewhere. URL - - URL and admin key - Download app content From 0882fdfcb7a64f581f5a375aae1e2b7ca2fc1a3b Mon Sep 17 00:00:00 2001 From: Elliott Hamai Date: Wed, 28 Jun 2017 15:50:33 -0700 Subject: [PATCH 03/21] Added flighting to test different ways to open app-level features (#1514) * Adding dynamic tabs support * Added support to open features inplace under the "platform features" tab * Added type checking for query string values, and set nullable types based on feedback --- .../AzureFunctions.AngularClient.csproj | 1 - .../src/app/feature-group/feature-item.ts | 10 ++- .../src/app/shared/models/constants.ts | 21 +++-- .../models/localStorage/enabled-features.ts | 6 +- .../models/localStorage/local-storage.ts | 6 +- .../src/app/shared/models/portal-resources.ts | 2 + .../shared/services/local-storage.service.ts | 10 ++- .../function-runtime.component.ts | 48 +++++----- .../site-dashboard.component.html | 31 +++++-- .../site-dashboard.component.scss | 5 ++ .../site-dashboard.component.ts | 87 +++++++++++++++---- .../site-enabled-features.component.ts | 59 ++++++++++--- .../site-manage/site-manage.component.html | 22 +++-- .../site-manage/site-manage.component.scss | 12 +++ .../site/site-manage/site-manage.component.ts | 77 +++++++++++----- .../site-summary/site-summary.component.html | 2 +- .../site-summary/site-summary.component.ts | 41 +++++---- .../src/app/tab/tab.component.ts | 2 +- .../src/app/tabs/tabs.component.html | 14 ++- .../src/app/tabs/tabs.component.scss | 41 --------- .../src/app/tabs/tabs.component.ts | 10 ++- .../src/sass/common/_variables.scss | 1 + .../src/sass/controls/_tabs.scss | 81 ++++++++++++++++- AzureFunctions/ResourcesPortal/Resources.resx | 6 ++ 24 files changed, 419 insertions(+), 176 deletions(-) delete mode 100644 AzureFunctions.AngularClient/src/app/tabs/tabs.component.scss diff --git a/AzureFunctions.AngularClient/AzureFunctions.AngularClient.csproj b/AzureFunctions.AngularClient/AzureFunctions.AngularClient.csproj index 807a725ba5..8726aa97ac 100644 --- a/AzureFunctions.AngularClient/AzureFunctions.AngularClient.csproj +++ b/AzureFunctions.AngularClient/AzureFunctions.AngularClient.csproj @@ -194,7 +194,6 @@ - diff --git a/AzureFunctions.AngularClient/src/app/feature-group/feature-item.ts b/AzureFunctions.AngularClient/src/app/feature-group/feature-item.ts index 134b96de1a..b9912a140a 100644 --- a/AzureFunctions.AngularClient/src/app/feature-group/feature-item.ts +++ b/AzureFunctions.AngularClient/src/app/feature-group/feature-item.ts @@ -1,3 +1,4 @@ +import { SiteDashboardComponent } from './../site/site-dashboard/site-dashboard.component'; import { Subject } from 'rxjs/Subject'; import { Subscription as RxSubscription } from 'rxjs/Subscription'; @@ -157,13 +158,14 @@ export class TabFeature extends FeatureItem{ title : string, keywords : string, info : string, - public componentName : string, - public tabSub : Subject){ + imageUrl : string, + public featureId : string, + private _siteDashboard : SiteDashboardComponent){ - super(title, keywords, info); + super(title, keywords, info, imageUrl); } click(){ - this.tabSub.next(this.componentName.toLowerCase()); + this._siteDashboard.openFeature(this.featureId); } } diff --git a/AzureFunctions.AngularClient/src/app/shared/models/constants.ts b/AzureFunctions.AngularClient/src/app/shared/models/constants.ts index 73ea55ac03..2c467ae814 100644 --- a/AzureFunctions.AngularClient/src/app/shared/models/constants.ts +++ b/AzureFunctions.AngularClient/src/app/shared/models/constants.ts @@ -41,15 +41,16 @@ export class Constants { public static ReadOnlyMode = 'readOnly'.toLocaleLowerCase(); } +export type EnableTabFeature = 'tabs' | 'inplace' | null; + export class SiteTabIds{ - public static overview = "Overview"; - public static monitor = "Monitor"; - public static features = "Platform features"; - public static functionRuntime = "Settings"; - public static apiDefinition = "API Definition"; - public static troubleshoot = "Troubleshoot"; - public static deploymentSource = "Deployment Source"; - public static config = "Config"; + public static readonly overview = "overview"; + public static readonly monitor = "monitor"; + public static readonly features = "platformFeatures"; + public static readonly functionRuntime = "functionRuntimeSettings"; + public static readonly apiDefinition = "apiDefinition"; + public static readonly config = "config"; + public static readonly applicationSettings = "appSettings"; } export class Arm{ @@ -84,6 +85,10 @@ export class Links{ public static standaloneCreateLearnMore = "https://go.microsoft.com/fwlink/?linkid=848756"; } +export class LocalStorageKeys{ + public static readonly siteTabs = "/site/tabs" +} + export class Order { public static templateOrder: string[] = [ diff --git a/AzureFunctions.AngularClient/src/app/shared/models/localStorage/enabled-features.ts b/AzureFunctions.AngularClient/src/app/shared/models/localStorage/enabled-features.ts index 3c6466f664..cd3bb2ce18 100644 --- a/AzureFunctions.AngularClient/src/app/shared/models/localStorage/enabled-features.ts +++ b/AzureFunctions.AngularClient/src/app/shared/models/localStorage/enabled-features.ts @@ -12,7 +12,9 @@ export enum Feature{ ApiDefinition, WebJobs, SiteExtensions, - AppInsight + AppInsight, + FunctionSettings, + AppSettings } export interface EnabledFeatures extends StorageItem{ @@ -25,7 +27,7 @@ export interface EnabledFeature{ } export interface EnabledFeatureItem extends EnabledFeature{ - componentName? : string; + featureId? : string; bladeInfo? : OpenBladeInfo; iconUrl : string; } diff --git a/AzureFunctions.AngularClient/src/app/shared/models/localStorage/local-storage.ts b/AzureFunctions.AngularClient/src/app/shared/models/localStorage/local-storage.ts index 6738f4c7c7..ed68cfe870 100644 --- a/AzureFunctions.AngularClient/src/app/shared/models/localStorage/local-storage.ts +++ b/AzureFunctions.AngularClient/src/app/shared/models/localStorage/local-storage.ts @@ -11,4 +11,8 @@ export interface StoredSubscriptions extends StorageItem{ export interface QuickstartSettings extends StorageItem{ disabled : boolean; -} \ No newline at end of file +} + +export interface TabSettings extends StorageItem{ + dynamicTabId : string; +} \ No newline at end of file diff --git a/AzureFunctions.AngularClient/src/app/shared/models/portal-resources.ts b/AzureFunctions.AngularClient/src/app/shared/models/portal-resources.ts index e0107ff165..c5d85121f4 100644 --- a/AzureFunctions.AngularClient/src/app/shared/models/portal-resources.ts +++ b/AzureFunctions.AngularClient/src/app/shared/models/portal-resources.ts @@ -369,6 +369,7 @@ export class PortalResources public static feature_backupsInfo: string = "feature_backupsInfo"; public static feature_allSettingsName: string = "feature_allSettingsName"; public static feature_allSettingsInfo: string = "feature_allSettingsInfo"; + public static feature_functionSettingsInfo: string = "feature_functionSettingsInfo"; public static feature_generalSettings: string = "feature_generalSettings"; public static feature_codeDeployment: string = "feature_codeDeployment"; public static feature_developmentTools: string = "feature_developmentTools"; @@ -421,6 +422,7 @@ export class PortalResources public static tab_overview: string = "tab_overview"; public static tab_features: string = "tab_features"; public static tab_settings: string = "tab_settings"; + public static tab_functionSettings: string = "tab_functionSettings"; public static tab_configuration: string = "tab_configuration"; public static try_appDisabled: string = "try_appDisabled"; public static template: string = "template"; diff --git a/AzureFunctions.AngularClient/src/app/shared/services/local-storage.service.ts b/AzureFunctions.AngularClient/src/app/shared/services/local-storage.service.ts index a2e0de9178..dec41d00c5 100644 --- a/AzureFunctions.AngularClient/src/app/shared/services/local-storage.service.ts +++ b/AzureFunctions.AngularClient/src/app/shared/services/local-storage.service.ts @@ -1,3 +1,4 @@ +import { LocalStorageKeys } from './../models/constants'; import { PortalService } from './portal.service'; import {LogEntryLevel} from '../models/portal'; import {Injectable, EventEmitter} from '@angular/core'; @@ -6,7 +7,7 @@ import {EnabledFeature, Feature} from '../models/localStorage/enabled-features'; @Injectable() export class LocalStorageService { - private _apiVersion = "2017-02-01"; + private _apiVersion = "2017-06-01"; private _apiVersionKey = "appsvc-api-version"; constructor(private _portalService : PortalService){ @@ -14,6 +15,9 @@ export class LocalStorageService { if(!apiVersion || apiVersion !== this._apiVersion){ this._resetStorage(); } + + // Ensures that saving tab state should only happen per-session + localStorage.removeItem(LocalStorageKeys.siteTabs); } getItem(key : string) : StorageItem{ @@ -38,6 +42,10 @@ export class LocalStorageService { } } + removeItem(key : string){ + localStorage.removeItem(key); + } + private _resetStorage(){ localStorage.clear(); localStorage.setItem(this._apiVersionKey, this._apiVersion); diff --git a/AzureFunctions.AngularClient/src/app/site/function-runtime/function-runtime.component.ts b/AzureFunctions.AngularClient/src/app/site/function-runtime/function-runtime.component.ts index 4adf5a75bc..cbf4f7ee0b 100644 --- a/AzureFunctions.AngularClient/src/app/site/function-runtime/function-runtime.component.ts +++ b/AzureFunctions.AngularClient/src/app/site/function-runtime/function-runtime.component.ts @@ -1,3 +1,5 @@ +import { TabsComponent } from './../../tabs/tabs.component'; +import { BusyStateComponent } from './../../busy-state/busy-state.component'; import { EditModeHelper } from './../../shared/Utilities/edit-mode.helper'; import { Component, Input, EventEmitter, OnInit, OnDestroy } from '@angular/core'; import { Response } from '@angular/http'; @@ -76,6 +78,7 @@ export class FunctionRuntimeComponent implements OnDestroy { public slotsEnabled: boolean; private slotsValueChange: Subject; private _numSlots: number = 0; + private _busyState : BusyStateComponent; constructor( private _armService: ArmService, @@ -86,14 +89,17 @@ export class FunctionRuntimeComponent implements OnDestroy { private _globalStateService: GlobalStateService, private _aiService: AiService, private _translateService: TranslateService, - private _slotsService: SlotsService + private _slotsService: SlotsService, + tabsComponent : TabsComponent ) { + this._busyState = tabsComponent.busyState; + this.showTryView = this._globalStateService.showTryView; this._viewInfoSub = this._viewInfoStream .switchMap(viewInfo => { this._viewInfo = viewInfo; - this._globalStateService.setBusyState(); + this._busyState.setBusyState(); this._appNode = (viewInfo.node); @@ -167,7 +173,7 @@ export class FunctionRuntimeComponent implements OnDestroy { } else { this.functionAppEditMode = true; } - this._globalStateService.clearBusyState(); + this._busyState.clearBusyState(); let traceKey = this._viewInfo.data.siteTraceKey; this._aiService.stopTrace('/site/function-runtime-tab-ready', traceKey); @@ -210,7 +216,7 @@ export class FunctionRuntimeComponent implements OnDestroy { this.proxySettingValueStream = new Subject(); this.proxySettingValueStream .subscribe((value: boolean) => { - this._globalStateService.setBusyState(); + this._busyState.setBusyState(); let appSettingValue: string = value ? Constants.routingExtensionVersion : Constants.disabled; this._cacheService.postArm(`${this.site.id}/config/appsettings/list`, true) @@ -222,7 +228,7 @@ export class FunctionRuntimeComponent implements OnDestroy { this.apiProxiesEnabled = value; this.needUpdateRoutingExtensionVersion = false; this.routingExtensionVersion = Constants.routingExtensionVersion; - this._globalStateService.clearBusyState(); + this._busyState.clearBusyState(); this._cacheService.clearArmIdCachePrefix(this.site.id); }); }); @@ -231,7 +237,7 @@ export class FunctionRuntimeComponent implements OnDestroy { this.functionEditModeValueStream .switchMap(state => { let originalState = this.functionAppEditMode; - this._globalStateService.setBusyState(); + this._busyState.setBusyState(); this.functionAppEditMode = state; let appSetting = this.functionAppEditMode ? Constants.ReadWriteMode : Constants.ReadOnlyMode; return this._cacheService.postArm(`${this.site.id}/config/appsettings/list`, true) @@ -244,7 +250,7 @@ export class FunctionRuntimeComponent implements OnDestroy { }) .do(null, originalState => { this.functionAppEditMode = originalState; - this._globalStateService.clearBusyState(); + this._busyState.clearBusyState(); this._broadcastService.broadcast(BroadcastEvent.Error, { message: this._translateService.instant(PortalResources.error_unableToUpdateFunctionAppEditMode), errorType: ErrorType.ApiError, @@ -257,26 +263,26 @@ export class FunctionRuntimeComponent implements OnDestroy { // getFunctionAppEditMode returns a subject and updates it on demand. .mergeMap(_ => this.functionApp.getFunctionAppEditMode()) .subscribe(fi => { - this._globalStateService.clearBusyState(); + this._busyState.clearBusyState(); }); this.slotsValueChange = new Subject(); this.slotsValueChange.subscribe((value: boolean) => { - this._globalStateService.setBusyState(); + this._busyState.setBusyState(); let slotsSettingsValue: string = value ? Constants.slotsSecretStorageSettingsValue : Constants.disabled; this._cacheService.postArm(`${this.site.id}/config/appsettings/list`, true) .mergeMap(r => { return this._slotsService.setStatusOfSlotOptIn(this.site, r.json(), slotsSettingsValue); }) .do(null, e => { - this._globalStateService.clearBusyState(); + this._busyState.clearBusyState(); this._aiService.trackException(e, 'function-runtime') }) .retry() .subscribe(r => { this.functionApp.fireSyncTrigger(); this.slotsEnabled = value; - this._globalStateService.clearBusyState(); + this._busyState.clearBusyState(); this._cacheService.clearArmIdCachePrefix(this.site.id); }); }); @@ -302,9 +308,9 @@ export class FunctionRuntimeComponent implements OnDestroy { } saveMemorySize(value: string | number) { - this._globalStateService.setBusyState(); + this._busyState.setBusyState(); this._updateMemorySize(this.site, value) - .subscribe(r => { this._globalStateService.clearBusyState(); Object.assign(this.site, r); this.dirty = false; }); + .subscribe(r => { this._busyState.clearBusyState(); Object.assign(this.site, r); this.dirty = false; }); } isIE(): boolean { @@ -313,14 +319,14 @@ export class FunctionRuntimeComponent implements OnDestroy { updateVersion() { this._aiService.trackEvent('/actions/app_settings/update_version'); - this._globalStateService.setBusyState(); + this._busyState.setBusyState(); this._cacheService.postArm(`${this.site.id}/config/appsettings/list`, true) .mergeMap(r => { return this._updateContainerVersion(this.site, r.json()); }) .subscribe(r => { this.needUpdateExtensionVersion = false; - this._globalStateService.clearBusyState(); + this._busyState.clearBusyState(); this._cacheService.clearArmIdCachePrefix(this.site.id); this._appNode.clearNotification(NotificationIds.newRuntimeVersion); }); @@ -328,7 +334,7 @@ export class FunctionRuntimeComponent implements OnDestroy { updateRoutingExtensionVersion() { this._aiService.trackEvent('/actions/app_settings/update_routing_version'); - this._globalStateService.setBusyState(); + this._busyState.setBusyState(); this._cacheService.postArm(`${this.site.id}/config/appsettings/list`, true) .mergeMap(r => { @@ -336,7 +342,7 @@ export class FunctionRuntimeComponent implements OnDestroy { }) .subscribe(r => { this.needUpdateRoutingExtensionVersion = false; - this._globalStateService.clearBusyState(); + this._busyState.clearBusyState(); this._cacheService.clearArmIdCachePrefix(this.site.id); }); } @@ -347,28 +353,28 @@ export class FunctionRuntimeComponent implements OnDestroy { let dailyMemoryTimeQuota = +this.dailyMemoryTimeQuota; if (dailyMemoryTimeQuota > 0) { - this._globalStateService.setBusyState(); + this._busyState.setBusyState(); this._updateDailyMemory(this.site, dailyMemoryTimeQuota).subscribe((r) => { var site = r.json(); this.showDailyMemoryWarning = (!site.properties.enabled && site.properties.siteDisabledReason === 1); this.showDailyMemoryInfo = true; this.site.properties.dailyMemoryTimeQuota = dailyMemoryTimeQuota; this.dailyMemoryTimeQuotaOriginal = this.dailyMemoryTimeQuota; - this._globalStateService.clearBusyState(); + this._busyState.clearBusyState(); }); } } } removeQuota() { - this._globalStateService.setBusyState(); + this._busyState.setBusyState(); this._updateDailyMemory(this.site, 0).subscribe(() => { this.showDailyMemoryInfo = false; this.showDailyMemoryWarning = false; this.dailyMemoryTimeQuota = ''; this.dailyMemoryTimeQuotaOriginal = this.dailyMemoryTimeQuota; this.site.properties.dailyMemoryTimeQuota = 0; - this._globalStateService.clearBusyState(); + this._busyState.clearBusyState(); }); } diff --git a/AzureFunctions.AngularClient/src/app/site/site-dashboard/site-dashboard.component.html b/AzureFunctions.AngularClient/src/app/site/site-dashboard/site-dashboard.component.html index a9bb5fe626..d8f23d017b 100644 --- a/AzureFunctions.AngularClient/src/app/site/site-dashboard/site-dashboard.component.html +++ b/AzureFunctions.AngularClient/src/app/site/site-dashboard/site-dashboard.component.html @@ -2,23 +2,40 @@ - + - + - + + - + + + + + + - + + diff --git a/AzureFunctions.AngularClient/src/app/site/site-dashboard/site-dashboard.component.scss b/AzureFunctions.AngularClient/src/app/site/site-dashboard/site-dashboard.component.scss index da81d5fd7a..db97545404 100644 --- a/AzureFunctions.AngularClient/src/app/site/site-dashboard/site-dashboard.component.scss +++ b/AzureFunctions.AngularClient/src/app/site/site-dashboard/site-dashboard.component.scss @@ -1,5 +1,10 @@ @import '../../../sass/main'; +#site-dashboard-container{ + padding-top: 5px; + background-color: $chrome-color; +} + #site-dashboard-pin{ display: inline-block; height: 14px; diff --git a/AzureFunctions.AngularClient/src/app/site/site-dashboard/site-dashboard.component.ts b/AzureFunctions.AngularClient/src/app/site/site-dashboard/site-dashboard.component.ts index d8eff61802..c910c554e0 100644 --- a/AzureFunctions.AngularClient/src/app/site/site-dashboard/site-dashboard.component.ts +++ b/AzureFunctions.AngularClient/src/app/site/site-dashboard/site-dashboard.component.ts @@ -1,7 +1,10 @@ +import { Url } from './../../shared/Utilities/url'; +import { LocalStorageService } from './../../shared/services/local-storage.service'; import { Component, OnInit, EventEmitter, Input, ViewChild } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { Observable } from 'rxjs/Observable'; import { Subject } from 'rxjs/Subject'; +import { ReplaySubject } from 'rxjs/ReplaySubject'; import 'rxjs/add/operator/do'; import 'rxjs/add/operator/retry'; import 'rxjs/add/operator/switchMap'; @@ -12,7 +15,7 @@ import { ConfigService } from './../../shared/services/config.service'; import { PortalService } from './../../shared/services/portal.service'; import { PortalResources } from './../../shared/models/portal-resources'; import { AiService } from './../../shared/services/ai.service'; -import { SiteTabIds } from './../../shared/models/constants'; +import { SiteTabIds, LocalStorageKeys, EnableTabFeature } from './../../shared/models/constants'; import { AppNode } from './../../tree-view/app-node'; import {TabsComponent} from '../../tabs/tabs.component'; import {TabComponent} from '../../tab/tab.component'; @@ -24,6 +27,7 @@ import {Descriptor, SiteDescriptor} from '../../shared/resourceDescriptors'; import {ArmObj} from '../../shared/models/arm/arm-obj'; import { Site } from '../../shared/models/arm/site'; import { PartSize } from '../../shared/models/portal'; +import { TabSettings } from './../../shared/models/localStorage/local-storage'; @Component({ selector: 'site-dashboard', @@ -36,13 +40,16 @@ export class SiteDashboardComponent { @ViewChild(TabsComponent) tabs : TabsComponent; public selectedTabId: string = SiteTabIds.overview; + public dynamicTabId: string | null = null; public site : ArmObj; public viewInfoStream : Subject; public viewInfo : TreeViewInfo; public TabIds = SiteTabIds; public Resources = PortalResources; - public activeComponent = ""; public isStandalone = false; + public tabsFeature: EnableTabFeature; + public openFeatureId = new ReplaySubject(1); + private _prevFeatureId : string; private _tabsLoaded = false; private _traceOnTabSelection = false; @@ -53,9 +60,11 @@ export class SiteDashboardComponent { private _aiService : AiService, private _portalService: PortalService, private _translateService : TranslateService, - private _configService : ConfigService) { + private _configService : ConfigService, + private _storageService : LocalStorageService) { this.isStandalone = _configService.isStandalone(); + this.tabsFeature = Url.getParameterByName(window.location.href, "appsvc.feature.tabs"); this.viewInfoStream = new Subject(); this.viewInfoStream @@ -107,14 +116,21 @@ export class SiteDashboardComponent { // time the component is loaded. setTimeout(() =>{ let appNode = this.viewInfo.node; - if(appNode.openFunctionSettingsTab && this.tabs && this.tabs.tabs){ - let tabs = this.tabs.tabs.toArray(); - let functionTab = tabs.find(t => t.title === SiteTabIds.functionRuntime); - if(functionTab){ - this.tabs.selectTab(functionTab); - } + if(this.tabs && this.tabs.tabs){ + + let savedTabInfo = this._storageService.getItem(LocalStorageKeys.siteTabs); + if(appNode.openFunctionSettingsTab){ + let tabs = this.tabs.tabs.toArray(); + let functionTab = tabs.find(t => t.title === SiteTabIds.functionRuntime); + if(functionTab){ + this.tabs.selectTab(functionTab); + } - appNode.openFunctionSettingsTab = false; + appNode.openFunctionSettingsTab = false; + } + else if(savedTabInfo){ + this.dynamicTabId = savedTabInfo.dynamicTabId; + } } }, 100); @@ -133,21 +149,54 @@ export class SiteDashboardComponent { this._tabsLoaded = true; this._traceOnTabSelection = true; + this._prevFeatureId = this.selectedTabId; this.selectedTabId = selectedTab.id; } - onTabClosed(closedTab: TabComponent){ - // For now only support a single dynamic tab - this.activeComponent = ""; + closeDynamicTab(tabId : string){ + let prevFeatureId = this.dynamicTabId === this.selectedTabId ? this._prevFeatureId : null; + this.dynamicTabId = null; + this._storageService.removeItem(LocalStorageKeys.siteTabs); + if(prevFeatureId){ + this.tabs.selectTabId(this._prevFeatureId); + } + + this._prevFeatureId = null; } - openTab(component : string){ - this.activeComponent = component; + openFeature(featureId : string){ + + if(this.tabsFeature === 'tabs'){ + this._prevFeatureId = this.selectedTabId; + + this.dynamicTabId = featureId; + let tabSettings = { + id : LocalStorageKeys.siteTabs, + dynamicTabId : this.dynamicTabId + }; + + this._storageService.setItem(LocalStorageKeys.siteTabs, tabSettings); - setTimeout(() =>{ - let tabs = this.tabs.tabs.toArray(); - this.tabs.selectTab(tabs[tabs.length-1]); - }, 100); + setTimeout(() =>{ + this.tabs.selectTabId(featureId); + }, 100); + + } + else if(this.tabsFeature === 'inplace'){ + if(featureId){ + this.tabs.selectTabId(SiteTabIds.features); + } + else{ + this.tabs.selectTabId(this._prevFeatureId); + } + + setTimeout(() =>{ + this.openFeatureId.next(featureId); + }, 100) + } + else{ + this.tabs.selectTabId(featureId); + } } pinPart(){ diff --git a/AzureFunctions.AngularClient/src/app/site/site-enabled-features/site-enabled-features.component.ts b/AzureFunctions.AngularClient/src/app/site/site-enabled-features/site-enabled-features.component.ts index edef8cffa4..19a8e73e58 100644 --- a/AzureFunctions.AngularClient/src/app/site/site-enabled-features/site-enabled-features.component.ts +++ b/AzureFunctions.AngularClient/src/app/site/site-enabled-features/site-enabled-features.component.ts @@ -1,3 +1,6 @@ +import { SiteDashboardComponent } from './../site-dashboard/site-dashboard.component'; +import { SiteTabIds } from './../../shared/models/constants'; +import { Url } from './../../shared/Utilities/url'; import {Component, OnInit, EventEmitter, Input, Output} from '@angular/core'; import { Observable } from 'rxjs/Observable'; import { Subject } from 'rxjs/Subject'; @@ -36,7 +39,6 @@ interface EnabledFeatureMap{ templateUrl: './site-enabled-features.component.html', styleUrls: ['./site-enabled-features.component.scss'], inputs: ['siteInput'], - outputs: ['componentName'] }) // First load list of enabled features from localStorage @@ -46,7 +48,6 @@ export class SiteEnabledFeaturesComponent { public featureItems : EnabledFeatureItem[] = []; public isLoading : boolean; - public componentName = new Subject(); private _site : ArmObj; private _siteSubject = new Subject>(); @@ -59,7 +60,8 @@ export class SiteEnabledFeaturesComponent { private _authZService : AuthzService, private _aiService : AiService, private _translateService : TranslateService, - private _globalStateService : GlobalStateService) { + private _globalStateService : GlobalStateService, + private _siteDashboard : SiteDashboardComponent) { this._siteSubject .distinctUntilChanged() @@ -93,6 +95,9 @@ export class SiteEnabledFeaturesComponent { this.isLoading = false; this._copyCachedFeaturesToF1(storageItem); } + else{ + this._addDefaultItems(this.featureItems); + } return Observable.zip( this._getConfigFeatures(r.site), @@ -114,6 +119,10 @@ export class SiteEnabledFeaturesComponent { this.isLoading = false; let latestFeatureItems : EnabledFeatureItem[] = []; + + // Need to add default items to latest otherwise they'll be removed from featureItems during merge. + this._addDefaultItems(latestFeatureItems); + results.forEach(result =>{ if(result && result.length > 0){ result.forEach(featureItem =>{ @@ -126,7 +135,7 @@ export class SiteEnabledFeaturesComponent { this._mergeFeaturesIntoF1(this.featureItems, latestFeatureItems); this._saveFeatures(this.featureItems); - }) + }); } set siteInput(site : ArmObj){ @@ -138,8 +147,8 @@ export class SiteEnabledFeaturesComponent { } openFeature(feature : EnabledFeatureItem){ - if(feature.componentName){ - this.componentName.next(feature.componentName); + if(feature.featureId){ + this._siteDashboard.openFeature(feature.featureId); } else if(feature.bladeInfo){ this._portalService.openBlade(feature.bladeInfo, "site-enabled-features"); @@ -180,9 +189,37 @@ export class SiteEnabledFeaturesComponent { }) } + private _addDefaultItems(features : EnabledFeature[]){ + let functionSettings = this._getEnabledFeatureItem(Feature.FunctionSettings); + let appSettings = this._getEnabledFeatureItem(Feature.AppSettings); + features.splice(0, 0, functionSettings, appSettings); + } + private _getEnabledFeatureItem(feature : Feature, ...args: any[]) : EnabledFeatureItem{ + let tabsFeature = Url.getParameterByName(window.location.href, "appsvc.feature.tabs"); switch (feature) { + case Feature.FunctionSettings: + return { + title: this._translateService.instant(tabsFeature ? PortalResources.tab_functionSettings : PortalResources.tab_settings), + feature: feature, + iconUrl: "images/Functions.svg", + featureId: SiteTabIds.functionRuntime + } + + case Feature.AppSettings: + return { + title: this._translateService.instant(PortalResources.feature_applicationSettingsName), + feature: feature, + bladeInfo: { + detailBlade : "WebsiteConfigSiteSettings", + detailBladeInputs : { + resourceUri : this._descriptor.resourceId, + } + }, + iconUrl: "images/application-settings.svg" + } + case Feature.AppInsight: return { title: this._translateService.instant(PortalResources.featureEnabled_appInsights), @@ -269,12 +306,7 @@ export class SiteEnabledFeaturesComponent { title : this._translateService.instant(PortalResources.feature_apiDefinitionName), feature : feature, iconUrl : "images/api-definition.svg", - bladeInfo : { - detailBlade : "ApiDefinition", - detailBladeInputs : { - resourceUri : this._site.id, - } - } + featureId: SiteTabIds.apiDefinition } case Feature.WebJobs: @@ -329,7 +361,8 @@ export class SiteEnabledFeaturesComponent { this._storageService.setItem(item.id, item); } - private _mergeFeaturesIntoF1(featureItems1 : EnabledFeatureItem[], + private _mergeFeaturesIntoF1( + featureItems1 : EnabledFeatureItem[], featureItems2: EnabledFeatureItem[]){ let removeFeatures : EnabledFeatureItem[] = []; diff --git a/AzureFunctions.AngularClient/src/app/site/site-manage/site-manage.component.html b/AzureFunctions.AngularClient/src/app/site/site-manage/site-manage.component.html index 510952beb4..607eecb212 100644 --- a/AzureFunctions.AngularClient/src/app/site/site-manage/site-manage.component.html +++ b/AzureFunctions.AngularClient/src/app/site/site-manage/site-manage.component.html @@ -1,4 +1,4 @@ -
+
+
- +
@@ -29,7 +28,18 @@
-
-
\ No newline at end of file + + +
+
+
+ + Function runtime settings + API definition +
+ + +
+
diff --git a/AzureFunctions.AngularClient/src/app/site/site-manage/site-manage.component.scss b/AzureFunctions.AngularClient/src/app/site/site-manage/site-manage.component.scss index 20d5bf0616..5ef7ef0936 100644 --- a/AzureFunctions.AngularClient/src/app/site/site-manage/site-manage.component.scss +++ b/AzureFunctions.AngularClient/src/app/site/site-manage/site-manage.component.scss @@ -34,4 +34,16 @@ .site-manage-feature-group{ margin: 25px 0px 30px 0px; +} + +#back-bar{ + background-color: $back-bar-color; + height: 40px; + font-size: 18px; + padding: 7px; + + i{ + margin-left: 15px; + margin-right: 5px; + } } \ No newline at end of file diff --git a/AzureFunctions.AngularClient/src/app/site/site-manage/site-manage.component.ts b/AzureFunctions.AngularClient/src/app/site/site-manage/site-manage.component.ts index 0cf079620b..8e44cb6a13 100644 --- a/AzureFunctions.AngularClient/src/app/site/site-manage/site-manage.component.ts +++ b/AzureFunctions.AngularClient/src/app/site/site-manage/site-manage.component.ts @@ -1,3 +1,7 @@ +import { Subscription as RxSubscription } from 'rxjs/Subscription'; +import { SiteDashboardComponent } from './../site-dashboard/site-dashboard.component'; +import { Url } from './../../shared/Utilities/url'; +import { SiteTabIds } from './../../shared/models/constants'; import {Component, OnInit, EventEmitter, Input, Output} from '@angular/core'; import { Observable } from 'rxjs/Observable'; import { Subject } from 'rxjs/Subject'; @@ -6,14 +10,13 @@ import 'rxjs/add/operator/retry'; import 'rxjs/add/operator/switchMap'; import 'rxjs/add/observable/zip'; import { TranslateService } from '@ngx-translate/core'; - import { PortalResources } from './../../shared/models/portal-resources'; import { GlobalStateService } from './../../shared/services/global-state.service'; import { CacheService } from './../../shared/services/cache.service'; import { TreeViewInfo } from './../../tree-view/models/tree-view-info'; import { AiService } from './../../shared/services/ai.service'; import { Message } from './../../shared/models/portal'; -import { DisableableBladeFeature, DisableableFeature, DisableInfo } from './../../feature-group/feature-item'; +import { DisableableBladeFeature, DisableableFeature, DisableInfo, TabFeature, FeatureItem, BladeFeature, OpenBrowserWindowFeature} from './../../feature-group/feature-item'; import { FeatureGroup } from './../../feature-group/feature-group'; import {ArmService} from '../../shared/services/arm.service'; import {AuthzService} from '../../shared/services/authz.service'; @@ -23,7 +26,6 @@ import {ArmObj} from '../../shared/models/arm/arm-obj'; import {SiteDescriptor} from '../../shared/resourceDescriptors'; import {PopOverComponent} from '../../pop-over/pop-over.component'; import {FeatureGroupComponent} from '../../feature-group/feature-group.component'; -import {FeatureItem, TabFeature, BladeFeature, OpenBrowserWindowFeature} from '../../feature-group/feature-item'; import {WebsiteId} from '../../shared/models/portal'; @Component({ @@ -39,16 +41,23 @@ export class SiteManageComponent { public groups3 : FeatureGroup[]; public searchTerm = ""; + public TabIds = SiteTabIds; + + public viewInfo : TreeViewInfo; + + // Used to open features within the same tab instead of in a new tab + public selectedFeatureId : string | null = null; + private _viewInfoStream = new Subject(); - private _viewInfo : TreeViewInfo; private _descriptor : SiteDescriptor; private _hasSiteWritePermissionStream = new Subject(); private _hasPlanReadPermissionStream = new Subject(); private _dynamicDisableInfo : DisableInfo; + private _tabsFeature: string; - @Output() openTabEvent = new Subject(); + private _selectedFeatureSubscription : RxSubscription; set viewInfoInput(viewInfo : TreeViewInfo){ this._viewInfoStream.next(viewInfo); @@ -60,17 +69,20 @@ export class SiteManageComponent { private _aiService : AiService, private _cacheService : CacheService, private _globalStateService : GlobalStateService, - private _translateService : TranslateService){ + private _translateService : TranslateService, + private _siteDashboard : SiteDashboardComponent){ + + this._tabsFeature = Url.getParameterByName(window.location.href, "appsvc.feature.tabs"); this._viewInfoStream .switchMap(viewInfo =>{ - this._viewInfo = viewInfo; + this.viewInfo = viewInfo; this._globalStateService.setBusyState(); return this._cacheService.getArm(viewInfo.resourceId); }) .switchMap(r =>{ this._globalStateService.clearBusyState(); - let traceKey = this._viewInfo.data.siteTraceKey; + let traceKey = this.viewInfo.data.siteTraceKey; this._aiService.stopTrace("/site/features-tab-ready", traceKey); let site : ArmObj = r.json(); @@ -122,11 +134,21 @@ export class SiteManageComponent { disableMessage : this._translateService.instant(PortalResources.featureDisabledNoPermissionToPlan) }) }); + + this._selectedFeatureSubscription = this._siteDashboard.openFeatureId.subscribe(featureId => { + if(this._tabsFeature === "inplace"){ + this.selectedFeatureId = featureId; + } + }) } ngOnDestroy() { this._portalService.closeBlades(); this._disposeGroups(); + if(this._selectedFeatureSubscription){ + this._selectedFeatureSubscription.unsubscribe(); + this._selectedFeatureSubscription = null; + } } private _disposeGroups(){ @@ -227,7 +249,8 @@ export class SiteManageComponent { this._dynamicDisableInfo), ] - let generalFeatures = [ + let generalFeatures: FeatureItem[] = [ + new BladeFeature( this._translateService.instant(PortalResources.feature_applicationSettingsName), this._translateService.instant(PortalResources.feature_applicationSettingsName) + @@ -287,6 +310,18 @@ export class SiteManageComponent { this._portalService) ] + if(this._tabsFeature === 'tabs' || this._tabsFeature === 'inplace'){ + generalFeatures.splice(0, 0, + new TabFeature( + this._translateService.instant(PortalResources.tab_functionSettings), + this._translateService.instant(PortalResources.tab_functionSettings), + this._translateService.instant(PortalResources.feature_functionSettingsInfo), + "images/functions.svg", + SiteTabIds.functionRuntime, + this._siteDashboard) + ); + } + this.groups1 = [ new FeatureGroup(this._translateService.instant(PortalResources.feature_generalSettings), generalFeatures), new FeatureGroup(this._translateService.instant(PortalResources.feature_codeDeployment), codeDeployFeatures), @@ -422,7 +457,7 @@ export class SiteManageComponent { } private _initCol3Groups(site : ArmObj){ - let apiManagementFeatures = [ + let apiManagementFeatures: FeatureItem[] = [ new BladeFeature( "CORS", "cors api", @@ -432,19 +467,20 @@ export class SiteManageComponent { detailBlade : "ApiCors", detailBladeInputs : { resourceUri : site.id } }, - this._portalService), + this._portalService) + ] - new BladeFeature( + if(this._tabsFeature === "tabs" || this._tabsFeature === "inplace"){ + apiManagementFeatures.splice(0, 0, + new TabFeature( this._translateService.instant(PortalResources.feature_apiDefinitionName), this._translateService.instant(PortalResources.feature_apiDefinitionName) + " swagger", this._translateService.instant(PortalResources.feature_apiDefinitionInfo), "images/api-definition.svg", - { - detailBlade : "ApiDefinition", - detailBladeInputs : { resourceUri : site.id } - }, - this._portalService), - ] + SiteTabIds.apiDefinition, + this._siteDashboard + )); + } let appServicePlanFeatures = [ new DisableableBladeFeature( @@ -574,8 +610,9 @@ export class SiteManageComponent { new FeatureGroup(this._translateService.instant(PortalResources.feature_resourceManagement), resourceManagementFeatures)]; } - openTab(tabName : string){ - this.openTabEvent.next(tabName); + navBack(){ + // this.selectedFeatureId = null; + this._siteDashboard.openFeature(null); } } diff --git a/AzureFunctions.AngularClient/src/app/site/site-summary/site-summary.component.html b/AzureFunctions.AngularClient/src/app/site/site-summary/site-summary.component.html index dc2b0cf835..29a33d139d 100644 --- a/AzureFunctions.AngularClient/src/app/site/site-summary/site-summary.component.html +++ b/AzureFunctions.AngularClient/src/app/site/site-summary/site-summary.component.html @@ -104,7 +104,7 @@

{{ 'enabledFeatures_header' | translate }}

- +
diff --git a/AzureFunctions.AngularClient/src/app/site/site-summary/site-summary.component.ts b/AzureFunctions.AngularClient/src/app/site/site-summary/site-summary.component.ts index a5f657efad..5a4f7cfe2f 100644 --- a/AzureFunctions.AngularClient/src/app/site/site-summary/site-summary.component.ts +++ b/AzureFunctions.AngularClient/src/app/site/site-summary/site-summary.component.ts @@ -1,3 +1,5 @@ +import { TabsComponent } from './../../tabs/tabs.component'; +import { BusyStateComponent } from './../../busy-state/busy-state.component'; import { UserService } from './../../shared/services/user.service'; import { Component, OnInit, EventEmitter, Input, Output, OnDestroy } from '@angular/core'; import { Response } from '@angular/http'; @@ -80,13 +82,12 @@ export class SiteSummaryComponent implements OnDestroy { public Resources = PortalResources; public showDownloadFunctionAppModal = false; - @Output() openTabEvent = new Subject(); - private _viewInfoStream: Subject; private _viewInfo: TreeViewInfo; private _subs: Subscription[]; private _blobUrl: string; private _isSlot: boolean; + private _busyState : BusyStateComponent; constructor( private _cacheService: CacheService, @@ -99,9 +100,11 @@ export class SiteSummaryComponent implements OnDestroy { public ts: TranslateService, private _configService: ConfigService, private _slotService: SlotsService, - userService: UserService) { + userService: UserService, + tabsComponent : TabsComponent) { this.isStandalone = _configService.isStandalone(); + this._busyState = tabsComponent.busyState; userService.getStartupInfo() .first() @@ -114,7 +117,7 @@ export class SiteSummaryComponent implements OnDestroy { .switchMap(viewInfo => { this._viewInfo = viewInfo; - this._globalStateService.setBusyState(); + this._busyState.setBusyState(); return this._cacheService.getArm(viewInfo.resourceId); }) .mergeMap(r => { @@ -158,7 +161,7 @@ export class SiteSummaryComponent implements OnDestroy { let resourceId = site.id.substring(0, site.id.indexOf("/slots")); availabilityId = `${resourceId}/providers/Microsoft.ResourceHealth/availabilityStatuses/current`; } - this._globalStateService.clearBusyState(); + this._busyState.clearBusyState(); let traceKey = this._viewInfo.data.siteTraceKey; this._aiService.stopTrace("/site/overview-tab-ready", traceKey); this.hideAvailability = this._isSlot || site.properties.sku === "Dynamic"; @@ -212,7 +215,7 @@ export class SiteSummaryComponent implements OnDestroy { return Observable.of(res); }) .do(null, e => { - this._globalStateService.clearBusyState(); + this._busyState.clearBusyState(); if (!this._globalStateService.showTryView) { this._aiService.trackException(e, "site-summary"); @@ -255,10 +258,6 @@ export class SiteSummaryComponent implements OnDestroy { this._cleanupBlob(); } - openComponent(component: string) { - this.openTabEvent.next(component); - } - toggleState() { if (!this.hasWriteAccess) { return; @@ -336,7 +335,7 @@ export class SiteSummaryComponent implements OnDestroy { if (confirmResult) { let notificationId = null; - this._globalStateService.setBusyState(); + this._busyState.setBusyState(); this._portalService.startNotification( this.ts.instant(PortalResources.siteSummary_resetProfileNotifyTitle), this.ts.instant(PortalResources.siteSummary_resetProfileNotifyTitle)) @@ -346,14 +345,14 @@ export class SiteSummaryComponent implements OnDestroy { return this._armService.post(`${this.site.id}/newpassword`, null) }) .subscribe(response => { - this._globalStateService.clearBusyState(); + this._busyState.clearBusyState(); this._portalService.stopNotification( notificationId, true, this.ts.instant(PortalResources.siteSummary_resetProfileNotifySuccess)); }, e => { - this._globalStateService.clearBusyState(); + this._busyState.clearBusyState(); this._portalService.stopNotification( notificationId, false, @@ -375,7 +374,7 @@ export class SiteSummaryComponent implements OnDestroy { let appNode = this._viewInfo.node; let notificationId = null; - this._globalStateService.setBusyState(); + this._busyState.setBusyState(); this._portalService.startNotification( this.ts.instant(PortalResources.siteSummary_deleteNotifyTitle).format(site.name), this.ts.instant(PortalResources.siteSummary_deleteNotifyTitle).format(site.name)) @@ -398,12 +397,12 @@ export class SiteSummaryComponent implements OnDestroy { if (!this._isSlot) { appNode.sideNav.search(""); } - this._globalStateService.clearBusyState(); + this._busyState.clearBusyState(); appNode.parent.select(); (appNode).remove(); }, e => { - this._globalStateService.clearBusyState(); + this._busyState.clearBusyState(); this._portalService.stopNotification( notificationId, false, @@ -424,7 +423,7 @@ export class SiteSummaryComponent implements OnDestroy { let confirmResult = confirm(this.ts.instant(PortalResources.siteSummary_restartConfirmation).format(this.site.name)); if (confirmResult) { - this._globalStateService.setBusyState(); + this._busyState.setBusyState(); this._portalService.startNotification( this.ts.instant(PortalResources.siteSummary_restartNotifyTitle).format(site.name), @@ -435,14 +434,14 @@ export class SiteSummaryComponent implements OnDestroy { return this._armService.post(`${site.id}/restart`, null) }) .subscribe(() => { - this._globalStateService.clearBusyState(); + this._busyState.clearBusyState(); this._portalService.stopNotification( notificationId, true, this.ts.instant(PortalResources.siteSummary_restartNotifySuccess).format(site.name)); }, e => { - this._globalStateService.clearBusyState(); + this._busyState.clearBusyState(); this._portalService.stopNotification( notificationId, false, @@ -525,7 +524,7 @@ export class SiteSummaryComponent implements OnDestroy { ? this.ts.instant(PortalResources.siteSummary_stopNotifyTitle).format(site.name) : this.ts.instant(PortalResources.siteSummary_startNotifyTitle).format(site.name); - this._globalStateService.setBusyState(); + this._busyState.setBusyState(); this._portalService.startNotification(notifyTitle, notifyTitle) .first() @@ -560,7 +559,7 @@ export class SiteSummaryComponent implements OnDestroy { ? this.ts.instant(PortalResources.siteSummary_stopNotifyFail).format(site.name) : this.ts.instant(PortalResources.siteSummary_startNotifyFail).format(site.name); - this._globalStateService.clearBusyState(); + this._busyState.clearBusyState(); this._portalService.stopNotification( notificationId, false, diff --git a/AzureFunctions.AngularClient/src/app/tab/tab.component.ts b/AzureFunctions.AngularClient/src/app/tab/tab.component.ts index 97d556d842..4460737731 100644 --- a/AzureFunctions.AngularClient/src/app/tab/tab.component.ts +++ b/AzureFunctions.AngularClient/src/app/tab/tab.component.ts @@ -2,7 +2,6 @@ import { Component, Input } from '@angular/core'; @Component({ selector: 'tab', - styleUrls: ['../tabs/tabs.component.scss'], templateUrl: './tab.component.html' }) export class TabComponent { @@ -10,4 +9,5 @@ export class TabComponent { @Input() id : string; @Input() active = false; @Input() closeable = false; + @Input() iconUrl : string; } \ No newline at end of file diff --git a/AzureFunctions.AngularClient/src/app/tabs/tabs.component.html b/AzureFunctions.AngularClient/src/app/tabs/tabs.component.html index 703e0aed2e..45f6b344ac 100644 --- a/AzureFunctions.AngularClient/src/app/tabs/tabs.component.html +++ b/AzureFunctions.AngularClient/src/app/tabs/tabs.component.html @@ -1,15 +1,21 @@ -