Merge branch 'fix/add-landing-page-for-confirmation-data-request' of h…

…ttps://github.com/intershop/intershop-pwa into fix/add-landing-page-for-confirmation-data-request

.cz-config.js

@@ -19,6 +19,10 @@ module.exports = {
     { value: 'test', name: 'test:     Fixing or adding tests' },
     { value: 'build', name: 'build:    Anything build related' },
     { value: 'deps', name: 'deps:     Dependency updates' },
+    {
+      value: 'ci',
+      name: 'ci:    Changes to the CI configuration files and scripts',
+    },
     {
       value: 'chore',
       name: 'chore:    Anything else...',

.dockerignore

@@ -17,6 +17,7 @@
 /.nb-gradle
 /nbproject/
 /.nvmrc
+/.vim/
 /.angular/cache
 **/*.log
 /src/environments/environment.local.ts
@@ -107,6 +108,9 @@
 # from src/app/extensions/quoting/exports/.gitignore
 /src/app/extensions/quoting/exports/**/lazy*
 
+# from src/app/extensions/rating/exports/.gitignore
+/src/app/extensions/rating/exports/**/lazy*
+
 # from src/app/extensions/recently/exports/.gitignore
 /src/app/extensions/recently/exports/**/lazy*
 

.eslintrc.json

@@ -657,6 +657,7 @@
         "ish-custom-rules/use-component-change-detection": "warn",
         "ish-custom-rules/use-correct-component-overrides": "warn",
         "ish-custom-rules/use-jest-extended-matchers-in-tests": "warn",
+        "ish-custom-rules/use-ssr-variable-instead-of-platform-id": "warn",
         "ish-custom-rules/require-formly-code-documentation": "warn",
         "jest/no-commented-out-tests": "warn",
         "jest/no-disabled-tests": "warn",
@@ -796,8 +797,10 @@
             "caughtErrors": "none"
           }
         ],
+        "no-var": "warn",
         "object-shorthand": "error",
         "prefer-arrow-callback": "warn",
+        "prefer-const": "warn",
         "prefer-template": "warn",
         "prettier/prettier": "warn",
         "rxjs-angular/prefer-takeuntil": [

.github/workflows/demo-server-down.yml

@@ -6,33 +6,29 @@ on:
     paths-ignore:
       - '**.md'
       - 'docs/**'
-
-env:
-  B2C_APP_SUFFIX: universal-b2c
-  B2B_APP_SUFFIX: universal-b2b
+  workflow_dispatch:
 
 jobs:
   RemoveDemoServer:
-    if: github.event.pull_request.head.repo.owner.login == 'intershop'
+    if: github.event.repository.full_name == 'intershop/intershop-pwa'
     runs-on: ubuntu-latest
     steps:
+      - name: Determine App Names
+        run: |
+          if [[ -n "${{ github.event.pull_request.head.ref }}" ]]
+          then
+            REF=${{ github.event.pull_request.head.ref }}
+          else
+            REF=${{ github.event.ref }}
+          fi
+          REF=$( echo $REF | sed -e 's/refs\/heads\///' | sed -e 's/[^a-zA-Z0-9-]/-/g' )
+          APP_NAME=$(printf '%.60s' "${{ secrets.AZURE_DEMO_RESOURCEGROUP }}-$REF")
+          echo "APP_NAME=$APP_NAME" >> $GITHUB_ENV
       - name: Login to Azure
         run: az login --service-principal --username ${{ secrets.AZURE_SP_USERNAME }} --password ${{ secrets.AZURE_SP_PASSWORD }} --tenant ${{ secrets.AZURE_SP_TENANT }}
 
-      - name: Remove Universal B2C App
-        env:
-          APP: '${{ secrets.AZURE_DEMO_RESOURCEGROUP }}-${{ github.event.pull_request.number }}-${{ env.B2C_APP_SUFFIX }}'
-          GROUP: ${{ secrets.AZURE_DEMO_RESOURCEGROUP }}
-        run: test -z "$(az webapp show -g $GROUP -n $APP)" || az webapp delete -g $GROUP --name $APP
-
-      - name: Remove Universal B2B App
-        env:
-          APP: '${{ secrets.AZURE_DEMO_RESOURCEGROUP }}-${{ github.event.pull_request.number }}-${{ env.B2B_APP_SUFFIX }}'
-          GROUP: ${{ secrets.AZURE_DEMO_RESOURCEGROUP }}
-        run: test -z "$(az webapp show -g $GROUP -n $APP)" || az webapp delete -g $GROUP --name $APP
-
       - name: Remove containerized WebApp
         env:
           APP: '${{ secrets.AZURE_DEMO_RESOURCEGROUP }}-${{ github.event.pull_request.number }}'
           GROUP: ${{ secrets.AZURE_DEMO_RESOURCEGROUP }}
-        run: test -z "$(az webapp show -g $GROUP -n $APP)" || az webapp delete -g $GROUP --name $APP
+        run: test -z "$(az webapp show -g $GROUP -n $APP_NAME)" || az webapp delete -g $GROUP --name $APP_NAME

.github/workflows/demo-server.yml → .github/workflows/demo-server-up.yml

@@ -1,10 +1,7 @@
 name: DemoServerUp
 
 on:
-  pull_request:
-    paths-ignore:
-      - '**.md'
-      - 'docs/**'
+  workflow_dispatch:
 
 # CONFIGURATION
 # For help, go to https://github.com/Azure/Actions
@@ -14,7 +11,6 @@ on:
 #
 # 2. Change these variables for your configuration:
 env:
-  AZURE_WEBAPP_NAME: '${{ secrets.AZURE_DEMO_RESOURCEGROUP }}-${{ github.event.pull_request.number }}'
   ICM_BASE_URL: http://pwa-review.northeurope.cloudapp.azure.com:8081
 
 jobs:
@@ -25,10 +21,9 @@ jobs:
         uses: rokroskar/workflow-run-cleanup-action@master
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
   build-and-deploy:
     needs: [CancelPrevious]
-    if: github.event.pull_request.head.repo.owner.login == 'intershop'
+    if: github.event.repository.full_name == 'intershop/intershop-pwa'
     name: Build and Deploy
     runs-on: ubuntu-latest
     steps:
@@ -51,6 +46,7 @@ jobs:
       - name: Set Environment
         run: |
           echo "DOCKER_IMAGE_UNIVERSAL=${{ steps.universal.outputs.digest }}"  >> $GITHUB_ENV
+          printf 'AZURE_WEBAPP_NAME=%.60s' "${{ secrets.AZURE_DEMO_RESOURCEGROUP }}-$( echo ${{ github.event.ref }} | sed -e 's/refs\/heads\///' | sed -e 's/[^a-zA-Z0-9-]/-/g' )" >> $GITHUB_ENV
       - name: Login via Azure CLI
         run: az login --service-principal --username ${{ secrets.AZURE_SP_USERNAME }} --password ${{ secrets.AZURE_SP_PASSWORD }} --tenant ${{ secrets.AZURE_SP_TENANT }}
       - name: Create or Update containerized WebApp
@@ -61,7 +57,6 @@ jobs:
           az webapp config container set --resource-group $GROUP --name $APP --docker-registry-server-user ${{ secrets.DOCKER_REGISTRY_USERNAME }} --docker-registry-server-password ${{ secrets.DOCKER_REGISTRY_PASSWORD }} --docker-custom-image-name $DOCKER_IMAGE_UNIVERSAL || az webapp create --resource-group $GROUP --plan ${{ secrets.AZURE_DEMO_APPSERVICEPLAN }} --name $APP --docker-registry-server-user ${{ secrets.DOCKER_REGISTRY_USERNAME }} --docker-registry-server-password ${{ secrets.DOCKER_REGISTRY_PASSWORD }} --deployment-container-image-name $DOCKER_IMAGE_UNIVERSAL
           az webapp config appsettings set -g $GROUP -n $APP --settings LOGGING=true ICM_BASE_URL=$ICM_BASE_URL
           az webapp deployment container config -g $GROUP -n $APP --enable-cd true
-
       - name: Create Commit Comment
         uses: peter-evans/commit-comment@v1
         with:

.github/workflows/development.yml

@@ -122,7 +122,7 @@ jobs:
         run: npm run dead-code
 
       - name: Find Unused TestBed declarations
-        run: npm exec npm-run-all "cleanup-testbed origin/develop" check-no-changes
+        run: npm exec npm-run-all "cleanup-testbed --related origin/develop" check-no-changes
 
   Schematics:
     needs: [Quality, Jest]

.github/workflows/integration.yml

@@ -161,3 +161,14 @@ jobs:
         with:
           name: videos
           path: e2e/cypress/videos
+
+  Shellspec:
+    needs: [CancelPrevious]
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Execute shellspec tests
+        run: |
+          docker run --rm -v "${{ github.workspace }}/nginx/docker-entrypoint.d:/src" shellspec/shellspec

.gitignore

@@ -18,6 +18,7 @@ node_modules
 /.nb-gradle
 /nbproject/
 /.nvmrc
+/.vim/
 
 # misc
 /.angular/cache

.prettierignore

@@ -44,6 +44,7 @@ node_modules
 nginx.conf
 /nginx/**/*.conf
 /nginx/**/*.tmpl
+/nginx/docker-entrypoint.d/.shellspec
 /.idea/
 /charts/**/templates/*
 *~