Skip to content
This repository has been archived by the owner on Jan 24, 2023. It is now read-only.

Commit

Permalink
Merge upstream (#400)
Browse files Browse the repository at this point in the history
* WIP

* Add theme migration

* File moves

* WIP

* Add theme migration

* Start to make core a separate library

* Tweaks

* WIP

* Fix package imports

* Fix migration script

* First pass at permission effects

* Fix merge issues

* First pass at reducer

* Tidy up logging

* Fix dark theme support

* Final set of cloud-foundry code out of common

* TIdy up and get themable packages working

* Tidy up custom build code

* Tidy ups

* Set defaults when no stratos.yaml file is present

* FIx migrate script for when stratos.yaml not present

* Remove comments

* Disable scss linter from code climate

* Rejig example extensions to be a package for v4 build

* Renames, todos

* Minor fixes

* Fix frontend unit test

* Fix removed e2e target

* Fix unit tests

* Tweaks

* Finish todos

* Fix transition from space summary to app summary page
- an entity service for a space with no org was cached by guid
- an entity service for a space requiring org used cached version
- solution is to make cache id include schema key (determines with/without org)

* Add comment, tidy up rootUpdatingKey

* Fix issue where gitlab summary tab threw errors in console
- fixes #4325

* Push combine of permission configs into checkers
- overcomes some weird change of permission type

* Fix issue where default add/remove setting in change role by username was incorrect
- add/remove radio button default value governed by add/remove feature flags
- when one is set to false the radio button should be disabled and the other selected

* Fix store-test-helper

* Update readme following move to Travis-ci.com

* Ensure the correct key is used metacard favourite info (#4321)

* Fix display of details in endpoint card in endpoint list (#4319)

* Clean default/blocked logic

* Rename @stratos to @stratosui

* FIx references in tsconfig.json

* Revert change to @stratosui in code

* Revert change to @stratosui in code

* Fix endpoint connect

* Fix unit test

* Fix e2e test

* Change following review #1

* Bump github.com/gorilla/websocket from 1.4.1 to 1.4.2 in /src/jetstream (#4199)

* Bump github.com/gorilla/websocket from 1.4.1 to 1.4.2 in /src/jetstream

Bumps [github.com/gorilla/websocket](https://github.com/gorilla/websocket) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/gorilla/websocket/releases)
- [Commits](gorilla/websocket@v1.4.1...v1.4.2)

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

* Update go.sum

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>

* Fix errors in console log during setup screens

* Helm: Change default image pull policy to Always

* Add copy address and edit to endpoint list view

* Use icon that is less confusing with refresh

* Change following review #2
- Fix cf package module file name
- Make CUSTOM_USER_PERMISSION_CHECKERS optional
- Remove need to inject CUSTOM_USER_PERMISSION_CHECKERS in multiple cf modules

* Add newline at end for codeclimate

* Tidy up code and add some more comments

* Fix for buildpack filename wrapping on card

* Fix code climate issue

* Fix compilation issues

* Update endpoint-list.helpers.ts

* Improve naming

* Tidy up

* Update .gitignore

* Tidy up. Build tools in dist/tools

* Change following review

* Rename tools to devkit. Add schematics

* More improvements and theme schematic added.

* Bump gopkg.in/yaml.v2 from 2.2.8 to 2.3.0 in /src/jetstream (#4336)

* Bump gopkg.in/yaml.v2 from 2.2.8 to 2.3.0 in /src/jetstream

Bumps [gopkg.in/yaml.v2](https://github.com/go-yaml/yaml) from 2.2.8 to 2.3.0.
- [Release notes](https://github.com/go-yaml/yaml/releases)
- [Commits](go-yaml/yaml@v2.2.8...v2.3.0)

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

* CI bump

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Neil MacDougall <neil_macdougall@hotmail.com>

* Remove unused import

* Remove unused import

* [Security] Bump websocket-extensions from 0.1.3 to 0.1.4 (#4356)

Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4. **This update includes a security fix.**
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](faye/websocket-extensions-node@0.1.3...0.1.4)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Hide deployment info card if not space developer
- fixes #4322

* Only space developers can create/unmap/delete routes in app routes table
- fixes #4324

* Only Space Developers should be able to change count, terminate or ssh to instances
- fixes #4330

* Permissions: Only Space Developers should be able to create/edit/delete an Autoscaler policy
- fixes #4323

* Users with no developer roles could click on add app button
- fixes #4361

* Fix tests

* Fail CI build if imagelist generation fails

* Org Managers: Disable org role checkboxes in roles stepper if not admin/org manager
- fixes #4332

* Routes List: Filter by org breaks when user is an org auditor
- fixes #4343

* Rename the e2e cf helper file

* Fix autoscaler tab

* Changes following review

* A few minor tidy-ups to help with review

* Fix several space developer permission bugs (#4362)

* Hide deployment info card if not space developer
- fixes #4322

* Only space developers can create/unmap/delete routes in app routes table
- fixes #4324

* Only Space Developers should be able to change count, terminate or ssh to instances
- fixes #4330

* Permissions: Only Space Developers should be able to create/edit/delete an Autoscaler policy
- fixes #4323

* Users with no developer roles could click on add app button
- fixes #4361

* Fix tests

* Fix autoscaler tab

* Changes following review

* Fix service stepper navigation (#4366)

* Fix service stepper navigation on create/edit cancel/sumbit
- create service stepper from app service tab, marketplace service summary, service wall
- edit service stepper from marketplace service instances, service wall instances, space service instances and app service instances lists
- fixes #4052, contrinbutes to #4079, #4051

* Fix subscription leak
- fixes #4295
- code no-longer needed

* Force return location of service stepper, fix table edit of upsi and other improvements

* Fix unit tests

* Fix e2e tests

* Fix e2e tests, add search to marketplace service instances table

* Changes following review

* Move base-entity-* to store package

* Add snackbar

* Remove pathget

* Remove more store -> core dependencies

* Move extension-types to store

* Move favourite mgr and helper from core to store

* Move user fav manager and helper to store package

* More references

* Fix logger service removal

* Fix build

* Address PR feedback

* Fix LoggerService after code moves

* Fix logger service ref

* Fix build issues

* Fix health check import

* Move sortStringify (only used once)

* NonOptionalKeys - only used once

* Move KnownKeys

* Move BrowserStandardEncoder

* Remove last environment link

* Move favourite config mapper

* Remove dependency on StratosScopeStrings

* Move BaseEndpointAuth

* Move StratosTheme

* Move ThemeService

* Move types from utils.service that are only used once in store

* Move PermissionValues

* Move http and jetstream helpers

* Move StyleService

* Move MetricQueryType

* Move getFullEndpointApiUrl

* Move StratosStatus

* Move generateStratosEntities back to core

* Finish store -> core sep

* Address PR feedback

* Fix compilation issue

* Fix merge weirdness

* Merge downstream (#4369)

* src based changes

* changes to ./build

* ./docs

* ./

* Changes following review

* Address PR feedback

* fix build

* whitespace changes

* Fix in core public-api after merge

* Fix duplicated k8s docs

* Typed access to actions and entities via catalog entity: Core Stratos Entities (#4387)

* WIP

* WIP

* WIP

* Endpoint changes

* Fix failure handling during connect on stepper

* Fix favourites

* Removed some TODOs

* Fixes & todos

* Unit test fixes

* Fixes following merge

* Fix cf unit tests

* Changes following review

* Theming improvements for header

* Tweaks, Migration Script Docs & Notes on others (#4389)

Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>

* Build devkit outside of dist folder

* Ignore example packages when there's a stratos config file

* Add dist-devkit to git ignore

* Changes following review

* Revert change needed downstream... (only needed when suse extension is included)

* Fix after merge

Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Neil MacDougall <neil_macdougall@hotmail.com>
  • Loading branch information
5 people committed Jun 29, 2020
1 parent 5c95d1c commit 0bb9998
Show file tree
Hide file tree
Showing 498 changed files with 5,151 additions and 3,396 deletions.
2 changes: 1 addition & 1 deletion .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ plugins:
markdownlint:
enabled: true
scss-lint:
enabled: true
enabled: false
exclude_patterns:
- "config/"
- "db/"
Expand Down
10 changes: 7 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ environment.dev.ts
#v1
*.iml
docs/src
lib
tools/test-backend/config/mock.config.json
tools/.coverage-karma/
dev-certs/*
Expand Down Expand Up @@ -81,6 +80,7 @@ deploy/ci/travis/temp/
deploy/kubernetes/console/imagelist.txt

.dist/
dist-devkit/
deploy/uaa/tmp/
src/backend/*/vendor/
.v8flags*
Expand All @@ -96,8 +96,9 @@ src/jetstream/config.properties
src/jetstream/db/dbconf.yml
src/jetstream/plugins/monocular/chart-repo/chartrepo

# Customisations

# Customisations - these can be removed in the future
# Left in for now to prevent these files being checked-in, if they are still present
# from a previous checkout
src/frontend/packages/core/favicon.ico
src/frontend/packages/core/sass/custom.scss
src/frontend/packages/core/assets/eula.html
Expand All @@ -110,6 +111,9 @@ src/frontend/packages/core/assets/custom
src/frontend/packages/core/sass/custom
src/frontend/packages/core/src/index.html

# Customisation - generated import module
src/frontend/packages/core/src/_custom-import.module.ts

# Prebuild package

stratos-frontend-prebuild.zip
Expand Down
8 changes: 4 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ Details:

## 2.6.1

[Full Changelog](https://github.com/cloudfoundry/stratos/compare/2.6.0...2.6.1)
[Full Changelog](https://github.com/SUSE/stratos/compare/2.6.0...2.6.1)

This release contains a few fixes:

Expand All @@ -182,7 +182,7 @@ This release contains two fixes listed below.

## 2.5.3

[Full Changelog](https://github.com/cloudfoundry-incubator/stratos/compare/2.5.2...2.5.3)
[Full Changelog](https://github.com/suse/stratos/compare/2.5.2...2.5.3)

This release contains a number of fixes and improvements:

Expand All @@ -200,7 +200,7 @@ This release contains a number of fixes and improvements:

## 2.5.2

[Full Changelog](https://github.com/cloudfoundry-incubator/stratos/compare/2.5.1...2.5.2)
[Full Changelog](https://github.com/suse/stratos/compare/2.5.1...2.5.2)

This release contains a number of fixes and improvements:

Expand All @@ -222,7 +222,7 @@ This release contains a number of fixes and improvements:
## 2.5.1

[Full Changelog](https://github.com/cloudfoundry-incubator/stratos/compare/2.5.0...2.5.1)
[Full Changelog](https://github.com/suse/stratos/compare/2.5.0...2.5.1)

This release contains a number of fixes and improvements:

Expand Down
101 changes: 56 additions & 45 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,17 @@
"newProjectRoot": "src/frontend/packages",
"projects": {
"stratos": {
"root": "",
"root": "src/frontend/packages",
"sourceRoot": "src/frontend/packages",
"projectType": "application",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "@angular-builders/custom-webpack:browser",
"options": {
"aot": true,
"customWebpackConfig": {
"path": "./dist-devkit/build/main.js"
},
"indexTransform": "./dist-devkit/build/index.transform.js",
"preserveSymlinks": true,
"outputPath": "dist",
"index": "src/frontend/packages/core/src/index.html",
Expand All @@ -36,10 +39,6 @@
},
"configurations": {
"production": {
"budgets": [{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
Expand All @@ -57,7 +56,7 @@
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"builder": "@angular-builders/custom-webpack:dev-server",
"options": {
"aot": true,
"sslCert": "dev-ssl/server.crt",
Expand Down Expand Up @@ -94,36 +93,37 @@
}
}
},
"theme": {
"root": "src/frontend/packages/theme/",
"sourceRoot": "",
"projectType": "library",
"architect": {
"build": {
"builder": "./dist-devkit:stratos-theme",
"options": {
"outputPath": "dist/theme"
}
}
}
},
"core": {
"root": "src/frontend/packages/core/",
"sourceRoot": "src/frontend/packages/core/src",
"projectType": "application",
"sourceRoot": "src/frontend/packages/core",
"projectType": "library",
"prefix": "app",
"schematics": {},
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "@angular-devkit/build-ng-packagr:build",
"options": {
"aot": true,
"preserveSymlinks": true,
"outputPath": "dist/core",
"index": "src/frontend/packages/core/src/index.html",
"main": "src/frontend/packages/core/src/main.ts",
"polyfills": "src/frontend/packages/core/src/polyfills.ts",
"tsConfig": "src/frontend/packages/core/tsconfig.app.json",
"assets": [
"src/frontend/packages/core/favicon.ico",
"src/frontend/packages/core/assets",
{
"glob": "**/*",
"input": "custom-src/frontend/assets/custom",
"output": "/core/assets/custom"
}
],
"styles": [
"src/frontend/packages/core/src/styles.css",
"src/frontend/packages/cf-autoscaler/src/styles.css"
],
"assets": [],
"styles": [],
"scripts": []
},
"configurations": {
Expand All @@ -148,23 +148,6 @@
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "core:build"
},
"configurations": {
"production": {
"browserTarget": "core:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "core:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
Expand Down Expand Up @@ -253,6 +236,37 @@
}
}
},
"shared": {
"root": "src/frontend/packages/shared",
"sourceRoot": "src/frontend/packages/shared/src",
"projectType": "library",
"prefix": "lib",
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"options": {
"tsConfig": "src/frontend/packages/shared/tsconfig.lib.json",
"project": "src/frontend/packages/shared/ng-package.json"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/frontend/packages/shared/src/test.ts",
"tsConfig": "src/frontend/packages/shared/tsconfig.spec.json",
"karmaConfig": "src/frontend/packages/shared/karma.conf.js"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": ["src/tsconfig.json"],
"tslintConfig": "src/frontend/packages/shared/tslint.json",
"files": ["src/frontend/packages/shared/src/**/*.ts"]
}
}
}
},
"cloud-foundry": {
"root": "src/frontend/packages/cloud-foundry",
"sourceRoot": "src/frontend/packages/cloud-foundry/src",
Expand Down Expand Up @@ -349,8 +363,5 @@
"@schematics/angular:directive": {
"prefix": "app"
}
},
"cli": {
"_defaultCollection": "@nrwl/angular"
}
}
Loading

0 comments on commit 0bb9998

Please sign in to comment.