Merge c0f685b into f4999e6

Azure · Sep 19, 2018 · 8fa5821 · 8fa5821
2 parents f4999e6 + c0f685b
commit 8fa5821
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 8 deletions.
diff --git a/client/src/app/edit-mode-warning/edit-mode-warning.component.html b/client/src/app/edit-mode-warning/edit-mode-warning.component.html
@@ -52,4 +52,11 @@
   <div class="alert alert-warning alert-dismissible" role="alert"
     [innerHtml]="('readOnlyLocalCache' | translate)">
   </div>
+</div>
+
+<div *ngIf="readOnlyLinuxDynamic">
+  <br />
+  <div class="alert alert-warning alert-dismissible" role="alert"
+    [innerHtml]="('readOnlyLinuxDynamic' | translate)">
+  </div>
 </div>
diff --git a/client/src/app/edit-mode-warning/edit-mode-warning.component.ts b/client/src/app/edit-mode-warning/edit-mode-warning.component.ts
@@ -24,6 +24,7 @@ export class EditModeWarningComponent implements OnInit {
     public readWriteVSGenerated = false;
     public readOnlyRunFromZip = false;
     public readOnlyLocalCache = false;
+    public readOnlyLinuxDynamic = false;
 
     constructor(private _functionAppService: FunctionAppService, private _broadcastService: BroadcastService) { }
 
@@ -50,6 +51,8 @@ export class EditModeWarningComponent implements OnInit {
                             this.readOnlyRunFromZip = true;
                         } else if (editMode === FunctionAppEditMode.ReadOnlyLocalCache) {
                             this.readOnlyLocalCache = true;
+                        } else if (editMode === FunctionAppEditMode.ReadOnlyLinuxDynamic) {
+                            this.readOnlyLinuxDynamic = true;
                         }
                     }
                 });
@@ -60,7 +63,7 @@ export class EditModeWarningComponent implements OnInit {
         this._broadcastService.broadcastEvent<TreeUpdateEvent>(BroadcastEvent.TreeUpdate, {
             operation: 'navigate',
             resourceId: this.context.site.id,
-            data: SiteTabIds.functionRuntime
+            data: SiteTabIds.functionRuntime,
         });
     }
 }
diff --git a/client/src/app/shared/Utilities/edit-mode.helper.ts b/client/src/app/shared/Utilities/edit-mode.helper.ts
@@ -2,19 +2,22 @@ import { FunctionAppEditMode } from 'app/shared/models/function-app-edit-mode';
 
 export class EditModeHelper {
     public static isReadOnly(editMode: FunctionAppEditMode): boolean {
-        return editMode === FunctionAppEditMode.ReadOnly ||
-            editMode === FunctionAppEditMode.ReadOnlySourceControlled ||
-            editMode === FunctionAppEditMode.ReadOnlySlots ||
-            editMode === FunctionAppEditMode.ReadOnlyVSGenerated ||
-            editMode === FunctionAppEditMode.ReadOnlyRunFromZip ||
-            editMode === FunctionAppEditMode.ReadOnlyLocalCache;
+        return editMode === FunctionAppEditMode.ReadOnly
+            || editMode === FunctionAppEditMode.ReadOnlySourceControlled
+            || editMode === FunctionAppEditMode.ReadOnlySlots
+            || editMode === FunctionAppEditMode.ReadOnlyVSGenerated
+            || editMode === FunctionAppEditMode.ReadOnlyRunFromZip
+            || editMode === FunctionAppEditMode.ReadOnlyLocalCache
+            || editMode === FunctionAppEditMode.ReadOnlyLinuxDynamic;
     }
 
     public static getWarningIfForced(editMode: FunctionAppEditMode): string {
         if (editMode === FunctionAppEditMode.ReadOnlyRunFromZip) {
             return 'readOnlyRunFromZip';
         } else if (editMode === FunctionAppEditMode.ReadOnlyLocalCache) {
             return 'readOnlyLocalCache';
+        } else if (editMode === FunctionAppEditMode.ReadOnlyLinuxDynamic) {
+            return 'readOnlyLinuxDynamic';
         } else {
             return null;
         }

diff --git a/client/src/app/shared/models/function-app-edit-mode.ts b/client/src/app/shared/models/function-app-edit-mode.ts
@@ -7,5 +7,6 @@ export enum FunctionAppEditMode {
     ReadOnlyVSGenerated,
     ReadWriteVSGenerated,
     ReadOnlyRunFromZip,
-    ReadOnlyLocalCache
+    ReadOnlyLocalCache,
+    ReadOnlyLinuxDynamic,
 }
diff --git a/client/src/app/shared/models/portal-resources.ts b/client/src/app/shared/models/portal-resources.ts
@@ -1323,4 +1323,5 @@
     public static dynamicLinuxPreview = 'dynamicLinuxPreview';
     public static formIsInvalid = 'formIsInvalid';
     public static finishAndDeploy = 'finishAndDeploy';
+    public static readOnlyLinuxDynamic = 'readOnlyLinuxDynamic';
 }
diff --git a/client/src/app/shared/services/function-app.service.ts b/client/src/app/shared/services/function-app.service.ts
@@ -816,6 +816,7 @@ export class FunctionAppService {
                         : '';
                     const usingLocalCache = appSettings && appSettings.properties[Constants.localCacheOptionSettingName] === Constants.localCacheOptionSettingValue;
                     const hasSlots = result.hasSlots.result;
+                    const isLinuxDynamic = ArmUtil.isLinuxDynamic(context.site);
 
                     const resolveReadOnlyMode = () => {
                         if (sourceControlled) {
@@ -857,6 +858,8 @@ export class FunctionAppService {
                         return FunctionAppEditMode.ReadOnlyRunFromZip;
                     } else if (usingLocalCache) {
                         return FunctionAppEditMode.ReadOnlyLocalCache;
+                    } else if (isLinuxDynamic) {
+                        return FunctionAppEditMode.ReadOnlyLinuxDynamic;
                     } else if (editModeSettingString === Constants.ReadWriteMode) {
                         return resolveReadWriteMode();
                     } else if (editModeSettingString === Constants.ReadOnlyMode) {

diff --git a/server/Resources/Resources.resx b/server/Resources/Resources.resx
@@ -4111,4 +4111,7 @@ Set to "External URL" to use an API definition that is hosted elsewhere.</value>
   <data name="finishAndDeploy" xml:space="preserve">
     <value>Finish and go to Deployment Center</value>
   </data>
+  <data name="readOnlyLinuxDynamic" xml:space="preserve">
+    <value>Editing functions in the portal is not supported for Linux Consumption Function Apps (Preview).</value>
+  </data>
 </root>