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

Merge upstream #408

Merged
merged 216 commits into from
Jul 9, 2020
Merged

Merge upstream #408

merged 216 commits into from
Jul 9, 2020

Conversation

richard-cox
Copy link
Member

richard-cox and others added 24 commits June 26, 2020 10:30
* Remove action entityLocation (not used)

* Fix restage
- fixes cloudfoundry#4392

* Remove RequestEntityLocation
* Update icons

* Update docker icon and optimize other pngs

* Improve resolution of container icon

* Update e2e test for new icons
…, improve code splitting (cloudfoundry#4412)

* Move out cf themese from _all-theme & remove custom cf table sort/filter field widths

* Move cf routes out of app.routing & move out cf route modules from cf package module (fixes code splitting)

* Fix autoscaler e2e test

* Split out CF modules and router imports into custom module

* Create cf-autoscaler package & routing modules
- note - CfAutoscalerModule is imported in CfAutoscalerPackageModule
- note - AutoscalerModule should be brought back into CfAutoscalerModule (stepper is lazy loaded.. but content missing elsewhere)

* Fix autoscaler e2e test #2

* Fix app autoscaler tab widgets, import using package name

* Move CfAutoscalerModule (app AS tab) out of always loaded AS package into lazy loaded app module

* Add comments, fix e2e test following app-running-instance change

* Allow routes to be applied to stratos navigation root without appearing in side nav

* Fix app-card-app-usage on app AS tab
- only seen when policy does not contain metrics restrictions
- fixes by bringing in CloudFoundrySharedModule again to CfAutoscalerModule
- means an also use app-running-instances again
- i've checked the chunks & sizes, they're similar as before

* Move CloudFoundrySharedModule out of CloudFoundryPackageModule

* Add comments

* Bring back in smaller search/sort input fields in main lists

* Bring back lost styling
* Use smaller page header on desktop browsers

* Change tooltip appear time
* Allow ng build to be un from any subfolder

* Add support for packages in orgs
…loudfoundry#4417)

* Fetch service in service instances card via store rather than inline
- fixes cloudfoundry#4397
- accessing entity via this.serviceInstanceEntity.entity.service_plan.entity.service.entity.service_broker_guid can sometimes fail
- fetch service, and thus service broker guid, from store instead
- this matches the table way of getting the broker

* Fix unit test

* Fix & Improve Service Instance Card
- ensure async properties have async pipe in html
- bind to params rather than properties
* Remove old symlink files in pre-4.0 Strtaos

* Also clean out favicon. Log when removing file

Co-authored-by: Richard Cox <richard.cox@suse.com>
- had a `top` with the old banner height
…dry#4429)

* E2E Debugging

* Fix travis file

* Reset travis file

* Furher debugging

* Report errors if we fail to write messages to web sockets

* Add client acknowledgement on close

* Fix backend unit tests. Undo travis change

* Remove debugging

* Remove protractor-console
- favourite & recent icon changes
@richard-cox richard-cox added the ready for review Ready for review label Jul 9, 2020
@richard-cox richard-cox self-assigned this Jul 9, 2020
@codecov-commenter
Copy link

Codecov Report

Merging #408 into master will increase coverage by 0.14%.
The diff coverage is 44.11%.

@@            Coverage Diff             @@
##           master     #408      +/-   ##
==========================================
+ Coverage   56.20%   56.34%   +0.14%     
==========================================
  Files         891      891              
  Lines       29209    29143      -66     
  Branches     4232     4217      -15     
==========================================
+ Hits        16416    16421       +5     
+ Misses      12793    12722      -71     

Copy link
Member

@nwmac nwmac left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@richard-cox richard-cox merged commit 8d26b45 into master Jul 9, 2020
@richard-cox richard-cox deleted the merge-upstream branch July 9, 2020 13:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready for review Ready for review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants