Merge pull request #1880 from Azure/dev

Sprint 12 Merge
Azure · Oct 13, 2017 · 0d8000a · 0d8000a
2 parents 5c18ec3 + 3a721ce
commit 0d8000a
Show file tree

Hide file tree

Showing 491 changed files with 9,774 additions and 4,761 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,8 @@
+language: node_js
+node_js:
+  - "6.9"
+before_script: 
+  - npm install -g --silent @angular/cli@1.1.3
+  - npm install -g --silent yarn
+script:
+  - cd AzureFunctions.AngularClient && yarn install && ng build -prod && cd ../server && yarn install && tsc
diff --git a/AzureFunctions.AngularClient/.angular-cli.json b/AzureFunctions.AngularClient/.angular-cli.json
@@ -9,7 +9,7 @@
       "outDir": "../server/src/public/ng-full",
       "assets": [
         "assets",
-        "images",
+        "image",
         "../node_modules/swagger-editor",
         "sass/main.scss"
       ],

diff --git a/AzureFunctions.AngularClient/AzureFunctions.AngularClient.csproj b/AzureFunctions.AngularClient/AzureFunctions.AngularClient.csproj
@@ -190,6 +190,9 @@
     <Content Include="src\app\site\site-config\app-settings\app-settings.component.html" />
     <Content Include="src\app\site\site-config\connection-strings\connection-strings.component.html" />
     <Content Include="src\app\site\site-config\general-settings\general-settings.component.html" />
+    <Content Include="src\app\site\site-config\default-documents\default-documents.component.html" />
+    <Content Include="src\app\site\site-config\handler-mappings\handler-mappings.component.html" />
+    <Content Include="src\app\site\site-config\virtual-directories\virtual-directories.component.html" />
     <Content Include="src\app\site\site-config-standalone\site-config.component-standalone.html" />
     <Content Include="src\app\site\site-dashboard\site-dashboard.component.html" />
     <Content Include="src\app\site\site-enabled-features\site-enabled-features.component.html" />
@@ -230,96 +233,96 @@
     <Content Include="src\app\tutorial\tutorial.component.css" />
     <Content Include="src\app\tutorial\tutorial.component.html" />
     <Content Include="src\assets\.gitkeep" />
-    <Content Include="src\images\add.svg" />
-    <Content Include="src\images\discard.svg" />
-    <Content Include="src\images\plus.svg" />
-    <Content Include="src\images\appInsights.svg" />
-    <Content Include="src\images\access-control.svg" />
-    <Content Include="src\images\activity-log.svg" />
-    <Content Include="src\images\advanced-tools.svg" />
-    <Content Include="src\images\api-definition.svg" />
-    <Content Include="src\images\api-proxy.svg" />
-    <Content Include="src\images\app-service-plan.svg" />
-    <Content Include="src\images\application-settings.svg" />
-    <Content Include="src\images\appsvc-editor.svg" />
-    <Content Include="src\images\arrow-right.svg" />
-    <Content Include="src\images\authentication.svg" />
-    <Content Include="src\images\automation-script.svg" />
-    <Content Include="src\images\azure-logo.svg" />
-    <Content Include="src\images\backups.svg" />
-    <Content Include="src\images\bitbucket_45.png" />
-    <Content Include="src\images\bolt.svg" />
-    <Content Include="src\images\BulletList.svg" />
-    <Content Include="src\images\busy-image.png" />
-    <Content Include="src\images\clock.svg" />
-    <Content Include="src\images\code.svg" />
-    <Content Include="src\images\console.svg" />
-    <Content Include="src\images\cors.svg" />
-    <Content Include="src\images\custom-domains.svg" />
-    <Content Include="src\images\data-process-template-dark.svg" />
-    <Content Include="src\images\data-process-template.svg" />
-    <Content Include="src\images\databaseMini3.svg" />
-    <Content Include="src\images\DataLakeAnalytics-alt.svg" />
-    <Content Include="src\images\delete.svg" />
-    <Content Include="src\images\deployment-credentials.svg" />
-    <Content Include="src\images\deployment-source.svg" />
-    <Content Include="src\images\diagnostic-logs.svg" />
-    <Content Include="src\images\download.svg" />
-    <Content Include="src\images\dropbox_45.png" />
-    <Content Include="src\images\emptybrowse-functions.svg" />
-    <Content Include="src\images\error.svg" />
-    <Content Include="src\images\extensions.svg" />
-    <Content Include="src\images\external_45.png" />
-    <Content Include="src\images\function-io.svg" />
-    <Content Include="src\images\Functions.svg" />
-    <Content Include="src\images\function_f.svg" />
-    <Content Include="src\images\generic-template.svg" />
-    <Content Include="src\images\GitHub_65.png" />
-    <Content Include="src\images\icon-collapse.svg" />
-    <Content Include="src\images\icon-expand.svg" />
-    <Content Include="src\images\info.svg" />
-    <Content Include="src\images\iot-template.svg" />
-    <Content Include="src\images\landing-page.png" />
-    <Content Include="src\images\learn-more.svg" />
-    <Content Include="src\images\localgit_45.png" />
-    <Content Include="src\images\locks.svg" />
-    <Content Include="src\images\log-stream.svg" />
-    <Content Include="src\images\Logins\facebook.png" />
-    <Content Include="src\images\Logins\google.png" />
-    <Content Include="src\images\Logins\microsoftaccount.png" />
-    <Content Include="src\images\Logins\vk.png" />
-    <Content Include="src\images\monitoring-coming-soon.png" />
-    <Content Include="src\images\networking.svg" />
-    <Content Include="src\images\onedrive_100.png" />
-    <Content Include="src\images\open-external.svg" />
-    <Content Include="src\images\pin.svg" />
-    <Content Include="src\images\process-explorer.svg" />
-    <Content Include="src\images\properties.svg" />
-    <Content Include="src\images\push.svg" />
-    <Content Include="src\images\quotas.svg" />
-    <Content Include="src\images\reset.svg" />
-    <Content Include="src\images\resource-explorer.svg" />
-    <Content Include="src\images\restart.svg" />
-    <Content Include="src\images\save.svg" />
-    <Content Include="src\images\search.svg" />
-    <Content Include="src\images\ssl.svg" />
-    <Content Include="src\images\stack.svg" />
-    <Content Include="src\images\start.svg" />
-    <Content Include="src\images\stop.svg" />
-    <Content Include="src\images\stopped.svg" />
-    <Content Include="src\images\success.svg" />
-    <Content Include="src\images\swagger-definition.svg" />
-    <Content Include="src\images\swap.svg" />
-    <Content Include="src\images\tags.svg" />
-    <Content Include="src\images\timer-template-dark.svg" />
-    <Content Include="src\images\timer-template.svg" />
-    <Content Include="src\images\tinfoil-flat-21px.png" />
-    <Content Include="src\images\vsts.png" />
-    <Content Include="src\images\warning.svg" />
-    <Content Include="src\images\webapp.svg" />
-    <Content Include="src\images\webhook-api-template-dark.svg" />
-    <Content Include="src\images\webhook-api-template.svg" />
-    <Content Include="src\images\webjobs.svg" />
+    <Content Include="src\image\add.svg" />
+    <Content Include="src\image\discard.svg" />
+    <Content Include="src\image\plus.svg" />
+    <Content Include="src\image\appInsights.svg" />
+    <Content Include="src\image\access-control.svg" />
+    <Content Include="src\image\activity-log.svg" />
+    <Content Include="src\image\advanced-tools.svg" />
+    <Content Include="src\image\api-definition.svg" />
+    <Content Include="src\image\api-proxy.svg" />
+    <Content Include="src\image\app-service-plan.svg" />
+    <Content Include="src\image\application-settings.svg" />
+    <Content Include="src\image\appsvc-editor.svg" />
+    <Content Include="src\image\arrow-right.svg" />
+    <Content Include="src\image\authentication.svg" />
+    <Content Include="src\image\automation-script.svg" />
+    <Content Include="src\image\azure-logo.svg" />
+    <Content Include="src\image\backups.svg" />
+    <Content Include="src\image\bitbucket_45.png" />
+    <Content Include="src\image\bolt.svg" />
+    <Content Include="src\image\BulletList.svg" />
+    <Content Include="src\image\busy-image.png" />
+    <Content Include="src\image\clock.svg" />
+    <Content Include="src\image\code.svg" />
+    <Content Include="src\image\console.svg" />
+    <Content Include="src\image\cors.svg" />
+    <Content Include="src\image\custom-domains.svg" />
+    <Content Include="src\image\data-process-template-dark.svg" />
+    <Content Include="src\image\data-process-template.svg" />
+    <Content Include="src\image\databaseMini3.svg" />
+    <Content Include="src\image\DataLakeAnalytics-alt.svg" />
+    <Content Include="src\image\delete.svg" />
+    <Content Include="src\image\deployment-credentials.svg" />
+    <Content Include="src\image\deployment-source.svg" />
+    <Content Include="src\image\diagnostic-logs.svg" />
+    <Content Include="src\image\download.svg" />
+    <Content Include="src\image\dropbox_45.png" />
+    <Content Include="src\image\emptybrowse-functions.svg" />
+    <Content Include="src\image\error.svg" />
+    <Content Include="src\image\extensions.svg" />
+    <Content Include="src\image\external_45.png" />
+    <Content Include="src\image\function-io.svg" />
+    <Content Include="src\image\Functions.svg" />
+    <Content Include="src\image\function_f.svg" />
+    <Content Include="src\image\generic-template.svg" />
+    <Content Include="src\image\GitHub_65.png" />
+    <Content Include="src\image\icon-collapse.svg" />
+    <Content Include="src\image\icon-expand.svg" />
+    <Content Include="src\image\info.svg" />
+    <Content Include="src\image\iot-template.svg" />
+    <Content Include="src\image\landing-page.png" />
+    <Content Include="src\image\learn-more.svg" />
+    <Content Include="src\image\localgit_45.png" />
+    <Content Include="src\image\locks.svg" />
+    <Content Include="src\image\log-stream.svg" />
+    <Content Include="src\image\Logins\facebook.png" />
+    <Content Include="src\image\Logins\google.png" />
+    <Content Include="src\image\Logins\microsoftaccount.png" />
+    <Content Include="src\image\Logins\vk.png" />
+    <Content Include="src\image\monitoring-coming-soon.png" />
+    <Content Include="src\image\networking.svg" />
+    <Content Include="src\image\onedrive_100.png" />
+    <Content Include="src\image\open-external.svg" />
+    <Content Include="src\image\pin.svg" />
+    <Content Include="src\image\process-explorer.svg" />
+    <Content Include="src\image\properties.svg" />
+    <Content Include="src\image\push.svg" />
+    <Content Include="src\image\quotas.svg" />
+    <Content Include="src\image\reset.svg" />
+    <Content Include="src\image\resource-explorer.svg" />
+    <Content Include="src\image\restart.svg" />
+    <Content Include="src\image\save.svg" />
+    <Content Include="src\image\search.svg" />
+    <Content Include="src\image\ssl.svg" />
+    <Content Include="src\image\stack.svg" />
+    <Content Include="src\image\start.svg" />
+    <Content Include="src\image\stop.svg" />
+    <Content Include="src\image\stopped.svg" />
+    <Content Include="src\image\success.svg" />
+    <Content Include="src\image\swagger-definition.svg" />
+    <Content Include="src\image\swap.svg" />
+    <Content Include="src\image\tags.svg" />
+    <Content Include="src\image\timer-template-dark.svg" />
+    <Content Include="src\image\timer-template.svg" />
+    <Content Include="src\image\tinfoil-flat-21px.png" />
+    <Content Include="src\image\vsts.png" />
+    <Content Include="src\image\warning.svg" />
+    <Content Include="src\image\webapp.svg" />
+    <Content Include="src\image\webhook-api-template-dark.svg" />
+    <Content Include="src\image\webhook-api-template.svg" />
+    <Content Include="src\image\webjobs.svg" />
     <Content Include="tslint.json" />
     <Content Include="src\tsconfig.json" />
     <Content Include="src\app\side-nav\side-nav.component.scss" />
@@ -508,6 +511,8 @@
     <TypeScriptCompile Include="src\app\shared\models\arm\permission.ts" />
     <TypeScriptCompile Include="src\app\shared\models\arm\site-config.ts" />
     <TypeScriptCompile Include="src\app\shared\models\arm\site.ts" />
+    <TypeScriptCompile Include="src\app\shared\models\arm\slot-config-names.ts" />
+    <TypeScriptCompile Include="src\app\shared\models\arm\virtual-application.ts" />
     <TypeScriptCompile Include="src\app\shared\models\binding-input-list.ts" />
     <TypeScriptCompile Include="src\app\shared\models\binding-input.ts" />
     <TypeScriptCompile Include="src\app\shared\models\binding-list.ts" />
@@ -605,17 +610,16 @@
     <TypeScriptCompile Include="src\app\site\function-runtime\function-runtime.component.ts" />
     <TypeScriptCompile Include="src\app\site\create-app\create-app.component.spec.ts" />
     <TypeScriptCompile Include="src\app\site\create-app\create-app.component.ts" />
-    <TypeScriptCompile Include="src\app\site\site-config\site-config.component.spec.ts" />
     <TypeScriptCompile Include="src\app\site\site-config\site-config.component.ts" />
-    <TypeScriptCompile Include="src\app\site\site-config\app-settings\app-settings.component.spec.ts" />
     <TypeScriptCompile Include="src\app\site\site-config\app-settings\app-settings.component.ts" />
-    <TypeScriptCompile Include="src\app\site\site-config\connection-strings\connection-strings.component.spec.ts" />
     <TypeScriptCompile Include="src\app\site\site-config\connection-strings\connection-strings.component.ts" />
-    <TypeScriptCompile Include="src\app\site\site-config\general-settings\general-settings.spec.component.ts" />
     <TypeScriptCompile Include="src\app\site\site-config\general-settings\general-settings.component.ts" />
     <TypeScriptCompile Include="src\app\site\site-config\general-settings\models\java-webcontainer-properties.ts" />
     <TypeScriptCompile Include="src\app\site\site-config\general-settings\models\java-settings-controls.ts" />
     <TypeScriptCompile Include="src\app\site\site-config\general-settings\models\general-settings-controls.ts" />
+    <TypeScriptCompile Include="src\app\site\site-config\default-documents\default-documents.component.ts" />
+    <TypeScriptCompile Include="src\app\site\site-config\handler-mappings\handler-mappings.component.ts" />
+    <TypeScriptCompile Include="src\app\site\site-config\virtual-directories\virtual-directories.component.ts" />
     <TypeScriptCompile Include="src\app\site\site-config-standalone\site-config-standalone.component.spec.ts" />
     <TypeScriptCompile Include="src\app\site\site-config-standalone\site-config-standalone.component.ts" />
     <TypeScriptCompile Include="src\app\site\site-dashboard\site-dashboard.component.spec.ts" />

diff --git a/AzureFunctions.AngularClient/package.json b/AzureFunctions.AngularClient/package.json
@@ -32,7 +32,7 @@
     "jsonschema": "^1.1.1",
     "marked": "^0.3.6",
     "moment": "^2.17.0",
-    "monaco-editor": "^0.7.0",
+    "monaco-editor": "^0.10.0",
     "ng2-cookies": "^1.0.3",
     "ng2-file-upload": "~1.2.1",
     "ng2-popover": "0.0.14",

diff --git a/AzureFunctions.AngularClient/src/app/aad-registration/aad-registration.component.scss b/AzureFunctions.AngularClient/src/app/aad-registration/aad-registration.component.scss
@@ -1,4 +1,4 @@
-@import '../../sass/main';
+@import '../../sass/common/variables';
 
 div {
     line-height: 22px;

diff --git a/AzureFunctions.AngularClient/src/app/api/api-details/api-details.component.html b/AzureFunctions.AngularClient/src/app/api/api-details/api-details.component.html
@@ -2,7 +2,7 @@
 
   <div class="header">
     <div>
-      <span class="text-level1-heading">{{apiProxyEdit.name}}&nbsp;</span>
+      <h2>{{apiProxyEdit.name}}&nbsp;</h2>
       <span class="link" (click)="deleteProxyClicked()">
                 <i class="fa fa-remove"></i> {{ 'apiProxy_delete' | translate }}
             </span>
@@ -107,8 +107,8 @@
     </request-respose-override>
 
     <div>
-        <button (click)="submitForm()" [class.custom-button-disabled]="!complexForm.valid || !complexForm.dirty || !rrOverrideValid" [disabled]="!complexForm.valid || !complexForm.dirty" class="custom-button">{{ 'save' | translate }}</button>
-        <button (click)="onReset()" [class.custom-button-disabled]="!complexForm.dirty" [disabled]="!complexForm.dirty" class="custom-button">{{ 'discrard' | translate }}</button>
+        <button (click)="submitForm()" [disabled]="!complexForm.valid || !complexForm.dirty || !rrOverrideValid" [disabled]="!complexForm.valid || !complexForm.dirty" class="custom-button">{{ 'save' | translate }}</button>
+        <button (click)="onReset()" [disabled]="!complexForm.dirty" [disabled]="!complexForm.dirty" class="custom-button">{{ 'discard' | translate }}</button>
     </div>
 
   </form>

diff --git a/AzureFunctions.AngularClient/src/app/api/api-new/api-new.component.html b/AzureFunctions.AngularClient/src/app/api/api-new/api-new.component.html
@@ -1,6 +1,6 @@
 <div class="newproxy-container">
 
-  <div class="text-level1-heading">{{ 'apiProxy_new' | translate }} </div>
+  <h2>{{ 'apiProxy_new' | translate }} </h2>
 
   <app-edit-mode-warning [functionApp]="functionApp" [appNode]="appNode"></app-edit-mode-warning>
 
@@ -96,7 +96,7 @@
           (valueChanges)="rrOverriedValueChanges($event)">
       </request-respose-override>
       <div>
-          <button [fnWriteAccess]="functionApp" type="submit" [class.custom-button-disabled]="!complexForm.valid || !rrOverrideValid" [disabled]="!complexForm.valid" class="custom-button">{{ 'create' | translate }}</button>
+          <button [fnWriteAccess]="functionApp" type="submit" [disabled]="!complexForm.valid || !rrOverrideValid" [disabled]="!complexForm.valid" class="custom-button">{{ 'create' | translate }}</button>
       </div>
   </form>
 </div>
diff --git a/AzureFunctions.AngularClient/src/app/api/api-new/api-new.component.scss b/AzureFunctions.AngularClient/src/app/api/api-new/api-new.component.scss
@@ -1,4 +1,4 @@
-@import '../../../sass/main';
+@import '../../../sass/common/variables';
 
 form {
     padding:10px 0px 0px 0px;
@@ -18,7 +18,6 @@ form > div {
 
 .newproxy-container{
     padding: 20px;
-    background-color: $body-bg-color;
 }
 
 .header {

diff --git a/...ngularClient/src/app/api/request-respose-override/request-respose-override.component.html b/...ngularClient/src/app/api/request-respose-override/request-respose-override.component.html
@@ -77,7 +77,8 @@
             <div monacoEditor class="monaco response-body"
                     (onContentChanged)="contentChanged($event)"
                     [content]="model.body"
-                    [functionAppInput]="functionApp">
+                    [functionAppInput]="functionApp"
+                    fileName="body.json">
             </div>
         </div>
     </div>

diff --git a/AzureFunctions.AngularClient/src/app/app.component.html b/AzureFunctions.AngularClient/src/app/app.component.html
@@ -1,5 +1,7 @@
-<busy-state name='global'></busy-state>
-<disabled-dashboard></disabled-dashboard>
-<error-list></error-list>
+<div id="app-root" [attr.theme]="theme">
+    <busy-state name='global' cssClass="global"></busy-state>
+    <disabled-dashboard></disabled-dashboard>
+    <error-list></error-list>
 
-<router-outlet></router-outlet>
+    <router-outlet></router-outlet>
+</div>
diff --git a/AzureFunctions.AngularClient/src/app/app.component.scss b/AzureFunctions.AngularClient/src/app/app.component.scss
@@ -0,0 +1,11 @@
+@import '../sass/common/variables';
+
+
+#app-root{
+    height: 100%;
+    width: 100%;
+
+    &[theme=dark]{
+        background-color: $body-bg-color-dark;
+    }
+}