[ADF-5283] Fix Permission Flaky test (#6380 )

* [ADF-5283] Fix Permission Flaky test * * Removed search service * * check permission for folder * * execution flow fixed * * wait for files to index * Fix e2e tests * * wait for user to index * * try something api fix * * revert back the changes * Add sleep * Refactor permission tests * bring back good things Co-authored-by: Cano <david.cano.nieto@gmail.com> Co-authored-by: Eugenio Romano <eromano@users.noreply.github.com> Co-authored-by: Eugenio Romano <eugenio.romano@alfresco.com>
Update protractor.excludes.json
2026-09-16 18:13:06 +00:00 · 2020-12-08 11:43:55 +00:00 · 2020-12-08 09:59:16 +00:00 · 2020-12-07 21:03:41 +00:00 · 2020-12-07 21:03:01 +00:00 · 2020-12-07 16:15:48 +00:00
1750 changed files with 63329 additions and 37963 deletions
@@ -0,0 +1,17 @@
+# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
+# For additional information regarding the format and rule options, please see:
+# https://github.com/browserslist/browserslist#queries
+
+# For the full list of supported browsers by the Angular framework, please see:
+# https://angular.io/guide/browser-support
+
+# You can see what browsers were selected by your queries by running:
+#   npx browserslist
+
+last 1 Chrome version
+last 1 Firefox version
+last 2 Edge major versions
+last 2 Safari major version
+last 2 iOS major versions
+Firefox ESR
+not IE 9-11 # For IE 9-11 support, remove 'not'.
@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 5
+  target-branch: develop
@@ -0,0 +1,54 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [develop, master]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [develop]
+  schedule:
+    - cron: '0 5 * * 0'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # If this run was triggered by a pull request event, then checkout
+    # the head of the pull request instead of the merge commit.
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      # Override language selection by uncommenting this and choosing your languages
+      with:
+        languages: javascript
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
@@ -0,0 +1,18 @@
+on: 
+  issue_comment:
+    types: [created]
+name: Automatic Rebase
+jobs:
+  rebase:
+    name: Rebase
+    if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase')
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout the latest code
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - name: Automatic Rebase
+      uses: cirrus-actions/rebase@1.3.1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -3,12 +3,13 @@ node_modules
 bundles
 workspace.xml
 .idea/
+*.iml
 .env.*
 .env
 dist/
 e2e/.env.cloud
 tmp
-e2e-output/
+e2e-output*/
 /e2e/downloads/
 *.npmrc
 .history
@@ -23,3 +24,6 @@ e2e-output/
 coverage/
 /desktop.ini
 out-tsc
+!/.protractor-smartrunner/
+/reports/
+e2e-result-*
@@ -3,13 +3,24 @@ git:
  quiet: true

 language: node_js
+arch: arm64-graviton2
 dist: bionic
 node_js:
-  - '12.16.3'
+  - '12.18.4'

+before_install: . ./scripts/ci/job_hooks/before_install.sh
 install:
    echo "no install"

+env:
+    global:
+        #E2E VARIABLES
+        - SAVE_SCREENSHOT=true
+        - REDIRECT_URI=/
+        - REDIRECT_URI_LOGOUT=/logout/
+        - BROWSER_RUN=true
+        - MAXINSTANCES=3
+
 branches:
  only:
  - master
@@ -17,35 +28,26 @@ branches:
  - /.*old-env.*/
  - /.*next-release.*/
  - /.*beta.*/
-  - /.*greenkeeper.*/

 stages:
-  - name: Lint & Build Dist
-    if: type = pull_request OR type = api
  - name: Lint & Build Dist & Release
-    if: (type = push OR type = cron) AND tag IS blank
-  - name: Update Rancher
-    if: (type = push AND tag IS blank)  OR type = api
-  - name: Deploy PR
-    if: type = pull_request && commit_message =~ /\[create preview\]/
+    if: tag IS blank
  - name: Check bundle
    if: type = push AND tag IS blank
+  - name: Trigger ADF child build
+    if: (branch = develop AND type = push) OR type = api
  - name: Unit test
    if: (branch != master AND type != cron AND tag IS blank) OR type = api
  - name: e2e Test
    if: (branch != master AND type != cron AND tag IS blank) OR type = api
  - name: Update Children Projects
-    if: branch = master AND type = push OR (tag =~ .*beta.*)
-  - name: Release beta tag
+    if: tag =~ .*beta.*
+  - name: Release tag
    if: type = cron OR branch = master
-  - name: Trigger ADF child build
-    if: (branch = develop AND type = push) OR type = api

 addons:
    chrome: stable
 before_script:
-    - "sudo chown root /opt/google/chrome/chrome-sandbox"
-    - "sudo chmod 4755 /opt/google/chrome/chrome-sandbox"
    - export GIT_HASH=`git rev-parse HEAD`
 services:
    - xvfb
@@ -53,20 +55,21 @@ services:
 jobs:
    include:
        # Run Only for any PR
-        - stage: Lint & Build Dist
-          name:  Lint & Build Dist
-          script:
-            - ./scripts/travis/build/build.sh || exit 1;
-            - ./scripts/lint.sh || exit 1;
-
-        # Run Only on develop and master
        - stage: Lint & Build Dist & Release
-          name:  Lint & Build Dist & Release
+          name:  Build
          script:
-            - ./scripts/travis/build/build.sh || exit 1;
-            - ./scripts/lint.sh || exit 1;
+            - ./scripts/travis/build/build.sh
            - ./scripts/travis/release/release-npm.sh
+            - ./scripts/travis/release/release-docker.sh

+          after_success:
+            - ./scripts/ci/utils/artifact-to-s3.sh -a ./dist/demo-shell -o "$S3_DBP_FOLDER/alfresco-demoshell.tar.bz2"
+            - ./scripts/ci/utils/artifact-to-s3.sh -a ./lib/dist -o "$S3_DBP_FOLDER/alfresco-libs.tar.bz2"
+
+        - stage: Lint & Build Dist & Release
+          name:  Lint
+          script:
+             - ./scripts/lint.sh

        - stage: Unit test
          name: Unit test content
@@ -75,42 +78,60 @@ jobs:
          name: Unit test core extension demo
          script: ./scripts/travis/unit-test/core-extension.sh
        - stage: Unit test
-          name: Unit test process process-cloud insights
+          name: Unit test process insights
          script: ./scripts/travis/unit-test/process.sh
+        - stage: Unit test
+          name: Unit test process-cloud
+          script: ./scripts/travis/unit-test/process-cloud.sh


        - stage: Update Children Projects
          script: ./scripts/travis/update/update-children.sh

-        - stage: Release beta tag
+        - stage: Release tag
          script: ./scripts/travis/release/git-tag.sh

-
        - stage: e2e Test
          name: core
+          before_script:
+            - ./scripts/ci/job_hooks/before_e2e.sh
+            - ./scripts/ci/check-env/check-cs-env.sh || travis_terminate 1
+            - ./scripts/ci/check-env/check-ps-env.sh || travis_terminate 1
          script: ./scripts/travis/e2e/core-e2e.sh
+          after_script: ./scripts/ci/job_hooks/after_e2e.sh
+
        - stage: e2e Test
          name:  content
+          before_script:
+              - ./scripts/ci/job_hooks/before_e2e.sh
+              - ./scripts/ci/check-env/check-cs-env.sh || travis_terminate 1
          script: ./scripts/travis/e2e/content-services-e2e.sh
+          after_script: ./scripts/ci/job_hooks/after_e2e.sh
+
        - stage: e2e Test
          name:  search
+          before_script:
+              - ./scripts/ci/job_hooks/before_e2e.sh
+              - ./scripts/ci/check-env/check-cs-env.sh || travis_terminate 1
          script: ./scripts/travis/e2e/search-e2e.sh
+          after_script: ./scripts/ci/job_hooks/after_e2e.sh
+
        - stage: e2e Test
          name: process
+          before_script:
+              - ./scripts/ci/job_hooks/before_e2e.sh || travis_terminate 1
+              - ./scripts/ci/check-env/check-ps-env.sh || travis_terminate 1
          script: ./scripts/travis/e2e/process-services-e2e.sh
+          after_script: ./scripts/ci/job_hooks/after_e2e.sh
+
        - stage: e2e Test
          name: process Cloud
+          before_script:
+              - ./scripts/ci/job_hooks/before_e2e.sh
+              - ./scripts/ci/check-env/check-cs-env.sh || travis_terminate 1
+              - ./scripts/ci/check-env/check-ps-cloud-env.sh || travis_terminate 1
          script: ./scripts/travis/e2e/process-services-cloud-e2e.sh
-
-
-        - stage: Update Rancher
-          name: Update Rancher
-          script: ./scripts/travis/deploy/deploy.sh
-
-        - stage: Deploy PR
-          name: Deploy PR
-          script: ./scripts/travis/deploy/deploy-pr.sh
-
+          after_script: ./scripts/ci/job_hooks/after_e2e.sh

        - stage: Check bundle
          script:
@@ -137,5 +158,4 @@ notifications:
 cache:
  directories:
  - node_modules
-  - demo-shell/dist
  - tmp
@@ -10,7 +10,7 @@
          "name": "e2e",
          "program": "${workspaceFolder}/node_modules/protractor/bin/protractor",
          "args": [
-              "`${workspaceFolder}/.vscode/closest-config-finder.sh ${file} protractor.conf.ts`",
+              "`${workspaceFolder}/.vscode/closest-config-finder.sh ${file} e2e/protractor.conf.js`",
              "--specs=${file}"
          ],
          "envFile": "${workspaceFolder}/.env",
@@ -13,10 +13,10 @@ Before you submit a pull request please follow the steps below:
 * Search in the [GitHub release history](https://github.com/Alfresco/alfresco-ng2-components/releases) to see if your
  issue has already been solved in a new version of ADF.
 * Fork our repository (if you don't know how to do this, read [this GitHub document](https://help.github.com/articles/creating-a-pull-request-from-a-fork/)).
-* Make your changes in a new git branch starting from development and following our [naming convention](https://github.com/Alfresco/alfresco-ng2-components/wiki/Branching-Strategy)
+* Make your changes in a new git branch starting from develop and following our [naming convention](https://github.com/Alfresco/alfresco-ng2-components/wiki/Branching-Strategy)

     ```shell
-     git checkout -b dev-{developerName}-{GitIssuedId/JiraIssueId} development
+     git checkout -b dev-{developerName}-{GitIssuedId/JiraIssueId} develop
     ```

 * Create your PR **including appropriate test cases** following the [code contribution acceptance criteria](https://github.com/Alfresco/alfresco-ng2-components/wiki/Code-contribution-acceptance-criteria)
@@ -28,16 +28,16 @@ Before you submit a pull request please follow the steps below:
    git push origin dev-{developerName}-{GitIssuedId/JiraIssueId}
    ```

-* In GitHub, send a pull request to `development`.
+* In GitHub, send a pull request to `develop`.
 * If we suggest changes then:
  * Make the required updates.
  * Re-run the tests.
  * Rebase your branch and force push to your GitHub repository (this will update your Pull Request):

    ```shell
-    git fetch development
+    git fetch develop
    git checkout dev-my-branch
-    git rebase development -i
+    git rebase develop -i
    git push -f
    ```
 Note: If you need more information about how to sync your fork, see [this page](https://help.github.com/articles/syncing-a-fork/).
@@ -1,10 +1,29 @@
-FROM nginx:stable-alpine
-LABEL version="3.0.0"
+# 1. Generate licenses

-COPY ./docker/nginx.conf /etc/nginx/nginx.conf
-COPY ./docker/entrypoint.sh /
+FROM node:12.16.2-alpine3.9 AS builder
+WORKDIR /usr/src/alfresco
+COPY package.json package.json

-WORKDIR /usr/share/nginx/html
-COPY demo-shell/dist/ .
+RUN mkdir -p ./licenses && \
+  yarn licenses list > ./licenses/licenses.txt && \
+  yarn licenses generate-disclaimer > ./licenses/disclaimer.txt

-ENTRYPOINT [ "/entrypoint.sh" ]
+# 2. Generate image
+
+FROM nginxinc/nginx-unprivileged:1.19.3-alpine
+
+ARG PROJECT_NAME
+
+COPY docker/default.conf.template /etc/nginx/templates/
+COPY docker/docker-entrypoint.d/* /docker-entrypoint.d/
+
+COPY dist/$PROJECT_NAME /usr/share/nginx/html/
+COPY dist/$PROJECT_NAME/app.config.json /etc/nginx/templates/app.config.json.template
+COPY --from=builder /usr/src/alfresco/licenses /usr/share/nginx/html/
+
+USER root
+RUN chmod a+w -R /etc/nginx/conf.d
+USER 101
+
+ENV BASE_PATH=/
+ENV NGINX_ENVSUBST_OUTPUT_DIR=/etc/nginx/conf.d
@@ -1,7 +1,7 @@
 # Prerequisites for building and running apps with the Alfresco Application Development Framework

 See our tutorial
-[Preparing the development environment](docs/tutorials/preparing-environment.md)
+[Creating your first ADF Application](docs/tutorials/creating-your-first-adf-application.md)
 for full details of what you need to install before using ADF.

 If you experience [CORS](https://en.wikipedia.org/wiki/Cross-origin_resource_sharing)
@@ -23,9 +23,7 @@ See the [Introduction page](INTRODUCTION.md) to get started with the Alfresco Ap

 ## Prerequisites

-Before you start using this development framework, make sure you have installed all required software and done all the necessary configuration. See our tutorial
-[Preparing the development environment](docs/tutorials/preparing-environment.md)
-for full details.
+Before you start using this development framework, make sure you have installed all required software and done all the necessary configuration. see the prerequisites section in [creating your first ADF Application](./creating-your-first-adf-application.md) for full details.

 ## Components

@@ -3,7 +3,7 @@
  "version": 1,
  "newProjectRoot": "lib",
  "projects": {
-    "dist": {
+    "demoshell": {
      "root": "demo-shell",
      "sourceRoot": "demo-shell/src",
      "projectType": "application",
@@ -11,253 +11,24 @@
        "build": {
          "builder": "@angular-devkit/build-angular:browser",
          "options": {
-            "outputPath": "demo-shell/dist",
+            "aot": true,
+            "allowedCommonJsDependencies": [
+              "minimatch",
+              "minimatch-browser",
+              "moment-es6",
+              "superagent",
+              "event-emitter",
+              "brace-expansion",
+              "d",
+              "chart.js"
+            ],
+            "outputPath": "dist/demo-shell",
            "index": "demo-shell/src/index.html",
            "main": "demo-shell/src/main.ts",
-            "tsConfig": "demo-shell/src/tsconfig.app.json",
+            "tsConfig": "tsconfig.dev.json",
            "polyfills": "demo-shell/src/polyfills.ts",
            "stylePreprocessorOptions": {
-              "includePaths": [
-                "demo-shell/src/node_modules"
-              ]
-            },
-            "assets": [
-              "demo-shell/src/assets",
-              "demo-shell/src/favicon-96x96.png",
-              "demo-shell/src/app.config.json",
-              {
-                "glob": "**/*",
-                "input": "demo-shell/resources",
-                "output": "/resources"
-              },
-              {
-                "glob": "**/*",
-                "input": "demo-shell/src/app/components/lazy-loading/i18n",
-                "output": "/resources/lazy-loading/i18n"
-              },
-              {
-                "glob": "**/*",
-                "input": "node_modules/@alfresco/adf-core/prebuilt-themes",
-                "output": "/assets/prebuilt-themes"
-              },
-              {
-                "glob": "**/*",
-                "input": "node_modules/@alfresco/adf-core/bundles/assets",
-                "output": "/assets"
-              },
-              {
-                "glob": "**/*",
-                "input": "node_modules/@alfresco/adf-insights/bundles/assets",
-                "output": "/assets"
-              },
-              {
-                "glob": "**/*",
-                "input": "node_modules/@alfresco/adf-process-services/bundles/assets",
-                "output": "/assets"
-              },
-              {
-                "glob": "**/*",
-                "input": "node_modules/@alfresco/adf-process-services-cloud/bundles/assets",
-                "output": "/assets"
-              },
-              {
-                "glob": "**/*",
-                "input": "node_modules/@alfresco/adf-content-services/bundles/assets",
-                "output": "/assets"
-              },
-              {
-                "glob": "pdf.worker.min.js",
-                "input": "node_modules/pdfjs-dist/build",
-                "output": "/"
-              },
-              {
-                "glob": "**/*",
-                "input": "node_modules/ngx-monaco-editor/assets/monaco",
-                "output": "/assets/monaco/"
-              }
-            ],
-            "styles": [
-              "demo-shell/src/assets/fonts/material-icons/material-icons.css",
-              "demo-shell/src/assets/fonts/muli/muli.css",
-              "demo-shell/src/styles.scss",
-              "demo-shell/src/custom-style.scss"
-            ],
-            "scripts": [
-              "node_modules/pdfjs-dist/build/pdf.js",
-              "node_modules/pdfjs-dist/web/pdf_viewer.js",
-              "node_modules/raphael/raphael.min.js",
-              "node_modules/moment/min/moment.min.js"
-            ]
-          },
-          "configurations": {
-            "production": {
-              "optimization": true,
-              "outputHashing": "all",
-              "sourceMap": false,
-              "extractCss": true,
-              "namedChunks": false,
-              "aot": true,
-              "extractLicenses": true,
-              "vendorChunk": true,
-              "buildOptimizer": true,
-              "verbose": false,
-              "budgets": [
-                {
-                  "type": "bundle",
-                  "name": "vendor",
-                  "baseline": "4.2MB",
-                  "warning": "4.5MB",
-                  "error": "5.0MB"
-                }
-              ],
-              "fileReplacements": [
-                {
-                  "replace": "demo-shell/src/environments/environment.ts",
-                  "with": "demo-shell/src/environments/environment.prod.ts"
-                }
-              ]
-            },
-            "e2e": {
-              "fileReplacements": [
-                {
-                  "replace": "demo-shell/src/environments/environment.ts",
-                  "with": "demo-shell/src/environments/environment.e2e.ts"
-                }
-              ]
-            }
-          }
-        },
-        "serve": {
-          "builder": "@angular-devkit/build-angular:dev-server",
-          "options": {
-            "browserTarget": "dist:build",
-            "host": "0.0.0.0",
-            "port": 3000,
-            "proxyConfig": "demo-shell/proxy.conf.js",
-            "disableHostCheck": true
-          },
-          "configurations": {
-            "production": {
-              "browserTarget": "dist:build:production"
-            },
-            "e2e": {
-              "browserTarget": "dist:build:e2e"
-            }
-          }
-        },
-        "extract-i18n": {
-          "builder": "@angular-devkit/build-angular:extract-i18n",
-          "options": {
-            "browserTarget": "dist:build"
-          }
-        },
-        "test": {
-          "builder": "@angular-devkit/build-angular:karma",
-          "options": {
-            "main": "demo-shell/src/test.ts",
-            "karmaConfig": "./demo-shell/karma.conf.js",
-            "polyfills": "demo-shell/src/polyfills.ts",
-            "tsConfig": "demo-shell/src/tsconfig.spec.json",
-            "scripts": [
-              "node_modules/pdfjs-dist/build/pdf.js",
-              "node_modules/pdfjs-dist/web/pdf_viewer.js",
-              "node_modules/raphael/raphael.min.js",
-              "node_modules/moment/min/moment.min.js"
-            ],
-            "styles": [
-              "demo-shell/src/assets/fonts/material-icons/material-icons.css",
-              "demo-shell/src/assets/fonts/muli/muli.css",
-              "demo-shell/src/styles.scss",
-              "demo-shell/src/custom-style.scss"
-            ],
-            "assets": [
-              "demo-shell/src/assets",
-              "demo-shell/src/favicon-96x96.png",
-              "demo-shell/src/app.config.json",
-              {
-                "glob": "**/*",
-                "input": "demo-shell/resources",
-                "output": "/resources"
-              },
-              {
-                "glob": "**/*",
-                "input": "demo-shell/src/app/components/lazy-loading/i18n",
-                "output": "/resources/lazy-loading/i18n"
-              },
-              {
-                "glob": "**/*",
-                "input": "node_modules/@alfresco/adf-core/prebuilt-themes",
-                "output": "/assets/prebuilt-themes"
-              },
-              {
-                "glob": "**/*",
-                "input": "node_modules/@alfresco/adf-core/bundles/assets",
-                "output": "/assets"
-              },
-              {
-                "glob": "**/*",
-                "input": "node_modules/@alfresco/adf-insights/bundles/assets",
-                "output": "/assets"
-              },
-              {
-                "glob": "**/*",
-                "input": "node_modules/@alfresco/adf-process-services/bundles/assets",
-                "output": "/assets"
-              },
-              {
-                "glob": "**/*",
-                "input": "node_modules/@alfresco/adf-process-services-cloud/bundles/assets",
-                "output": "/assets"
-              },
-              {
-                "glob": "**/*",
-                "input": "node_modules/@alfresco/adf-content-services/bundles/assets",
-                "output": "/assets"
-              },
-              {
-                "glob": "pdf.worker.min.js",
-                "input": "node_modules/pdfjs-dist/build",
-                "output": "/"
-              },
-              {
-                "glob": "**/*",
-                "input": ".node_modules/ngx-monaco-editor/assets/monaco",
-                "output": "/assets/monaco/"
-              }
-            ]
-          }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "./demo-shell/src/tsconfig.app.json"
-            ],
-            "exclude": [
-              "**/node_modules/**/*",
-              "package.json"
-            ]
-          }
-        }
-      }
-    },
-    "dev": {
-      "root": "demo-shell",
-      "sourceRoot": "demo-shell/src",
-      "projectType": "application",
-      "architect": {
-        "build": {
-          "builder": "@angular-devkit/build-angular:browser",
-          "options": {
-            "outputPath": "demo-shell/dist",
-            "index": "demo-shell/src/index.html",
-            "main": "demo-shell/src/main.ts",
-            "tsConfig": "demo-shell/src/tsconfig.dev.json",
-            "polyfills": "demo-shell/src/polyfills.ts",
-            "stylePreprocessorOptions": {
-              "includePaths": [
-                "lib"
-              ]
+              "includePaths": ["lib"]
            },
            "assets": [
              "demo-shell/src/assets",
@@ -359,6 +130,12 @@
          },
          "configurations": {
            "production": {
+              "budgets": [
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ],
              "optimization": true,
              "outputHashing": "all",
              "sourceMap": false,
@@ -377,6 +154,12 @@
              ]
            },
            "e2e": {
+              "budgets": [
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ],
              "fileReplacements": [
                {
                  "replace": "demo-shell/src/environments/environment.ts",
@@ -389,7 +172,7 @@
        "serve": {
          "builder": "@angular-devkit/build-angular:dev-server",
          "options": {
-            "browserTarget": "dev:build",
+            "browserTarget": "demoshell:build",
            "host": "0.0.0.0",
            "port": 3000,
            "proxyConfig": "demo-shell/proxy.conf.js",
@@ -397,19 +180,13 @@
          },
          "configurations": {
            "production": {
-              "browserTarget": "dev:build:production"
+              "browserTarget": "demoshell:build:production"
            },
            "e2e": {
-              "browserTarget": "dev:build:e2e"
+              "browserTarget": "demoshell:build:e2e"
            }
          }
        },
-        "extract-i18n": {
-          "builder": "@angular-devkit/build-angular:extract-i18n",
-          "options": {
-            "browserTarget": "dev:build"
-          }
-        },
        "test": {
          "builder": "@angular-devkit/build-angular:karma",
          "options": {
@@ -519,18 +296,13 @@
        "lint": {
          "builder": "@angular-devkit/build-angular:tslint",
          "options": {
-            "tsConfig": [
-              "./demo-shell/src/tsconfig.app.json"
-            ],
-            "exclude": [
-              "**/node_modules/**/*",
-              "package.json"
-            ]
+            "tsConfig": ["tsconfig.dev.json"],
+            "exclude": ["**/node_modules/**/*", "package.json"]
          }
        }
      }
    },
-    "lib-e2e-test": {
+    "demoshell-e2e": {
      "root": "demo-shell",
      "sourceRoot": "./demo-shell",
      "projectType": "application",
@@ -551,19 +323,15 @@
        "e2e": {
          "builder": "@angular-devkit/build-angular:protractor",
          "options": {
-            "protractorConfig": "./protractor.conf.ts",
+            "protractorConfig": "./e2e/protractor.conf.js",
            "devServerTarget": "lib-e2e-test:serve"
          }
        },
        "lint": {
          "builder": "@angular-devkit/build-angular:tslint",
          "options": {
-            "tsConfig": [
-              "./e2e/tsconfig.e2e.json"
-            ],
-            "exclude": [
-              "**/node_modules/**/*"
-            ]
+            "tsConfig": ["./e2e/tsconfig.e2e.json"],
+            "exclude": ["**/node_modules/**/*"]
          }
        }
      }
@@ -582,7 +350,8 @@
          },
          "configurations": {
            "production": {
-              "project": "lib/core/ng-package.json"
+              "project": "lib/core/ng-package.json",
+              "tsConfig": "lib/core/tsconfig.lib.prod.json"
            }
          }
        },
@@ -601,11 +370,9 @@
          "options": {
            "tsConfig": [
              "lib/core/tsconfig.lib.json",
-              "lib/core/tsconfig.lib.json"
+              "lib/core/tsconfig.spec.json"
            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
+            "exclude": ["**/node_modules/**"]
          }
        }
      }
@@ -624,7 +391,8 @@
          },
          "configurations": {
            "production": {
-              "project": "lib/content-services/ng-package.json"
+              "project": "lib/content-services/ng-package.json",
+              "tsConfig": "lib/content-services/tsconfig.lib.prod.json"
            }
          }
        },
@@ -645,9 +413,7 @@
              "lib/content-services/tsconfig.lib.json",
              "lib/content-services/tsconfig.spec.json"
            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
+            "exclude": ["**/node_modules/**"]
          }
        }
      }
@@ -666,7 +432,8 @@
          },
          "configurations": {
            "production": {
-              "project": "lib/process-services/ng-package.json"
+              "project": "lib/process-services/ng-package.json",
+              "tsConfig": "lib/process-services/tsconfig.lib.prod.json"
            }
          }
        },
@@ -687,9 +454,7 @@
              "lib/process-services/tsconfig.lib.json",
              "lib/process-services/tsconfig.spec.json"
            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
+            "exclude": ["**/node_modules/**"]
          }
        }
      }
@@ -708,7 +473,8 @@
          },
          "configurations": {
            "production": {
-              "project": "lib/process-services-cloud/ng-package.json"
+              "project": "lib/process-services-cloud/ng-package.json",
+              "tsConfig": "lib/process-services-cloud/tsconfig.lib.prod.json"
            }
          }
        },
@@ -729,9 +495,7 @@
              "lib/process-services-cloud/tsconfig.lib.json",
              "lib/process-services-cloud/tsconfig.spec.json"
            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
+            "exclude": ["**/node_modules/**"]
          }
        }
      }
@@ -750,7 +514,8 @@
          },
          "configurations": {
            "production": {
-              "project": "lib/insights/ng-package.json"
+              "project": "lib/insights/ng-package.json",
+              "tsConfig": "lib/insights/tsconfig.lib.prod.json"
            }
          }
        },
@@ -771,16 +536,14 @@
              "lib/insights/tsconfig.lib.json",
              "lib/insights/tsconfig.spec.json"
            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
+            "exclude": ["**/node_modules/**"]
          }
        }
      }
    },
    "extensions": {
      "root": "lib/extensions",
-      "sourceRoot": "lib/extensions/src/lib",
+      "sourceRoot": "lib/extensions/src",
      "projectType": "library",
      "prefix": "adf",
      "architect": {
@@ -789,6 +552,11 @@
          "options": {
            "tsConfig": "lib/extensions/tsconfig.lib.json",
            "project": "lib/extensions/ng-package.json"
+          },
+          "configurations": {
+            "production": {
+              "tsConfig": "lib/extensions/tsconfig.lib.prod.json"
+            }
          }
        },
        "test": {
@@ -808,9 +576,7 @@
              "lib/extensions/tsconfig.lib.json",
              "lib/extensions/tsconfig.spec.json"
            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
+            "exclude": ["**/node_modules/**"]
          }
        }
      }
@@ -826,14 +592,11 @@
          "options": {
            "tsConfig": "lib/testing/tsconfig.lib.json",
            "project": "lib/testing/ng-package.json"
-          }
-        },
-        "test": {
-          "builder": "@angular-devkit/build-angular:karma",
-          "options": {
-            "main": "lib/testing/src/test.ts",
-            "tsConfig": "lib/testing/tsconfig.spec.json",
-            "karmaConfig": "lib/testing/karma.conf.js"
+          },
+          "configurations": {
+            "production": {
+              "tsConfig": "lib/testing/tsconfig.lib.prod.json"
+            }
          }
        },
        "lint": {
@@ -843,9 +606,7 @@
              "lib/testing/tsconfig.lib.json",
              "lib/testing/tsconfig.spec.json"
            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
+            "exclude": ["**/node_modules/**"]
          }
        }
      }
@@ -860,10 +621,15 @@
          "builder": "@angular-devkit/build-ng-packagr:build",
          "options": {
            "tsConfig": "lib/cli/tsconfig.json"
+          },
+          "configurations": {
+            "production": {
+              "tsConfig": "lib/cli/tsconfig.lib.prod.json"
+            }
          }
        }
      }
    }
  },
-  "defaultProject": "dist"
+  "defaultProject": "demoshell"
 }
@@ -6,10 +6,8 @@
    "CSRF",
    "glyphicon",
    "sharedlinks",
-    "Redistributable",
    "fullscreen",
    "sidenav",
-    "injectable",
    "truthy",
    "cryptodoc",
    "mysites",
@@ -33,16 +31,7 @@
    "SOLR",
    "unshare",
    "validators",
-    "guid",
-    "polyfill",
-    "polyfills",
-    "jsonp",
-    "hammerjs",
    "pdfjs",
-    "xpath",
-    "tooltip",
-    "tooltips",
-    "unindent",
    "exif",
    "cardview",
    "webm",
@@ -140,13 +129,16 @@
    "uploadfileform",
    "processwithstarteventform",
    "processstring",
-    "typeahed"
+    "typeahed",
+    "minmax",
+    "jsons"
  ],
  "dictionaries": [
    "html",
    "en-gb",
    "en_US",
-    "softwareTerms"
+    "softwareTerms",
+    "node"
  ],
  "ignorePaths": [
    "lib/{content-services,core,extensions,insights,process-services}/**/*.spec.ts",
@@ -0,0 +1,95 @@
+/**
+ * This file decorates the Angular CLI with the Nx CLI to enable features such as computation caching
+ * and faster execution of tasks.
+ *
+ * It does this by:
+ *
+ * - Patching the Angular CLI to warn you in case you accidentally use the undecorated ng command.
+ * - Symlinking the ng to nx command, so all commands run through the Nx CLI
+ * - Updating the package.json postinstall script to give you control over this script
+ *
+ * The Nx CLI decorates the Angular CLI, so the Nx CLI is fully compatible with it.
+ * Every command you run should work the same when using the Nx CLI, except faster.
+ *
+ * Because of symlinking you can still type `ng build/test/lint` in the terminal. The ng command, in this case,
+ * will point to nx, which will perform optimizations before invoking ng. So the Angular CLI is always invoked.
+ * The Nx CLI simply does some optimizations before invoking the Angular CLI.
+ *
+ * To opt out of this patch:
+ * - Replace occurrences of nx with ng in your package.json
+ * - Remove the script from your postinstall script in your package.json
+ * - Delete and reinstall your node_modules
+ */
+
+const fs = require("fs");
+const os = require("os");
+const cp = require("child_process");
+const isWindows = os.platform() === "win32";
+const { output } = require("@nrwl/workspace");
+
+/**
+ * Paths to files being patched
+ */
+const angularCLIInitPath = "node_modules/@angular/cli/lib/cli/index.js";
+
+/**
+ * Patch index.js to warn you if you invoke the undecorated Angular CLI.
+ */
+function patchAngularCLI(initPath) {
+  const angularCLIInit = fs.readFileSync(initPath, "utf-8").toString();
+
+  if (!angularCLIInit.includes("NX_CLI_SET")) {
+    fs.writeFileSync(
+      initPath,
+      `
+if (!process.env['NX_CLI_SET']) {
+  const { output } = require('@nrwl/workspace');
+  output.warn({ title: 'The Angular CLI was invoked instead of the Nx CLI. Use "npx ng [command]" or "nx [command]" instead.' });
+}
+${angularCLIInit}
+    `
+    );
+  }
+}
+
+/**
+ * Symlink of ng to nx, so you can keep using `ng build/test/lint` and still
+ * invoke the Nx CLI and get the benefits of computation caching.
+ */
+function symlinkNgCLItoNxCLI() {
+  try {
+    const ngPath = "./node_modules/.bin/ng";
+    const nxPath = "./node_modules/.bin/nx";
+    if (isWindows) {
+      /**
+       * This is the most reliable way to create symlink-like behavior on Windows.
+       * Such that it works in all shells and works with npx.
+       */
+      ["", ".cmd", ".ps1"].forEach(ext => {
+        fs.writeFileSync(ngPath + ext, fs.readFileSync(nxPath + ext));
+      });
+    } else {
+      // If unix-based, symlink
+      cp.execSync(`ln -sf ./nx ${ngPath}`);
+    }
+  } catch (e) {
+    output.error({
+      title:
+        "Unable to create a symlink from the Angular CLI to the Nx CLI:" +
+        e.message
+    });
+    throw e;
+  }
+}
+
+try {
+  symlinkNgCLItoNxCLI();
+  patchAngularCLI(angularCLIInitPath);
+  output.log({
+    title: "Angular CLI has been decorated to enable computation caching."
+  });
+} catch (e) {
+  output.error({
+    title: "Decoration of the Angular CLI did not complete successfully"
+  });
+}
@@ -27,7 +27,7 @@ var server = http.createServer(function (req, res) {
        req.on('end', function() {
            if (req.url === '/') {
                log('Received message: ' + body);
-            } else if (req.url = '/scheduled') {
+            } else if (req.url === '/scheduled') {
                log('Received task ' + req.headers['x-aws-sqsd-taskname'] + ' scheduled at ' + req.headers['x-aws-sqsd-scheduled-at']);
            }

@@ -1,7 +1,7 @@
 {
  "name": "Alfresco-ADF-Angular-Demo",
  "description": "Demo shell for Alfresco Angular components",
-  "version": "3.8.0",
+  "version": "4.1.0",
  "author": "Alfresco Software, Ltd.",
  "repository": {
    "type": "git",
@@ -1,3 +1,5 @@
+require('dotenv').config();
+
 var PROXY_HOST_ADF = process.env.PROXY_HOST_ADF;

 module.exports = {
@@ -21,7 +21,8 @@
      "SHOW_COMMENTS": "إظهار التعليقات على الإصدارات",
      "ALLOW_DOWNLOAD": "تمكين تنزيل الإصدار",
      "READ_ONLY": "للقراءة فقط",
-      "COMMENTS": "إظهار التعليقات"
+      "COMMENTS": "إظهار التعليقات",
+      "VERSION_COMPARISON": "إظهار مقارنة الإصدار"
    },
    "PERSONAL-FILES": "الملفات الشخصية",
    "WARN-MULTIPLE-UPLOADS": "عرض تحذير للتحميلات المتعددة.",
@@ -55,6 +56,7 @@
  "APP_LAYOUT": {
    "APP": "تطبيق",
    "APP_NAME": "تطبيق ADF التوضيحي",
+    "FILTERED_SEARCH": "عنوان عامل التصفية",
    "HOME": "رئيسية",
    "NODE-SELECTOR": "محدد العقدة",
    "SITES": "المواقع",
@@ -103,7 +105,8 @@
    "PEOPLE_CLOUD": "مكون سحابة الأشخاص",
    "GROUPS_CLOUD": "مكون سحابة المجموعة",
    "CONFIRM-DIALOG": "مربع حوار التأكيد",
-    "COMMUNITY": "Community"
+    "COMMUNITY": "Community",
+    "SERVICE_TASK_LIST": "قائمة مهام الخدمات"
  },
  "TRASHCAN": {
    "ACTIONS": {
@@ -119,7 +122,7 @@
  "DOCUMENT_LIST": {
    "MULTISELECT_CHECKBOXES": "تحديد متعدد (مع خانات اختيارات)",
    "THUMBNAILS": "تمكين الصور المصغرة",
-    "ALLOW_DROP_FILES": "تمكين إسقاط ملفات في مجلد",
+    "ALLOW_DROP_FILES": "تمكين إسقاط الملفات في مجلد أو ملف",
    "MULTIPLE_FILE_UPLOAD": "تحميل ملفات متعددة",
    "FOLDER_UPLOAD": "تحميل مجلد",
    "CUSTOM_FILTER": "عامل تصفية امتدادات مخصص",
@@ -21,7 +21,8 @@
      "SHOW_COMMENTS": "Zobrazit komentáře k verzím",
      "ALLOW_DOWNLOAD": "Povolit stažení verze",
      "READ_ONLY": "Pouze ke čtení",
-      "COMMENTS": "Zobrazit komentáře"
+      "COMMENTS": "Zobrazit komentáře",
+      "VERSION_COMPARISON": "Zobrazit porovnání verzí"
    },
    "PERSONAL-FILES": "Osobní soubory",
    "WARN-MULTIPLE-UPLOADS": "Zobrazit upozornění v případě hromadného odesílání",
@@ -55,6 +56,7 @@
  "APP_LAYOUT": {
    "APP": "Aplikace",
    "APP_NAME": "Ukázková aplikace ADF",
+    "FILTERED_SEARCH": "Záhlaví filtru",
    "HOME": "Domů",
    "NODE-SELECTOR": "Selektor uzlu",
    "SITES": "Místa",
@@ -103,7 +105,8 @@
    "PEOPLE_CLOUD": "Součást cloudu osob",
    "GROUPS_CLOUD": "Součást cloudu skupin",
    "CONFIRM-DIALOG": "Dialogové okno s potvrzením",
-    "COMMUNITY": "Community"
+    "COMMUNITY": "Community",
+    "SERVICE_TASK_LIST": "Seznam úloh služby"
  },
  "TRASHCAN": {
    "ACTIONS": {
@@ -119,7 +122,7 @@
  "DOCUMENT_LIST": {
    "MULTISELECT_CHECKBOXES": "Hromadný výběr (pomocí zaškrtávacích polí)",
    "THUMBNAILS": "Povolit miniatury",
-    "ALLOW_DROP_FILES": "Povolit přetažení souborů do složky",
+    "ALLOW_DROP_FILES": "Povolit přetahování souborů do složky nebo souboru",
    "MULTIPLE_FILE_UPLOAD": "Odeslání více souborů",
    "FOLDER_UPLOAD": "Odeslat složku",
    "CUSTOM_FILTER": "Vlastní filtr rozšíření",
@@ -21,7 +21,8 @@
      "SHOW_COMMENTS": "Vis kommentarer til versioner",
      "ALLOW_DOWNLOAD": "Aktivér versionsdownload",
      "READ_ONLY": "Skrivebeskyttet",
-      "COMMENTS": "Vis kommentarer"
+      "COMMENTS": "Vis kommentarer",
+      "VERSION_COMPARISON": "Vis sammenligningsversion"
    },
    "PERSONAL-FILES": "Personlige filer",
    "WARN-MULTIPLE-UPLOADS": "Vis advarsler for flere uploads.",
@@ -55,6 +56,7 @@
  "APP_LAYOUT": {
    "APP": "App",
    "APP_NAME": "ADF-demoapp",
+    "FILTERED_SEARCH": "Filter-overskrift",
    "HOME": "Hjem",
    "NODE-SELECTOR": "Nodevælger",
    "SITES": "Websteder",
@@ -103,7 +105,8 @@
    "PEOPLE_CLOUD": "Personcloudkomponent",
    "GROUPS_CLOUD": "Gruppecloudkomponent",
    "CONFIRM-DIALOG": "Bekræftelsesdialogboks",
-    "COMMUNITY": "Community"
+    "COMMUNITY": "Community",
+    "SERVICE_TASK_LIST": "Opgaveliste for tjeneste"
  },
  "TRASHCAN": {
    "ACTIONS": {
@@ -119,7 +122,7 @@
  "DOCUMENT_LIST": {
    "MULTISELECT_CHECKBOXES": "Vælg flere (med afkrydsningsfelter)",
    "THUMBNAILS": "Aktivér miniaturevisninger",
-    "ALLOW_DROP_FILES": "Aktivér Slip filer i en mappe",
+    "ALLOW_DROP_FILES": "Aktiver dropfiler i en mappe eller som en fil",
    "MULTIPLE_FILE_UPLOAD": "Upload af flere filer",
    "FOLDER_UPLOAD": "Upload af mappe",
    "CUSTOM_FILTER": "Filter for brugerdefinerede udvidelser",
@@ -21,7 +21,8 @@
      "SHOW_COMMENTS": "Anmerkungen zu Versionen einblenden",
      "ALLOW_DOWNLOAD": "Herunterladen von Version aktivieren",
      "READ_ONLY": "Schreibgeschützt",
-      "COMMENTS": "Kommentare anzeigen"
+      "COMMENTS": "Kommentare anzeigen",
+      "VERSION_COMPARISON": "Versionsvergleich anzeigen"
    },
    "PERSONAL-FILES": "Persönliche Dateien",
    "WARN-MULTIPLE-UPLOADS": "Warnung bei Mehrfach-Uploads anzeigen.",
@@ -55,6 +56,7 @@
  "APP_LAYOUT": {
    "APP": "Anwendung",
    "APP_NAME": "ADF-Demoanwendung",
+    "FILTERED_SEARCH": "Filter-Header",
    "HOME": "Startseite",
    "NODE-SELECTOR": "Node-Auswahl",
    "SITES": "Sites",
@@ -103,7 +105,8 @@
    "PEOPLE_CLOUD": "Personen-Cloud-Komponente",
    "GROUPS_CLOUD": "Gruppen-Cloud-Komponente",
    "CONFIRM-DIALOG": "Bestätigungsdialog",
-    "COMMUNITY": "Community"
+    "COMMUNITY": "Community",
+    "SERVICE_TASK_LIST": "Service-Aufgabenliste"
  },
  "TRASHCAN": {
    "ACTIONS": {
@@ -119,7 +122,7 @@
  "DOCUMENT_LIST": {
    "MULTISELECT_CHECKBOXES": "Mehrfachauswahl (mit Kontrollkästchen)",
    "THUMBNAILS": "Miniaturansichten aktivieren",
-    "ALLOW_DROP_FILES": "Ablegen von Dateien in Ordner aktivieren",
+    "ALLOW_DROP_FILES": "Ablegen von Dateien in einem Ordner oder einer Datei aktivieren",
    "MULTIPLE_FILE_UPLOAD": "Mehrere Dateien hochladen",
    "FOLDER_UPLOAD": "Ordner hochladen",
    "CUSTOM_FILTER": "Filter für benutzerdefinierte Erweiterungen",
@@ -56,6 +56,7 @@
  "APP_LAYOUT": {
    "APP": "App",
    "APP_NAME": "ADF Demo Application",
+    "FILTERED_SEARCH": "Filter Header",
    "HOME": "Home",
    "NODE-SELECTOR": "Node Selector",
    "SITES": "Sites",
@@ -104,7 +105,8 @@
    "PEOPLE_CLOUD": "People Cloud Component",
    "GROUPS_CLOUD": "Groups Cloud Component",
    "CONFIRM-DIALOG": "Confirmation Dialog",
-    "COMMUNITY": "Community"
+    "COMMUNITY": "Community",
+    "SERVICE_TASK_LIST": "Service Task List"
  },
  "TRASHCAN": {
    "ACTIONS": {
@@ -285,14 +287,14 @@
  "GROUP-TITLE1-TRANSLATION-KEY": "CUSTOM TITLE TRANSLATION ONE",
  "GROUP-TITLE2-TRANSLATION-KEY": "CUSTOM TITLE TRANSLATION TWO",
  "ERROR_CONTENT": {
+    "RETURN_BUTTON": {
+      "TEXT": "Back to home"
+    },
    "507": {
      "TITLE": "ACS Disk full",
      "DESCRIPTION": "Content exceeds overall storage quota limit configured for the network or system",
      "SECONDARY_BUTTON": {
        "TEXT": ""
-      },
-      "RETURN_BUTTON": {
-        "TEXT": "Back to home"
      }
    }
  },
@@ -21,7 +21,8 @@
      "SHOW_COMMENTS": "Mostrar comentarios en las versiones",
      "ALLOW_DOWNLOAD": "Habilitar descarga de versión",
      "READ_ONLY": "Solo lectura",
-      "COMMENTS": "Mostrar comentarios"
+      "COMMENTS": "Mostrar comentarios",
+      "VERSION_COMPARISON": "Mostrar versión comparada"
    },
    "PERSONAL-FILES": "Ficheros personales",
    "WARN-MULTIPLE-UPLOADS": "Mostrar advertencia de múltiples cargas.",
@@ -55,6 +56,7 @@
  "APP_LAYOUT": {
    "APP": "Aplicación",
    "APP_NAME": "Aplicación ADF Demo",
+    "FILTERED_SEARCH": "Filtros",
    "HOME": "Inicio",
    "NODE-SELECTOR": "Selector de nodo",
    "SITES": "Sitios",
@@ -103,7 +105,8 @@
    "PEOPLE_CLOUD": "Componente en la nube de personas",
    "GROUPS_CLOUD": "Componente en la nube de grupos",
    "CONFIRM-DIALOG": "Cuadro de diálogo de confirmación",
-    "COMMUNITY": "Community"
+    "COMMUNITY": "Community",
+    "SERVICE_TASK_LIST": "Lista de tareas de servicio"
  },
  "TRASHCAN": {
    "ACTIONS": {
@@ -119,7 +122,7 @@
  "DOCUMENT_LIST": {
    "MULTISELECT_CHECKBOXES": "Selección múltiple (con casillas)",
    "THUMBNAILS": "Habilitar miniaturas",
-    "ALLOW_DROP_FILES": "Habilitar arrastre de ficheros en una carpeta",
+    "ALLOW_DROP_FILES": "Habilitar arrastre de ficheros a una carpeta o fichero",
    "MULTIPLE_FILE_UPLOAD": "Carga de varios ficheros",
    "FOLDER_UPLOAD": "Carga de carpetas",
    "CUSTOM_FILTER": "Filtro de extensiones personalizado",
@@ -21,7 +21,8 @@
      "SHOW_COMMENTS": "Näytä kommentit versioissa",
      "ALLOW_DOWNLOAD": "Ota version lataaminen käyttöön",
      "READ_ONLY": "Vain luku",
-      "COMMENTS": "Näytä kommentit"
+      "COMMENTS": "Näytä kommentit",
+      "VERSION_COMPARISON": "Näytä versiovertailu"
    },
    "PERSONAL-FILES": "Omat tiedostot",
    "WARN-MULTIPLE-UPLOADS": "Näytä varoitus useille latauksille.",
@@ -55,6 +56,7 @@
  "APP_LAYOUT": {
    "APP": "Sovellus",
    "APP_NAME": "ADF-demosovellus",
+    "FILTERED_SEARCH": "Suodattimet",
    "HOME": "Aloitussivu",
    "NODE-SELECTOR": "Solmuvalitsin",
    "SITES": "Sivustot",
@@ -103,7 +105,8 @@
    "PEOPLE_CLOUD": "Ihmispilvi-komponentti",
    "GROUPS_CLOUD": "Ryhmäpilvi-komponentti",
    "CONFIRM-DIALOG": "Vahvistusvalintaikkuna",
-    "COMMUNITY": "Community"
+    "COMMUNITY": "Community",
+    "SERVICE_TASK_LIST": "Palvelutehtäväluettelo"
  },
  "TRASHCAN": {
    "ACTIONS": {
@@ -119,7 +122,7 @@
  "DOCUMENT_LIST": {
    "MULTISELECT_CHECKBOXES": "Monivalinta (valintaruuduilla)",
    "THUMBNAILS": "Ota pikkukuvat käyttöön",
-    "ALLOW_DROP_FILES": "Ota tiedostojen kansioon pudottaminen käyttöön",
+    "ALLOW_DROP_FILES": "Ota tiedostojen kansioon tai tiedostoon pudottaminen käyttöön",
    "MULTIPLE_FILE_UPLOAD": "Useiden tiedostojen lataaminen",
    "FOLDER_UPLOAD": "Kansion lataaminen",
    "CUSTOM_FILTER": "Mukautettu tiedostomuotosuodatin",
@@ -21,7 +21,8 @@
      "SHOW_COMMENTS": "Afficher les commentaires sur les versions",
      "ALLOW_DOWNLOAD": "Activer le téléchargement de la version",
      "READ_ONLY": "Lecture seule",
-      "COMMENTS": "Afficher les commentaires"
+      "COMMENTS": "Afficher les commentaires",
+      "VERSION_COMPARISON": "Afficher la comparaison des versions"
    },
    "PERSONAL-FILES": "Fichiers personnels",
    "WARN-MULTIPLE-UPLOADS": "Avertir en cas de téléchargements multiples.",
@@ -55,6 +56,7 @@
  "APP_LAYOUT": {
    "APP": "Application",
    "APP_NAME": "Application Démo ADF",
+    "FILTERED_SEARCH": "En-tête du filtre",
    "HOME": "Accueil",
    "NODE-SELECTOR": "Sélecteur de nœud",
    "SITES": "Sites",
@@ -77,7 +79,7 @@
    "FORM_LOADING": "Chargement du formulaire",
    "UPLOADER": "Chargeur",
    "WEBSCRIPT": "Script Web",
-    "TAG": "Tag",
+    "TAG": "Balise",
    "PIPES": "Tuyaux",
    "TRASHCAN": "Corbeille",
    "SOCIAL": "Réseaux sociaux",
@@ -103,7 +105,8 @@
    "PEOPLE_CLOUD": "Composant cloud des personnes",
    "GROUPS_CLOUD": "Composant cloud des groupes",
    "CONFIRM-DIALOG": "Boîte de dialogue de confirmation",
-    "COMMUNITY": "Communauté"
+    "COMMUNITY": "Communauté",
+    "SERVICE_TASK_LIST": "Liste des tâches de service"
  },
  "TRASHCAN": {
    "ACTIONS": {
@@ -119,7 +122,7 @@
  "DOCUMENT_LIST": {
    "MULTISELECT_CHECKBOXES": "Sélection multiple (avec cases à cocher)",
    "THUMBNAILS": "Activer les miniatures",
-    "ALLOW_DROP_FILES": "Activer l'option déposer des fichiers dans un dossier",
+    "ALLOW_DROP_FILES": "Activer la fonctionnalité Déposer les fichiers dans un dossier ou un fichier",
    "MULTIPLE_FILE_UPLOAD": "Importation de fichiers multiples",
    "FOLDER_UPLOAD": "Importation de dossier",
    "CUSTOM_FILTER": "Filtre d'extensions personnalisées",
@@ -137,7 +140,7 @@
    "COLUMNS": {
      "DISPLAY_NAME": "Nom affiché",
      "IS_LOCKED": "Verrouiller",
-      "TAG": "Tag",
+      "TAG": "Balise",
      "NODE_ID": "ID du nœud",
      "CREATED_BY": "Créé par",
      "CREATED_ON": "Créé le",
@@ -253,9 +256,9 @@
    "RATING": "Composant d'évaluation"
  },
  "TAG": {
-    "LIST": "Liste de tags Content Services",
+    "LIST": "Liste de balises Content Services",
    "INSERT": "Insérer l'ID du nœud",
-    "NODE_LIST": "Liste de tags par ID de nœud"
+    "NODE_LIST": "Liste de balises par ID de nœud"
  },
  "DEMO_PERMISSION": {
    "INHERIT_PERMISSION_BUTTON": "Hériter les droits d'accès",
@@ -21,7 +21,8 @@
      "SHOW_COMMENTS": "Mostra commenti sulle versioni",
      "ALLOW_DOWNLOAD": "Abilita scaricamento versioni",
      "READ_ONLY": "Sola lettura",
-      "COMMENTS": "Mostra commenti"
+      "COMMENTS": "Mostra commenti",
+      "VERSION_COMPARISON": "Mostra confronto versioni"
    },
    "PERSONAL-FILES": "File personali",
    "WARN-MULTIPLE-UPLOADS": "Mostra avviso per caricamenti multipli.",
@@ -55,6 +56,7 @@
  "APP_LAYOUT": {
    "APP": "Applicazione",
    "APP_NAME": "Applicazione demo ADF",
+    "FILTERED_SEARCH": "Intestazione filtro",
    "HOME": "Home",
    "NODE-SELECTOR": "Selezione nodo",
    "SITES": "Siti",
@@ -103,7 +105,8 @@
    "PEOPLE_CLOUD": "Componente Cloud persone",
    "GROUPS_CLOUD": "Componente Cloud gruppi",
    "CONFIRM-DIALOG": "Finestra di conferma",
-    "COMMUNITY": "Community"
+    "COMMUNITY": "Community",
+    "SERVICE_TASK_LIST": "Elenco compiti servizio"
  },
  "TRASHCAN": {
    "ACTIONS": {
@@ -119,7 +122,7 @@
  "DOCUMENT_LIST": {
    "MULTISELECT_CHECKBOXES": "Selezione multipla (con caselle di spunta)",
    "THUMBNAILS": "Abilita miniature",
-    "ALLOW_DROP_FILES": "Abilita trascinamento di file in una cartella",
+    "ALLOW_DROP_FILES": "Abilita Rilascio file in una cartella o file",
    "MULTIPLE_FILE_UPLOAD": "Caricamento di file multipli",
    "FOLDER_UPLOAD": "Caricamento cartelle",
    "CUSTOM_FILTER": "Filtro estensioni personalizzato",
@@ -21,7 +21,8 @@
      "SHOW_COMMENTS": "バージョンに関するコメントを表示",
      "ALLOW_DOWNLOAD": "バージョンのダウンロードを許可",
      "READ_ONLY": "読取り専用",
-      "COMMENTS": "コメントを表示する"
+      "COMMENTS": "コメントを表示する",
+      "VERSION_COMPARISON": "バージョンの比較を表示"
    },
    "PERSONAL-FILES": "個人的なファイル",
    "WARN-MULTIPLE-UPLOADS": "複数のアップロードの警告を表示します。",
@@ -55,6 +56,7 @@
  "APP_LAYOUT": {
    "APP": "アプリ",
    "APP_NAME": "ADF デモアプリケーション",
+    "FILTERED_SEARCH": "フィルタヘッダー",
    "HOME": "ホーム",
    "NODE-SELECTOR": "ノードセレクター",
    "SITES": "サイト",
@@ -103,7 +105,8 @@
    "PEOPLE_CLOUD": "メンバーのクラウドコンポーネント",
    "GROUPS_CLOUD": "グループのクラウドコンポーネント",
    "CONFIRM-DIALOG": "確認ダイアログ",
-    "COMMUNITY": "Community"
+    "COMMUNITY": "Community",
+    "SERVICE_TASK_LIST": "サービスタスクリスト"
  },
  "TRASHCAN": {
    "ACTIONS": {
@@ -119,7 +122,7 @@
  "DOCUMENT_LIST": {
    "MULTISELECT_CHECKBOXES": "複数選択 (チェックボックスを使用)",
    "THUMBNAILS": "サムネイルを有効にする",
-    "ALLOW_DROP_FILES": "フォルダへのドラッグ&ドロップを許可",
+    "ALLOW_DROP_FILES": "ファイルのドロップを許可",
    "MULTIPLE_FILE_UPLOAD": "複数ファイルのアップロード",
    "FOLDER_UPLOAD": "フォルダのアップロード",
    "CUSTOM_FILTER": "カスタム拡張子フィルタ",
@@ -21,7 +21,8 @@
      "SHOW_COMMENTS": "Vis kommentarer om versjoner",
      "ALLOW_DOWNLOAD": "Aktiver versjonsnedlasting",
      "READ_ONLY": "Skrivebeskyttet",
-      "COMMENTS": "Vis kommentarer"
+      "COMMENTS": "Vis kommentarer",
+      "VERSION_COMPARISON": "Vis sammenligning av versjoner"
    },
    "PERSONAL-FILES": "Personlige filer",
    "WARN-MULTIPLE-UPLOADS": "Vis advarsel for flere opplastinger.",
@@ -55,6 +56,7 @@
  "APP_LAYOUT": {
    "APP": "App",
    "APP_NAME": "ADF-demoprogam",
+    "FILTERED_SEARCH": "Filteroverskrift",
    "HOME": "Hjem",
    "NODE-SELECTOR": "Nodevelger",
    "SITES": "Områder",
@@ -103,7 +105,8 @@
    "PEOPLE_CLOUD": "Personsky-komponent",
    "GROUPS_CLOUD": "Gruppesky-kompontent",
    "CONFIRM-DIALOG": "Bekreftelsesdialog",
-    "COMMUNITY": "Community"
+    "COMMUNITY": "Community",
+    "SERVICE_TASK_LIST": "Serviceoppgaveliste"
  },
  "TRASHCAN": {
    "ACTIONS": {
@@ -119,7 +122,7 @@
  "DOCUMENT_LIST": {
    "MULTISELECT_CHECKBOXES": "Multivalg (med avskrysningsbokser)",
    "THUMBNAILS": "Aktiver miniatyrbilder",
-    "ALLOW_DROP_FILES": "Aktiver Slipp filer i en mappe",
+    "ALLOW_DROP_FILES": "Aktiver Slipp filer i en mappe eller en fil",
    "MULTIPLE_FILE_UPLOAD": "Opplasting av flere filer",
    "FOLDER_UPLOAD": "Opplasting av mappe",
    "CUSTOM_FILTER": "Tilpasset utvidelsesfilter",
@@ -21,11 +21,12 @@
      "SHOW_COMMENTS": "Opmerkingen over versies tonen",
      "ALLOW_DOWNLOAD": "Versiedownload inschakelen",
      "READ_ONLY": "Alleen-lezen",
-      "COMMENTS": "Opmerkingen weergeven"
+      "COMMENTS": "Opmerkingen weergeven",
+      "VERSION_COMPARISON": "Versievergelijking tonen"
    },
    "PERSONAL-FILES": "Persoonlijke bestanden",
    "WARN-MULTIPLE-UPLOADS": "Waarschuwing weergeven bij meerdere uploads.",
-    "CUSTOM-PERMISSION-MESSAGE": "Aangepast machtigingsbericht inschakelen",
+    "CUSTOM-PERMISSION-MESSAGE": "Aangepast rechtenbericht inschakelen",
    "MEDIUM-TIME-FORMAT": "Middellange tijdnotatie voor lijst met documenten inschakelen",
    "SEARCH": {
      "RADIO": {
@@ -55,6 +56,7 @@
  "APP_LAYOUT": {
    "APP": "App",
    "APP_NAME": "ADF-demotoepassing",
+    "FILTERED_SEARCH": "Filterkop",
    "HOME": "Home",
    "NODE-SELECTOR": "Selectiefunctie voor node",
    "SITES": "Sites",
@@ -103,7 +105,8 @@
    "PEOPLE_CLOUD": "Component Personencloud",
    "GROUPS_CLOUD": "Component Groepencloud",
    "CONFIRM-DIALOG": "Bevestigingsdialoogvenster",
-    "COMMUNITY": "Community"
+    "COMMUNITY": "Community",
+    "SERVICE_TASK_LIST": "Lijst met servicetaken"
  },
  "TRASHCAN": {
    "ACTIONS": {
@@ -119,7 +122,7 @@
  "DOCUMENT_LIST": {
    "MULTISELECT_CHECKBOXES": "Multiselect (met selectievakjes)",
    "THUMBNAILS": "Miniaturen inschakelen",
-    "ALLOW_DROP_FILES": "Bestanden neerzetten in een map inschakelen",
+    "ALLOW_DROP_FILES": "Bestanden neerzetten in een map of een bestand inschakelen",
    "MULTIPLE_FILE_UPLOAD": "Meerdere bestanden uploaden",
    "FOLDER_UPLOAD": "Map uploaden",
    "CUSTOM_FILTER": "Aangepast extensiefilter",
@@ -334,8 +337,8 @@
      "KEY": "Key",
      "TITLE": "Titel",
      "ICON": "Pictogram",
-      "TASK_ID": "Taak-ID",
-      "PROCESS_ID": "Procesinstantie-ID",
+      "TASK_ID": "Taak-id",
+      "PROCESS_ID": "Procesinstantie-id",
      "ACTION_TYPE": "Actietype"
    }
  }
@@ -21,7 +21,8 @@
      "SHOW_COMMENTS": "Pokaż komentarze do wersji",
      "ALLOW_DOWNLOAD": "Włącz pobieranie wersji",
      "READ_ONLY": "Tylko do odczytu",
-      "COMMENTS": "Pokaż komentarze"
+      "COMMENTS": "Pokaż komentarze",
+      "VERSION_COMPARISON": "Pokaż porównanie wersji"
    },
    "PERSONAL-FILES": "Pliki osobiste",
    "WARN-MULTIPLE-UPLOADS": "Wyświetl ostrzeżenie dla wielu operacji przesyłania.",
@@ -55,6 +56,7 @@
  "APP_LAYOUT": {
    "APP": "Aplikacja",
    "APP_NAME": "Wersja demonstracyjna aplikacji ADF",
+    "FILTERED_SEARCH": "Nagłówek filtra",
    "HOME": "Strona główna",
    "NODE-SELECTOR": "Selektor węzłów",
    "SITES": "Witryny",
@@ -103,7 +105,8 @@
    "PEOPLE_CLOUD": "Składnik Chmura dla osób",
    "GROUPS_CLOUD": "Składnik Chmura dla grup",
    "CONFIRM-DIALOG": "Okno dialogowe potwierdzenia",
-    "COMMUNITY": "Community"
+    "COMMUNITY": "Community",
+    "SERVICE_TASK_LIST": "Lista zadań serwisowych"
  },
  "TRASHCAN": {
    "ACTIONS": {
@@ -119,7 +122,7 @@
  "DOCUMENT_LIST": {
    "MULTISELECT_CHECKBOXES": "Wybór wielokrotny (przy użyciu pól wyboru)",
    "THUMBNAILS": "Włącz miniatury",
-    "ALLOW_DROP_FILES": "Włącz upuszczanie plików w folderze",
+    "ALLOW_DROP_FILES": "Włącz upuszczanie plików w folderze lub pliku",
    "MULTIPLE_FILE_UPLOAD": "Przesyłanie wielu plików",
    "FOLDER_UPLOAD": "Przesyłanie folderu",
    "CUSTOM_FILTER": "Niestandardowy filtr rozszerzeń",
@@ -21,7 +21,8 @@
      "SHOW_COMMENTS": "Mostrar comentários em versões",
      "ALLOW_DOWNLOAD": "Ativar download da versão",
      "READ_ONLY": "Somente leitura",
-      "COMMENTS": "Mostrar comentários"
+      "COMMENTS": "Mostrar comentários",
+      "VERSION_COMPARISON": "Mostrar comparação de versões"
    },
    "PERSONAL-FILES": "Arquivos pessoais",
    "WARN-MULTIPLE-UPLOADS": "Exibir alerta para vários uploads.",
@@ -55,6 +56,7 @@
  "APP_LAYOUT": {
    "APP": "Aplicativo",
    "APP_NAME": "Aplicativo Demo ADF",
+    "FILTERED_SEARCH": "Filtros",
    "HOME": "Página Inicial",
    "NODE-SELECTOR": "Seletor de nó",
    "SITES": "Sites",
@@ -103,7 +105,8 @@
    "PEOPLE_CLOUD": "Componente da Nuvem de Pessoas",
    "GROUPS_CLOUD": "Componente da Nuvem de Grupos",
    "CONFIRM-DIALOG": "Caixa de diálogo de confirmação",
-    "COMMUNITY": "Comunidade"
+    "COMMUNITY": "Comunidade",
+    "SERVICE_TASK_LIST": "Lista de tarefas de serviços"
  },
  "TRASHCAN": {
    "ACTIONS": {
@@ -119,7 +122,7 @@
  "DOCUMENT_LIST": {
    "MULTISELECT_CHECKBOXES": "Seleção Múltipla (com caixas de seleção)",
    "THUMBNAILS": "Ativar Miniaturas",
-    "ALLOW_DROP_FILES": "Ativar Soltar Arquivos em uma pasta",
+    "ALLOW_DROP_FILES": "Ativar soltar arquivos em uma pasta ou um arquivo",
    "MULTIPLE_FILE_UPLOAD": "Carregamento de Vários Arquivos",
    "FOLDER_UPLOAD": "Carregamento de Pasta",
    "CUSTOM_FILTER": "Filtro de extensões personalizado",
@@ -21,7 +21,8 @@
      "SHOW_COMMENTS": "Показать комментарии к версиям",
      "ALLOW_DOWNLOAD": "Включить загрузку версий",
      "READ_ONLY": "Только чтение",
-      "COMMENTS": "Показать комментарии"
+      "COMMENTS": "Показать комментарии",
+      "VERSION_COMPARISON": "Показать сравнение версий"
    },
    "PERSONAL-FILES": "Личные файлы",
    "WARN-MULTIPLE-UPLOADS": "Показывать предупреждение для нескольких загрузок.",
@@ -55,6 +56,7 @@
  "APP_LAYOUT": {
    "APP": "Приложение",
    "APP_NAME": "Демонстрационное приложение ADF",
+    "FILTERED_SEARCH": "Заголовок фильтра",
    "HOME": "Домашняя",
    "NODE-SELECTOR": "Селектор узлов",
    "SITES": "Сайты",
@@ -103,7 +105,8 @@
    "PEOPLE_CLOUD": "Компонент облака «Пользователи»",
    "GROUPS_CLOUD": "Компонент облака «Группы»",
    "CONFIRM-DIALOG": "Диалоговое окно подтверждения",
-    "COMMUNITY": "Community"
+    "COMMUNITY": "Community",
+    "SERVICE_TASK_LIST": "Список сервисных задач"
  },
  "TRASHCAN": {
    "ACTIONS": {
@@ -119,7 +122,7 @@
  "DOCUMENT_LIST": {
    "MULTISELECT_CHECKBOXES": "Выбор нескольких вариантов (с флажками)",
    "THUMBNAILS": "Включить эскизы",
-    "ALLOW_DROP_FILES": "Включить перетаскивание файлов в папку",
+    "ALLOW_DROP_FILES": "Включите перетаскивание файлов в папке или файле",
    "MULTIPLE_FILE_UPLOAD": "Загрузка нескольких файлов",
    "FOLDER_UPLOAD": "Загрузка папки",
    "CUSTOM_FILTER": "Пользовательский фильтр расширений",
@@ -21,7 +21,8 @@
      "SHOW_COMMENTS": "Visa kommentarer om versioner",
      "ALLOW_DOWNLOAD": "Aktivera version nedladdning",
      "READ_ONLY": "Skrivskyddad",
-      "COMMENTS": "Visa kommentarer"
+      "COMMENTS": "Visa kommentarer",
+      "VERSION_COMPARISON": "Visa versionsjämförelse"
    },
    "PERSONAL-FILES": "Personliga filer",
    "WARN-MULTIPLE-UPLOADS": "Visa varning för flera uppladdningar",
@@ -55,6 +56,7 @@
  "APP_LAYOUT": {
    "APP": "Program",
    "APP_NAME": "ADF-demoprogram",
+    "FILTERED_SEARCH": "Filter sidhuvud",
    "HOME": "Hem",
    "NODE-SELECTOR": "Nodväljare",
    "SITES": "Webbplatser",
@@ -103,7 +105,8 @@
    "PEOPLE_CLOUD": "Personer moln-komponent",
    "GROUPS_CLOUD": "Grupper moln-komponent",
    "CONFIRM-DIALOG": "Dialogruta för bekräftelse",
-    "COMMUNITY": "Community"
+    "COMMUNITY": "Community",
+    "SERVICE_TASK_LIST": "Serviceuppgiftslista"
  },
  "TRASHCAN": {
    "ACTIONS": {
@@ -119,7 +122,7 @@
  "DOCUMENT_LIST": {
    "MULTISELECT_CHECKBOXES": "Flerval (med kryssrutor)",
    "THUMBNAILS": "Aktivera miniatyrbilder",
-    "ALLOW_DROP_FILES": "Aktivera släpp filer i en mapp",
+    "ALLOW_DROP_FILES": "Gör det möjligt att dra in filer i en mapp eller en fil",
    "MULTIPLE_FILE_UPLOAD": "Uppladdning av flera filer",
    "FOLDER_UPLOAD": "Mappuppladdning",
    "CUSTOM_FILTER": "Anpassade tilläggsfilter",
@@ -21,7 +21,8 @@
      "SHOW_COMMENTS": "显示有关版本的注释",
      "ALLOW_DOWNLOAD": "启用版本下载",
      "READ_ONLY": "只读",
-      "COMMENTS": "显示注释"
+      "COMMENTS": "显示注释",
+      "VERSION_COMPARISON": "显示版本对比"
    },
    "PERSONAL-FILES": "个人文件",
    "WARN-MULTIPLE-UPLOADS": "针对多个上传显示警告。",
@@ -55,6 +56,7 @@
  "APP_LAYOUT": {
    "APP": "APP",
    "APP_NAME": "ADF 演示应用程序",
+    "FILTERED_SEARCH": "筛选标题",
    "HOME": "主页",
    "NODE-SELECTOR": "节点选择器",
    "SITES": "站点",
@@ -103,7 +105,8 @@
    "PEOPLE_CLOUD": "人员云组件",
    "GROUPS_CLOUD": "组云组件",
    "CONFIRM-DIALOG": "确认对话",
-    "COMMUNITY": "Community"
+    "COMMUNITY": "Community",
+    "SERVICE_TASK_LIST": "服务任务列表"
  },
  "TRASHCAN": {
    "ACTIONS": {
@@ -119,7 +122,7 @@
  "DOCUMENT_LIST": {
    "MULTISELECT_CHECKBOXES": "多选（含复选框）",
    "THUMBNAILS": "启用缩略图",
-    "ALLOW_DROP_FILES": "在文件夹中启用“文件拖放”",
+    "ALLOW_DROP_FILES": "在文件夹或文件中启用拖动文件",
    "MULTIPLE_FILE_UPLOAD": "上传多个文件",
    "FOLDER_UPLOAD": "文件夹上传",
    "CUSTOM_FILTER": "自定义扩展过滤器",
@@ -24,7 +24,8 @@
    "redirectUriLogout": "/logout",
    "publicUrls": [
      "**/preview/s/*",
-      "**/settings"
+      "**/settings",
+      "**/logout"
    ]
  },
  "application": {
@@ -104,6 +105,7 @@
    }
  ],
  "search": {
+    "filterWithContains": true,
    "app:fields": [
      "cm:name",
      "cm:title",
@@ -117,7 +119,8 @@
    ],
    "include": [
      "path",
-      "allowableOperations"
+      "allowableOperations",
+      "properties"
    ],
    "sorting": {
      "options": [
@@ -434,6 +437,169 @@
      ]
    }
  },
+  "search-headers": {
+    "filterWithContains": true,
+    "app:fields": [
+      "cm:name",
+      "cm:title",
+      "cm:description",
+      "ia:whatEvent",
+      "ia:descriptionEvent",
+      "lnk:title",
+      "lnk:description",
+      "TEXT",
+      "TAG"
+    ],
+    "categories": [
+      {
+        "id": "queryName",
+        "name": "SEARCH.SEARCH_HEADER.FILTERS.NAME.TITLE",
+        "columnKey": "name",
+        "enabled": true,
+        "component": {
+          "selector": "text",
+          "settings": {
+            "pattern": "cm:name:'(.*?)'",
+            "field": "cm:name",
+            "placeholder": "SEARCH.SEARCH_HEADER.FILTERS.NAME.PLACEHOLDER",
+            "searchSuffix" : "*",
+            "allowUpdateOnChange" : false
+          }
+        }
+      },
+      {
+        "id": "checkList",
+        "name": "SEARCH.SEARCH_HEADER.FILTERS.TYPE.TITLE",
+        "columnKey":"$thumbnail",
+        "enabled": true,
+        "component": {
+          "selector": "check-list",
+          "settings": {
+            "pageSize": 5,
+            "allowUpdateOnChange" : false,
+            "operator": "OR",
+            "options": [
+              {
+                "name": "SEARCH.SEARCH_HEADER.FILTERS.TYPE.FOLDER",
+                "value": "TYPE:'cm:folder'"
+              },
+              {
+                "name": "SEARCH.SEARCH_HEADER.FILTERS.TYPE.DOCUMENT",
+                "value": "TYPE:'cm:content'"
+              }
+            ]
+          }
+        }
+      },
+      {
+        "id": "contentSize",
+        "name": "SEARCH.SEARCH_HEADER.FILTERS.SIZE.TITLE",
+        "columnKey":"content.sizeInBytes",
+        "enabled": true,
+        "component": {
+          "selector": "check-list",
+          "settings": {
+            "allowUpdateOnChange" : false,
+            "options": [
+              {
+                "name": "SEARCH.SEARCH_HEADER.FILTERS.SIZE.SMALL",
+                "value": "content.size:[0 TO 1048576] OR TYPE:'cm:folder'"
+              },
+              {
+                "name": "SEARCH.SEARCH_HEADER.FILTERS.SIZE.MEDIUM",
+                "value": "content.size:[1048576 TO 52428800] OR TYPE:'cm:folder'"
+              },
+              {
+                "name": "SEARCH.SEARCH_HEADER.FILTERS.SIZE.LARGE",
+                "value": "content.size:<52428800 TO 524288000] OR TYPE:'cm:folder'"
+              },
+              {
+                "name": "SEARCH.SEARCH_HEADER.FILTERS.SIZE.HUGE",
+                "value": "content.size:<524288000 TO MAX] OR TYPE:'cm:folder'"
+              }
+            ]
+          }
+        }
+      },
+      {
+        "id": "createdDateRange",
+        "name": "SEARCH.SEARCH_HEADER.FILTERS.DATE.TITLE",
+        "columnKey": "createdAt",
+        "enabled": true,
+        "component": {
+          "selector": "date-range",
+          "settings": {
+            "allowUpdateOnChange" : false,
+            "field": "cm:created",
+            "dateFormat": "DD-MMM-YY",
+            "maxDate": "today"
+          }
+        }
+      }
+    ],
+    "highlight": {
+      "prefix": " ",
+      "postfix": " ",
+      "mergeContiguous": true,
+      "fields": [
+        {
+          "field": "cm:title"
+        },
+        {
+          "field": "description",
+          "prefix": "(",
+          "postfix": ")"
+        }
+      ]
+    },
+    "sorting": {
+      "options": [
+        {
+          "key": "name",
+          "label": "Name",
+          "type": "FIELD",
+          "field": "cm:name",
+          "ascending": true
+        },
+        {
+          "key": "content.sizeInBytes",
+          "label": "Size",
+          "type": "FIELD",
+          "field": "content.size",
+          "ascending": true
+        },
+        {
+          "key": "createdByUser.displayName",
+          "label": "Author",
+          "type": "FIELD",
+          "field": "cm:creator",
+          "ascending": true
+        },
+        {
+          "key": "createdAt",
+          "label": "Created",
+          "type": "FIELD",
+          "field": "cm:created",
+          "ascending": true
+        },
+        {
+          "key": "score",
+          "label": "Relevance",
+          "type": "FIELD",
+          "field": "score",
+          "ascending": false
+        }
+      ],
+      "defaults": [
+        {
+          "key": "score",
+          "type": "FIELD",
+          "field": "score",
+          "ascending": false
+        }
+      ]
+    }
+  },
  "pagination": {
    "size": 20,
    "supportedPageSizes": [
@@ -552,7 +718,8 @@
          "type": "text",
          "title": "ADF-DOCUMENT-LIST.LAYOUT.NAME",
          "cssClass": "full-width ellipsis-cell",
-          "sortable": true
+          "sortable": true,
+          "sortingKey": "name"
        },
        {
          "key": "visibility",
@@ -803,6 +970,35 @@
      "delete"
    ]
  },
+  "adf-edit-service-task-filter": {
+    "filterProperties": [
+      "appName",
+      "serviceTaskId",
+      "activityName",
+      "activityType",
+      "completedDate",
+      "startedDate",
+      "sort",
+      "order",
+      "status",
+      "elementId",
+      "serviceName",
+      "processInstanceId",
+      "processDefinitionId",
+      "serviceName"
+    ],
+    "sortProperties": [
+      "id",
+      "activityName",
+      "completedDate",
+      "startedDate"
+    ],
+    "actions": [
+      "save",
+      "saveAs",
+      "delete"
+    ]
+  },
  "adf-edit-process-filter": {
    "filterProperties": [
      "status",
@@ -847,7 +1043,8 @@
    },
    "multi-value-pipe-separator": ", ",
    "multi-value-chips": true,
-    "copy-to-clipboard-action": true
+    "copy-to-clipboard-action": true,
+    "selectFilterLimit": 5
  },
  "sideNav": {
    "expandedSidenav": true,
@@ -899,6 +1096,44 @@
      ]
    }
  },
+  "adf-cloud-service-task-list": {
+    "presets": {
+      "default": [
+        {
+          "key": "entry.id",
+          "type": "text",
+          "title": "ADF_CLOUD_SERVICE_TASK_LIST.PROPERTIES.ID",
+          "sortable": true
+        },
+        {
+          "key": "entry.activityName",
+          "type": "text",
+          "title": "ADF_CLOUD_SERVICE_TASK_LIST.PROPERTIES.ACTIVITY_NAME",
+          "sortable": true
+        },
+        {
+          "key": "entry.status",
+          "type": "text",
+          "title": "ADF_CLOUD_SERVICE_TASK_LIST.PROPERTIES.STATUS",
+          "sortable": true
+        },
+        {
+          "key": "entry.startedDate",
+          "type": "date",
+          "title": "ADF_CLOUD_SERVICE_TASK_LIST.PROPERTIES.STARTED_DATE",
+          "sortable": true,
+          "format": "timeAgo"
+        },
+        {
+          "key": "entry.completedDate",
+          "type": "date",
+          "title": "ADF_CLOUD_SERVICE_TASK_LIST.PROPERTIES.COMPLETED_DATE",
+          "sortable": true,
+          "format": "timeAgo"
+        }
+      ]
+    }
+  },
  "adf-cloud-process-list": {
    "presets": {
      "default": [
@@ -930,6 +1165,28 @@
      ]
    }
  },
+  "adf-cloud-priority-values": [
+    {
+      "key": "0",
+      "value": "0",
+      "label": "ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.NONE"
+    },
+    {
+      "key": "1",
+      "value": "1",
+      "label": "ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.LOW"
+    },
+    {
+      "key": "2",
+      "value": "2",
+      "label": "ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.NORMAL"
+    },
+    {
+      "key": "3",
+      "value": "3",
+      "label": "ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.HIGH"
+    }
+  ],
  "alfresco-deployed-apps": [
    {
      "name": "candidatebaseapp"
@@ -22,7 +22,7 @@ import {
    PageTitleService
 } from '@alfresco/adf-core';
 import { Router } from '@angular/router';
-import { MatDialog } from '@angular/material';
+import { MatDialog } from '@angular/material/dialog';

@Component({
    selector: 'app-root',
@@ -47,20 +47,16 @@ import { AppsViewComponent } from './components/process-service/apps-view.compon
 import { FilesComponent } from './components/files/files.component';
 import { VersionManagerDialogAdapterComponent } from './components/files/version-manager-dialog-adapter.component';
 import { MetadataDialogAdapterComponent } from './components/files/metadata-dialog-adapter.component';
-
 import { ThemePickerModule } from './components/theme-picker/theme-picker';
-
-import { routing } from './app.routes';
+import { appRoutes } from './app.routes';
 import { TaskAttachmentsComponent } from './components/process-service/task-attachments.component';
 import { ProcessAttachmentsComponent } from './components/process-service/process-attachments.component';
 import { SharedLinkViewComponent } from './components/shared-link-view/shared-link-view.component';
 import { DemoPermissionComponent } from './components/permissions/demo-permissions.component';
-import { ReportIssueComponent } from './components/report-issue/report-issue.component';
 import { MonacoEditorModule } from 'ngx-monaco-editor';
 import { ContentModule } from '@alfresco/adf-content-services';
 import { InsightsModule } from '@alfresco/adf-insights';
 import { ProcessModule } from '@alfresco/adf-process-services';
-import { AppExtensionsModule } from './app-extension.module';
 import { TreeViewSampleComponent } from './components/tree-view/tree-view-sample.component';
 import { CloudLayoutComponent } from './components/cloud/cloud-layout.component';
 import { AppsCloudDemoComponent } from './components/cloud/apps-cloud-demo.component';
@@ -68,6 +64,7 @@ import { TasksCloudDemoComponent } from './components/cloud/tasks-cloud-demo.com
 import { ProcessesCloudDemoComponent } from './components/cloud/processes-cloud-demo.component';
 import { TaskDetailsCloudDemoComponent } from './components/cloud/task-details-cloud-demo.component';
 import { TaskHeaderCloudDemoComponent } from './components/cloud/task-header-cloud-demo.component';
+import { ServiceTaskListCloudDemoComponent } from './components/cloud/service-task-list-cloud-demo.component';
 import { CloudViewerComponent } from './components/cloud/cloud-viewer.component';
 import { ProcessDetailsCloudDemoComponent } from './components/cloud/process-details-cloud-demo.component';
 import { StartTaskCloudDemoComponent } from './components/cloud/start-task-cloud-demo.component';
@@ -81,9 +78,14 @@ import { FormCloudDemoComponent } from './components/app-layout/cloud/form-demo/
 import { environment } from '../environments/environment';
 import { AppCloudSharedModule } from './components/cloud/shared/cloud.shared.module';
 import { DemoErrorComponent } from './components/error/demo-error.component';
+import { ProcessServicesCloudModule } from '@alfresco/adf-process-services-cloud';
+import { FilteredSearchComponent } from './components/files/filtered-search.component';
+import { RouterModule } from '@angular/router';
+import { ProcessCloudLayoutComponent } from './components/cloud/process-cloud-layout.component';
 import {
-    ProcessServicesCloudModule
-} from '@alfresco/adf-process-services-cloud';
+    CustomEditorComponent,
+    CustomWidgetComponent
+} from './components/cloud/custom-form-components/custom-editor.component';

 import { registerLocaleData } from '@angular/common';
 import localeFr from '@angular/common/locales/fr';
@@ -125,18 +127,17 @@ registerLocaleData(localeSv);
        BrowserModule,
        environment.e2e ? NoopAnimationsModule : BrowserAnimationsModule,
        ReactiveFormsModule,
-        routing,
+        RouterModule.forRoot(appRoutes, { initialNavigation: true }),
        FormsModule,
        HttpClientModule,
        MaterialModule,
-        AppExtensionsModule,
        FlexLayoutModule,
        TranslateModule.forRoot(),
        CoreModule.forRoot(),
        ContentModule.forRoot(),
        InsightsModule.forRoot(),
        ProcessModule.forRoot(),
-        ProcessServicesCloudModule,
+        ProcessServicesCloudModule.forRoot(),
        ExtensionsModule.forRoot(),
        ThemePickerModule,
        ChartsModule,
@@ -158,6 +159,7 @@ registerLocaleData(localeSv);
        FormNodeViewerComponent,
        AppsViewComponent,
        FilesComponent,
+        FilteredSearchComponent,
        FormComponent,
        FormListComponent,
        VersionManagerDialogAdapterComponent,
@@ -170,7 +172,6 @@ registerLocaleData(localeSv);
        DemoPermissionComponent,
        DemoErrorComponent,
        FormLoadingComponent,
-        ReportIssueComponent,
        TreeViewSampleComponent,
        CloudLayoutComponent,
        AppsCloudDemoComponent,
@@ -188,7 +189,11 @@ registerLocaleData(localeSv);
        PeopleGroupCloudDemoComponent,
        ConfirmDialogExampleComponent,
        FormCloudDemoComponent,
-        ConfirmDialogExampleComponent
+        ConfirmDialogExampleComponent,
+        CustomEditorComponent,
+        CustomWidgetComponent,
+        ProcessCloudLayoutComponent,
+        ServiceTaskListCloudDemoComponent
    ],
    providers: [
        {
@@ -213,10 +218,6 @@ registerLocaleData(localeSv);
            }
        }
    ],
-    entryComponents: [
-        VersionManagerDialogAdapterComponent,
-        MetadataDialogAdapterComponent
-    ],
    bootstrap: [AppComponent]
 })
 export class AppModule {
@@ -15,15 +15,8 @@
 * limitations under the License.
 */

-import { ModuleWithProviders } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
-import {
-    AuthGuard,
-    AuthGuardEcm,
-    ErrorContentComponent,
-    AuthGuardBpm,
-    AuthGuardSsoRoleService
-} from '@alfresco/adf-core';
+import { Routes } from '@angular/router';
+import { AuthGuard, AuthGuardEcm, ErrorContentComponent, AuthGuardBpm, AuthGuardSsoRoleService } from '@alfresco/adf-core';
 import { AppLayoutComponent } from './components/app-layout/app-layout.component';
 import { HomeComponent } from './components/home/home.component';
 import { LogoutComponent } from './components/logout/logout.component';
@@ -41,7 +34,6 @@ import { OverlayViewerComponent } from './components/overlay-viewer/overlay-view
 import { SharedLinkViewComponent } from './components/shared-link-view/shared-link-view.component';
 import { FormLoadingComponent } from './components/form/form-loading.component';
 import { DemoPermissionComponent } from './components/permissions/demo-permissions.component';
-import { ReportIssueComponent } from './components/report-issue/report-issue.component';
 import { AppComponent } from './app.component';
 import { TreeViewSampleComponent } from './components/tree-view/tree-view-sample.component';
 import { AppsCloudDemoComponent } from './components/cloud/apps-cloud-demo.component';
@@ -59,12 +51,16 @@ import { FormCloudDemoComponent } from './components/app-layout/cloud/form-demo/
 import { ConfirmDialogExampleComponent } from './components/confirm-dialog/confirm-dialog-example.component';
 import { DemoErrorComponent } from './components/error/demo-error.component';
 import { TaskHeaderCloudDemoComponent } from './components/cloud/task-header-cloud-demo.component';
+import { FilteredSearchComponent } from './components/files/filtered-search.component';
+import { ProcessCloudLayoutComponent } from './components/cloud/process-cloud-layout.component';
+import { ServiceTaskListCloudDemoComponent } from './components/cloud/service-task-list-cloud-demo.component';
+
 export const appRoutes: Routes = [
-    { path: 'login', loadChildren: 'app/components/login/login.module#AppLoginModule' },
+    { path: 'login', loadChildren: () => import('./components/login/login.module').then(m => m.AppLoginModule) },
    { path: 'logout', component: LogoutComponent },
    {
        path: 'settings',
-        loadChildren: 'app/components/settings/settings.module#AppSettingsModule'
+        loadChildren: () => import('./components/settings/settings.module').then(m => m.AppSettingsModule)
    },
    {
        path: 'files/:nodeId/view',
@@ -75,7 +71,20 @@ export const appRoutes: Routes = [
        children: [
            {
                path: '',
-                loadChildren: 'app/components/file-view/file-view.module#FileViewModule'
+                loadChildren: () => import('./components/file-view/file-view.module').then(m => m.FileViewModule)
+            }
+        ]
+    },
+    {
+        path: 'files/:nodeId/:versionId/view',
+        component: AppComponent,
+        canActivate: [AuthGuardEcm],
+        canActivateChild: [AuthGuardEcm],
+        outlet: 'overlay',
+        children: [
+            {
+                path: '',
+                loadChildren: () => import('./components/file-view/file-view.module').then(m => m.FileViewModule)
            }
        ]
    },
@@ -87,7 +96,7 @@ export const appRoutes: Routes = [
        children: [
            {
                path: '',
-                loadChildren: 'app/components/file-view/file-view.module#FileViewModule'
+                loadChildren: () => import('./components/file-view/file-view.module').then(m => m.FileViewModule)
            }
        ]
    },
@@ -100,14 +109,14 @@ export const appRoutes: Routes = [
            {
                path: 'breadcrumb',
                canActivate: [AuthGuardEcm],
-                loadChildren: 'app/components/breadcrumb-demo/breadcrumb-demo.module#AppBreadcrumbModule'
+                loadChildren: () => import('./components/breadcrumb-demo/breadcrumb-demo.module').then(m => m.AppBreadcrumbModule)
            },
            {
                path: 'notifications',
                children: [
                    {
                        path: '',
-                        loadChildren: 'app/components/notifications/notifications.module#AppNotificationsModule'
+                        loadChildren: () => import('./components/notifications/notifications.module').then(m => m.AppNotificationsModule)
                    }
                ]
            },
@@ -116,7 +125,7 @@ export const appRoutes: Routes = [
                children: [
                    {
                        path: '',
-                        loadChildren: 'app/components/config-editor/config-editor.module#AppConfigEditorModule'
+                        loadChildren: () => import('./components/config-editor/config-editor.module').then(m => m.AppConfigEditorModule)
                    }
                ]
            },
@@ -125,7 +134,7 @@ export const appRoutes: Routes = [
                children: [
                    {
                        path: '',
-                        loadChildren: 'app/components/pipes/pipes.module#AppPipesModule'
+                        loadChildren: () => import('./components/pipes/pipes.module').then(m => m.AppPipesModule)
                    }
                ]
            },
@@ -134,7 +143,7 @@ export const appRoutes: Routes = [
                children: [
                    {
                        path: '',
-                        loadChildren: 'app/components/card-view/card-view.module#AppCardViewModule'
+                        loadChildren: () => import('./components/card-view/card-view.module').then(m => m.AppCardViewModule)
                    }
                ]
            },
@@ -143,7 +152,7 @@ export const appRoutes: Routes = [
                children: [
                    {
                        path: '',
-                        loadChildren: 'app/components/sites/sites.module#SitesModule'
+                        loadChildren: () => import('./components/sites/sites.module').then(m => m.SitesModule)
                    }
                ]
            },
@@ -152,7 +161,7 @@ export const appRoutes: Routes = [
                children: [
                    {
                        path: '',
-                        loadChildren: 'app/components/header-data/header-data.module#AppHeaderDataModule'
+                        loadChildren: () => import('./components/header-data/header-data.module').then(m => m.AppHeaderDataModule)
                    }
                ]
            },
@@ -167,28 +176,38 @@ export const appRoutes: Routes = [
            {
                path: 'cloud',
                canActivate: [AuthGuardSsoRoleService],
-                data: { roles: ['ACTIVITI_USER'], redirectUrl: '/error/403' },
+                data: { roles: ['ACTIVITI_ADMIN', 'ACTIVITI_USER'], redirectUrl: '/error/403' },
                children: [
                    {
                        path: '',
+                        data: { roles: ['ACTIVITI_USER'], redirectUrl: '/error/403' },
                        component: AppsCloudDemoComponent
                    },
                    {
                        path: 'people-group-cloud',
+                        data: { roles: ['ACTIVITI_USER'], redirectUrl: '/error/403' },
                        component: PeopleGroupCloudDemoComponent
                    },
                    {
                        path: 'task-header-cloud',
+                        data: { roles: ['ACTIVITI_USER'], redirectUrl: '/error/403' },
                        component: TaskHeaderCloudDemoComponent
                    },
+                    {
+                        path: 'service-task-list',
+                        data: { roles: ['ACTIVITI_ADMIN'], redirectUrl: '/error/403' },
+                        component: ServiceTaskListCloudDemoComponent
+                    },
                    {
                        path: 'community',
-                        loadChildren: 'app/components/cloud/community/community.module#AppCommunityModule'
+                        data: { roles: ['ACTIVITI_USER'], redirectUrl: '/error/403' },
+                        loadChildren: () => import('./components/cloud/community/community.module').then(m => m.AppCommunityModule)
                    },
                    {
                        path: ':appName',
                        canActivate: [AuthGuardSsoRoleService],
                        data: { clientRoles: ['appName'], roles: ['ACTIVITI_USER'], redirectUrl: '/error/403' },
+                        component: ProcessCloudLayoutComponent,
                        children: [
                            {
                                path: '',
@@ -231,7 +250,7 @@ export const appRoutes: Routes = [
            },
            {
                path: 'node-selector',
-                loadChildren: 'app/components/content-node-selector/content-node-selector.module#AppContentNodeSelectorModule'
+                loadChildren: () => import('./components/content-node-selector/content-node-selector.module').then(m => m.AppContentNodeSelectorModule)
            },
            {
                path: 'confirm-dialog',
@@ -239,22 +258,37 @@ export const appRoutes: Routes = [
            },
            {
                path: 'settings-layout',
-                loadChildren: 'app/components/settings/settings.module#AppSettingsModule'
+                loadChildren: () => import('./components/settings/settings.module').then(m => m.AppSettingsModule)
            },
            {
                path: 'trashcan',
                canActivate: [AuthGuardEcm],
-                loadChildren: 'app/components/trashcan/trashcan.module#AppTrashcanModule'
+                loadChildren: () => import('./components/trashcan/trashcan.module').then(m => m.AppTrashcanModule)
            },
            {
                path: 'files',
                component: FilesComponent,
                canActivate: [AuthGuardEcm]
            },
+            {
+                path: 'filtered-search',
+                component: FilteredSearchComponent,
+                canActivate: [AuthGuardEcm]
+            },
+            {
+                path: 'filtered-search/:id',
+                component: FilteredSearchComponent,
+                canActivate: [AuthGuardEcm]
+            },
+            {
+                path: 'filtered-search/:id/display/:mode',
+                component: FilteredSearchComponent,
+                canActivate: [AuthGuardEcm]
+            },
            {
                path: 'extensions/document-list/presets',
                canActivate: [AuthGuardEcm],
-                loadChildren: './components/document-list/extension-presets/extension-presets.module#ExtensionPresetsModule'
+                loadChildren: () => import('./components/document-list/extension-presets/extension-presets.module').then(m => m.ExtensionPresetsModule)
            },
            {
                path: 'files/:id',
@@ -269,16 +303,16 @@ export const appRoutes: Routes = [
            {
                path: 'dl-custom-sources',
                canActivate: [AuthGuardEcm],
-                loadChildren: 'app/components/files/custom-sources.module#AppCustomSourcesModule'
+                loadChildren: () => import('./components/files/custom-sources.module').then(m => m.AppCustomSourcesModule)

            },
            {
                path: 'datatable',
-                loadChildren: 'app/components/datatable/datatable.module#AppDataTableModule'
+                loadChildren: () => import('./components/datatable/datatable.module').then(m => m.AppDataTableModule)
            },
            {
                path: 'datatable/dnd',
-                loadChildren: './components/datatable/drag-and-drop/datatable-dnd.module#AppDataTableDndModule'
+                loadChildren: () => import('./components/datatable/drag-and-drop/datatable-dnd.module').then(m => m.AppDataTableDndModule)
            },
            {
                path: 'search',
@@ -352,17 +386,17 @@ export const appRoutes: Routes = [
            {
                path: 'webscript',
                canActivate: [AuthGuardEcm],
-                loadChildren: 'app/components/webscript/webscript.module#AppWebScriptModule'
+                loadChildren: () => import('./components/webscript/webscript.module').then(m => m.AppWebScriptModule)
            },
            {
                path: 'tag',
                canActivate: [AuthGuardEcm],
-                loadChildren: 'app/components/tag/tag.module#AppTagModule'
+                loadChildren: () => import('./components/tag/tag.module').then(m => m.AppTagModule)
            },
            {
                path: 'social',
                canActivate: [AuthGuardEcm],
-                loadChildren: 'app/components/social/social.module#AppSocialModule'
+                loadChildren: () => import('./components/social/social.module').then(m => m.AppSocialModule)
            },
            {
                path: 'permissions/:id',
@@ -376,11 +410,11 @@ export const appRoutes: Routes = [
            },
            {
                path: 'about',
-                loadChildren: 'app/components/about/about.module#AppAboutModule'
+                loadChildren: () => import('./components/about/about.module').then(m => m.AppAboutModule)
            },
            {
                path: 'icons',
-                loadChildren: './components/icons/icons.module#AppIconsModule'
+                loadChildren: () => import('./components/icons/icons.module').then(m => m.AppIconsModule)
            },
            { path: 'form-cloud', component: FormCloudDemoComponent },
            { path: 'form', component: FormComponent },
@@ -391,17 +425,13 @@ export const appRoutes: Routes = [
                component: OverlayViewerComponent,
                canActivate: [AuthGuardEcm]
            },
-            {
-                path: 'report-issue',
-                component: ReportIssueComponent
-            },
            {
                path: 'datatable-lazy',
-                loadChildren: 'app/components/lazy-loading/lazy-loading.module#LazyLoadingModule'
+                loadChildren: () => import('./components/lazy-loading/lazy-loading.module').then(m => m.LazyLoadingModule)
            },
            {
                path: 'copy-content',
-                loadChildren: 'app/components/datatable/copy-content/datatable.module#AppDataTableCopyModule'
+                loadChildren: () => import('./components/datatable/copy-content/datatable.module').then(m => m.AppDataTableCopyModule)
            },
            {
                path: 'template-list',
@@ -410,12 +440,12 @@ export const appRoutes: Routes = [
            {
                path: 'task-list',
                canActivate: [AuthGuardBpm],
-                loadChildren: 'app/components/task-list-demo/task-list.module#AppTaskListModule'
+                loadChildren: () => import('./components/task-list-demo/task-list.module').then(m => m.AppTaskListModule)
            },
            {
                path: 'process-list',
                canActivate: [AuthGuardBpm],
-                loadChildren: 'app/components/process-list-demo/process-list.module#AppProcessListModule'
+                loadChildren: () => import('./components/process-list-demo/process-list.module').then(m => m.AppProcessListModule)
            },
            {
                path: 'error/no-authorization',
@@ -443,5 +473,3 @@ export const appRoutes: Routes = [
        redirectTo: 'error/404'
    }
 ];
-
-export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes, { initialNavigation: true });
@@ -40,6 +40,7 @@ export class AppLayoutComponent implements OnInit, OnDestroy {
            ]
        },
        { href: '/files', icon: 'folder_open', title: 'APP_LAYOUT.CONTENT_SERVICES' },
+        { href: '/filtered-search', icon: 'rowing', title: 'APP_LAYOUT.FILTERED_SEARCH' },
        { href: '/breadcrumb', icon: 'label', title: 'APP_LAYOUT.BREADCRUMB' },
        { href: '/notifications', icon: 'alarm', title: 'APP_LAYOUT.NOTIFICATIONS' },
        { href: '/card-view', icon: 'view_headline', title: 'APP_LAYOUT.CARD_VIEW' },
@@ -54,7 +55,8 @@ export class AppLayoutComponent implements OnInit, OnDestroy {
                { href: '/cloud/community', icon: 'cloud', title: 'APP_LAYOUT.COMMUNITY' },
                { href: '/form-cloud', icon: 'poll', title: 'APP_LAYOUT.FORM' },
                { href: '/cloud/people-group-cloud', icon: 'group', title: 'APP_LAYOUT.PEOPLE_GROUPS_CLOUD' },
-                { href: '/cloud/task-header-cloud', icon: 'cloud', title: 'APP_LAYOUT.TASK_HEADER_CLOUD.COMPONENT_NAME' }
+                { href: '/cloud/task-header-cloud', icon: 'cloud', title: 'APP_LAYOUT.TASK_HEADER_CLOUD.COMPONENT_NAME' },
+                { href: '/cloud/service-task-list', icon: 'cloud', title: 'APP_LAYOUT.SERVICE_TASK_LIST' }
            ]
        },
        { href: '/activiti', icon: 'device_hub', title: 'APP_LAYOUT.PROCESS_SERVICES', children: [
@@ -16,9 +16,22 @@
 */

 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { FormFieldModel, NotificationService, CoreAutomationService, FormModel, FormRenderingService } from '@alfresco/adf-core';
-import { FormCloudService, CloudFormRenderingService } from '@alfresco/adf-process-services-cloud';
+import {
+    CoreAutomationService,
+    FormFieldModel,
+    FormModel,
+    FormRenderingService,
+    NotificationService
+} from '@alfresco/adf-core';
+import {
+    CloudFormRenderingService,
+    FormCloudService
+} from '@alfresco/adf-process-services-cloud';
 import { Subscription } from 'rxjs';
+import {
+    CustomEditorComponent,
+    CustomWidgetComponent
+} from '../../../cloud/custom-form-components/custom-editor.component';

@Component({
    templateUrl: 'cloud-form-demo.component.html',
@@ -47,7 +60,20 @@ export class FormCloudDemoComponent implements OnInit, OnDestroy {
    constructor(
        private notificationService: NotificationService,
        private formService: FormCloudService,
-        private automationService: CoreAutomationService) {
+        private automationService: CoreAutomationService,
+        private formRenderingService: FormRenderingService) {
+        this.formRenderingService.register({
+            'demo-widget': () => CustomEditorComponent,
+            'custom-editor': () => CustomEditorComponent,
+            'custom-string': () => CustomWidgetComponent,
+            'custom-datetime': () => CustomWidgetComponent,
+            'custom-file': () => CustomWidgetComponent,
+            'custom-number': () => CustomWidgetComponent,
+            'custom-something': () => CustomWidgetComponent,
+            'custom-boolean': () => CustomWidgetComponent,
+            'custom-date': () => CustomWidgetComponent,
+            'custom': () => CustomWidgetComponent
+        });
    }

    logErrors(errorFields: FormFieldModel[]) {
@@ -40,7 +40,7 @@ import { takeUntil } from 'rxjs/operators';
 })
 export class CardViewComponent implements OnInit, OnDestroy {

-    @ViewChild('console') console: ElementRef;
+    @ViewChild('console', { static: true }) console: ElementRef;

    isEditable = true;
    properties: any;
@@ -10,7 +10,8 @@
        [appName]="appName"
        [showIcons]="true"
        [filterParam]="currentTaskFilter$ | async"
-        (filterClick)="onTaskFilterSelected($event)">
+        (filterClicked)="onTaskFilterSelected($event)"
+        (filterSelected)="onTaskFilterSelected($event)">
      </adf-cloud-task-filters>
  </mat-expansion-panel>

@@ -25,7 +26,8 @@
        [appName]="appName"
        [showIcons]="true"
        [filterParam]="currentProcessFilter$ | async"
-        (filterClick)="onProcessFilterSelected($event)">
+        (filterClicked)="onProcessFilterSelected($event)"
+        (filterSelected)="onProcessFilterSelected($event)">
      </adf-cloud-process-filters>
  </mat-expansion-panel>
 </mat-accordion>
@@ -0,0 +1,71 @@
+/*!
+ * @license
+ * Copyright 2019 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Component, OnInit } from '@angular/core';
+import { FormService, WidgetComponent } from '@alfresco/adf-core';
+// tslint:disable:component-selector
+
+@Component({
+    selector: 'custom-editor-widget',
+    template: `
+        <div style="color: green">
+            ADF version of custom form widget
+        </div>
+    `
+})
+export class CustomEditorComponent extends WidgetComponent {
+    constructor() {
+        super();
+    }
+}
+
+@Component({
+    selector: 'app-sample-widget',
+    template: `
+        <div style="color: red">
+            <p *ngIf="field.readOnly || readOnly">
+                <label class="adf-label" [attr.for]="field.id">{{field.name | translate }}<span *ngIf="isRequired()">*</span></label>
+                <span>{{field.value}}</span>
+            </p>
+
+            <mat-form-field *ngIf="!(field.readOnly || readOnly)">
+                <label class="adf-label" [attr.for]="field.id">{{field.name | translate }}<span *ngIf="isRequired()">*</span></label>
+                <input matInput
+                       class="adf-input"
+                       type="text"
+                       [id]="field.id"
+                       [required]="isRequired()"
+                       [value]="field.value"
+                       [(ngModel)]="field.value"
+                       (ngModelChange)="onFieldChanged(field)">
+                <mat-hint>{{field.placeholder}}</mat-hint>
+            </mat-form-field>
+            <error-widget [error]="field.validationSummary"></error-widget>
+            <error-widget *ngIf="isInvalidFieldRequired()" required="{{ 'FORM.FIELD.REQUIRED' | translate }}"></error-widget>
+        </div>
+    `
+})
+export class CustomWidgetComponent extends WidgetComponent  implements OnInit {
+
+    constructor(public formService: FormService) {
+        super(formService);
+    }
+
+    ngOnInit() {
+        this.field.value = typeof this.field.value === 'object' ? JSON.stringify(this.field.value) : this.field.value;
+    }
+}
@@ -6,14 +6,14 @@
    <mat-card-content>
        <br>
        <mat-radio-group (change)="onChangePeopleMode($event)">
-            <mat-radio-button checked="true" class="app-people-single-mode" data-automation-id="app-people-single-mode" value="single">{{
+            <mat-radio-button [checked]="true" class="app-people-single-mode" data-automation-id="app-people-single-mode" value="single">{{
                'PEOPLE_GROUPS_CLOUD.SINGLE' | translate }}</mat-radio-button>
            <mat-radio-button class="app-people-multiple-mode" data-automation-id="app-people-multiple-mode" value="multiple">{{
                'PEOPLE_GROUPS_CLOUD.MULTI' | translate }}</mat-radio-button>
        </mat-radio-group>
        <div class="app-people-control-options">
            <mat-radio-group (change)="onChangePeopleFilterMode($event)">
-                <mat-radio-button checked="true" class="app-people-single-mode" value="appName">{{
+                <mat-radio-button [checked]="true" class="app-people-single-mode" value="appName">{{
                    'PEOPLE_GROUPS_CLOUD.APP_FILTER_MODE' | translate }}</mat-radio-button>
                <mat-radio-button class="app-people-multiple-mode" data-automation-id="app-people-filter-role" value="role">{{
                    'PEOPLE_GROUPS_CLOUD.ROLE_FILTER_MODE' | translate }}</mat-radio-button>
@@ -77,14 +77,14 @@
    <mat-card-content>
        <br>
        <mat-radio-group (change)="onChangeGroupsMode($event)">
-            <mat-radio-button checked="true" class="app-people-single-mode" data-automation-id="app-group-single-mode" value="single">{{
+            <mat-radio-button [checked]="true" class="app-people-single-mode" data-automation-id="app-group-single-mode" value="single">{{
                'PEOPLE_GROUPS_CLOUD.SINGLE' | translate }}</mat-radio-button>
            <mat-radio-button class="app-people-multiple-mode" data-automation-id="app-group-multiple-mode" value="multiple">{{
                'PEOPLE_GROUPS_CLOUD.MULTI' | translate }}</mat-radio-button>
        </mat-radio-group>
        <div class="app-groups-control-options">
            <mat-radio-group (change)="onChangeGroupsFilterMode($event)">
-                <mat-radio-button checked="true" class="app-people-single-mode" value="appName">{{
+                <mat-radio-button [checked]="true" class="app-people-single-mode" value="appName">{{
                    'PEOPLE_GROUPS_CLOUD.APP_FILTER_MODE' | translate }}</mat-radio-button>
                <mat-radio-button class="app-people-multiple-mode" data-automation-id="app-group-filter-role" value="role">{{
                    'PEOPLE_GROUPS_CLOUD.ROLE_FILTER_MODE' | translate }}</mat-radio-button>
@@ -17,7 +17,8 @@

 import { Component, ViewEncapsulation } from '@angular/core';
 import { ComponentSelectionMode } from '@alfresco/adf-process-services-cloud';
-import { MatRadioChange, MatCheckboxChange } from '@angular/material';
+import { MatCheckboxChange } from '@angular/material/checkbox';
+import { MatRadioChange } from '@angular/material/radio';
 import { IdentityGroupModel, IdentityUserModel } from '@alfresco/adf-core';

@Component({
@@ -0,0 +1,45 @@
+/*!
+ * @license
+ * Copyright 2019 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Component } from '@angular/core';
+import { FormRenderingService } from '@alfresco/adf-core';
+import { CloudFormRenderingService } from '@alfresco/adf-process-services-cloud';
+import { CustomEditorComponent, CustomWidgetComponent } from './custom-form-components/custom-editor.component';
+
+@Component({
+    template: `<router-outlet></router-outlet>`,
+    providers: [
+        { provide: FormRenderingService, useClass: CloudFormRenderingService }
+    ]
+})
+export class ProcessCloudLayoutComponent {
+
+    constructor(private formRenderingService: FormRenderingService) {
+        this.formRenderingService.register({
+            'custom-editor': () => CustomEditorComponent,
+            'demo-widget': () => CustomEditorComponent,
+            'custom-string': () => CustomWidgetComponent,
+            'custom-datetime': () => CustomWidgetComponent,
+            'custom-file': () => CustomWidgetComponent,
+            'custom-number': () => CustomWidgetComponent,
+            'custom-something': () => CustomWidgetComponent,
+            'custom-boolean': () => CustomWidgetComponent,
+            'custom-date': () => CustomWidgetComponent,
+            'custom': () => CustomWidgetComponent
+        });
+    }
+}
@@ -13,8 +13,10 @@
            fxFlex
            class="app-cloud-layout-overflow"
            [appName]="editedFilter.appName"
-            [initiator]="editedFilter.initiator"
+            [appVersion]="editedFilter.appVersion"
+            [initiator]="getInitiatorValue()"
            [processDefinitionId]="editedFilter.processDefinitionId"
+            [processDefinitionName]="editedFilter.processDefinitionName"
            [processDefinitionKey]="editedFilter.processDefinitionKey"
            [id]="editedFilter.processInstanceId"
            [status]="editedFilter.status"
@@ -116,6 +116,10 @@ export class ProcessesCloudDemoComponent implements OnInit, OnDestroy {
        }
    }

+    getInitiatorValue(): string {
+        return this.editedFilter.initiator?.map(initiator => initiator.username).join(',');
+    }
+
    onChangePageSize(event: Pagination) {
        this.userPreference.paginationSize = event.maxItems;
    }
@@ -0,0 +1,42 @@
+<div fxLayout
+     fxFill>
+    <adf-cloud-service-task-filters [appName]="appName"
+                                    [filterParam]="{index: 0}"
+                                    (filterClicked)="onTaskFilterSelected($event)"
+                                    (filterSelected)="onTaskFilterSelected($event)">
+
+    </adf-cloud-service-task-filters>
+    <div fxLayout="column"
+         fxFlex>
+        <adf-cloud-edit-service-task-filter [id]="filterId"
+                                            [appName]="appName"
+                                            [filterProperties]="taskFilterProperties.filterProperties"
+                                            [sortProperties]="taskFilterProperties.sortProperties"
+                                            [actions]="taskFilterProperties.actions"
+                                            (filterChange)="onFilterChange($event)">
+        </adf-cloud-edit-service-task-filter>
+        <div fxLayout="column"
+             fxFlex
+             fxFill
+             fxLayoutAlign="space-between"
+             *ngIf="editedFilter">
+            <adf-cloud-service-task-list #taskCloud
+                                         fxFlex
+                                         [queryParams]="editedFilter"
+                                         class="app-cloud-layout-overflow"
+                                         [appName]="editedFilter.appName"
+                                         [sorting]="sortArray"
+                                         [multiselect]="multiselect"
+                                         [selectionMode]="selectionMode"
+                                         [stickyHeader]="true"
+                                         [showActions]="actionMenu"
+                                         [showContextMenu]="contextMenu">
+            </adf-cloud-service-task-list>
+            <adf-pagination [target]="taskCloud"
+                            (changePageSize)="onChangePageSize($event)"
+                            (nextPage)="resetSelectedRows()"
+                            (prevPage)="resetSelectedRows()">
+            </adf-pagination>
+        </div>
+    </div>
+</div>
@@ -0,0 +1,110 @@
+/*!
+ * @license
+ * Copyright 2019 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Component, OnInit, OnDestroy, ViewChild } from '@angular/core';
+import { TaskListCloudSortingModel, ServiceTaskListCloudComponent, ServiceTaskFilterCloudModel } from '@alfresco/adf-process-services-cloud';
+import { UserPreferencesService, AppConfigService, PaginationModel } from '@alfresco/adf-core';
+import { CloudLayoutService, CloudServiceSettings } from './services/cloud-layout.service';
+import { Subject } from 'rxjs';
+import { takeUntil } from 'rxjs/operators';
+
+@Component({
+    templateUrl: 'service-task-list-cloud-demo.component.html'
+})
+export class ServiceTaskListCloudDemoComponent implements OnInit, OnDestroy {
+
+    public static ACTION_SAVE_AS = 'saveAs';
+    public static ACTION_DELETE = 'delete';
+    static TASK_FILTER_PROPERTY_KEYS = 'adf-edit-service-task-filter';
+
+    @ViewChild('taskCloud')
+    taskCloud: ServiceTaskListCloudComponent;
+
+    appName = 'simpleapp';
+
+    isFilterLoaded = false;
+
+    selectedRow: any;
+
+    sortArray: TaskListCloudSortingModel[];
+    editedFilter: ServiceTaskFilterCloudModel;
+    taskFilterProperties: any  = { filterProperties: [], sortProperties: [], actions: [] };
+
+    multiselect: boolean;
+    selectedRows: string[] = [];
+    actionMenu: boolean;
+    contextMenu: boolean;
+    actions: any[] = [];
+    selectedAction: { id: number, name: string, actionType: string};
+    selectedContextAction: { id: number, name: string, actionType: string};
+    selectionMode: string;
+    filterId: string;
+
+    private onDestroy$ = new Subject<boolean>();
+
+    constructor(
+        private cloudLayoutService: CloudLayoutService,
+        private userPreference: UserPreferencesService,
+        private appConfig: AppConfigService) {
+
+        const properties = this.appConfig.get<Array<any>>(ServiceTaskListCloudDemoComponent.TASK_FILTER_PROPERTY_KEYS);
+        if (properties === this.taskFilterProperties) {
+            this.taskFilterProperties = properties;
+        }
+    }
+
+    ngOnInit() {
+        this.isFilterLoaded = false;
+        this.cloudLayoutService.settings$
+            .pipe(takeUntil(this.onDestroy$))
+            .subscribe(settings => this.setCurrentSettings(settings));
+    }
+
+    ngOnDestroy() {
+        this.onDestroy$.next(true);
+        this.onDestroy$.complete();
+    }
+
+    setCurrentSettings(settings: CloudServiceSettings) {
+        if (settings) {
+            this.multiselect = settings.multiselect;
+            this.selectionMode = settings.selectionMode;
+            this.actionMenu = settings.actionMenu;
+            this.contextMenu = settings.contextMenu;
+            this.actions = settings.actions;
+        }
+    }
+
+    onTaskFilterSelected(filter: ServiceTaskFilterCloudModel) {
+        this.filterId = filter.id;
+        this.editedFilter = filter;
+    }
+
+    onChangePageSize(event: PaginationModel) {
+        this.userPreference.paginationSize = event.maxItems;
+    }
+
+    resetSelectedRows() {
+        this.selectedRows = [];
+    }
+
+    onFilterChange(filter: ServiceTaskFilterCloudModel) {
+        this.appName = filter.appName;
+        this.editedFilter = Object.assign({}, filter);
+        this.sortArray = [new TaskListCloudSortingModel({ orderBy: this.editedFilter.sort, direction: this.editedFilter.order })];
+    }
+}
@@ -18,7 +18,10 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { CloudSettingsComponent } from './cloud-settings.component';
-import { MatDialogModule, MatInputModule, MatSelectModule, MatSlideToggleModule } from '@angular/material';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatInputModule } from '@angular/material/input';
+import { MatSelectModule } from '@angular/material/select';
+import { MatSlideToggleModule } from '@angular/material/slide-toggle';
 import { CoreModule } from '@alfresco/adf-core';
 import { FlexLayoutModule } from '@angular/flex-layout';

@@ -17,13 +17,17 @@

 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { NotificationService, AppConfigService } from '@alfresco/adf-core';
+import { NotificationService, AppConfigService, FormRenderingService } from '@alfresco/adf-core';
 import { CloudLayoutService } from './services/cloud-layout.service';
-import { PreviewService } from 'app/services/preview.service';
+import { PreviewService } from '../../services/preview.service';
+import { CloudFormRenderingService } from '@alfresco/adf-process-services-cloud';

@Component({
    templateUrl: './start-process-cloud-demo.component.html',
-    styleUrls: ['./start-process-cloud-demo.component.scss']
+    styleUrls: ['./start-process-cloud-demo.component.scss'],
+    providers: [
+        { provide: FormRenderingService, useClass: CloudFormRenderingService }
+    ]
 })
 export class StartProcessCloudDemoComponent implements OnInit {

@@ -19,7 +19,7 @@ import { Component, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { NotificationService } from '@alfresco/adf-core';
 import { TaskHeaderCloudComponent } from '@alfresco/adf-process-services-cloud';
-import { PreviewService } from 'app/services/preview.service';
+import { PreviewService } from '../../services/preview.service';

@Component({
    templateUrl: './task-details-cloud-demo.component.html',
@@ -27,7 +27,7 @@ import { PreviewService } from 'app/services/preview.service';
 })
 export class TaskDetailsCloudDemoComponent {

-    @ViewChild('taskHeader')
+    @ViewChild('taskHeader', { static: true })
    taskHeader: TaskHeaderCloudComponent;

    taskId: string;
@@ -24,7 +24,7 @@ import { FormControl } from '@angular/forms';
    styleUrls: ['./task-header-cloud-demo.component.scss']
 })
 export class TaskHeaderCloudDemoComponent {
-    @ViewChild('taskHeader')
+    @ViewChild('taskHeader', { static: true })
    taskHeader: TaskHeaderCloudComponent;

    appName: string;
@@ -16,7 +16,7 @@
 */

 import { Component } from '@angular/core';
-import { MatDialog } from '@angular/material';
+import { MatDialog } from '@angular/material/dialog';
 import { ConfirmDialogComponent } from '@alfresco/adf-content-services';

@Component({
@@ -42,9 +42,6 @@ const routes: Routes = [
    declarations: [
        ExtensionPresetsComponent,
        NameColumnComponent
-    ],
-    entryComponents: [
-        NameColumnComponent
    ]
 })
 export class ExtensionPresetsModule {
@@ -1,15 +1,7 @@
-<div fxLayout="column" fxLayoutAlign="center center">
-    <adf-error-content [errorCode]="errorCode">
-        <div adf-error-content-actions class="app-error-content-buttons">
-            <a a id="adf-secondary-button" mat-raised-button color="primary"
-                 (click)="onReportIssue()"
-                class="app-error-content-description-link">
-                {{ 'ERROR_CONTENT.' + errorCode + '.SECONDARY_BUTTON.TEXT' | translate | uppercase }}
-            </a>
-            <a id="adf-return-button" mat-raised-button color="primary" (click)="onReturnButton()">
-                {{ 'ERROR_CONTENT.' + errorCode + '.RETURN_BUTTON.TEXT' | translate | uppercase }}
-            </a>
-        </div>
-    </adf-error-content>
-</div>
-
+<adf-error-content [errorCode]="errorCode">
+    <div adf-error-content-actions>
+        <button mat-raised-button (click)="onReturnButton()">
+            {{ 'ERROR_CONTENT.RETURN_BUTTON.TEXT' | translate }}
+        </button>
+    </div>
+</adf-error-content>
@@ -1,9 +0,0 @@
-.app-error-content {
-
-    &-buttons {
-        display: flex;
-        width: 100%;
-        justify-content: space-evenly;
-    }
-}
-
@@ -20,7 +20,6 @@ import { ActivatedRoute, Params, Router } from '@angular/router';

@Component({
    selector: 'app-demo-error',
-    styleUrls: ['./demo-error.component.scss'],
    templateUrl: './demo-error.component.html'
 })
 export class DemoErrorComponent implements OnInit {
@@ -32,7 +31,7 @@ export class DemoErrorComponent implements OnInit {

    ngOnInit() {
        if (this.route) {
-            this.route.params.forEach((params: Params) => {
+            this.route.params.subscribe((params: Params) => {
                if (params['id']) {
                    this.errorCode = params['id'];
                }
@@ -40,10 +39,6 @@ export class DemoErrorComponent implements OnInit {
        }
    }

-    onReportIssue() {
-        this.router.navigate(['/report-issue']);
-    }
-
    onReturnButton() {
        this.router.navigate(['/']);
    }
@@ -108,7 +108,8 @@
                <mat-card>
                    <mat-card-content>
                        <adf-version-manager [node]="node"
-                                             (uploadError)="onUploadError($event)">
+                                             (uploadError)="onUploadError($event)"
+                                             (viewVersion)="onViewVersion($event)">
                        </adf-version-manager>
                    </mat-card-content>
                </mat-card>
@@ -318,6 +319,7 @@
    <adf-viewer
        [blobFile]="content"
        [nodeId]="nodeId"
+        [versionId]="versionId"
        [showRightSidebar]="showRightSidebar"
        [showLeftSidebar]="showLeftSidebar"
        [allowGoBack]="allowGoBack"
@@ -18,7 +18,7 @@
 import { Component, OnInit, ViewEncapsulation } from '@angular/core';
 import { ActivatedRoute, Router, PRIMARY_OUTLET } from '@angular/router';
 import { ContentService, AllowableOperationsEnum, PermissionsEnum, NodesApiService } from '@alfresco/adf-core';
-import { MatSnackBar } from '@angular/material';
+import { MatSnackBar } from '@angular/material/snack-bar';
 import { PreviewService } from '../../services/preview.service';

@Component({
@@ -30,6 +30,7 @@ import { PreviewService } from '../../services/preview.service';
 export class FileViewComponent implements OnInit {

    nodeId: string = null;
+    versionId: string = null;
    displayEmptyMetadata = false;
    expanded: boolean;
    multi = false;
@@ -72,6 +73,7 @@ export class FileViewComponent implements OnInit {
    ngOnInit() {
        this.route.params.subscribe((params) => {
            const id = params.nodeId;
+            this.versionId = params.versionId;
            if (id) {
                this.nodeApiService.getNode(id).subscribe(
                    (node) => {
@@ -92,6 +94,10 @@ export class FileViewComponent implements OnInit {
        });
    }

+    onViewVersion(versionId: string) {
+        this.preview.showResource(this.nodeId, versionId);
+    }
+
    onViewerVisibilityChanged() {
        const primaryUrl = this.router.parseUrl(this.router.url).root.children[PRIMARY_OUTLET].toString();
        this.router.navigateByUrl(primaryUrl);
@@ -27,7 +27,7 @@ export class CustomSourcesComponent {
    @Input()
    selectedSource = '-recent-';

-    @ViewChild('customSourcesDocumentList')
+    @ViewChild('customSourcesDocumentList', { static: true })
    documentList: DocumentListComponent;

    sources = [
@@ -13,6 +13,7 @@
                [currentFolderId]="'-recent-'"
                locationFormat="/files"
                [display]="'gallery'"
+                [preselectNodes]="selectedNodes"
                [showHeader]="false"
                [maxItems]="5"
                (preview)="showFile($event)"
@@ -82,7 +83,7 @@
                        mat-icon-button
                        [disabled]="!canCreateContent(documentList.folderNode)"
                        title="{{ 'DOCUMENT_LIST.TOOLBAR.NEW_FOLDER' | translate }}"
-                        (error)="openSnackMessage($event)"
+                        (error)="openSnackMessageError($event)"
                        (success)="documentList.reload()"
                        [adf-create-folder]="currentFolderId"
                        matTooltip="{{ 'DOCUMENT_LIST.TOOLBAR.NEW_FOLDER' | translate }}">
@@ -100,7 +101,7 @@
                        mat-icon-button
                            [disabled]="!canEditFolder(documentList.selection)"
                            title="{{ 'DOCUMENT_LIST.TOOLBAR.EDIT_FOLDER' | translate }}"
-                            (error)="openSnackMessage($event)"
+                            (error)="openSnackMessageError($event)"
                            [adf-edit-folder]="documentList.selection[0]?.entry"
                            (success)="documentList.reload()"
                            matTooltip="{{ 'DOCUMENT_LIST.TOOLBAR.EDIT_FOLDER' | translate }}">
@@ -183,7 +184,7 @@
                        <span>{{ 'DOCUMENT_LIST.TOOLBAR.CARDVIEW' | translate }}</span>
                    </button>
                    <button mat-menu-item
-                            (error)="openSnackMessage($event)"
+                            (error)="openSnackMessageError($event)"
                            [adf-create-folder]="currentFolderId">
                        <mat-icon>create_new_folder</mat-icon>
                        <span>{{ 'DOCUMENT_LIST.TOOLBAR.NEW_FOLDER' | translate }}</span>
@@ -195,18 +196,11 @@
                    </button>
                    <button mat-menu-item
                            [disabled]="!canEditFolder(documentList.selection)"
-                            (error)="openSnackMessage($event)"
+                            (error)="openSnackMessageError($event)"
                            [adf-edit-folder]="documentList.selection[0]?.entry">
                        <mat-icon>create</mat-icon>
                        <span>{{ 'DOCUMENT_LIST.TOOLBAR.EDIT_FOLDER' | translate }}</span>
                    </button>
-                    <button mat-menu-item
-                            [disabled]="!hasSelection(documentList.selection)"
-                            title="Download"
-                            (click)="downloadNodes(documentList.selection)">
-                        <mat-icon>get_app</mat-icon>
-                        <span>{{ 'DOCUMENT_LIST.TOOLBAR.DOWNLOAD' | translate }}</span>
-                    </button>
                    <button mat-menu-item
                            adf-check-allowable-operation="delete"
                            [adf-nodes]="documentList.selection"
@@ -237,13 +231,17 @@
                [showHeader]="showHeader"
                [thumbnails]="thumbnails"
                [stickyHeader]="stickyHeader"
+                [headerFilters]="headerFilters"
+                [filterValue]="paramValues"
                (error)="onNavigationError($event)"
                (success)="resetError()"
                (ready)="emitReadyEvent($event)"
                (preview)="showFile($event)"
                (folderChange)="onFolderChange($event)"
                (permissionError)="handlePermissionError($event)"
-                (name-click)="documentList.onNodeDblClick($event.detail?.node)">
+                (name-click)="documentList.onNodeDblClick($event.detail?.node)"
+                (filterSelection)="onFilterSelected($event)">
+
                <adf-custom-no-permission-template *ngIf="enableCustomPermissionMessage">
                    <h1>You don't have permissions</h1>
                </adf-custom-no-permission-template>
@@ -263,6 +261,7 @@
                    <data-column
                        *ngIf="showNameColumn && hyperlinkNavigation"
                        key="name"
+                        sortingKey="name"
                        class="app-ellipsis-cell"
                        title="{{'DOCUMENT_LIST.COLUMNS.DISPLAY_NAME' | translate}}"
                        [formatTooltip]="getNodeNameTooltip">
@@ -273,6 +272,7 @@
                    <data-column
                        *ngIf="showNameColumn && !hyperlinkNavigation"
                        key="name"
+                        sortingKey="name"
                        title="{{'DOCUMENT_LIST.COLUMNS.DISPLAY_NAME' | translate}}"
                        [formatTooltip]="getNodeNameTooltip"
                        class="app-ellipsis-cell adf-expand-cell-5">
@@ -290,6 +290,7 @@
                        key="content.sizeInBytes"
                        title="{{'DOCUMENT_LIST.COLUMNS.SIZE' | translate}}"
                        type="fileSize"
+                        sortingKey="sizeInBytes"
                        class="app-desktop-only adf-ellipsis-cell">
                    </data-column>
                    <data-column
@@ -316,12 +317,15 @@
                    <data-column
                        class="app-full-width adf-ellipsis-cell adf-desktop-only"
                        title="{{'DOCUMENT_LIST.COLUMNS.NODE_ID' | translate}}"
+                        [sortable]="false"
                        key="id">
                    </data-column>
+
                    <data-column
                        title="{{'DOCUMENT_LIST.COLUMNS.IS_LOCKED' | translate}}"
-                        key="id"
+                        key="lock"
                        [focus]="false"
+                        [sortable]="false"
                        class="app-desktop-only adf-ellipsis-cell">
                        <ng-template let-entry="$implicit">
                            <button mat-icon-button [adf-node-lock]="entry.row.node.entry" class="app-lock-button">
@@ -333,11 +337,13 @@
                    <data-column
                        title="{{'DOCUMENT_LIST.COLUMNS.CREATED_BY' | translate}}"
                        key="createdByUser.displayName"
+                        sortingKey="createdByUser"
                        class="app-desktop-only adf-ellipsis-cell">
                    </data-column>
                    <data-column
                        title="{{'DOCUMENT_LIST.COLUMNS.CREATED' | translate}}"
                        key="createdAt"
+                        sortingKey="createdAt"
                        type="date"
                        [format]="enableMediumTimeFormat ? 'medium' : 'timeAgo'"
                        class="app-desktop-only adf-ellipsis-cell">
@@ -529,13 +535,13 @@
        </section>

        <section>
-            <mat-slide-toggle [color]="'primary'" [(ngModel)]="multiselect">
+            <mat-slide-toggle data-automation-id="multiSelectToggle" [color]="'primary'" [(ngModel)]="multiselect">
                {{'DOCUMENT_LIST.MULTISELECT_CHECKBOXES' | translate}}
            </mat-slide-toggle>
        </section>

        <section>
-            <mat-slide-toggle id="adf-multiple-upload-switch" [color]="'primary'" [(ngModel)]="multipleFileUpload">
+            <mat-slide-toggle id="adf-multiple-upload-switch" [color]="'primary'" (change)="onMultipleFilesUpload()" [(ngModel)]="multipleFileUpload" >
                {{'DOCUMENT_LIST.MULTIPLE_FILE_UPLOAD' | translate}}
            </mat-slide-toggle>
        </section>
@@ -628,6 +634,21 @@
            </mat-slide-toggle>
        </section>

+        <section>
+            <mat-slide-toggle
+                color="primary" [(ngModel)]="preselectNodes" id="preselectNodes">
+                Preselect Nodes
+            </mat-slide-toggle>
+        </section>
+
+        <form class="example-form">
+            <mat-form-field *ngIf="preselectNodes" class="adf-preselect-nodes-input">
+                <input matInput
+                (input)="setPreselectNodes($event.target?.value)"
+                placeholder="NodeEntry[] => [{ entry: { isFile: true, id: 'node-id' }}, { entry: { isFile: true, id: 'node-id' }} ]">
+            </mat-form-field>
+        </form>
+
        <h5>Upload</h5>
        <section *ngIf="acceptedFilesTypeShow">
            <mat-form-field floatPlaceholder="float">
@@ -652,7 +673,7 @@
                [multipleFiles]="multipleFileUpload"
                [uploadFolders]="folderUpload"
                [maxFilesSize]="maxSizeShow ? maxFilesSize : null"
-                (error)="openSnackMessage($event)"
+                (error)="openSnackMessageError($event)"
                [versioning]="versioning"
                [adf-check-allowable-operation]="'create'"
                [adf-nodes]="enableUpload ? getCurrentDocumentListNode() : []"
@@ -670,7 +691,7 @@
                [multipleFiles]="multipleFileUpload"
                [uploadFolders]="folderUpload"
                [versioning]="versioning"
-                (error)="openSnackMessage($event)"
+                (error)="openSnackMessageError($event)"
                [adf-check-allowable-operation]="'create'"
                [adf-nodes]="enableUpload ? getCurrentDocumentListNode() : []"
                (permissionEvent)="handlePermissionError($event)">
@@ -697,4 +718,4 @@
    </div>
 </div>

-<adf-file-uploading-dialog #fileDialog (error)="openSnackMessage($event)"></adf-file-uploading-dialog>
+<adf-file-uploading-dialog #fileDialog (error)="openSnackMessageError($event)"></adf-file-uploading-dialog>
@@ -88,4 +88,8 @@
            justify-content: center;
        }
    }
+
+    .adf-preselect-nodes-input {
+        width: 100%;
+    }
 }
@@ -15,21 +15,18 @@
 * limitations under the License.
 */

-import {
-    Component, Input, OnInit, OnChanges, OnDestroy, Optional,
-    EventEmitter, ViewChild, SimpleChanges, Output
-} from '@angular/core';
+import { Component, Input, OnInit, OnChanges, OnDestroy, Optional, EventEmitter, ViewChild, SimpleChanges, Output } from '@angular/core';
 import { Location } from '@angular/common';
-
-import { MatDialog } from '@angular/material';
+import { MatDialog } from '@angular/material/dialog';
 import { ActivatedRoute, Params, Router } from '@angular/router';
-import { MinimalNodeEntity, NodePaging, Pagination, MinimalNodeEntryEntity, SiteEntry, SearchEntry } from '@alfresco/js-api';
+import { MinimalNodeEntity, NodePaging, Pagination, MinimalNodeEntryEntity, SiteEntry, SearchEntry, NodeEntry } from '@alfresco/js-api';
 import {
-    AlfrescoApiService, AuthenticationService, AppConfigService, AppConfigValues, ContentService, TranslationService,
-    FileUploadEvent, FolderCreatedEvent, LogService, NotificationService,
+    AlfrescoApiService, AuthenticationService, AppConfigService, AppConfigValues, ContentService, FolderCreatedEvent, LogService, NotificationService,
    UploadService, DataRow, UserPreferencesService,
-    PaginationComponent, FormValues, DisplayMode, InfinitePaginationComponent, HighlightDirective,
-    SharedLinksApiService
+    PaginationComponent, FormValues, DisplayMode, ShowHeaderMode, InfinitePaginationComponent,
+    SharedLinksApiService,
+    FormRenderingService,
+    FileUploadEvent
 } from '@alfresco/adf-core';

 import {
@@ -38,23 +35,27 @@ import {
    UploadFilesEvent,
    ConfirmDialogComponent,
    LibraryDialogComponent,
-    ContentMetadataService
+    ContentMetadataService,
+    FilterSearch
 } from '@alfresco/adf-content-services';

-import { SelectAppsDialogComponent } from '@alfresco/adf-process-services';
+import { SelectAppsDialogComponent, ProcessFormRenderingService } from '@alfresco/adf-process-services';

 import { VersionManagerDialogAdapterComponent } from './version-manager-dialog-adapter.component';
 import { MetadataDialogAdapterComponent } from './metadata-dialog-adapter.component';
 import { Subject } from 'rxjs';
 import { PreviewService } from '../../services/preview.service';
-import { debounceTime, takeUntil } from 'rxjs/operators';
+import { takeUntil, debounceTime, scan } from 'rxjs/operators';

 const DEFAULT_FOLDER_TO_SHOW = '-my-';

@Component({
    selector: 'app-files-component',
    templateUrl: './files.component.html',
-    styleUrls: ['./files.component.scss']
+    styleUrls: ['./files.component.scss'],
+    providers: [
+        { provide: FormRenderingService, useClass: ProcessFormRenderingService }
+    ]
 })
 export class FilesComponent implements OnInit, OnChanges, OnDestroy {

@@ -66,7 +67,7 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
    showVersions = false;
    allowDropFiles = true;
    displayMode = DisplayMode.List;
-    includeFields = ['isFavorite', 'isLocked', 'aspectNames'];
+    includeFields = ['isFavorite', 'isLocked', 'aspectNames', 'definition'];

    baseShareUrl = (
        this.appConfig.get<string>(AppConfigValues.BASESHAREURL) ||
@@ -75,9 +76,9 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
    toolbarColor = 'default';

    selectionModes = [
-        {value: 'none', viewValue: 'None'},
-        {value: 'single', viewValue: 'Single'},
-        {value: 'multiple', viewValue: 'Multiple'}
+        { value: 'none', viewValue: 'None' },
+        { value: 'single', viewValue: 'Single' },
+        { value: 'multiple', viewValue: 'Multiple' }
    ];

    // The identifier of a node. You can also use one of these well-known aliases: -my- | -shared- | -root-
@@ -89,10 +90,10 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
    processId;

    @Input()
-    sorting = ['name', 'asc'];
+    sorting = ['name', 'ASC'];

    @Input()
-    sortingMode = 'client';
+    sortingMode = 'server';

    @Input()
    showRecentFiles = true;
@@ -104,7 +105,7 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
    showSettingsPanel = true;

    @Input()
-    showHeader = true;
+    showHeader: string = ShowHeaderMode.Always;

    @Input()
    selectionMode = 'multiple';
@@ -157,6 +158,18 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
    @Input()
    searchTerm = '';

+    @Input()
+    navigationRoute = '/files';
+
+    @Input()
+    headerFilters = false;
+
+    @Input()
+    paramValues: Map<any, any> = null;
+
+    @Input()
+    filterSorting: string = null;
+
    @Output()
    documentListReady: EventEmitter<any> = new EventEmitter();

@@ -178,34 +191,34 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
    @Output()
    deleteElementSuccess: EventEmitter<any> = new EventEmitter();

-    @ViewChild('documentList')
+    @ViewChild('documentList', { static: true })
    documentList: DocumentListComponent;

    @ViewChild('standardPagination')
    standardPagination: PaginationComponent;

-    @ViewChild(InfinitePaginationComponent)
+    @ViewChild(InfinitePaginationComponent, { static: true })
    infinitePaginationComponent: InfinitePaginationComponent;

-    @ViewChild(HighlightDirective)
-    highlighter: HighlightDirective;
-
    permissionsStyle: PermissionStyleModel[] = [];
    infiniteScrolling: boolean;
    stickyHeader: boolean;
+    preselectNodes: boolean;
    warnOnMultipleUploads = false;
    thumbnails = false;
+
    enableCustomPermissionMessage = false;
    enableMediumTimeFormat = false;
    displayEmptyMetadata = false;
    hyperlinkNavigation = false;

+    selectedNodes = [];
+
    constructor(private notificationService: NotificationService,
                private uploadService: UploadService,
                private contentService: ContentService,
                private dialog: MatDialog,
                private location: Location,
-                private translateService: TranslationService,
                private router: Router,
                private logService: LogService,
                private appConfig: AppConfigService,
@@ -262,15 +275,31 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
        }

        this.uploadService.fileUploadComplete
-            .pipe(
-                debounceTime(300),
-                takeUntil(this.onDestroy$)
-            )
-            .subscribe(value => this.onFileUploadEvent(value));
+        .pipe(
+            debounceTime(300),
+            scan((files, currentFile) => [...files, currentFile], []),
+            takeUntil(this.onDestroy$)
+        )
+        .subscribe((value: any[]) => {
+            let selectedNodes: NodeEntry[] = [];
+
+            if (this.preselectNodes) {
+                if (value && value.length > 0 ) {
+                    if (this.selectionMode === 'single') {
+                        selectedNodes = [...[value[value.length - 1]].map((uploadedFile) => uploadedFile.data)];
+                    } else {
+                        selectedNodes = [...value.map((uploadedFile) => uploadedFile.data)];
+                    }
+                    this.selectedNodes = [...selectedNodes];
+                }
+            }
+
+            this.onFileUploadEvent(value[0]);
+        });

        this.uploadService.fileUploadDeleted
-            .pipe(takeUntil(this.onDestroy$))
-            .subscribe(value => this.onFileUploadEvent(value));
+        .pipe(takeUntil(this.onDestroy$))
+        .subscribe(value => this.onFileUploadEvent(value));

        this.contentService.folderCreated
            .pipe(takeUntil(this.onDestroy$))
@@ -297,6 +326,12 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
            });
    }

+    onFileUploadEvent(event: FileUploadEvent) {
+        if (event && event.file.options.parentId === this.documentList.currentFolderId) {
+            this.documentList.reload();
+        }
+    }
+
    ngOnDestroy() {
        this.onDestroy$.next(true);
        this.onDestroy$.complete();
@@ -323,7 +358,7 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {

    getCurrentDocumentListNode(): MinimalNodeEntity[] {
        if (this.documentList.folderNode) {
-            return [{entry: this.documentList.folderNode}];
+            return [{ entry: this.documentList.folderNode }];
        } else {
            return [];
        }
@@ -339,12 +374,6 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
        this.errorMessage = null;
    }

-    onFileUploadEvent(event: FileUploadEvent) {
-        if (event && event.file.options.parentId === this.documentList.currentFolderId) {
-            this.documentList.reload();
-        }
-    }
-
    onFolderCreated(event: FolderCreatedEvent) {
        this.logService.log('FOLDER CREATED');
        this.logService.log(event);
@@ -361,23 +390,25 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
    }

    onFolderChange($event) {
-        this.router.navigate(['/files', $event.value.id, 'display', this.displayMode]);
+        this.router.navigate([this.navigationRoute, $event.value.id, 'display', this.displayMode]);
    }

    handlePermissionError(event: any) {
-        this.translateService.get('PERMISSION.LACKOF', {
+        this.notificationService.showError('PERMISSION.LACKOF', null, {
            permission: event.permission,
            action: event.action,
            type: event.type
-        }).subscribe((message) => {
-            this.openSnackMessage(message);
        });
    }

-    openSnackMessage(message: string) {
+    openSnackMessageError(message: string) {
        this.notificationService.showError(message);
    }

+    openSnackMessageInfo(message: string) {
+        this.notificationService.showInfo(message);
+    }
+
    emitReadyEvent(event: NodePaging) {
        this.documentListReady.emit(event);
    }
@@ -388,25 +419,24 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {

    onContentActionError(errors: any) {
        const errorStatusCode = JSON.parse(errors.message).error.statusCode;
-        let translatedErrorMessage: any;
+        let message: string;

        switch (errorStatusCode) {
            case 403:
-                translatedErrorMessage = this.translateService.instant('OPERATION.ERROR.PERMISSION');
+                message = 'OPERATION.ERROR.PERMISSION';
                break;
            case 409:
-                translatedErrorMessage = this.translateService.instant('OPERATION.ERROR.CONFLICT');
+                message = 'OPERATION.ERROR.CONFLICT';
                break;
            default:
-                translatedErrorMessage = this.translateService.instant('OPERATION.ERROR.UNKNOWN');
+                message = 'OPERATION.ERROR.UNKNOWN';
        }

-        this.openSnackMessage(translatedErrorMessage);
+        this.openSnackMessageError(message);
    }

    onContentActionSuccess(message: string) {
-        const translatedMessage: any = this.translateService.instant(message);
-        this.openSnackMessage(translatedMessage);
+        this.openSnackMessageInfo(message);
        this.documentList.reload();
    }

@@ -414,7 +444,7 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
        this.uploadService.fileDeleted.next(message);
        this.deleteElementSuccess.emit();
        this.documentList.reload();
-        this.openSnackMessage(message);
+        this.openSnackMessageInfo(message);
    }

    onPermissionRequested(node: any) {
@@ -428,31 +458,30 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {

        if (this.contentService.hasAllowableOperations(contentEntry, 'update')) {
            this.dialog.open(VersionManagerDialogAdapterComponent, {
-                data: {contentEntry: contentEntry, showComments: showComments, allowDownload: allowDownload},
+                data: { contentEntry, showComments, allowDownload },
                panelClass: 'adf-version-manager-dialog',
                width: '630px'
            });
        } else {
-            const translatedErrorMessage: any = this.translateService.instant('OPERATION.ERROR.PERMISSION');
-            this.openSnackMessage(translatedErrorMessage);
+            this.openSnackMessageError('OPERATION.ERROR.PERMISSION');
        }
    }

    onManageMetadata(event: any) {
        const contentEntry = event.value.entry;
+        const displayEmptyMetadata = this.displayEmptyMetadata;

        if (this.contentService.hasAllowableOperations(contentEntry, 'update')) {
            this.dialog.open(MetadataDialogAdapterComponent, {
                data: {
-                    contentEntry: contentEntry,
-                    displayEmptyMetadata: this.displayEmptyMetadata
+                    contentEntry,
+                    displayEmptyMetadata
                },
                panelClass: 'adf-metadata-manager-dialog',
                width: '630px'
            });
        } else {
-            const translatedErrorMessage: any = this.translateService.instant('OPERATION.ERROR.PERMISSION');
-            this.openSnackMessage(translatedErrorMessage);
+            this.openSnackMessageError('OPERATION.ERROR.PERMISSION');
        }
    }

@@ -460,17 +489,17 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
        this.currentFolderId = site.entry.guid;
    }

-    hasSelection(selection: Array<MinimalNodeEntity>): boolean {
+    hasSelection(selection: Array<any>): boolean {
        return selection && selection.length > 0;
    }

    hasOneFileSelected(): boolean {
-        const selection: Array<MinimalNodeEntity> = this.documentList.selection;
+        const selection = this.documentList.selection;
        return selection && selection.length === 1 && selection[0].entry.isFile;
    }

    userHasPermissionToManageVersions(): boolean {
-        const selection: Array<MinimalNodeEntity> = this.documentList.selection;
+        const selection = this.documentList.selection;
        return this.contentService.hasAllowableOperations(selection[0].entry, 'update');
    }

@@ -519,22 +548,32 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {

    onChangePageSize(event: Pagination): void {
        this.preference.paginationSize = event.maxItems;
+        this.pagination.maxItems = event.maxItems;
+        this.pagination.skipCount = event.skipCount;
        this.changedPageSize.emit(event);
    }

    onChangePageNumber(event: Pagination): void {
+        this.pagination.maxItems = event.maxItems;
+        this.pagination.skipCount = event.skipCount;
        this.changedPageNumber.emit(event);
    }

    onNextPage(event: Pagination): void {
+        this.pagination.maxItems = event.maxItems;
+        this.pagination.skipCount = event.skipCount;
        this.turnedNextPage.emit(event);
    }

    loadNextBatch(event: Pagination): void {
+        this.pagination.maxItems = event.maxItems;
+        this.pagination.skipCount = event.skipCount;
        this.loadNext.emit(event);
    }

    onPrevPage(event: Pagination): void {
+        this.pagination.maxItems = event.maxItems;
+        this.pagination.skipCount = event.skipCount;
        this.turnedPreviousPage.emit(event);
    }

@@ -555,7 +594,6 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {

    canDownloadNode(node: MinimalNodeEntity): boolean {
        return node && node.entry && node.entry.name === 'custom';
-
    }

    onBeginUpload(event: UploadFilesEvent) {
@@ -582,10 +620,7 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
    }

    isCustomActionDisabled(node: MinimalNodeEntity): boolean {
-        if (node && node.entry && node.entry.name === 'custom') {
-            return false;
-        }
-        return true;
+        return !(node && node.entry && node.entry.name === 'custom');
    }

    runCustomAction(event: any) {
@@ -608,8 +643,7 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
                width: '630px'
            });
        } else {
-            const translatedErrorMessage: any = this.translateService.instant('OPERATION.ERROR.PERMISSION');
-            this.openSnackMessage(translatedErrorMessage);
+            this.openSnackMessageError('OPERATION.ERROR.PERMISSION');
        }
    }

@@ -633,4 +667,64 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
        }
        return '';
    }
+
+    onFilterSelected(activeFilters: FilterSearch[]) {
+        if (activeFilters.length) {
+           this.navigateToFilter(activeFilters);
+        } else {
+           this.clearFilterNavigation();
+        }
+    }
+
+    navigateToFilter(activeFilters: FilterSearch[]) {
+        const objectFromMap = {};
+        activeFilters.forEach((filter: FilterSearch) => {
+            let paramValue = null;
+            if (filter.value && filter.value.from && filter.value.to) {
+                paramValue = `${filter.value.from}||${filter.value.to}`;
+            } else {
+                paramValue = filter.value;
+            }
+            objectFromMap[filter.key] = paramValue;
+        });
+
+        this.router.navigate([], { relativeTo: this.route, queryParams: objectFromMap });
+    }
+
+    clearFilterNavigation() {
+        this.documentList.node = null;
+        if (this.currentFolderId === '-my-') {
+            this.router.navigate([this.navigationRoute, '']);
+        } else {
+            this.router.navigate([this.navigationRoute, this.currentFolderId, 'display', this.displayMode]);
+        }
+        this.documentList.reload();
+    }
+
+    setPreselectNodes(nodes: string) {
+        this.selectedNodes = this.getArrayFromString(nodes);
+        this.documentList.reload();
+    }
+
+    isStringArray(str: string): boolean {
+        try {
+            const result = JSON.parse(str);
+            return Array.isArray(result);
+        } catch (e) {
+            return false;
+        }
+    }
+
+    private getArrayFromString<T = any>(value: string): T[] {
+        if (this.isStringArray(value)) {
+            return JSON.parse(value);
+        } else {
+            return [];
+        }
+    }
+
+    onMultipleFilesUpload() {
+        this.selectedNodes = [];
+    }
+
 }
@@ -0,0 +1,9 @@
+<app-files-component [sortingMode]="'server'"
+                     [showRecentFiles]="false"
+                     [showSitePicker]="true"
+                     [showSettingsPanel]="false"
+                     [navigationRoute]="navigationRoute"
+                     [currentFolderId]="currentFolderId"
+                     [headerFilters]="true"
+                     [paramValues]="queryParams">
+</app-files-component>
@@ -0,0 +1,46 @@
+/*!
+ * @license
+ * Copyright 2019 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Component, Optional } from '@angular/core';
+import { ActivatedRoute, Params } from '@angular/router';
+
+@Component({
+    selector: 'app-filtered-search-component',
+    templateUrl: './filtered-search.component.html'
+})
+export class FilteredSearchComponent {
+
+    navigationRoute = '/filtered-search';
+    currentFolderId = '-my-';
+
+    queryParams = null;
+
+    constructor(@Optional() private route: ActivatedRoute) {
+
+        if (this.route) {
+            this.route.params.forEach((params: Params) => {
+                if (params['id'] && this.currentFolderId !== params['id']) {
+                    this.currentFolderId = params['id'];
+                }
+            });
+
+            this.route.queryParamMap.subscribe((queryMap: Params) => {
+                this.queryParams = queryMap.params;
+            });
+        }
+    }
+}
@@ -16,7 +16,7 @@
 */

 import { Component, Inject, ViewEncapsulation } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { MinimalNodeEntryEntity } from '@alfresco/js-api';

@Component({
@@ -32,7 +32,9 @@
                         [newFileVersion]="newFileVersion"
                         [allowDownload]="allowDownload"
                         [showComments]="showComments"
-                         (uploadError)="uploadError($event)"></adf-version-manager>
+                         (uploadError)="uploadError($event)"
+                         (viewVersion)="onViewVersion($event)"
+    ></adf-version-manager>
 </section>
 <section mat-dialog-content *ngIf="readOnly">
    <adf-version-list [node]="contentEntry" [showActions]="false"></adf-version-list>
@@ -19,6 +19,7 @@ import { Component, Inject, ViewEncapsulation } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { MinimalNodeEntryEntity } from '@alfresco/js-api';
 import { MatSnackBar } from '@angular/material/snack-bar';
+import { PreviewService } from '../../services/preview.service';

@Component({
    templateUrl: './version-manager-dialog-adapter.component.html',
@@ -34,7 +35,8 @@ export class VersionManagerDialogAdapterComponent {
    readOnly = false;
    showVersionComparison = false;

-    constructor(@Inject(MAT_DIALOG_DATA) data: any,
+    constructor(private previewService: PreviewService,
+                @Inject(MAT_DIALOG_DATA) data: any,
                private snackBar: MatSnackBar,
                private containingDialog?: MatDialogRef<VersionManagerDialogAdapterComponent>) {
        this.contentEntry = data.contentEntry;
@@ -51,6 +53,11 @@ export class VersionManagerDialogAdapterComponent {
        this.containingDialog.close();
    }

+    onViewVersion(versionId: string) {
+        this.previewService.showResource(this.contentEntry.id, versionId);
+        this.close();
+    }
+
    hideVersionComparison(isCancelled: boolean | Node) {
        if (isCancelled) {
            this.showVersionComparison = false;
@@ -6,6 +6,7 @@
                <adf-form
                    [showRefreshButton]="false"
                    [form]="form"
+                    [enableFixedSpacedForm]="keepPrefixedSpace"
                    (formError)="logErrors($event)">
                </adf-form>
            </div>
@@ -47,6 +48,11 @@
            </div>

        </mat-tab>
+        <mat-tab label="Options">
+            <mat-slide-toggle [checked]="keepPrefixedSpace" (change)="togglePrefixedSpace()" >
+                Keep prefixed space for hidden field
+            </mat-slide-toggle>
+        </mat-tab>

    </mat-tab-group>
 </div>
@@ -38,6 +38,7 @@ export class FormComponent implements OnInit, OnDestroy {
    errorFields: FormFieldModel[] = [];
    formConfig: string;
    editor: any;
+    keepPrefixedSpace = true;

    editorOptions = {
        theme: 'vs-dark',
@@ -85,7 +86,7 @@ export class FormComponent implements OnInit, OnDestroy {
    }

    parseForm() {
-        this.form = this.formService.parseForm(JSON.parse(this.formConfig));
+        this.form = this.formService.parseForm(JSON.parse(this.formConfig), null, false, this.keepPrefixedSpace);
    }

    onSaveFormConfig() {
@@ -113,4 +114,8 @@ export class FormComponent implements OnInit, OnDestroy {

        $event.target.value = '';
    }
+
+    togglePrefixedSpace() {
+        this.keepPrefixedSpace = !this.keepPrefixedSpace;
+    }
 }
@@ -20,6 +20,7 @@ import { Injectable, Output, EventEmitter } from '@angular/core';
@Injectable({
    providedIn: 'root'
 })
+// tslint:disable-next-line: directive-class-suffix
 export class HeaderDataService {

    show = true;
@@ -16,7 +16,7 @@
 */

 import { Component, OnInit } from '@angular/core';
-import { MatIconRegistry } from '@angular/material';
+import { MatIconRegistry } from '@angular/material/icon';
 import { DomSanitizer } from '@angular/platform-browser';

@Component({
@@ -0,0 +1,5 @@
+{
+  "LAZY": {
+    "TEXT": "Text from lazy component resources"
+  }
+}
@@ -0,0 +1,5 @@
+{
+  "LAZY": {
+    "TEXT": "Text from lazy component resources"
+  }
+}
@@ -0,0 +1,5 @@
+{
+  "LAZY": {
+    "TEXT": "Text from lazy component resources"
+  }
+}
@@ -0,0 +1,5 @@
+{
+  "LAZY": {
+    "TEXT": "Text from lazy component resources"
+  }
+}
@@ -0,0 +1,5 @@
+{
+  "LAZY": {
+    "TEXT": "Texto de recursos de componentes lazy"
+  }
+}
@@ -0,0 +1,5 @@
+{
+  "LAZY": {
+    "TEXT": "Text from lazy component resources"
+  }
+}
@@ -0,0 +1,5 @@
+{
+  "LAZY": {
+    "TEXT": "Texte de ressources composant lazy"
+  }
+}
@@ -0,0 +1,5 @@
+{
+  "LAZY": {
+    "TEXT": "Text from lazy component resources"
+  }
+}
@@ -0,0 +1,5 @@
+{
+  "LAZY": {
+    "TEXT": "Text from lazy component resources"
+  }
+}
@@ -0,0 +1,5 @@
+{
+  "LAZY": {
+    "TEXT": "Tekst fra ressursene med lazy komponent"
+  }
+}
@@ -0,0 +1,5 @@
+{
+  "LAZY": {
+    "TEXT": "Text from lazy component resources"
+  }
+}
@@ -0,0 +1,5 @@
+{
+  "LAZY": {
+    "TEXT": "Text from lazy component resources"
+  }
+}
@@ -0,0 +1,5 @@
+{
+  "LAZY": {
+    "TEXT": "Text from lazy component resources"
+  }
+}
@@ -0,0 +1,5 @@
+{
+  "LAZY": {
+    "TEXT": "Text from lazy component resources"
+  }
+}
@@ -0,0 +1,5 @@
+{
+  "LAZY": {
+    "TEXT": "Text from lazy component resources"
+  }
+}
@@ -0,0 +1,5 @@
+{
+  "LAZY": {
+    "TEXT": "Text from lazy component resources"
+  }
+}
@@ -4,7 +4,7 @@
    <p class="app-toggle">
        <mat-slide-toggle
            id="switch3"
-            [color]="'primary'"
+            color="primary"
            (change)="toggleCSRF()"
            [checked]="!disableCsrf">
            CSRF
@@ -13,7 +13,7 @@
    <p class="app-toggle">
        <mat-slide-toggle
            id="switch4"
-            [color]="'primary'"
+            color="primary"
            (change)="toggleFooter()"
            [checked]="showFooter">
            {{ 'LOGIN.LOGIN_FOOTER'| translate }}
@@ -22,7 +22,7 @@
    <p class="app-toggle">
        <mat-slide-toggle
            id="adf-toggle-show-rememberme"
-            [color]="'primary'"
+            color="primary"
            (change)="toggleRememberMe()"
            [checked]="showRememberMe">
            {{ 'LOGIN.SHOW_REMEMBERME'| translate }}
@@ -31,7 +31,7 @@
    <p class="app-toggle">
        <mat-slide-toggle
            id="adf-toggle-show-successRoute"
-            [color]="'primary'"
+            color="primary"
            (change)="toggleSuccessRoute()"
            [checked]="customSuccessRoute">
            {{ 'LOGIN.SHOW_SUCCESS_ROUTE'| translate }}
@@ -51,7 +51,7 @@
    <p class="app-toggle">
        <mat-slide-toggle
            id="adf-toggle-logo"
-            [color]="'primary'"
+            color="primary"
            (change)="toggleLogo()"
            [checked]="customLogoImage">
            {{ 'LOGIN.CUSTOM_LOGO'| translate }}
@@ -77,13 +77,10 @@
 </a>

 <adf-login
-    #alfrescoLogin
    [successRoute]="customSuccessRouteURI"
    [logoImageUrl]="customLogoImageURL"
-    [fieldsValidation]="customValidation"
    [showLoginActions]="showFooter"
    [showRememberMe]="showFooter && showRememberMe"
-    (executeSubmit)="checkForm($event)"
    copyrightText="{{ 'application.copyright' | adfAppConfig }}"
    (success)="onLogin()"
    (error)="onError($event)">
@@ -91,7 +88,7 @@
        <p>
            <mat-slide-toggle
                id="switch3-mobile"
-                [color]="'primary'"
+                color="primary"
                (change)="toggleCSRF()"
                [checked]="!disableCsrf">
                CSRF
@@ -100,14 +97,19 @@
        <p>
            <mat-slide-toggle
                id="switch4-mobile"
-                [color]="'primary'"
+                color="primary"
                (change)="toggleFooter()"
                [checked]="showFooter">
                {{ 'LOGIN.LOGIN_FOOTER'| translate }}
            </mat-slide-toggle>
        </p>
-        <button type="button" mat-raised-button color="accent" class="app-mobile-setting-button" routerLink="/settings"
-                data-automation-id="settings">{{ 'APP_LAYOUT.SETTINGS'| translate }}
+        <button
+            type="button"
+            mat-raised-button
+            color="accent"
+            class="app-mobile-setting-button"
+            routerLink="/settings"
+            data-automation-id="settings">{{ 'APP_LAYOUT.SETTINGS'| translate }}
        </button>

    </div>
@@ -15,8 +15,7 @@
 * limitations under the License.
 */

-import { Component, OnInit, ViewChild } from '@angular/core';
-import { Validators } from '@angular/forms';
+import { Component } from '@angular/core';
 import { Router } from '@angular/router';
 import { LogService } from '@alfresco/adf-core';

@@ -25,12 +24,8 @@ import { LogService } from '@alfresco/adf-core';
    templateUrl: './login.component.html',
    styleUrls: ['./login.component.scss']
 })
-export class LoginComponent implements OnInit {
+export class LoginComponent {

-    @ViewChild('alfrescoLogin')
-    alfrescoLogin: any;
-
-    customValidation: any;
    customSuccessRouteURI = '';
    customLogoImageURL = './assets/images/alfresco-logo.svg';

@@ -39,28 +34,17 @@ export class LoginComponent implements OnInit {
    showRememberMe = true;
    customSuccessRoute = false;
    customLogoImage = false;
-    customMinLength = 2;

    constructor(private router: Router,
                private logService: LogService) {
-        this.customValidation = {
-            username: ['', Validators.compose([Validators.required, Validators.minLength(this.customMinLength)])],
-            password: ['', Validators.required]
-        };
-    }
-
-    ngOnInit() {
-        this.alfrescoLogin.addCustomValidationError('username', 'required', 'LOGIN.MESSAGES.USERNAME-REQUIRED');
-        this.alfrescoLogin.addCustomValidationError('username', 'minlength', 'LOGIN.MESSAGES.USERNAME-MIN', { minLength: this.customMinLength });
-        this.alfrescoLogin.addCustomValidationError('password', 'required', 'LOGIN.MESSAGES.PASSWORD-REQUIRED');
    }

    onLogin() {
        this.router.navigate(['/home']);
    }

-    onError($event) {
-        this.logService.error($event);
+    onError(err: any) {
+        this.logService.error(err);
    }

    toggleCSRF() {
@@ -88,9 +72,4 @@ export class LoginComponent implements OnInit {
            this.customLogoImageURL = null;
        }
    }
-
-    checkForm(event: any) {
-        const values = event.values;
-        this.logService.log(values);
-    }
 }
@@ -17,7 +17,7 @@

 import { Component, OnInit, OnDestroy } from '@angular/core';
 import { NotificationService } from '@alfresco/adf-core';
-import { MatSnackBarConfig } from '@angular/material';
+import { MatSnackBarConfig } from '@angular/material/snack-bar';
 import { FormBuilder, FormGroup, FormControl } from '@angular/forms';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
@@ -28,7 +28,7 @@ import { NodesApiService, NotificationService } from '@alfresco/adf-core';
 })
 export class DemoPermissionComponent implements OnInit {

-    @ViewChild('permissionList')
+    @ViewChild('permissionList', { static: true })
    displayPermissionComponent: PermissionListComponent;

    nodeId: string;
@@ -51,12 +51,12 @@ export class DemoPermissionComponent implements OnInit {
        this.nodeService
            .getNode(this.nodeId, {include: ['permissions'] })
            .subscribe( (currentNode: MinimalNodeEntryEntity) => {
-                this.toggleStatus = currentNode.permissions.isInheritanceEnabled;
+                this.toggleStatus = currentNode.permissions?.isInheritanceEnabled ?? false;
            });
    }

    onUpdatedPermissions(node: MinimalNodeEntryEntity) {
-        this.toggleStatus = node.permissions.isInheritanceEnabled;
+        this.toggleStatus = node.permissions?.isInheritanceEnabled ?? false;
        this.displayPermissionComponent.reload();
    }

@@ -46,8 +46,7 @@ export class CustomStencil01 extends WidgetComponent {

@NgModule({
    declarations: [ CustomEditorComponent, CustomStencil01 ],
-    exports: [ CustomEditorComponent, CustomStencil01 ],
-    entryComponents: [ CustomEditorComponent, CustomStencil01 ]
+    exports: [ CustomEditorComponent, CustomStencil01 ]
 })
 export class CustomEditorsModule {

@@ -18,13 +18,13 @@
 import { Component, Input, OnChanges, OnInit, ViewChild, OnDestroy } from '@angular/core';
 import { ProcessInstance, ProcessService ,
    ProcessAttachmentListComponent, ProcessUploadService } from '@alfresco/adf-process-services';
-import { UploadService, AlfrescoApiService, AppConfigService } from '@alfresco/adf-core';
+import { UploadService, AlfrescoApiService, AppConfigService, DiscoveryApiService } from '@alfresco/adf-core';
 import { PreviewService } from '../../services/preview.service';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';

-export function processUploadServiceFactory(api: AlfrescoApiService, config: AppConfigService) {
-    return new ProcessUploadService(api, config);
+export function processUploadServiceFactory(api: AlfrescoApiService, config: AppConfigService, discoveryApiService: DiscoveryApiService) {
+    return new ProcessUploadService(api, config, discoveryApiService);
 }

@Component({
@@ -35,7 +35,7 @@ export function processUploadServiceFactory(api: AlfrescoApiService, config: App
        {
            provide: UploadService,
            useFactory: (processUploadServiceFactory),
-            deps: [AlfrescoApiService, AppConfigService]
+            deps: [AlfrescoApiService, AppConfigService, DiscoveryApiService]
        }
    ]
 })
@@ -27,7 +27,8 @@
                            <adf-task-filters [filterParam]="filterSelected"
                                              [appId]="appId"
                                              [showIcon]="showTaskFilterIcon"
-                                              (filterClick)="onTaskFilterClick($event)"
+                                              (filterClicked)="onTaskFilterClick($event)"
+                                              (filterSelected)="onTaskFilterClick($event)"
                                              (success)="onSuccessTaskFilterList()" #activitiFilter>
                            </adf-task-filters>
                        </mat-expansion-panel>
@@ -118,7 +119,7 @@
             label="{{'PS-TAB.PROCESSES-TAB' | translate}}">
        <div class="app-page-content" *ngIf="showProcessTab">
            <div class="app-grid" fxLayout="row" fxLayout.lt-lg="column" fxLayoutAlign="stretch">
-                <div class="app-grid-item app-processes-menu" fxFlex.gt-md="225px">
+                <div id="app-processes-menu"  class="app-grid-item app-processes-menu" fxFlex.gt-md="225px">
                    <div class="app-list-buttons">
                        <adf-sidebar-action-menu [expanded]="true" [width]="205"
                                                 title="{{'ADF_SIDEBAR_ACTION_MENU.BUTTON.CREATE' | translate}}">
@@ -145,7 +146,7 @@
                                    [appId]="appId"
                                    [filterParam]="filterSelected"
                                    [showIcon]="showProcessFilterIcon"
-                                    (filterClick)="onProcessFilterChange($event)"
+                                    (filterClicked)="onProcessFilterChange($event)"
                                    (filterSelected)="onProcessFilterChange($event)"
                                    (success)="onSuccessProcessFilterList()">
                            </adf-process-instance-filters>
@@ -237,12 +238,12 @@
            <div class="app-grid-item app-reports-menu" fxFlex.gt-md="300px">
                <span><h5>Report List</h5></span>
                <mat-divider></mat-divider>
-                <adf-analytics-report-list
+                <!-- <adf-analytics-report-list
                    [appId]="appId"
                    [selectFirst]="selectFirstReport"
                    (reportClick)="onReportClick($event)"
                    #analyticsReportList>
-                </adf-analytics-report-list>
+                </adf-analytics-report-list> -->
            </div>
            <div class="app-grid-item app-reports-details" fxFlex.gt-md="1 1 auto">
                <adf-analytics
@@ -52,7 +52,8 @@ import {
    TaskDetailsComponent,
    TaskDetailsEvent,
    TaskFiltersComponent,
-    TaskListComponent
+    TaskListComponent,
+    ProcessFormRenderingService
 } from '@alfresco/adf-process-services';
 import { Subject } from 'rxjs';
 import { /*CustomEditorComponent*/ CustomStencil01 } from './custom-editor/custom-editor.component';
@@ -72,7 +73,10 @@ const REPORT_ROUTE = 2;
    selector: 'app-process-service',
    templateUrl: './process-service.component.html',
    styleUrls: ['./process-service.component.scss'],
-    encapsulation: ViewEncapsulation.None
+    encapsulation: ViewEncapsulation.None,
+    providers: [
+        { provide: FormRenderingService, useClass: ProcessFormRenderingService }
+    ]
 })
 export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit {

@@ -103,7 +107,7 @@ export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit
    @ViewChild('activitiStartProcess')
    activitiStartProcess: StartProcessInstanceComponent;

-    @ViewChild('analyticsReportList')
+    @ViewChild('analyticsReportList', { static: true })
    analyticsReportList: AnalyticsReportListComponent;

    @Input()
@@ -22,13 +22,13 @@ import {
    TaskUploadService,
    TaskDetailsModel
 } from '@alfresco/adf-process-services';
-import { UploadService, AlfrescoApiService, AppConfigService } from '@alfresco/adf-core';
+import { UploadService, AlfrescoApiService, AppConfigService, DiscoveryApiService } from '@alfresco/adf-core';
 import { PreviewService } from '../../services/preview.service';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';

-export function taskUploadServiceFactory(api: AlfrescoApiService, config: AppConfigService) {
-    return new TaskUploadService(api, config);
+export function taskUploadServiceFactory(api: AlfrescoApiService, config: AppConfigService, discoveryApiService: DiscoveryApiService) {
+    return new TaskUploadService(api, config, discoveryApiService);
 }

@Component({
@@ -39,7 +39,7 @@ export function taskUploadServiceFactory(api: AlfrescoApiService, config: AppCon
        {
            provide: UploadService,
            useFactory: (taskUploadServiceFactory),
-            deps: [AlfrescoApiService, AppConfigService]
+            deps: [AlfrescoApiService, AppConfigService, DiscoveryApiService]
        }
    ]
 })
@@ -1,9 +0,0 @@
-<div class="app-report-issue">
-    <h1>Report Issue</h1>
-    <form class="app-report-issue-form">
-        <mat-form-field>
-            <textarea matInput placeholder="Leave a comment" class="app-report-issue-form-textarea"></textarea>
-        </mat-form-field>
-    </form>
-    <button mat-raised-button>Submit</button>
-</div>
--- a/Show More
+++ b/Show More