Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Manual merge of master into stable #2538

Merged
merged 40 commits into from
Jul 7, 2022
Merged

Manual merge of master into stable #2538

merged 40 commits into from
Jul 7, 2022

Conversation

gingi
Copy link
Member

@gingi gingi commented Jul 1, 2022

Handles a reversion that did not persist in an autoatic merge.

rechen and others added 30 commits July 1, 2022 13:28
Only behavior was spammed errors to the console.
Bumps [plist](https://github.com/TooTallNate/node-plist) from 3.0.4 to 3.0.5.
- [Release notes](https://github.com/TooTallNate/node-plist/releases)
- [Changelog](https://github.com/TooTallNate/plist.js/blob/master/History.md)
- [Commits](https://github.com/TooTallNate/node-plist/commits)

---
updated-dependencies:
- dependency-name: plist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Possibly addresses issues with Conditional Access policies that require a minimum Chromium version of 91. (#2446)
Bumps [moment](https://github.com/moment/moment) from 2.29.1 to 2.29.3.
- [Release notes](https://github.com/moment/moment/releases)
- [Changelog](https://github.com/moment/moment/blob/2.29.3/CHANGELOG.md)
- [Commits](moment/moment@2.29.1...2.29.3)

---
updated-dependencies:
- dependency-name: moment
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Rena <cRui861@users.noreply.github.com>
Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Rena <cRui861@users.noreply.github.com>
Bumps [karma](https://github.com/karma-runner/karma) from 6.3.14 to 6.3.16.
- [Release notes](https://github.com/karma-runner/karma/releases)
- [Changelog](https://github.com/karma-runner/karma/blob/master/CHANGELOG.md)
- [Commits](karma-runner/karma@v6.3.14...v6.3.16)

---
updated-dependencies:
- dependency-name: karma
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Rena <cRui861@users.noreply.github.com>
Batch Explorer would not start when an exception is thrown during silent auth that isn't an authentication error.
Support for proxied environments.
Bumps [ejs](https://github.com/mde/ejs) from 3.1.6 to 3.1.7.
- [Release notes](https://github.com/mde/ejs/releases)
- [Changelog](https://github.com/mde/ejs/blob/main/CHANGELOG.md)
- [Commits](mde/ejs@v3.1.6...v3.1.7)

---
updated-dependencies:
- dependency-name: ejs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
* [WIP] Added new gradient colors to heatmap
TODO: update legend to collapse sub-states and pick better naming for the running task slot sub-states

* Categories can expand and contract now and are closed by default.
* colors of the categories will stay as subitem color
* [WIP] need to fix running state error (showing up as black instead of green)
* [WIP] need to add dropdown icon next to categories

* Fix selectState logic and add caret expansion and collapse identifier on categories

* Add logic for handling task slots for running state
* Change task slot colors to be more accessible

* Add 100% for heatmap legend and picked colors for heatmap
* clean up

* Fix typo

* Comment explaining state counter for running task usages

* Remove whitespace

* Fix unit tests
* [WIP] fix unit tests for running task overlay

* Fix async issue and fix state counter unit tests

* Add running task slot usage tests and fix percentages

* Add a few more tests for task slot usage overlay
In-release regression caused by upgrade to Electron 13 (3bd43c7).
Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md)
- [Commits](caolan/async@v2.6.3...v2.6.4)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [eventsource](https://github.com/EventSource/eventsource) from 1.0.7 to 1.1.1.
- [Release notes](https://github.com/EventSource/eventsource/releases)
- [Changelog](https://github.com/EventSource/eventsource/blob/master/HISTORY.md)
- [Commits](EventSource/eventsource@v1.0.7...v1.1.1)

---
updated-dependencies:
- dependency-name: eventsource
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
* Installs Batch Explorer in a restricted network.
Bumps [node-forge](https://github.com/digitalbazaar/forge) from 1.0.0 to 1.3.0.
- [Release notes](https://github.com/digitalbazaar/forge/releases)
- [Changelog](https://github.com/digitalbazaar/forge/blob/main/CHANGELOG.md)
- [Commits](digitalbazaar/forge@v1.0.0...v1.3.0)

---
updated-dependencies:
- dependency-name: node-forge
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
gingi and others added 10 commits July 1, 2022 13:28
Fixes AB#766, AB#768: Addresses some security vulnerabilities in module dependencies (validator and json-schema).
Addresses issue with caching multiple tokens for same user (AzureAD/microsoft-authentication-library-for-js#4486).
* Fix AB#515: Narrator reports wrong Max retry count

* Fix AB#516: Graphs are inaccessible in scan mode

* Fix AB#517: Label is not associated with control

Co-authored-by: Sanjana Kapur <sanjanakapur@microsoft.com>
Co-authored-by: Shiran Pasternak <shiran.pasternak@microsoft.com>
* Fix AB#502: The Name property of a focusable element must not be null

* Fix AB#509: Focusable sibling elements must not have the same Name and LocalizedControlType

Co-authored-by: Sanjana Kapur <sanjanakapur@microsoft.com>
* Updated changelog and version.

* Update changelog

Co-authored-by: rechen <rechen@microsoft.com>
…vice SKUs (#2400)"

8a7424b

Batch Service supports VM SKU API so reenabling service call.
@codecov
Copy link

codecov bot commented Jul 1, 2022

Codecov Report

Merging #2538 (d55d3c8) into stable (c27f474) will decrease coverage by 0.00%.
The diff coverage is 93.40%.

Impacted file tree graph

@@            Coverage Diff             @@
##           stable    #2538      +/-   ##
==========================================
- Coverage   65.00%   65.00%   -0.01%     
==========================================
  Files         914      915       +1     
  Lines       26361    26366       +5     
  Branches     5179     5190      +11     
==========================================
+ Hits        17136    17139       +3     
- Misses       9225     9227       +2     
Impacted Files Coverage Δ
...sk/ui/datetime-picker/datetime-picker.component.ts 96.07% <ø> (ø)
...pp/components/pool/graphs/pool-graphs.component.ts 15.23% <0.00%> (ø)
src/app/utils/index.ts 100.00% <ø> (ø)
...s/heatmap/legend/nodes-heatmap-legend.component.ts 63.15% <75.00%> (-2.56%) ⬇️
src/app/services/compute/vm-size.service.ts 87.23% <91.30%> (+1.29%) ⬆️
src/app/utils/node-utils.ts 92.30% <92.30%> (ø)
...elect/select-dropdown/select-dropdown.component.ts 96.82% <100.00%> (+0.05%) ⬆️
src/@batch-flask/ui/select/select.component.ts 81.33% <100.00%> (+0.13%) ⬆️
...pp/components/pool/graphs/heatmap/heatmap-color.ts 95.00% <100.00%> (ø)
...nts/pool/graphs/heatmap/nodes-heatmap.component.ts 95.23% <100.00%> (-0.40%) ⬇️
... and 5 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c27f474...d55d3c8. Read the comment docs.

@cRui861 cRui861 merged commit 771ec69 into stable Jul 7, 2022
@cRui861 cRui861 deleted the release/prepare-2.14.0 branch July 7, 2022 17:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants