Fixes #2256 and Fixes #2432 - Logic apps in national clouds and delete function bugs (#2472)

Author: ehamai

AzureFunctions.AngularClient/src/app/shared/models/constants.ts

@@ -168,6 +168,7 @@ export class ScenarioIds {
     public static readonly addConsole = 'AddConsole';
     public static readonly addSsh = 'AddSsh';
     public static readonly addTopLevelAppsNode = 'AddTopLevelAppsNode';
+    public static readonly addLogicApps = 'AddLogicApps';
     public static readonly enableAppInsights = 'EnableAppInsights';
     public static readonly enablePushNotifications = 'EnablePushNotifications';
     public static readonly enableAuth = 'EnableAuth';

AzureFunctions.AngularClient/src/app/shared/services/function-app.service.ts

@@ -126,16 +126,16 @@ export class FunctionAppService {
         return this
             .getClient(context)
             .execute(
-                { resourceId: context.site.id }, /*input*/ 
-                token => Observable /*query*/ 
+                { resourceId: context.site.id }, /*input*/
+                token => Observable /*query*/
                     .zip(
                         this.retrieveProxies(context, token),
                         this._cacheService.get('assets/schemas/proxies.json', false, this.portalHeaders(token)),
                         (p, s) => ({ proxies: p, schema: s }))
                     .flatMap(response => this.validateAndGetProxies(response.proxies, response.schema)));
     }
 
-    private retrieveProxies(context: FunctionAppContext, token: string) : Observable<any> {
+    private retrieveProxies(context: FunctionAppContext, token: string): Observable<any> {
         return this._cacheService
             .get(context.urlTemplates.proxiesJsonUrl, false, this.headers(token))
             .catch(err => err.status === 404
@@ -147,8 +147,7 @@ export class FunctionAppService {
                 : Observable.throw(err));
     }
 
-    private validateAndGetProxies(proxiesResponse: any, schemaResponse: any) : Observable<ApiProxy[]>
-    {
+    private validateAndGetProxies(proxiesResponse: any, schemaResponse: any): Observable<ApiProxy[]> {
         let proxiesJson, schemaJson;
 
         try {
@@ -181,7 +180,7 @@ export class FunctionAppService {
                 });
             }
         }
-        
+
         return Observable.of(ApiProxy.fromJson(proxiesJson));
     }
 
@@ -431,14 +430,13 @@ export class FunctionAppService {
     }
 
     deleteFunction(context: FunctionAppContext, functionInfo: FunctionInfo): Result<void> {
-        return this.getClient(context).execute({ resourceId: context.site.id }, t =>
-            this._cacheService.delete(functionInfo.href, this.jsonHeaders(t)));
-        // .concatMap(r => this.getRuntimeGeneration())
-        // .concatMap((runtimeVersion: string) => {
-        //     return runtimeVersion === 'V2'
-        //         ? this.updateDisabledAppSettings([functionInfo])
-        //         : Observable.of(null);
-        // }));
+        return this.getClient(context)
+            .execute({ resourceId: context.site.id }, t => {
+                return this._cacheService.delete(functionInfo.href, this.jsonHeaders(t));
+            })
+            .do(r => {
+                this._cacheService.clearCachePrefix(context.urlTemplates.functionsUrl);
+            });
     }
 
     // TODO: [ahmels] change to Result<T>

AzureFunctions.AngularClient/src/app/shared/services/scenario/national-cloud.environment.ts

@@ -39,6 +39,13 @@ export class NationalCloudEnvironment extends AzureEnvironment {
             }
         };
 
+        this.scenarioChecks[ScenarioIds.addLogicApps] = {
+            id: ScenarioIds.addLogicApps,
+            runCheck: () => {
+                return { status: 'disabled' };
+            }
+        };
+
         this.scenarioChecks[ScenarioIds.enableAppInsights] = {
             id: ScenarioIds.enableAppInsights,
             runCheck: () => {

AzureFunctions.AngularClient/src/app/site/site-manage/site-manage.component.ts

@@ -198,14 +198,15 @@ export class SiteManageComponent extends FeatureComponent<TreeViewInfo<SiteData>
         ];
 
         const developmentToolFeatures = [
-            new TabFeature(
-                this._translateService.instant(PortalResources.tab_logicApps),
-                this._translateService.instant(PortalResources.tab_logicApps),
-                this._translateService.instant(PortalResources.feature_logicAppsInfo),
-                'image/logicapp.svg',
-                SiteTabIds.logicApps,
-                this._broadcastService
-            ),
+            this._scenarioService.checkScenario(ScenarioIds.addLogicApps, { site: site }).status !== 'disabled'
+                ? new TabFeature(
+                    this._translateService.instant(PortalResources.tab_logicApps),
+                    this._translateService.instant(PortalResources.tab_logicApps),
+                    this._translateService.instant(PortalResources.feature_logicAppsInfo),
+                    'image/logicapp.svg',
+                    SiteTabIds.logicApps,
+                    this._broadcastService
+                ) : null,
 
             this._scenarioService.checkScenario(ScenarioIds.addConsole, { site: site }).status !== 'disabled'
                 ? new DisableableBladeFeature(