Skip to content

Commit

Permalink
Release: Sept 2020 (#699)
Browse files Browse the repository at this point in the history
* chore(release): 4.1.4

* add 4.1.4 build files

* chore(release): 4.1.5

* add version 4.1.5 build files

* fix copy paste failure when query bar is empty

* HB of localized GE.jsons (#660)

Co-authored-by: OfficeGlobal <OfficeGlobal@microsoft.com>

* ci: add Azure Static Web Apps workflow file
on-behalf-of: @Azure opensource@microsoft.com

* change multiline property

* remove main tag

* Fix: sovereign clouds metadata (#676)

* fix crashing when fetching soverign metadata

* remove dead code

* add comment to explain why only the first value is taken

* Feature: Add Graph toolkit tab (#452)

* create graph toolkit views

* add localisation for missing graph toolkit

* move implementation to json file and use succinct code

* display open in mgtdev message and change missing toolkit text

* adds source to example url

* add new examples. move file to root of project

* updates icon in code snippet

* fixes messaging changes requested

* removes unnecessary period

* display blue dot on supported queries

* add space to 'no toolkit' messaging

* display text and icon in mobile view

* Feature: History items ttl (#677)

* show history items younger than 30 days, remove the rest

* change terminology to expiry

* flip expiry check

* Fix: add fallback texts to placeholder text (#690)

* create function to provide fallback texts for placeholder texts

* display object value

* add fallback text translator to pivot items

* Localize tooltip message

* add render details header function

* add tooltip on 'admin consent required' header

* remove unnecessary white space

* add translate message function

* add tooltip on permissions panel

* Fix: remove unnecessary code snippets tab (#695)

* Task: update azure pipeline (#691)

* create drop files and version number variable

* remove publish code coverage results

* remove conditions when publishing artifacts

* temporarily pause reporting pipeline failure

* change to ubuntu-latest

* display sources directory

* Change to default working directory

* reset to build sources directory

* pause deployment

* vs2017-win2016

* remove set version number

* temporarily pause the notification task

* change vmImage

* fix merge conflicts

* add build id

* remove name from pipeline

* comment deployment steps

* remove name from build

* add test coverage back to pipeline

* remove build folder from source code

* add build folder to .gitignore

* skip tag creation, change version script

* remove condition so that there is always a build folder

* disable unwanted steps

* adds triggers and filters to the steps

* split pipeline to two jobs

* add display name

* rename job id

* add job dependency on previous task

* move publishing tasks to publishing job

* run npm install before publish

* add date to run name

* remove source branch from name

* publish code coverage results

* remove publish code coverage task

* change position of setversion number;
add condition

* update version to latest

* remove disabled tasks

* Task: HandBack of localized GE.jsons (#698)

Co-authored-by: OfficeGlobal <OfficeGlobal@microsoft.com>

* Task: Reduce padding/spacing on request header  (#696)

* remove excess padding

* remove styling

* remove break

* chore(release): 4.1.7

Co-authored-by: OfficeGlobal <47977325+OfficeGlobal@users.noreply.github.com>
Co-authored-by: OfficeGlobal <OfficeGlobal@microsoft.com>
Co-authored-by: Azure Static Web Apps <opensource@microsoft.com>
Co-authored-by: Elinor <ekaguongo@gmail.com>
  • Loading branch information
5 people committed Sep 16, 2020
1 parent a95da96 commit fbce276
Show file tree
Hide file tree
Showing 45 changed files with 519 additions and 4,400 deletions.
45 changes: 45 additions & 0 deletions .github/workflows/azure-static-web-apps-jolly-sand-0ac78c710.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: Azure Static Web Apps CI/CD

on:
push:
branches:
- dev
pull_request:
types: [opened, synchronize, reopened, closed]
branches:
- dev

jobs:
build_and_deploy_job:
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
runs-on: ubuntu-latest
name: Build and Deploy Job
steps:
- uses: actions/checkout@v2
with:
submodules: true
- name: Build And Deploy
id: builddeploy
uses: Azure/static-web-apps-deploy@v0.0.1-preview
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_JOLLY_SAND_0AC78C710 }}
repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
action: "upload"
###### Repository/Build Configurations - These values can be configured to match you app requirements. ######
# For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
app_location: "/" # App source code path
api_location: "api" # Api source code path - optional
app_artifact_location: "build" # Built app content directory - optional
###### End of Repository/Build Configurations ######

close_pull_request_job:
if: github.event_name == 'pull_request' && github.event.action == 'closed'
runs-on: ubuntu-latest
name: Close Pull Request Job
steps:
- name: Close Pull Request
id: closepullrequest
uses: Azure/static-web-apps-deploy@v0.0.1-preview
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_JOLLY_SAND_0AC78C710 }}
action: "close"
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

# dependencies
/node_modules
/build
/.pnp
.pnp.js

Expand Down
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,29 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

### [4.1.7](https://github.com/microsoftgraph/microsoft-graph-explorer-v2/compare/v4.1.4...v4.1.7) (2020-09-16)


### Bug Fixes

* add fallback texts to placeholder text ([#690](https://github.com/microsoftgraph/microsoft-graph-explorer-v2/issues/690)) ([4419110](https://github.com/microsoftgraph/microsoft-graph-explorer-v2/commit/441911079035b2cbbe137f168c8fb3baa0887dec))
* copy paste query address bar ([#658](https://github.com/microsoftgraph/microsoft-graph-explorer-v2/issues/658)) ([f47d237](https://github.com/microsoftgraph/microsoft-graph-explorer-v2/commit/f47d23733a73b9e4dc33b5c328e2e87feed318a1))
* Message bar truncation ([#679](https://github.com/microsoftgraph/microsoft-graph-explorer-v2/issues/679)) ([569bf53](https://github.com/microsoftgraph/microsoft-graph-explorer-v2/commit/569bf53eef99179bfe811de5a09835fb86656bea))
* Remove main tag ([#680](https://github.com/microsoftgraph/microsoft-graph-explorer-v2/issues/680)) ([5e634dd](https://github.com/microsoftgraph/microsoft-graph-explorer-v2/commit/5e634ddbbcc20bdd5662b11e94fc3307e5c6e84f))
* remove unnecessary code snippets tab ([#695](https://github.com/microsoftgraph/microsoft-graph-explorer-v2/issues/695)) ([7aca4fc](https://github.com/microsoftgraph/microsoft-graph-explorer-v2/commit/7aca4fca87f0e09fea706f254ce3ae4799740a9b))
* sovereign clouds metadata ([#676](https://github.com/microsoftgraph/microsoft-graph-explorer-v2/issues/676)) ([d0de298](https://github.com/microsoftgraph/microsoft-graph-explorer-v2/commit/d0de298e0d4068defaa9b135e99820c28a366d6f))

### [4.1.6](https://github.com/microsoftgraph/microsoft-graph-explorer-v4/compare/v4.1.4...v4.1.6) (2020-08-07)


### Bug Fixes

* add fallback texts to placeholder text ([#690](https://github.com/microsoftgraph/microsoft-graph-explorer-v2/issues/690)) ([4419110](https://github.com/microsoftgraph/microsoft-graph-explorer-v2/commit/441911079035b2cbbe137f168c8fb3baa0887dec))
* copy paste query address bar ([#658](https://github.com/microsoftgraph/microsoft-graph-explorer-v2/issues/658)) ([f47d237](https://github.com/microsoftgraph/microsoft-graph-explorer-v2/commit/f47d23733a73b9e4dc33b5c328e2e87feed318a1))
* Message bar truncation ([#679](https://github.com/microsoftgraph/microsoft-graph-explorer-v2/issues/679)) ([569bf53](https://github.com/microsoftgraph/microsoft-graph-explorer-v2/commit/569bf53eef99179bfe811de5a09835fb86656bea))
* Remove main tag ([#680](https://github.com/microsoftgraph/microsoft-graph-explorer-v2/issues/680)) ([5e634dd](https://github.com/microsoftgraph/microsoft-graph-explorer-v2/commit/5e634ddbbcc20bdd5662b11e94fc3307e5c6e84f))
* remove unnecessary code snippets tab ([#695](https://github.com/microsoftgraph/microsoft-graph-explorer-v2/issues/695)) ([7aca4fc](https://github.com/microsoftgraph/microsoft-graph-explorer-v2/commit/7aca4fca87f0e09fea706f254ce3ae4799740a9b))
* sovereign clouds metadata ([#676](https://github.com/microsoftgraph/microsoft-graph-explorer-v2/issues/676)) ([d0de298](https://github.com/microsoftgraph/microsoft-graph-explorer-v2/commit/d0de298e0d4068defaa9b135e99820c28a366d6f))
* copy paste query address bar ([#658](https://github.com/microsoftgraph/microsoft-graph-explorer-v4/issues/658)) ([f47d237](https://github.com/microsoftgraph/microsoft-graph-explorer-v4/commit/f47d23733a73b9e4dc33b5c328e2e87feed318a1))

### 4.1.5 (2020-07-23)
Expand Down
231 changes: 143 additions & 88 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -1,89 +1,144 @@
# ------------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License.
# See License in the project root for license information.
# ------------------------------------------------------------------------------
#
# 1. Validates the repository's pull requests and commits
# 2. Builds and publishes release artifacts

name: $(date:yyyyMMdd)$(rev:.r)

pool:
vmImage: 'vs2017-win2016'

steps:
- task: NodeTool@0
inputs:
versionSpec: '8.x'
displayName: 'Install Node.js'

- script: |
npm install
displayName: 'npm install'
- script: |
npm run lint
displayName: 'Runs linting checks'
- script: |
npm test -- --coverage
displayName: 'Runs tests'
- script: |
npm run build
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/dev'))
env:
REACT_APP_CLIENT_ID: $(REACT_APP_STAGING_CLIENT_ID)
REACT_APP_INSTRUMENTATION_KEY: $(REACT_APP_INSTRUMENTATION_KEY)
displayName: 'Build static assets for staging'
- script: |
npm run build
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
env:
REACT_APP_CLIENT_ID: $(REACT_APP_PROD_CLIENT_ID)
REACT_APP_INSTRUMENTATION_KEY: $(REACT_APP_INSTRUMENTATION_KEY)
displayName: 'Build static assets for prod'
- task: PublishCodeCoverageResults@1
inputs:
codeCoverageTool: Cobertura
summaryFileLocation: 'coverage/clover.xml'
reportDirectory: 'coverage'

- task: DeleteFiles@1
inputs:
contents: node_modules
displayName: 'Delete node_modules'

- task: AzureRmWebAppDeployment@3
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/dev'))
inputs:
azureSubscription: 'Graph-Explorer-ARM'
WebAppName: 'graphTryIt-staging'
Package: '$(System.DefaultWorkingDirectory)'
GenerateWebConfig: true
WebConfigParameters: '-Handler iisnode -NodeStartFile server.js -appType node'
displayName: 'Deploy to staging'

- task: AzureFileCopy@2
inputs:
sourcePath: 'build'
azureConnectionType: 'ConnectedServiceNameARM'
azureSubscription: 'arm-connection'
destination: 'azureBlob'
storage: 'graphstagingblobstorage'
containerName: 'staging/vendor/bower_components/explorer-v2/build'
cleanTargetBeforeCopy: true
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/dev'))
displayName: 'Deploy to -tst'

- task: AzureRmWebAppDeployment@3
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
inputs:
azureSubscription: 'Graph-Explorer-ARM'
WebAppName: 'graphTryIt'
Package: '$(System.DefaultWorkingDirectory)'
GenerateWebConfig: true
WebConfigParameters: '-Handler iisnode -NodeStartFile server.js -appType node'
displayName: 'Deploy to production'

- task: YodLabs.O365PostMessage.O365PostMessageBuild.O365PostMessageBuild@0
displayName: 'Graph Client Tooling pipeline fail notification'
inputs:
addressType: serviceEndpoint
serviceEndpointName: 'microsoftgraph pipeline status'
title: '$(Build.DefinitionName) failure notification'
text: 'This pipeline has failed. View the build details for further information. This is a blocking failure. '
condition: failed()
enabled: true
vmImage: 'ubuntu-latest'

pr:
branches:
include:
- master
- dev
- feature/*
- task/*
- fix/*
paths:
exclude:
- .github/*
- .vscode/*
- build/*
- .gitignore
- .prettierrc
- CHANGELOG.md
- CONTRIBUTING.md
- LICENSE
- README.md
- azure-pipelines.yml
- package-lock.json

trigger:
branches:
include:
- master
- dev
- feature/*
- task/*
- fix/*
paths:
exclude:
- .github/*
- .vscode/*
- build/*
- .gitignore
- .prettierrc
- CHANGELOG.md
- CONTRIBUTING.md
- LICENSE
- README.md
- azure-pipelines.yml
- package-lock.json

jobs:
- job: One
displayName: 'Build and test validation'
steps:
- task: NodeTool@0
inputs:
versionSpec: '10.x'
displayName: 'Install Node.js'

- script: |
npm install
displayName: 'npm install'
- script: |
npm run lint
displayName: 'Runs linting checks'
- script: |
npm test -- --coverage
displayName: 'Runs tests'
- script: |
npm run build
displayName: 'Run build'
- job: Two
displayName: 'Publish artifacts'
dependsOn: One
condition: succeeded()
steps:

- script: |
npm install
displayName: 'npm install'
- script: |
npm run build
env:
REACT_APP_CLIENT_ID: $(REACT_APP_STAGING_CLIENT_ID)
REACT_APP_INSTRUMENTATION_KEY: $(REACT_APP_INSTRUMENTATION_KEY)
displayName: 'Build static assets for staging'
- task: PowerShell@2
displayName: 'Set version-number'
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
inputs:
targetType: 'inline'
script: |
$lernaPath = "$Env:BUILD_SOURCESDIRECTORY\package.json"
$json = Get-Content "$lernaPath" | Out-String | ConvertFrom-Json
$versionNumber = $json.version;
Write-Host "Setting the build number variable to '$versionNumber'."
Write-Host "##vso[build.updatebuildnumber]$versionNumber"
- script: |
npm run build
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
env:
REACT_APP_CLIENT_ID: $(REACT_APP_PROD_CLIENT_ID)
REACT_APP_INSTRUMENTATION_KEY: $(REACT_APP_INSTRUMENTATION_KEY)
displayName: 'Build static assets for prod'
- task: CopyFiles@1
displayName: 'Copy files to: $(Build.ArtifactStagingDirectory)'
inputs:
SourceFolder: '$(System.DefaultWorkingDirectory)/build'
TargetFolder: '$(Build.ArtifactStagingDirectory)'

- task: PublishBuildArtifacts@1
displayName: 'Publish Artifact: drop'
inputs:
PathtoPublish: '$(build.ArtifactStagingDirectory)'

- task: DeleteFiles@1
inputs:
contents: node_modules
displayName: 'Delete node_modules'

# - task: YodLabs.O365PostMessage.O365PostMessageBuild.O365PostMessageBuild@0
# displayName: 'Graph Client Tooling pipeline fail notification'
# inputs:
# addressType: serviceEndpoint
# serviceEndpointName: 'microsoftgraph pipeline status'
# title: '$(Build.DefinitionName) failure notification'
# text: 'This pipeline has failed. View the build details for further information. This is a blocking failure. '
# condition: failed()
# enabled: false
13 changes: 0 additions & 13 deletions build/asset-manifest.json

This file was deleted.

2 changes: 0 additions & 2 deletions build/editor.worker.js

This file was deleted.

1 change: 0 additions & 1 deletion build/editor.worker.js.map

This file was deleted.

Binary file removed build/favicon.ico
Binary file not shown.
25 changes: 0 additions & 25 deletions build/index.html

This file was deleted.

2 changes: 0 additions & 2 deletions build/json.worker.js

This file was deleted.

1 change: 0 additions & 1 deletion build/json.worker.js.map

This file was deleted.

15 changes: 0 additions & 15 deletions build/manifest.json

This file was deleted.

22 changes: 0 additions & 22 deletions build/precache-manifest.60c5a133b3b92a016d4198102e8c4acb.js

This file was deleted.

Loading

0 comments on commit fbce276

Please sign in to comment.