Merge acca7e9 into 7137411

Azure · Sep 19, 2018 · 6e49140 · 6e49140
2 parents 7137411 + acca7e9
commit 6e49140
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/client/src/app/site/function-runtime/function-runtime.component.html b/client/src/app/site/function-runtime/function-runtime.component.html
@@ -101,7 +101,7 @@
                     </div>
                 </div>
             </ng-container>
-            <div *ngIf="hasFunctions && !functionRuntimeSelectorDisabled" class="alert alert-warning">
+            <div *ngIf="disableRuntimeSelector" class="alert alert-warning">
                 <img class="alert-icon" src="image/warning.svg" alt="{{ 'warning' | translate}}"/>
                 <div class="alert-message">
                     <span class="title-label">{{ 'appFunctionSettings_warning_6' | translate }}</span><br/>
@@ -112,7 +112,7 @@
                 <radio-selector
                     [defaultValue]="extensionVersion"
                     [options]="functionRutimeOptions"
-                    [disabled]="hasFunctions || functionRuntimeSelectorDisabled"
+                    [disabled]="disableRuntimeSelector"
                     (value)="functionRuntimeValueStream.next($event)"
                     id="runtimeVersionRadioButton"
                     aria-labelledby="runtimeVersionLabel runtimeVersionRadioButton">

diff --git a/client/src/app/site/function-runtime/function-runtime.component.ts b/client/src/app/site/function-runtime/function-runtime.component.ts
@@ -75,7 +75,8 @@ export class FunctionRuntimeComponent extends FunctionAppContextComponent {
     public slotsStatusOptions: SelectOption<boolean>[];
     public slotsAppSetting: string;
     public slotsEnabled: boolean;
-    public functionRuntimeSelectorDisabled = false;
+    public betaDisabled = false;
+    public disableRuntimeSelector = false;
     public slotsValueChange: Subject<boolean>;
     private _busyManager: BusyStateScopeManager;
 
@@ -96,7 +97,7 @@ export class FunctionRuntimeComponent extends FunctionAppContextComponent {
 
         this._busyManager = new BusyStateScopeManager(broadcastService, SiteTabIds.functionRuntime);
 
-        this.functionRuntimeSelectorDisabled = this._scenarioService.checkScenario(ScenarioIds.functionBeta).status === 'disabled';
+        this.betaDisabled = this._scenarioService.checkScenario(ScenarioIds.functionBeta).status === 'disabled';
 
         this.functionStatusOptions = [
             {
@@ -263,6 +264,8 @@ export class FunctionRuntimeComponent extends FunctionAppContextComponent {
                     this.extensionVersion = Constants.latest;
                 }
 
+                this.disableRuntimeSelector = (this.extensionVersion !== Constants.latest) && (this.hasFunctions || this.betaDisabled);
+
                 this.badRuntimeVersion = !this._validRuntimeVersion();
 
                 this.setNeedUpdateExtensionVersion();