Angular 9 migration

.gitignore

@@ -86,7 +86,7 @@ src/backend/*/vendor/
 .v8flags*
 
 *.bak
-./secrets.yaml
+/secrets.yaml
 build/dev_config.json
 e2e-reports/
 .stratos-git-metadata.json

angular.json

@@ -11,6 +11,7 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
+            "aot": true,
             "preserveSymlinks": true,
             "outputPath": "dist",
             "index": "src/frontend/packages/core/src/index.html",
@@ -35,6 +36,12 @@
           },
           "configurations": {
             "production": {
+              "budgets": [
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ],
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
@@ -101,6 +108,7 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
+            "aot": true,
             "preserveSymlinks": true,
             "outputPath": "dist/core",
             "index": "src/frontend/packages/core/src/index.html",
@@ -124,6 +132,12 @@
           },
           "configurations": {
             "production": {
+              "budgets": [
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ],
               "fileReplacements": [
                 {
                   "replace": "src/frontend/packages/core/src/environments/environment.ts",
@@ -216,7 +230,12 @@
             "tsConfig": "src/frontend/packages/store/tsconfig.lib.json",
             "project": "src/frontend/packages/store/ng-package.json"
           }
-        },
+        ,          "configurations": {
+            "production": {
+              "tsConfig": "src/frontend/packages/store/tsconfig.lib.prod.json"
+            }
+          }
+},
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
@@ -254,7 +273,12 @@
             "tsConfig": "src/frontend/packages/cloud-foundry/tsconfig.lib.json",
             "project": "src/frontend/packages/cloud-foundry/ng-package.json"
           }
-        },
+        ,          "configurations": {
+            "production": {
+              "tsConfig": "src/frontend/packages/cloud-foundry/tsconfig.lib.prod.json"
+            }
+          }
+},
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
@@ -292,7 +316,12 @@
             "tsConfig": "src/frontend/packages/cf-autoscaler/tsconfig.lib.json",
             "project": "src/frontend/packages/cf-autoscaler/ng-package.json"
           }
-        },
+        ,          "configurations": {
+            "production": {
+              "tsConfig": "src/frontend/packages/cf-autoscaler/tsconfig.lib.prod.json"
+            }
+          }
+},
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
@@ -323,13 +352,13 @@
   "schematics": {
     "@schematics/angular:component": {
       "prefix": "app",
-      "styleext": "scss"
+      "style": "scss"
     },
     "@schematics/angular:directive": {
       "prefix": "app"
     }
   },
   "cli": {
-    "defaultCollection": "@nrwl/angular"
+    "_defaultCollection": "@nrwl/angular"
   }
 }

deploy/ci/travis/check-e2e-pr.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+if [ -n "${TRAVIS_PULL_REQUEST}" ]; then
+  if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then
+    echo "Checking labels on ${TRAVIS_PULL_REQUEST_SLUG} #${TRAVIS_PULL_REQUEST}"
+    LABEL=$(curl -s "https://api.github.com/repos/${TRAVIS_PULL_REQUEST_SLUG}/pulls/${TRAVIS_PULL_REQUEST}" | jq -r '.labels[] | select(.name == "e2e-debug") | .name')
+    if [ "${LABEL}" == "e2e-debug" ]; then
+      echo "PR has the 'e2e-debug' label - enabling debug logging for E2E tests"
+      export STRATOS_E2E_DEBUG=true
+    fi
+  fi
+fi

deploy/ci/travis/e2e-build-script.sh

@@ -13,12 +13,12 @@ LOCAL_BUILD="true"
 # TRAVIS_COMMIT
 
 if [ -z "$TRAVIS_REPO_SLUG" ]; then
-  echo "Need to be running in Trvis"
+  echo "Need to be running in Travis"
   exit 1
 fi
 
 if [ -z "$TRAVIS_COMMIT" ]; then
-  echo "Need to be running in Trvis"
+  echo "Need to be running in Travis"
   exit 1
 fi
 
@@ -40,9 +40,11 @@ function tryGetExistingBuild() {
   if [ $? -eq 0 ]; then
     # We found an existing build, so download and unpack it
     echo "Downloading build package"
-    tar -xvf ${GZIP_NAME}
+    tar -xvf ${GZIP_NAME} > /dev/null
     if [ $? -eq 0 ]; then
       LOCAL_BUILD="false"
+    else 
+      echo "Failed to untar the build package"
     fi
     rm -rf ${GZIP_NAME}
   fi

deploy/ci/travis/job-e2e-before_script.sh

@@ -16,6 +16,9 @@ if [ "${MAILCATCHER}" == "true" ]; then
   docker run -d -p 1080:80 -p 1025:25 --name mail tophfr/mailcatcher
 fi
 
+# Start a local UAA - this will take a few seconds to come up in the background
+docker run -d -p 8080:8080 splatform/stratos-uaa
+
 # Check that the S3 server is available
 curl -k --max-time 20 ${AWS_ENDPOINT}
 if [ $? -ne 0 ]; then

deploy/ci/travis/run-e2e-tests.sh

@@ -5,6 +5,8 @@ set -e
 echo "Stratos e2e tests"
 echo "================="
 
+DIRPATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && cd ../../.. && pwd)"
+
 echo "Checking docker version"
 
 docker version
@@ -40,8 +42,6 @@ fi
 
 echo "Using local deployment for e2e tests"
 # Quick deploy locally
-# Start a local UAA - this will take a few seconds to come up in the background
-docker run -d -p 8080:8080 splatform/stratos-uaa
 
 # Build if needed or use existing build for this commit
 DIRNAME="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
@@ -64,6 +64,9 @@ export STRATOS_E2E_BASE_URL="https://127.0.0.1:5443"
 
 E2E_TARGET="e2e -- --no-webdriver-update --dev-server-target= --base-url=https://127.0.0.1:5443 --suite=${SUITE}"
 
+# Set Stratos debug if running a PR with the appropriate label
+source "${DIRPATH}/deploy/ci/travis/check-e2e-pr.sh"
+
 # Capture video if configured
 if [ "$CAPTURE_VIDEO" == "video" ]; then
   echo "Waiting for ffmpeg install to complete..."

docs/extensions.md

@@ -81,7 +81,20 @@ For example:
 The approach for all of these is the same:
 
 1. Create a new component that will provide the tab contents
-2. Ensure that your component is included in the `EntryComponent` section of your custom module
+2. Ensure that your component is declared with the `ExtensionService` in the imports of your custom module, for example:
+```
+  @NgModule({
+    imports: [
+      ExtensionService.declare([
+        ExtensionComponent,
+      ])
+    ],
+    declarations: [
+      ExtensionComponent
+    ]
+  })
+```
+
 2. Decorate the component with the `StratosTab` decorator, for example:
 
 ```
@@ -122,8 +135,8 @@ An action is a icon button that appears at the top-right of a View. For example:
 The approach for all of these is the same:
 
 1. Create a new component that will provide the contents to show when the action is clicked
-2. Ensure that your component is included in the `EntryComponent` section of your custom module
-2. Decorate the component with the `StratosAction` decorator, for example:
+2. Ensure that your component is declared with the `ExtensionService` in the imports of your custom module
+3. Decorate the component with the `StratosAction` decorator, for example:
 
 ```
 @StratosAction({
@@ -243,16 +256,19 @@ export class ExampleTabExtensionComponent implements OnInit {
 Save the file.
 
 
-### Mark the component as an entry component
+### Mark the component as an extensions component
 
-The last thing we need to do is to mark our Extension component as an entry component.
+The last thing we need to do is to mark our Extension component as an extensions component.
 
-To do this, in a text editor, open the file `src/frontend/app/custom/custom.module.ts` and add the entry components section so it looks like this:
+To do this, in a text editor, open the file `src/frontend/app/custom/custom.module.ts` and add the `ExtensionService.declare` to the import sesion, so it looks like this:
 
 ```
 @NgModule({
   imports: [
-    CommonModule
+    CommonModule,
+    ExtensionService.declare([
+      ExampleTabExtensionComponent,
+    ])    
   ],
   declarations: [ExampleTabExtensionComponent],
   entryComponents: [ExampleTabExtensionComponent]

examples/custom-src/frontend/app/custom/custom.module.ts

@@ -8,6 +8,7 @@ import { AcmeLoginComponent } from './acme-login/acme-login.component';
 import { AcmeSupportInfoComponent } from './acme-support-info/acme-support-info.component';
 import { AppActionExtensionComponent } from './app-action-extension/app-action-extension.component';
 import { AppTabExtensionComponent } from './app-tab-extension/app-tab-extension.component';
+import { ExtensionService } from '../core/extension/extension-service';
 
 const AcmeCustomizations: CustomizationsMetadata = {
   copyright: '© 2018 ACME Corp',
@@ -20,6 +21,10 @@ const AcmeCustomizations: CustomizationsMetadata = {
     CoreModule,
     SharedModule,
     MDAppModule,
+    ExtensionService.declare([
+      AppTabExtensionComponent,
+      AppActionExtensionComponent,
+    ])
   ],
   declarations: [
     AcmeLoginComponent,

ngcc.config.js

@@ -0,0 +1,16 @@
+// Ignore the deep import warnings on the AJSF library
+module.exports = {
+  packages: {
+    '@cfstratos/ajsf-core': {
+      ignorableDeepImportMatchers: [
+        /lodash\//,
+        /json-schema-draft-06.json$/,
+      ]
+    },
+    '@cfstratos/ajsf-material': {
+      ignorableDeepImportMatchers: [
+        /lodash\//,
+      ]
+    },
+  },
+};