Skip to content

Commit

Permalink
Merge pull request #27 from microsoft/master
Browse files Browse the repository at this point in the history
merge with master
  • Loading branch information
AhmedAbdoOrtiga authored Jun 23, 2020
2 parents cc6c445 + 23db22f commit 3da3dd7
Show file tree
Hide file tree
Showing 154 changed files with 4,999 additions and 976 deletions.
52 changes: 52 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: "Code scanning - action"

on:
push:
pull_request:
schedule:
- cron: '0 19 * * 0'

jobs:
CodeQL-Build:

# CodeQL runs on ubuntu-latest and windows-latest
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
fetch-depth: 2

# If this run was triggered by a pull request event, then checkout
# the head of the pull request instead of the merge commit.
- run: git checkout HEAD^2
if: ${{ github.event_name == 'pull_request' }}

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
# Override language selection by uncommenting this and choosing your languages
# with:
# languages: go, javascript, csharp, python, cpp, java

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
.github/
.prettierignore
.yarnrc
.vs/
AppXManifest.xml
copyright-header.txt
dist/
Expand Down
4 changes: 4 additions & 0 deletions build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ jobs:
displayName: generate typings for scss files
timeoutInMinutes: 3

- script: yarn null:check
displayName: check for strictNullChecks violations
timeoutInMinutes: 5

- script: yarn test --ci
displayName: run unit tests
timeoutInMinutes: 10
Expand Down
1 change: 1 addition & 0 deletions copyright-header.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"./.dependabot",
"./.git",
"./.github",
"./.vs",
"./.vscode",
"./dist",
"./docs/art/ada-cat.ansi256.txt",
Expand Down
36 changes: 19 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,13 @@
"copyright:check": "license-check-and-add check -f copyright-header.config.json",
"copyright:fix": "license-check-and-add add -f copyright-header.config.json",
"download:electron-mirror": "node ./pipeline/scripts/download-electron-mirror.js",
"fastpass": "npm-run-all --print-label scss:clean --parallel copyright:check lint:check format:check && grunt ada-cat",
"fastpass": "npm-run-all --print-label scss:build --parallel copyright:check lint:check format:check null:check && grunt ada-cat",
"fastpass:fix": "npm-run-all --print-label --serial scss:clean copyright:fix lint:fix format:fix",
"format:check": "prettier --config prettier.config.js --check \"**/*\"",
"format:fix": "prettier --config prettier.config.js --write \"**/*\"",
"lint:check": "tslint -c ./tslint.json -p ./tsconfig.json",
"lint:fix": "tslint --fix -c ./tslint.json -p ./tsconfig.json",
"null:check": "tsc -p ./tsconfig.strictNullChecks.json",
"react-devtools": "react-devtools",
"scss:build": "tsm \"src/**/*.scss\"",
"scss:clean": "grunt clean:scss",
Expand Down Expand Up @@ -60,17 +61,17 @@
"7zip-bin": "^5.0.3",
"@electron/get": "^1.12.2",
"@types/applicationinsights-js": "^1.0.7",
"@types/chrome": "0.0.114",
"@types/chrome": "0.0.116",
"@types/enzyme": "^3.10.5",
"@types/enzyme-adapter-react-16": "^1.0.6",
"@types/jest": "^26.0.0",
"@types/jsdom": "^16.2.3",
"@types/lodash": "^4.14.155",
"@types/lodash": "^4.14.156",
"@types/make-dir": "^2.1.0",
"@types/moment": "^2.13.0",
"@types/puppeteer": "^3.0.0",
"@types/q": "^1.5.4",
"@types/react": "^16.9.36",
"@types/react": "^16.9.38",
"@types/react-copy-to-clipboard": "^4.3.0",
"@types/react-dom": "^16.9.8",
"@types/react-helmet": "^6.0.0",
Expand All @@ -85,14 +86,14 @@
"commander": "^5.1.0",
"core-js-bundle": "^3.6.5",
"cross-env": "^7.0.2",
"css-loader": "^3.5.3",
"css-loader": "^3.6.0",
"electron-builder": "^22.7.0",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"express": "^4.16.4",
"extract-zip": "^2.0.1",
"fake-indexeddb": "^3.0.1",
"fork-ts-checker-webpack-plugin": "^4.1.6",
"fake-indexeddb": "^3.0.2",
"fork-ts-checker-webpack-plugin": "^5.0.3",
"grunt": "^1.1.0",
"grunt-bom-removal": "1.0.1",
"grunt-cli": "^1.3.1",
Expand All @@ -105,7 +106,7 @@
"identity-obj-proxy": "^3.0.0",
"jest": "^26.0.1",
"jest-circus": "^26.0.1",
"jest-junit": "^10.0.0",
"jest-junit": "^11.0.1",
"js-yaml": "^3.14.0",
"license-check-and-add": "^3.0.4",
"make-dir": "^3.1.0",
Expand All @@ -114,17 +115,17 @@
"npm-run-all": "^4.1.5",
"preprocess": "^3.2.0",
"prettier": "^2.0.5",
"puppeteer": "^3.3.0",
"puppeteer": "^4.0.0",
"react-devtools": "^4.7.0",
"regenerator-runtime": "^0.13.5",
"sass-loader": "^8.0.2",
"script-loader": "0.7.2",
"serve-static": "^1.13.2",
"simple-git": "^2.6.0",
"simple-git": "^2.9.0",
"source-map-loader": "^1.0.0",
"spectron": "^10.0.1",
"terser-webpack-plugin": "^3.0.3",
"ts-jest": "^26.1.0",
"terser-webpack-plugin": "^3.0.6",
"ts-jest": "^26.1.1",
"ts-loader": "^7.0.5",
"tslint": "^5.20.1",
"tslint-microsoft-contrib": "6.2.0",
Expand All @@ -133,29 +134,30 @@
"typescript": "^3.9.5",
"webdriverio": "^4.13.0",
"webpack": "^4.43.0",
"webpack-cli": "^3.3.11",
"webpack-cli": "^3.3.12",
"webpack-node-externals": "^1.7.2"
},
"dependencies": {
"accessibility-insights-for-android-service-bin": "^1.2.0",
"appium-adb": "^8.5.1",
"appium-adb": "^8.6.2",
"applicationinsights-js": "^1.0.21",
"axe-core": "3.5.1",
"axios": "^0.19.2",
"classnames": "^2.2.6",
"electron": "8.2.2",
"electron-log": "^4.2.1",
"electron-log": "^4.2.2",
"electron-updater": "^4.3.1",
"idb-keyval": "^3.2.0",
"lodash": "^4.17.15",
"moment": "^2.26.0",
"moment": "^2.27.0",
"office-ui-fabric-react": "7.98.0",
"portfinder": "^1.0.26",
"q": "1.5.1",
"react": "^16.13.1",
"react-copy-to-clipboard": "^5.0.2",
"react-dom": "^16.13.1",
"react-helmet": "^6.1.0",
"react-resize-detector": "^4.2.3",
"react-resize-detector": "^5.0.6",
"react-router-dom": "^5.2.0",
"ua-parser-js": "^0.7.21",
"uuid": "^8.1.0",
Expand Down
26 changes: 3 additions & 23 deletions src/DetailsView/Styles/detailsview.scss
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ div.insights-file-issue-details-dialog-container {
#details-container {
display: flex;
flex-direction: column;
height: 100%;

.ms-Nav-compositeLink a {
border-left: $pivotItemLeftBorderWidth $pivotItemBorderStyle $neutral-0;
Expand Down Expand Up @@ -244,6 +245,7 @@ div.insights-file-issue-details-dialog-container {
grid-template-rows: 1fr;
width: 100%;
min-height: 0;
height: 100%;
&.reflow-ui {
grid-template-columns: $detailsViewReflowLeftNavWidth 1fr;
}
Expand Down Expand Up @@ -279,17 +281,6 @@ div.insights-file-issue-details-dialog-container {
.ms-Nav-navItems {
margin-bottom: 0px;
}
.button-flex-container .status-icon {
color: $primary-text;
margin-left: 24px;
font-size: 18px;
&.negative-outcome-icon {
color: $negative-outcome;
}
&.positive-outcome-icon {
color: $positive-outcome;
}
}
}
.test-step-view {
padding-left: 0.75vw;
Expand Down Expand Up @@ -397,11 +388,6 @@ div.insights-file-issue-details-dialog-container {
padding-left: calc(0.5vw + 13px); // 13px is Chevron width.
}
.test-step-nav {
.ms-Nav-compositeLink {
.button-flex-container {
width: 100%;
}
}
z-index: 100;
background-color: $neutral-0;
.index-circle {
Expand All @@ -425,13 +411,6 @@ div.insights-file-issue-details-dialog-container {
.ms-Button-label {
color: $neutral-100;
}
.button-flex-container {
display: flex;
flex-wrap: nowrap;
justify-content: flex-start;
height: 100%;
align-items: center;
}
&.is-selected {
a {
background-color: $communication-tint-40;
Expand Down Expand Up @@ -462,6 +441,7 @@ div.insights-file-issue-details-dialog-container {
.details-view-body-content-pane {
display: flex;
flex-direction: column;
height: 100%;
&.reflow-ui {
word-break: break-word;
}
Expand Down
24 changes: 24 additions & 0 deletions src/DetailsView/components/left-nav/common-left-nav-link.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

@import '../../../common/styles/colors.scss';
@import '../../../common/styles/common.scss';

:global(.is-selected) .left-nav-link-container {
color: $always-black;
}

.left-nav-link-container {
padding-left: 5%;
padding-right: 8%;
width: $detailsViewLeftNavWidth;
color: $primary-text;
display: flex;
flex-wrap: nowrap;
justify-content: flex-start;
height: 100%;
align-items: center;
.link-icon {
font-size: 24px;
}
}
Loading

0 comments on commit 3da3dd7

Please sign in to comment.