From e8a3e5b9bd91db6f78c94f4c34d54f37d7801e00 Mon Sep 17 00:00:00 2001 From: estefani29 <58530184+estefani29@users.noreply.github.com> Date: Tue, 24 Dec 2019 08:12:29 -0600 Subject: [PATCH 01/12] Set up CI with Azure Pipelines [skip ci] --- azure-pipelines.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 azure-pipelines.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 000000000..eaf129c81 --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,24 @@ +pool: + vmImage: 'ubuntu-16.04' +trigger: + - master +steps: + - task: CopyFiles@2 + displayName: 'Copy Files to: $(build.artifactstagingdirectory)/Templates' + inputs: + SourceFolder: deployment + Contents: '*.json' + TargetFolder: '$(build.artifactstagingdirectory)/Templates' + - task: Npm@1 + displayName: 'npm custom' + inputs: + command: custom + verbose: false + customCommand: 'install --production' + - task: ArchiveFiles@2 + displayName: 'Archive $(Build.SourcesDirectory)' + inputs: + rootFolderOrFile: '$(Build.SourcesDirectory)' + includeRootFolder: false + - task: PublishBuildArtifacts@1 + displayName: 'Publish Artifact: drop' From 232d9d4e14a240dbf8ef2b56db63345904aa7d91 Mon Sep 17 00:00:00 2001 From: "estefani.zuniga" Date: Tue, 24 Dec 2019 08:15:24 -0600 Subject: [PATCH 02/12] Adding build status badges --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ba478ab97..ad6307ef5 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ - +[![Build Status](https://dev.azure.com/estefanizuniga0049/estefanizuniga/_apis/build/status/estefani29.ContosoAir?branchName=master)](https://dev.azure.com/estefanizuniga0049/estefanizuniga/_build/latest?definitionId=1&branchName=master) # Microsoft.Github CI Demo From 7ecc5064fb38b8c4c8fbbe9a138f49192068978e Mon Sep 17 00:00:00 2001 From: "estefani.zuniga" Date: Tue, 24 Dec 2019 08:19:15 -0600 Subject: [PATCH 03/12] Update build pipelines --- azure-pipelines.yml | 45 ++++++++++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index eaf129c81..c98daf5b3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,24 +1,43 @@ pool: - vmImage: 'ubuntu-16.04' + vmImage: ubuntu-16.04 trigger: - master steps: - - task: CopyFiles@2 - displayName: 'Copy Files to: $(build.artifactstagingdirectory)/Templates' - inputs: - SourceFolder: deployment - Contents: '*.json' - TargetFolder: '$(build.artifactstagingdirectory)/Templates' - task: Npm@1 - displayName: 'npm custom' inputs: - command: custom - verbose: false - customCommand: 'install --production' + command: install + - script: 'npm test' + displayName: 'Run unit tests' + continueOnError: true + - task: PublishTestResults@2 + displayName: 'Publish Test Results' + condition: succeededOrFailed() + inputs: + testResultsFiles: $(System.DefaultWorkingDirectory)/test-report.xml + - task: PublishCodeCoverageResults@1 + displayName: 'Publish Code Coverage' + condition: 'in(variables[''Agent.JobStatus''], ''Succeeded'')' + inputs: + codeCoverageTool: Cobertura + summaryFileLocation: '$(System.DefaultWorkingDirectory)/coverage/*coverage.xml' + reportDirectory: $(System.DefaultWorkingDirectory)/coverage - task: ArchiveFiles@2 - displayName: 'Archive $(Build.SourcesDirectory)' + displayName: 'Archive sources' inputs: - rootFolderOrFile: '$(Build.SourcesDirectory)' + rootFolderOrFile: $(Build.SourcesDirectory) includeRootFolder: false + - task: CopyFiles@2 + displayName: 'Copy ARM templates' + inputs: + SourceFolder: deployment + Contents: '*.json' + TargetFolder: $(build.artifactstagingdirectory)/Templates - task: PublishBuildArtifacts@1 displayName: 'Publish Artifact: drop' + + # - task: Npm@1 + # displayName: 'npm custom' + # inputs: + # command: custom + # verbose: false + # customCommand: 'install --production' \ No newline at end of file From 6ddf1b7c0403038c4b3699cbf13d2aa56e520ce9 Mon Sep 17 00:00:00 2001 From: "estefani.zuniga" Date: Tue, 24 Dec 2019 08:24:23 -0600 Subject: [PATCH 04/12] Update build pipeline 2 --- azure-pipelines.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c98daf5b3..48eefd550 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,8 +4,11 @@ trigger: - master steps: - task: Npm@1 + displayName: 'npm custom' inputs: - command: install + command: custom + verbose: false + customCommand: 'install --production' - script: 'npm test' displayName: 'Run unit tests' continueOnError: true @@ -35,9 +38,4 @@ steps: - task: PublishBuildArtifacts@1 displayName: 'Publish Artifact: drop' - # - task: Npm@1 - # displayName: 'npm custom' - # inputs: - # command: custom - # verbose: false - # customCommand: 'install --production' \ No newline at end of file + \ No newline at end of file From 7e1ba0b81b57da5c1b7d8ff3a172f7e0ebb00a13 Mon Sep 17 00:00:00 2001 From: "estefani.zuniga" Date: Tue, 24 Dec 2019 08:27:25 -0600 Subject: [PATCH 05/12] Update build pipelines 3 --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 48eefd550..06cd90224 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -8,7 +8,7 @@ steps: inputs: command: custom verbose: false - customCommand: 'install --production' + customCommand: 'install' - script: 'npm test' displayName: 'Run unit tests' continueOnError: true From 05289712cafebcffbb42324a3c085342bd64c162 Mon Sep 17 00:00:00 2001 From: "estefani.zuniga" Date: Tue, 24 Dec 2019 08:33:27 -0600 Subject: [PATCH 06/12] update build pipelines 4 --- azure-pipelines.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 06cd90224..98e8245e3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -6,9 +6,7 @@ steps: - task: Npm@1 displayName: 'npm custom' inputs: - command: custom - verbose: false - customCommand: 'install' + command: install - script: 'npm test' displayName: 'Run unit tests' continueOnError: true From b82b5c999c5f2486b02f7f86147b8f31d1a83633 Mon Sep 17 00:00:00 2001 From: "estefani.zuniga" Date: Tue, 24 Dec 2019 08:40:25 -0600 Subject: [PATCH 07/12] update build pipelines --- azure-pipelines.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 98e8245e3..48eefd550 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -6,7 +6,9 @@ steps: - task: Npm@1 displayName: 'npm custom' inputs: - command: install + command: custom + verbose: false + customCommand: 'install --production' - script: 'npm test' displayName: 'Run unit tests' continueOnError: true From 3716231e0b0150332f16460ece447b40aac9f6dd Mon Sep 17 00:00:00 2001 From: "estefani.zuniga" Date: Tue, 24 Dec 2019 08:45:47 -0600 Subject: [PATCH 08/12] update 2 --- azure-pipelines.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 48eefd550..d4743ccee 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -9,6 +9,9 @@ steps: command: custom verbose: false customCommand: 'install --production' + - task: Npm@1 + inputs: + command: install - script: 'npm test' displayName: 'Run unit tests' continueOnError: true From c0d83a77f4e2ffc9d3cff50d1ac15fce5b890e66 Mon Sep 17 00:00:00 2001 From: "estefani.zuniga" Date: Tue, 24 Dec 2019 09:09:35 -0600 Subject: [PATCH 09/12] update 1 --- azure-pipelines.yml | 79 +++++++++++++++++++++++++++++---------------- 1 file changed, 52 insertions(+), 27 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d4743ccee..ac1bb6fb6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,44 +1,69 @@ pool: - vmImage: ubuntu-16.04 + vmImage: 'ubuntu-16.04' trigger: - master steps: + - task: CopyFiles@2 + displayName: 'Copy Files to: $(build.artifactstagingdirectory)/Templates' + inputs: + SourceFolder: deployment + Contents: '*.json' + TargetFolder: '$(build.artifactstagingdirectory)/Templates' - task: Npm@1 displayName: 'npm custom' inputs: command: custom verbose: false customCommand: 'install --production' - - task: Npm@1 - inputs: - command: install - - script: 'npm test' - displayName: 'Run unit tests' - continueOnError: true - - task: PublishTestResults@2 - displayName: 'Publish Test Results' - condition: succeededOrFailed() - inputs: - testResultsFiles: $(System.DefaultWorkingDirectory)/test-report.xml - - task: PublishCodeCoverageResults@1 - displayName: 'Publish Code Coverage' - condition: 'in(variables[''Agent.JobStatus''], ''Succeeded'')' - inputs: - codeCoverageTool: Cobertura - summaryFileLocation: '$(System.DefaultWorkingDirectory)/coverage/*coverage.xml' - reportDirectory: $(System.DefaultWorkingDirectory)/coverage - task: ArchiveFiles@2 - displayName: 'Archive sources' + displayName: 'Archive $(Build.SourcesDirectory)' inputs: - rootFolderOrFile: $(Build.SourcesDirectory) + rootFolderOrFile: '$(Build.SourcesDirectory)' includeRootFolder: false - - task: CopyFiles@2 - displayName: 'Copy ARM templates' - inputs: - SourceFolder: deployment - Contents: '*.json' - TargetFolder: $(build.artifactstagingdirectory)/Templates - task: PublishBuildArtifacts@1 displayName: 'Publish Artifact: drop' +# pool: +# vmImage: ubuntu-16.04 +# trigger: +# - master +# steps: +# - task: Npm@1 +# displayName: 'npm custom' +# inputs: +# command: custom +# verbose: false +# customCommand: 'install --production' +# - task: Npm@1 +# inputs: +# command: install +# - script: 'npm test' +# displayName: 'Run unit tests' +# continueOnError: true +# - task: PublishTestResults@2 +# displayName: 'Publish Test Results' +# condition: succeededOrFailed() +# inputs: +# testResultsFiles: $(System.DefaultWorkingDirectory)/test-report.xml +# - task: PublishCodeCoverageResults@1 +# displayName: 'Publish Code Coverage' +# condition: 'in(variables[''Agent.JobStatus''], ''Succeeded'')' +# inputs: +# codeCoverageTool: Cobertura +# summaryFileLocation: '$(System.DefaultWorkingDirectory)/coverage/*coverage.xml' +# reportDirectory: $(System.DefaultWorkingDirectory)/coverage +# - task: ArchiveFiles@2 +# displayName: 'Archive sources' +# inputs: +# rootFolderOrFile: $(Build.SourcesDirectory) +# includeRootFolder: false +# - task: CopyFiles@2 +# displayName: 'Copy ARM templates' +# inputs: +# SourceFolder: deployment +# Contents: '*.json' +# TargetFolder: $(build.artifactstagingdirectory)/Templates +# - task: PublishBuildArtifacts@1 +# displayName: 'Publish Artifact: drop' + \ No newline at end of file From feb22d3b339f90d6157cd71eefa63889d9746183 Mon Sep 17 00:00:00 2001 From: "estefani.zuniga" Date: Tue, 24 Dec 2019 09:12:17 -0600 Subject: [PATCH 10/12] update2 --- azure-pipelines.yml | 79 ++++++++++++++++----------------------------- 1 file changed, 27 insertions(+), 52 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ac1bb6fb6..d4743ccee 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,69 +1,44 @@ pool: - vmImage: 'ubuntu-16.04' + vmImage: ubuntu-16.04 trigger: - master steps: - - task: CopyFiles@2 - displayName: 'Copy Files to: $(build.artifactstagingdirectory)/Templates' - inputs: - SourceFolder: deployment - Contents: '*.json' - TargetFolder: '$(build.artifactstagingdirectory)/Templates' - task: Npm@1 displayName: 'npm custom' inputs: command: custom verbose: false customCommand: 'install --production' + - task: Npm@1 + inputs: + command: install + - script: 'npm test' + displayName: 'Run unit tests' + continueOnError: true + - task: PublishTestResults@2 + displayName: 'Publish Test Results' + condition: succeededOrFailed() + inputs: + testResultsFiles: $(System.DefaultWorkingDirectory)/test-report.xml + - task: PublishCodeCoverageResults@1 + displayName: 'Publish Code Coverage' + condition: 'in(variables[''Agent.JobStatus''], ''Succeeded'')' + inputs: + codeCoverageTool: Cobertura + summaryFileLocation: '$(System.DefaultWorkingDirectory)/coverage/*coverage.xml' + reportDirectory: $(System.DefaultWorkingDirectory)/coverage - task: ArchiveFiles@2 - displayName: 'Archive $(Build.SourcesDirectory)' + displayName: 'Archive sources' inputs: - rootFolderOrFile: '$(Build.SourcesDirectory)' + rootFolderOrFile: $(Build.SourcesDirectory) includeRootFolder: false + - task: CopyFiles@2 + displayName: 'Copy ARM templates' + inputs: + SourceFolder: deployment + Contents: '*.json' + TargetFolder: $(build.artifactstagingdirectory)/Templates - task: PublishBuildArtifacts@1 displayName: 'Publish Artifact: drop' -# pool: -# vmImage: ubuntu-16.04 -# trigger: -# - master -# steps: -# - task: Npm@1 -# displayName: 'npm custom' -# inputs: -# command: custom -# verbose: false -# customCommand: 'install --production' -# - task: Npm@1 -# inputs: -# command: install -# - script: 'npm test' -# displayName: 'Run unit tests' -# continueOnError: true -# - task: PublishTestResults@2 -# displayName: 'Publish Test Results' -# condition: succeededOrFailed() -# inputs: -# testResultsFiles: $(System.DefaultWorkingDirectory)/test-report.xml -# - task: PublishCodeCoverageResults@1 -# displayName: 'Publish Code Coverage' -# condition: 'in(variables[''Agent.JobStatus''], ''Succeeded'')' -# inputs: -# codeCoverageTool: Cobertura -# summaryFileLocation: '$(System.DefaultWorkingDirectory)/coverage/*coverage.xml' -# reportDirectory: $(System.DefaultWorkingDirectory)/coverage -# - task: ArchiveFiles@2 -# displayName: 'Archive sources' -# inputs: -# rootFolderOrFile: $(Build.SourcesDirectory) -# includeRootFolder: false -# - task: CopyFiles@2 -# displayName: 'Copy ARM templates' -# inputs: -# SourceFolder: deployment -# Contents: '*.json' -# TargetFolder: $(build.artifactstagingdirectory)/Templates -# - task: PublishBuildArtifacts@1 -# displayName: 'Publish Artifact: drop' - \ No newline at end of file From ee8bcfd733aedf47c674ba5b1c2fac541be25644 Mon Sep 17 00:00:00 2001 From: "estefani.zuniga" Date: Tue, 24 Dec 2019 09:23:53 -0600 Subject: [PATCH 11/12] updated 3 --- azure-pipelines.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d4743ccee..48eefd550 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -9,9 +9,6 @@ steps: command: custom verbose: false customCommand: 'install --production' - - task: Npm@1 - inputs: - command: install - script: 'npm test' displayName: 'Run unit tests' continueOnError: true From f49be5894505f40e2eed527d0ab9cb4d28fc6f36 Mon Sep 17 00:00:00 2001 From: "estefani.zuniga" Date: Mon, 30 Dec 2019 16:33:27 -0600 Subject: [PATCH 12/12] changes airport sorting. Fixes AB#1352 --- src/services/airports.service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/airports.service.js b/src/services/airports.service.js index f9af6ab4f..276444bcf 100644 --- a/src/services/airports.service.js +++ b/src/services/airports.service.js @@ -8,7 +8,7 @@ class AirportsService { } getAll(){ - return this._airports.filter(a => a.code).map(avoidEmptyCity); + return this._airports.filter(a => a.code).map(avoidEmptyCity).sort((a, b) => (a.city > b.city) ? 1 : -1); } getByCode(code) {