bump 4.0.0

bump dependencies 4.0.0
drag and drop improvements (copy effect) (#6019 )
2026-09-16 18:13:06 +00:00 · 2020-08-18 11:41:49 +01:00 · 2020-08-18 11:12:28 +01:00 · 2020-08-18 10:57:09 +01:00 · 2020-08-18 10:29:32 +01:00 · 2020-08-18 10:07:19 +01:00
2216 changed files with 85716 additions and 53263 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'.
@@ -10,28 +10,9 @@
 # precedence. When someone opens a pull request that only
 # modifies JS files, only @js-owner and not the global
 # owner(s) will be requested for a review.
-e2e/*   @eromano @cristinaj @gmandakini @marouanbentaleb
-
- # You can also use email addresses if you prefer. They'll be
-# used to look up users just like we do for commit author
-# emails.
-#*.go docs@example.com
-docs/* @m-hulbert  @eromano
-
- # In this example, @doctocat owns any files in the build/logs
-# directory at the root of the repository and any of its
-# subdirectories.
-#/build/logs/ @doctocat
+/e2e/   @eromano @cristinaj

 # The `docs/*` pattern will match files like
 # `docs/getting-started.md` but not further nested files like
 # `docs/build-app/troubleshooting.md`.
-#docs/*  docs@example.com
-
- # In this example, @octocat owns any file in an apps directory
-# anywhere in your repository.
-#apps/ @octocat
-
- # In this example, @doctocat owns any file in the `/docs`
-# directory in the root of your repository.
-#/docs/ @doctocat
+/docs/  @m-hulbert  @eromano
@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+  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 }}
@@ -23,3 +23,4 @@ e2e-output/
 coverage/
 /desktop.ini
 out-tsc
+!/.protractor-smartrunner/
@@ -11,7 +11,7 @@ pull_request_rules:
      conditions:
          - status-success=continuous-integration/travis-ci/pr
          - status-success=security/snyk - package.json (eromano (GitHub marketplace))
-          - '#approved-reviews-by>=2'
+          - '#approved-reviews-by>=1'
          - '#changes-requested-reviews-by=0'
          - '#commented-reviews-by=0'
          - label!="do not merge"
@@ -1,5 +1,5 @@
 # Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
-version: v1.13.5
+version: v1.14.1
 ignore: {}
 # patches apply the minimum changes required to fix a vulnerability
 patch:
@@ -8,3 +8,39 @@ patch:
        patched: '2019-11-20T10:48:59.194Z'
    - '@alfresco/js-api > @alfresco/adf-cli > npm-registry-fetch > make-fetch-happen > https-proxy-agent':
        patched: '2019-11-20T10:48:59.194Z'
+  SNYK-JS-TREEKILL-536781:
+    - snyk > snyk-sbt-plugin > tree-kill:
+        patched: '2019-12-12T00:35:06.820Z'
+  SNYK-JS-LODASH-567746:
+    - snyk > lodash:
+        patched: '2020-05-01T00:35:43.233Z'
+    - snyk > @snyk/dep-graph > lodash:
+        patched: '2020-05-01T00:35:43.233Z'
+    - snyk > inquirer > lodash:
+        patched: '2020-05-01T00:35:43.233Z'
+    - snyk > snyk-config > lodash:
+        patched: '2020-05-01T00:35:43.233Z'
+    - snyk > snyk-mvn-plugin > lodash:
+        patched: '2020-05-01T00:35:43.233Z'
+    - snyk > snyk-nodejs-lockfile-parser > lodash:
+        patched: '2020-05-01T00:35:43.233Z'
+    - snyk > snyk-nuget-plugin > lodash:
+        patched: '2020-05-01T00:35:43.233Z'
+    - snyk > @snyk/dep-graph > graphlib > lodash:
+        patched: '2020-05-01T00:35:43.233Z'
+    - snyk > snyk-go-plugin > graphlib > lodash:
+        patched: '2020-05-01T00:35:43.233Z'
+    - snyk > snyk-nodejs-lockfile-parser > graphlib > lodash:
+        patched: '2020-05-01T00:35:43.233Z'
+    - snyk > @snyk/snyk-cocoapods-plugin > @snyk/dep-graph > lodash:
+        patched: '2020-05-01T00:35:43.233Z'
+    - snyk > snyk-nuget-plugin > dotnet-deps-parser > lodash:
+        patched: '2020-05-01T00:35:43.233Z'
+    - snyk > snyk-php-plugin > @snyk/composer-lockfile-parser > lodash:
+        patched: '2020-05-01T00:35:43.233Z'
+    - snyk > @snyk/snyk-cocoapods-plugin > @snyk/dep-graph > graphlib > lodash:
+        patched: '2020-05-01T00:35:43.233Z'
+    - snyk > @snyk/snyk-cocoapods-plugin > @snyk/cocoapods-lockfile-parser > @snyk/ruby-semver > lodash:
+        patched: '2020-05-01T00:35:43.233Z'
+    - snyk > @snyk/snyk-cocoapods-plugin > @snyk/cocoapods-lockfile-parser > @snyk/dep-graph > graphlib > lodash:
+        patched: '2020-05-01T00:35:43.233Z'
@@ -1 +1,2 @@
 _theming.scss
+lib/core/viewer/components/pdf-viewer-host.component.scss
@@ -3,131 +3,149 @@ git:
  quiet: true

 language: node_js
-dist: trusty
+dist: bionic
 node_js:
- # Use the explicit NodeJS LTS version 8.9.4 to avoid any automatic upgrade of the version.
-  - '10.16.0'
+  - '12.16.3'

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

 branches:
  only:
  - master
-  - development
+  - develop
  - /.*old-env.*/
  - /.*next-release.*/
  - /.*beta.*/
-  - /.*greenkeeper.*/

-# TRAVIS_PULL_REQUEST == false means is running on dev branch and is not a PR
 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\]/
  - 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: (type != cron AND tag IS blank) OR type = api
-  - name: Update Rancher
-    if: (type = push AND tag IS blank)
+    if: (branch != master AND type != cron AND tag IS blank) OR type = api
  - name: e2e Test
-    if: (type != cron AND tag IS blank) OR type = api
-  - name: Update Rancher PR
-    if: type = pull_request
+    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: type = cron
+    if: tag =~ .*beta.*
+  - name: Release tag
+    if: type = cron OR branch = master

 addons:
    chrome: stable
 before_script:
    - "sudo chown root /opt/google/chrome/chrome-sandbox"
    - "sudo chmod 4755 /opt/google/chrome/chrome-sandbox"
-
-before_install:
-    - export CHROME_BIN=chromium-browser
-    - export DISPLAY=:99.0
-    - sh -e /etc/init.d/xvfb start
-    - sleep 3 # give xvfb some time to start
+    - export GIT_HASH=`git rev-parse HEAD`
+services:
+    - xvfb

 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 Development 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/release/release.sh
-            - TAG_VERSION=$(./scripts/travis/deploy/tag-travis-branch.sh)
-            - echo "Running the docker with tag" $TAG_VERSION
-            - ./node_modules/@alfresco/adf-cli/bin/adf-cli docker-publish --loginCheck --loginUsername "$DOCKER_REPOSITORY_USER" --loginPassword "$DOCKER_REPOSITORY_PASSWORD" --loginRepo "$DOCKER_REPOSITORY_DOMAIN" --dockerRepo "$DOCKER_REPOSITORY" --dockerTags "$TAG_VERSION,$TAGS" --pathProject "$(pwd)"
-
+            - ./scripts/travis/build/build.sh
+            - ./scripts/lint.sh
+            - ./scripts/travis/release/release-npm.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: Unit test
          name: Unit test content
          script:  ./scripts/travis/unit-test/content.sh
        - stage: Unit test
          name: Unit test core extension demo
-          script: ./scripts/travis/unit-test/core-extension-demo.sh
+          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/utils/artifact-from-s3.sh -a "$S3_DBP_FOLDER/alfresco-demoshell.tar.bz2" -o "./dist/demo-shell"
+            - ./scripts/ci/utils/artifact-from-s3.sh -a "$S3_DBP_FOLDER/alfresco-libs.tar.bz2" -o "./lib/dist"
          script: ./scripts/travis/e2e/core-e2e.sh
        - stage: e2e Test
          name:  content
+          before_script:
+              - ./scripts/ci/utils/artifact-from-s3.sh -a "$S3_DBP_FOLDER/alfresco-demoshell.tar.bz2" -o "./dist/demo-shell"
+              - ./scripts/ci/utils/artifact-from-s3.sh -a "$S3_DBP_FOLDER/alfresco-libs.tar.bz2" -o "./lib/dist"
          script: ./scripts/travis/e2e/content-services-e2e.sh
        - stage: e2e Test
          name:  search
+          before_script:
+              - ./scripts/ci/utils/artifact-from-s3.sh -a "$S3_DBP_FOLDER/alfresco-demoshell.tar.bz2" -o "./dist/demo-shell"
+              - ./scripts/ci/utils/artifact-from-s3.sh -a "$S3_DBP_FOLDER/alfresco-libs.tar.bz2" -o "./lib/dist"
          script: ./scripts/travis/e2e/search-e2e.sh
        - stage: e2e Test
          name: process
+          before_script:
+              - ./scripts/ci/utils/artifact-from-s3.sh -a "$S3_DBP_FOLDER/alfresco-demoshell.tar.bz2" -o "./dist/demo-shell"
+              - ./scripts/ci/utils/artifact-from-s3.sh -a "$S3_DBP_FOLDER/alfresco-libs.tar.bz2" -o "./lib/dist"
          script: ./scripts/travis/e2e/process-services-e2e.sh
        - stage: e2e Test
          name: process Cloud
+          before_script:
+              - ./scripts/ci/utils/artifact-from-s3.sh -a "$S3_DBP_FOLDER/alfresco-demoshell.tar.bz2" -o "./dist/demo-shell"
+              - ./scripts/ci/utils/artifact-from-s3.sh -a "$S3_DBP_FOLDER/alfresco-libs.tar.bz2" -o "./lib/dist"
          script: ./scripts/travis/e2e/process-services-cloud-e2e.sh


+        - stage: Update Rancher
+          name: Update Rancher
+          before_script: ./scripts/ci/utils/artifact-from-s3.sh -a "$S3_DBP_FOLDER/alfresco-demoshell.tar.bz2" -o "./dist/demo-shell"
+          script: ./scripts/travis/deploy/deploy.sh
+
+        - stage: Deploy PR
+          name: Deploy PR
+          script: ./scripts/travis/deploy/deploy-pr.sh
+
+
        - stage: Check bundle
          script:
          - ADF_VERSION=$(npm view @alfresco/adf-core@${TAG_NPM} version)
          - ./scripts/npm-check-bundles.sh -v ${ADF_VERSION}


-        - stage: Update Rancher
-          script:
-          - TAG_VERSION=$(./scripts/travis/deploy/tag-travis-branch.sh)
-          - echo "Update rancher with docker tag" $TAG_VERSION  --url $REPO_RANCHER --environment_name $REPO_RANCHER_ADF_NAME
-          - ./scripts/rancher-update.sh --access_key $RANCHER_TOKEN --secret_key $RANCHER_SECRET --url $REPO_RANCHER --environment_name $REPO_RANCHER_ADF_NAME --image docker:$DOCKER_REPOSITORY:$TAG_VERSION
+        - stage: Trigger ADF child build
+          name: Trigger ADF child build
+          script: ./scripts/travis/update/trigger-travis-children.sh --branch $TRAVIS_BRANCH Alfresco $TRAVIS_ACCESS_TOKEN

-
-        - stage: Update Rancher PR
-          name: Update Rancher PR
-          script: ./scripts/travis/deploy/deploy.sh
+notifications:
+  slack:
+    on_pull_requests: false
+    rooms:
+      secure: "qcTP/+rhVweMSZZAQMPz4sW7boS8XC0RX1SPYgg7hIfxBr9747WpRLkJ1sirkVaXI/6XfYAyl42CTfPmTuJxIC+co/NSnEDknwVsnKZd0O/ykTpo+mxIN4BTZX8dm+gELR5IEYQPs+Yki3ZnD9b+0mCK1yD8JallKCQeE2U9BhzZhP/Fn0ce35EulybNp3QQDaox0XC+7gadMdxlvK8mzP1scw76wRLtx25QLxxV+OwEw0bzyh8y3onfjHfnoDcUQWRTNdnjapzmgf1LNdC202A5kwp5sJggfSDr+ActRqaMvv4BbMsFpdan34B6zPQJfyZL1r8IB8O8BEKcAaOUVcTjnZAOom8kHS8F07/mo5xnNYmV8oNX2/egr1CiG4U0EAGF2XGqM+vetYnF88LTEzy84kVxmSwKGVfzlGOyTplMXJ1iCENndtfWm1AXhAFj5RSsSAZg6IStTM+mcpnC75moEwQtj8bTenwehHz1HQAjQX7xeTQo27SxDc7oqp1ReyXCllMjKxckjVGmp2j6yxn1Jl55kivBj57vluLtEtziOGluVELP5E2fV0VAuErNhnjLm4LJARVN76PQaTOXYwATVVJJDhb/77TesvxQsr3VfiROEKm7QB7IDFjghjLLisSX67JQ5+7K/qMlqf9+9hNw4n0v1eMylVjt+gyxspc="
+    on_failure: always
+    on_success: change
+    template:
+      - "Repo `%{repository_slug}` *%{result}* build (<%{build_url}|#%{build_number}>) for commit (<%{compare_url}|%{commit}>) on branch `%{branch}`."
+      - "Author: %{author} Execution time: *%{duration}*"
+      - "Message: %{message}"

 cache:
  directories:
  - node_modules
-  - demo-shell/dist
  - tmp
@@ -0,0 +1,17 @@
+specFile=$1;
+configFile=$2;
+
+findconfig() {
+  if [ -f "$1" ]; then
+    printf '%s\n' "${PWD%/}/$1"
+  elif [ "$PWD" = / ]; then
+    false
+  else
+    (cd .. && findconfig $1)
+  fi
+}
+
+DIR=$(dirname "$specFile")
+cd $DIR
+configFile=`findconfig "$configFile"`;
+echo "$configFile";
@@ -0,0 +1,27 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+          "type": "node",
+          "request": "launch",
+          "name": "e2e",
+          "program": "${workspaceFolder}/node_modules/protractor/bin/protractor",
+          "args": [
+              "`${workspaceFolder}/.vscode/closest-config-finder.sh ${file} e2e/protractor.conf.js`",
+              "--specs=${file}"
+          ],
+          "envFile": "${workspaceFolder}/.env",
+          "console": "integratedTerminal",
+          "sourceMaps": true,
+          "smartStep": true,
+          "skipFiles": [
+              "${workspaceFolder}/node_modules/**/*.js",
+              "<node_internals>/**/*.js"
+          ],
+          "internalConsoleOptions": "neverOpen"
+      }
+    ]
+}
@@ -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,41 +1,12 @@
-# 1. Generate licenses
-
-FROM node:11.9-alpine AS builder
-WORKDIR /usr/src/alfresco
-COPY package.json package.json
-
-RUN mkdir -p ./licenses && \
-  yarn licenses list > ./licenses/licenses.txt && \
-  yarn licenses generate-disclaimer > ./licenses/disclaimer.txt
-
-# 2. Generate image
-
 FROM nginx:stable-alpine
 LABEL version="3.0.0"

-ARG GROUPNAME=Alfresco
-ARG GROUPID=1000
-ARG USERNAME=adf
-ARG USERID=33011
-
-ARG BUILD_NUMBER
+ARG PROJECT_NAME=demo-shell

 COPY ./docker/nginx.conf /etc/nginx/nginx.conf
 COPY ./docker/entrypoint.sh /

 WORKDIR /usr/share/nginx/html
-COPY demo-shell/dist/ .
-COPY --from=builder /usr/src/alfresco/licenses ./licenses
+COPY dist/$PROJECT_NAME .

-RUN addgroup -g ${GROUPID} ${GROUPNAME} && \
-  adduser -S -u ${USERID} -G ${GROUPNAME} -s "/bin/bash" ${USERNAME} && \
-  chown -R ${USERNAME}:${GROUPNAME} ./${BUILD_NUMBER}/app.config.json && \
-  chown -R ${USERNAME}:${GROUPNAME} /var/cache/nginx && \
-  touch /var/run/nginx.pid && \
-  chown -R ${USERNAME}:${GROUPNAME} /var/run/nginx.pid && \
-  chmod +x /entrypoint.sh && \
-  chown -R ${USERNAME}:${GROUPNAME} /entrypoint.sh
-
-EXPOSE 8080
-USER ${USERNAME}
 ENTRYPOINT [ "/entrypoint.sh" ]
@@ -2,8 +2,8 @@

 | branch | status |
 | --- | --- |
-| master | [![Build Status](https://travis-ci.org/Alfresco/alfresco-ng2-components.svg?branch=master)](https://travis-ci.org/Alfresco/alfresco-ng2-components) |
-| development | [![Build Status](https://travis-ci.org/Alfresco/alfresco-ng2-components.svg?branch=development)](https://travis-ci.org/Alfresco/alfresco-ng2-components) |
+| master | [![Build Status](https://travis-ci.com/Alfresco/alfresco-ng2-components.svg?branch=master)](https://travis-ci.com/Alfresco/alfresco-ng2-components) |
+| develop | [![Build Status](https://travis-ci.com/Alfresco/alfresco-ng2-components.svg?branch=develop)](https://travis-ci.com/Alfresco/alfresco-ng2-components) |

 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/d9eb873741da403bb3284778102372e7)](https://www.codacy.com/app/Alfresco/alfresco-ng2-components?utm_source=github.com&utm_medium=referral&utm_content=Alfresco/alfresco-ng2-components&utm_campaign=badger)
 [![Join the chat at https://gitter.im/Alfresco/alfresco-ng2-components](https://badges.gitter.im/Alfresco/alfresco-ng2-components.svg)](https://gitter.im/Alfresco/alfresco-ng2-components?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
@@ -65,5 +65,5 @@ All components are supported in the following browsers:

 * Due to a [known issue](https://bugzilla.mozilla.org/show_bug.cgi?id=1188880) in Firefox, the Alfresco Upload Component does not currently support folder upload functionality on Firefox.    

-See the [Browser Support](BROWSER-SUPPORT.md) article for more details. 
+See the [Browser Support](BROWSER-SUPPORT.md) article for more details.

@@ -3,7 +3,7 @@
  "version": 1,
  "newProjectRoot": "lib",
  "projects": {
-    "dist": {
+    "demoshell": {
      "root": "demo-shell",
      "sourceRoot": "demo-shell/src",
      "projectType": "application",
@@ -11,248 +11,29 @@
        "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"
-              ]
+              "includePaths": ["lib"]
            },
            "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,
-              "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"
-              ]
-            },
-            "assets": [
-              "demo-shell/src/assets",
-              "demo-shell/src/app.config.json",
              {
                "glob": "**/*",
                "input": "demo-shell/src/assets",
@@ -285,17 +66,17 @@
              },
              {
                "glob": "**/*",
-                "input": "lib/process-services/assets",
+                "input": "lib/process-services/src/lib/assets",
                "output": "/assets"
              },
              {
                "glob": "**/*",
-                "input": "lib/process-services-cloud/assets",
+                "input": "lib/process-services-cloud/src/lib/assets",
                "output": "/assets"
              },
              {
                "glob": "**/*",
-                "input": "lib/content-services/assets",
+                "input": "lib/content-services/src/lib/assets",
                "output": "/assets"
              },
              {
@@ -305,7 +86,7 @@
              },
              {
                "glob": "**/*",
-                "input": "lib/content-services/i18n",
+                "input": "lib/content-services/src/lib/i18n",
                "output": "/assets/adf-content-services/i18n"
              },
              {
@@ -349,6 +130,12 @@
          },
          "configurations": {
            "production": {
+              "budgets": [
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ],
              "optimization": true,
              "outputHashing": "all",
              "sourceMap": false,
@@ -367,6 +154,12 @@
              ]
            },
            "e2e": {
+              "budgets": [
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ],
              "fileReplacements": [
                {
                  "replace": "demo-shell/src/environments/environment.ts",
@@ -379,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",
@@ -387,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": {
@@ -421,6 +208,7 @@
            ],
            "assets": [
              "demo-shell/src/assets",
+              "demo-shell/src/favicon-96x96.png",
              "demo-shell/src/app.config.json",
              {
                "glob": "**/*",
@@ -454,17 +242,17 @@
              },
              {
                "glob": "**/*",
-                "input": "lib/process-services/assets",
+                "input": "lib/process-services/src/lib/assets",
                "output": "/assets"
              },
              {
                "glob": "**/*",
-                "input": "lib/process-services-cloud/assets",
+                "input": "lib/process-services-cloud/src/lib/assets",
                "output": "/assets"
              },
              {
                "glob": "**/*",
-                "input": "lib/content-services/assets",
+                "input": "lib/content-services/src/lib/assets",
                "output": "/assets"
              },
              {
@@ -474,7 +262,7 @@
              },
              {
                "glob": "**/*",
-                "input": "lib/content-services/i18n",
+                "input": "lib/content-services/src/lib/i18n",
                "output": "/assets/adf-content-services/i18n"
              },
              {
@@ -508,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",
@@ -540,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/**/*"]
          }
        }
      }
@@ -571,7 +350,8 @@
          },
          "configurations": {
            "production": {
-              "project": "lib/core/ng-package.json"
+              "project": "lib/core/ng-package.json",
+              "tsConfig": "lib/core/tsconfig.lib.prod.json"
            }
          }
        },
@@ -590,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/**"]
          }
        }
      }
@@ -613,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"
            }
          }
        },
@@ -634,9 +413,7 @@
              "lib/content-services/tsconfig.lib.json",
              "lib/content-services/tsconfig.spec.json"
            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
+            "exclude": ["**/node_modules/**"]
          }
        }
      }
@@ -655,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"
            }
          }
        },
@@ -676,9 +454,7 @@
              "lib/process-services/tsconfig.lib.json",
              "lib/process-services/tsconfig.spec.json"
            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
+            "exclude": ["**/node_modules/**"]
          }
        }
      }
@@ -697,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"
            }
          }
        },
@@ -718,9 +495,7 @@
              "lib/process-services-cloud/tsconfig.lib.json",
              "lib/process-services-cloud/tsconfig.spec.json"
            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
+            "exclude": ["**/node_modules/**"]
          }
        }
      }
@@ -739,7 +514,8 @@
          },
          "configurations": {
            "production": {
-              "project": "lib/insights/ng-package.json"
+              "project": "lib/insights/ng-package.json",
+              "tsConfig": "lib/insights/tsconfig.lib.prod.json"
            }
          }
        },
@@ -760,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": {
@@ -778,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": {
@@ -797,9 +576,7 @@
              "lib/extensions/tsconfig.lib.json",
              "lib/extensions/tsconfig.spec.json"
            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
+            "exclude": ["**/node_modules/**"]
          }
        }
      }
@@ -815,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": {
@@ -832,13 +606,30 @@
              "lib/testing/tsconfig.lib.json",
              "lib/testing/tsconfig.spec.json"
            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
+            "exclude": ["**/node_modules/**"]
+          }
+        }
+      }
+    },
+    "cli": {
+      "root": "lib/cli",
+      "sourceRoot": "lib/cli",
+      "projectType": "library",
+      "prefix": "adf",
+      "architect": {
+        "build": {
+          "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",
@@ -138,13 +127,17 @@
    "booleanvisibility",
    "processparent",
    "uploadfileform",
-    "processwithstarteventform"
+    "processwithstarteventform",
+    "processstring",
+    "typeahed",
+    "minmax"
  ],
  "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']);
            }

@@ -6,6 +6,7 @@
    "target": "es5",
    "types":[
      "jasmine",
+      "jasminewd2",
      "node"
    ]
  }
@@ -1,7 +1,7 @@
 {
  "name": "Alfresco-ADF-Angular-Demo",
  "description": "Demo shell for Alfresco Angular components",
-  "version": "3.6.0",
+  "version": "4.0.0",
  "author": "Alfresco Software, Ltd.",
  "repository": {
    "type": "git",
@@ -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": "المواقع",
@@ -119,7 +121,7 @@
  "DOCUMENT_LIST": {
    "MULTISELECT_CHECKBOXES": "تحديد متعدد (مع خانات اختيارات)",
    "THUMBNAILS": "تمكين الصور المصغرة",
-    "ALLOW_DROP_FILES": "تمكين إسقاط ملفات في مجلد",
+    "ALLOW_DROP_FILES": "تمكين إسقاط الملفات في مجلد أو ملف",
    "MULTIPLE_FILE_UPLOAD": "تحميل ملفات متعددة",
    "FOLDER_UPLOAD": "تحميل مجلد",
    "CUSTOM_FILTER": "عامل تصفية امتدادات مخصص",
@@ -270,14 +272,16 @@
    },
    "TOOLTIP_MESSAGE": {
      "START_INPUT": "صفحة البدء"
-    }
+    },
+    "TASK_CONTEXT_MENU": "قائمة سياق قائمة المهام"
  },
  "PROCESS_LIST_DEMO": {
    "ERROR_MESSAGE": {
      "APP_ID_REQUIRED_ERROR": "إدراج معرف التطبيق",
      "APP_ID_TYPE_ERROR": "يجب أن يكون معرف التطبيق رقمًا",
      "NUMBER_GREATER_THAN": "يجب أن تكون القيمة أكبر من {{ value }} أو تساويها"
-    }
+    },
+    "PROCESS_CONTEXT_MENU": "قائمة سياق قائمة العمليات"
  },
  "GROUP-TITLE1-TRANSLATION-KEY": "الترجمة الأولى للعنوان المخصص",
  "GROUP-TITLE2-TRANSLATION-KEY": "الترجمة الثانية للعنوان المخصص",
@@ -308,7 +312,12 @@
    "APP_NAME": "اسم التطبيق",
    "APP_FILTER_MODE": "التصفية حسب اسم التطبيق",
    "ROLE_FILTER_MODE": "التصفية حسب الدور",
-    "PRESELECT_VALIDATION": "التحديد المسبق للتحقق من الصحة"
+    "PRESELECT_VALIDATION": "التحديد المسبق للتحقق من الصحة",
+    "ALL_PRESELECTED_USERS": "كل المستخدمين المحددين مسبقًا",
+    "ALL_PRESELECTED_GROUPS": "كل المجموعات المحددة مسبقًا",
+    "INVALID_USERS": "المستخدمون غير الصالحين",
+    "INVALID_GROUPS": "مجموعات غير صالحة",
+    "READONLY_MODE": "وضع القراءة فقط"
  },
  "SETTINGS_CLOUD": {
    "MULTISELECTION": "تحديد متعدد",
@@ -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í filtrů",
    "HOME": "Domů",
    "NODE-SELECTOR": "Selektor uzlu",
    "SITES": "Místa",
@@ -119,7 +121,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í",
@@ -270,14 +272,16 @@
    },
    "TOOLTIP_MESSAGE": {
      "START_INPUT": "Počáteční strana"
-    }
+    },
+    "TASK_CONTEXT_MENU": "Místní nabídka Seznam úkolů"
  },
  "PROCESS_LIST_DEMO": {
    "ERROR_MESSAGE": {
      "APP_ID_REQUIRED_ERROR": "Vložit ID aplikace",
      "APP_ID_TYPE_ERROR": "ID aplikace musí být číslo",
      "NUMBER_GREATER_THAN": "Hodnota musí být rovna nebo větší než {{ value }}"
-    }
+    },
+    "PROCESS_CONTEXT_MENU": "Místní nabídka Seznam procesů"
  },
  "GROUP-TITLE1-TRANSLATION-KEY": "Vlastní překlad názvu 1",
  "GROUP-TITLE2-TRANSLATION-KEY": "Vlastní překlad názvu 2",
@@ -308,7 +312,12 @@
    "APP_NAME": "Název aplikace",
    "APP_FILTER_MODE": "Filtrovat podle názvu aplikace",
    "ROLE_FILTER_MODE": "Filtrovat podle role",
-    "PRESELECT_VALIDATION": "Ověření předvolené hodnoty"
+    "PRESELECT_VALIDATION": "Ověření předvolené hodnoty",
+    "ALL_PRESELECTED_USERS": "Všichni předvolení uživatelé",
+    "ALL_PRESELECTED_GROUPS": "Všechny předvolené skupiny",
+    "INVALID_USERS": "Neplatní uživatelé",
+    "INVALID_GROUPS": "Neplatné skupiny",
+    "READONLY_MODE": "Režim jen pro čtení"
  },
  "SETTINGS_CLOUD": {
    "MULTISELECTION": "Hromadný výběr",
@@ -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": "Filtre",
    "HOME": "Hjem",
    "NODE-SELECTOR": "Nodevælger",
    "SITES": "Websteder",
@@ -63,7 +65,7 @@
    "NOTIFICATIONS": "Meddelelser",
    "TASK_LIST": "Opgaveliste",
    "PROCESS_LIST": "Procesliste",
-    "PROCESS_CLOUD": "Activiti Cloud",
+    "PROCESS_CLOUD": "Proces Cloud",
    "CARD_VIEW": "Kortvisning",
    "PROCESS_SERVICES": "Process Services",
    "LOGIN": "Log ind",
@@ -119,7 +121,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",
@@ -270,14 +272,16 @@
    },
    "TOOLTIP_MESSAGE": {
      "START_INPUT": "Startside"
-    }
+    },
+    "TASK_CONTEXT_MENU": "Opgave Liste Kontekst Menu"
  },
  "PROCESS_LIST_DEMO": {
    "ERROR_MESSAGE": {
      "APP_ID_REQUIRED_ERROR": "Indsæt app-id",
      "APP_ID_TYPE_ERROR": "App-id'et skal være et tal",
      "NUMBER_GREATER_THAN": "Værdien skal være større end eller lig med {{ value }}"
-    }
+    },
+    "PROCESS_CONTEXT_MENU": "Proces Liste Kontekst Menu"
  },
  "GROUP-TITLE1-TRANSLATION-KEY": "Brugerdefineret titel oversættelse et",
  "GROUP-TITLE2-TRANSLATION-KEY": "Brugerdefineret titel oversættelse to",
@@ -308,7 +312,12 @@
    "APP_NAME": "Appnavn",
    "APP_FILTER_MODE": "Filtrer efter appnavn",
    "ROLE_FILTER_MODE": "Filtrer efter rolle",
-    "PRESELECT_VALIDATION": "Forudvælg validering"
+    "PRESELECT_VALIDATION": "Forudvælg validering",
+    "ALL_PRESELECTED_USERS": "Alle forudvalgte brugere",
+    "ALL_PRESELECTED_GROUPS": "Alle forudvalgte grupper",
+    "INVALID_USERS": "Ugyldige brugere",
+    "INVALID_GROUPS": "Ugyldige grupper",
+    "READONLY_MODE": "Skrivebeskyttet tilstand"
  },
  "SETTINGS_CLOUD": {
    "MULTISELECTION": "Multivalg",
@@ -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": "Filterzeile",
    "HOME": "Startseite",
    "NODE-SELECTOR": "Node-Auswahl",
    "SITES": "Sites",
@@ -119,7 +121,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",
@@ -270,14 +272,16 @@
    },
    "TOOLTIP_MESSAGE": {
      "START_INPUT": "Startseite"
-    }
+    },
+    "TASK_CONTEXT_MENU": "Aufgabenlisten-Kontextmenü"
  },
  "PROCESS_LIST_DEMO": {
    "ERROR_MESSAGE": {
      "APP_ID_REQUIRED_ERROR": "App-ID einfügen",
      "APP_ID_TYPE_ERROR": "App-ID muss eine Zahl sein",
      "NUMBER_GREATER_THAN": "Wert muss größer oder gleich {{ value }} sein"
-    }
+    },
+    "PROCESS_CONTEXT_MENU": "Prozesslisten-Kontextmenü"
  },
  "GROUP-TITLE1-TRANSLATION-KEY": "Übersetzung benutzerdefinierter Titel 1",
  "GROUP-TITLE2-TRANSLATION-KEY": "Übersetzung benutzerdefinierter Titel 2",
@@ -308,7 +312,12 @@
    "APP_NAME": "Anwendungsname",
    "APP_FILTER_MODE": "Nach Anwendungsname filtern",
    "ROLE_FILTER_MODE": "Nach Rolle filtern",
-    "PRESELECT_VALIDATION": "Vorauswahl-Prüfung"
+    "PRESELECT_VALIDATION": "Vorauswahl-Prüfung",
+    "ALL_PRESELECTED_USERS": "Alle vorausgewählten Benutzer",
+    "ALL_PRESELECTED_GROUPS": "Alle vorausgewählten Gruppen",
+    "INVALID_USERS": "Unzulässige Benutzer",
+    "INVALID_GROUPS": "Unzulässige Gruppen",
+    "READONLY_MODE": "Schreibgeschützter Modus"
  },
  "SETTINGS_CLOUD": {
    "MULTISELECTION": "Mehrfachauswahl",
@@ -21,7 +21,8 @@
      "SHOW_COMMENTS": "Show comments on versions",
      "ALLOW_DOWNLOAD": "Enable version download",
      "READ_ONLY": "Read-only",
-      "COMMENTS": "Show comments"
+      "COMMENTS": "Show comments",
+      "VERSION_COMPARISON": "Show version comparison"
    },
    "PERSONAL-FILES": "Personal Files",
    "WARN-MULTIPLE-UPLOADS": "Display warning for multiple uploads.",
@@ -55,6 +56,7 @@
  "APP_LAYOUT": {
    "APP": "App",
    "APP_NAME": "ADF Demo Application",
+    "FILTERED_SEARCH": "Filter Header",
    "HOME": "Home",
    "NODE-SELECTOR": "Node Selector",
    "SITES": "Sites",
@@ -119,7 +121,7 @@
  "DOCUMENT_LIST": {
    "MULTISELECT_CHECKBOXES": "Multiselect (with checkboxes)",
    "THUMBNAILS": "Enable Thumbnails",
-    "ALLOW_DROP_FILES": "Enable Drop Files in a folder",
+    "ALLOW_DROP_FILES": "Enable Drop Files in a folder or a file",
    "MULTIPLE_FILE_UPLOAD": "Multiple File Upload",
    "FOLDER_UPLOAD": "Folder upload",
    "CUSTOM_FILTER": "Custom extensions filter",
@@ -270,14 +272,16 @@
    },
    "TOOLTIP_MESSAGE": {
      "START_INPUT": "Starting page"
-    }
+    },
+    "TASK_CONTEXT_MENU": "Task List Context Menu"
  },
  "PROCESS_LIST_DEMO": {
    "ERROR_MESSAGE": {
      "APP_ID_REQUIRED_ERROR": "Insert App ID",
      "APP_ID_TYPE_ERROR": "App ID must be a number",
      "NUMBER_GREATER_THAN": "Value must be greater than or equal to {{ value }}"
-    }
+    },
+    "PROCESS_CONTEXT_MENU": "Process List Context Menu"
  },
  "GROUP-TITLE1-TRANSLATION-KEY": "CUSTOM TITLE TRANSLATION ONE",
  "GROUP-TITLE2-TRANSLATION-KEY": "CUSTOM TITLE TRANSLATION TWO",
@@ -308,7 +312,12 @@
    "APP_NAME": "Application Name",
    "APP_FILTER_MODE": "Filter by application name",
    "ROLE_FILTER_MODE": "Filter by role",
-    "PRESELECT_VALIDATION": "Preselect validation"
+    "PRESELECT_VALIDATION": "Preselect validation",
+    "ALL_PRESELECTED_USERS": "All Preselected Users",
+    "ALL_PRESELECTED_GROUPS": "All Preselected Groups",
+    "INVALID_USERS": "Invalid Users",
+    "INVALID_GROUPS": "Invalid Groups",
+    "READONLY_MODE": "Read-only Mode"
  },
  "SETTINGS_CLOUD": {
    "MULTISELECTION": "Multiselection",
@@ -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",
@@ -112,14 +114,14 @@
    },
    "EMPTY_STATE": {
      "TITLE": "La papelera está vacía",
-      "FIRST_TEXT": "Los elementos que elimine se trasladan a la papelera.",
+      "FIRST_TEXT": "Los elementos que elimine se moverán a la papelera.",
      "SECOND_TEXT": "Vacíe la papelera para eliminar los elementos permanentemente."
    }
  },
  "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",
@@ -223,7 +225,7 @@
    "PROCESS_SERVICES": "Process Services",
    "LOGIN_FOOTER": "Pie del inicio de sesión",
    "SHOW_REMEMBERME": "Mostrar opción para recordarme",
-    "SHOW_SUCCESS_ROUTE": "Permitir ruta correcta",
+    "SHOW_SUCCESS_ROUTE": "Mostrar ruta correcta",
    "CUSTOM_LOGO": "Logotipo personalizado"
  },
  "SEARCH": {
@@ -270,14 +272,16 @@
    },
    "TOOLTIP_MESSAGE": {
      "START_INPUT": "Inicio de página"
-    }
+    },
+    "TASK_CONTEXT_MENU": "Menú de contexto Lista de tareas"
  },
  "PROCESS_LIST_DEMO": {
    "ERROR_MESSAGE": {
      "APP_ID_REQUIRED_ERROR": "Insertar ID de aplicación",
      "APP_ID_TYPE_ERROR": "El ID de aplicación debe ser un número",
      "NUMBER_GREATER_THAN": "El valor debe ser igual o superior a {{ value }}"
-    }
+    },
+    "PROCESS_CONTEXT_MENU": "Menú de contexto Lista de procesos"
  },
  "GROUP-TITLE1-TRANSLATION-KEY": "Traducción de título personalizado 1",
  "GROUP-TITLE2-TRANSLATION-KEY": "Traducción de título personalizado 2",
@@ -308,7 +312,12 @@
    "APP_NAME": "Nombre de la aplicación",
    "APP_FILTER_MODE": "Filtrar por nombre de la aplicación",
    "ROLE_FILTER_MODE": "Filtrar por función",
-    "PRESELECT_VALIDATION": "Preseleccionar validación"
+    "PRESELECT_VALIDATION": "Preseleccionar validación",
+    "ALL_PRESELECTED_USERS": "Todos los usuarios preseleccionados",
+    "ALL_PRESELECTED_GROUPS": "Todos los grupos preseleccionados",
+    "INVALID_USERS": "Usuarios no válidos",
+    "INVALID_GROUPS": "Grupos no válidos",
+    "READONLY_MODE": "Modo de solo lectura"
  },
  "SETTINGS_CLOUD": {
    "MULTISELECTION": "Selección múltiple",
@@ -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",
@@ -119,7 +121,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",
@@ -270,14 +272,16 @@
    },
    "TOOLTIP_MESSAGE": {
      "START_INPUT": "Aloitussivu"
-    }
+    },
+    "TASK_CONTEXT_MENU": "Tehtäväluettelon pikavalikko"
  },
  "PROCESS_LIST_DEMO": {
    "ERROR_MESSAGE": {
      "APP_ID_REQUIRED_ERROR": "Lisää sovellustunnus",
      "APP_ID_TYPE_ERROR": "Sovellustunnuksen täytyy olla numero",
      "NUMBER_GREATER_THAN": "Arvon täytyy olla yhtä suuri tai suurempi kuin {{ value }}"
-    }
+    },
+    "PROCESS_CONTEXT_MENU": "Prosessiluettelon pikavalikko"
  },
  "GROUP-TITLE1-TRANSLATION-KEY": "Oma otsikkokäännös yksi",
  "GROUP-TITLE2-TRANSLATION-KEY": "Oma otsikkokäännös kaksi",
@@ -308,7 +312,12 @@
    "APP_NAME": "Sovelluksen nimi",
    "APP_FILTER_MODE": "Suodata sovelluksen nimen perusteella",
    "ROLE_FILTER_MODE": "Suodata roolin perusteella",
-    "PRESELECT_VALIDATION": "Vahvistus esivalittu"
+    "PRESELECT_VALIDATION": "Vahvistus esivalittu",
+    "ALL_PRESELECTED_USERS": "Kaikki esivalitut käyttäjät",
+    "ALL_PRESELECTED_GROUPS": "Kaikki esivalitut ryhmät",
+    "INVALID_USERS": "Kelpaamattomat käyttäjät",
+    "INVALID_GROUPS": "Kelpaamattomat ryhmät",
+    "READONLY_MODE": "Vain luku -tila"
  },
  "SETTINGS_CLOUD": {
    "MULTISELECTION": "Monivalinta",
@@ -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": "Filtres",
    "HOME": "Accueil",
    "NODE-SELECTOR": "Sélecteur de nœud",
    "SITES": "Sites",
@@ -119,7 +121,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",
@@ -270,14 +272,16 @@
    },
    "TOOLTIP_MESSAGE": {
      "START_INPUT": "Démarrage de la page"
-    }
+    },
+    "TASK_CONTEXT_MENU": "Menu contextuel Liste des tâches"
  },
  "PROCESS_LIST_DEMO": {
    "ERROR_MESSAGE": {
      "APP_ID_REQUIRED_ERROR": "Insérer l'ID d'application",
      "APP_ID_TYPE_ERROR": "L'ID d'application doit être un numéro",
      "NUMBER_GREATER_THAN": "La valeur doit être égale ou supérieure à {{ value }}"
-    }
+    },
+    "PROCESS_CONTEXT_MENU": "Menu contextuel Liste des processus"
  },
  "GROUP-TITLE1-TRANSLATION-KEY": "Titre personnalisé traduction un",
  "GROUP-TITLE2-TRANSLATION-KEY": "Titre personnalisé traduction deux",
@@ -308,7 +312,12 @@
    "APP_NAME": "Nom de l'application",
    "APP_FILTER_MODE": "Filtrer par nom d'application",
    "ROLE_FILTER_MODE": "Filtrer par rôle",
-    "PRESELECT_VALIDATION": "Validation présélectionnée"
+    "PRESELECT_VALIDATION": "Validation présélectionnée",
+    "ALL_PRESELECTED_USERS": "Tous les utilisateurs présélectionnés",
+    "ALL_PRESELECTED_GROUPS": "Tous les groupes présélectionnés",
+    "INVALID_USERS": "Utilisateurs non valides",
+    "INVALID_GROUPS": "Groupes non valides",
+    "READONLY_MODE": "Mode lecture seule"
  },
  "SETTINGS_CLOUD": {
    "MULTISELECTION": "Multisélection",
@@ -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 filtri",
    "HOME": "Home",
    "NODE-SELECTOR": "Selezione nodo",
    "SITES": "Siti",
@@ -119,7 +121,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",
@@ -270,14 +272,16 @@
    },
    "TOOLTIP_MESSAGE": {
      "START_INPUT": "Inizia da pagina"
-    }
+    },
+    "TASK_CONTEXT_MENU": "Menu di scelta rapida Elenco compiti"
  },
  "PROCESS_LIST_DEMO": {
    "ERROR_MESSAGE": {
      "APP_ID_REQUIRED_ERROR": "Inserisci ID applicazione",
      "APP_ID_TYPE_ERROR": "L'ID applicazione deve essere un numero",
      "NUMBER_GREATER_THAN": "Il valore deve essere maggiore o uguale a {{ value }}"
-    }
+    },
+    "PROCESS_CONTEXT_MENU": "Menu di scelta rapida Elenco processi"
  },
  "GROUP-TITLE1-TRANSLATION-KEY": "Custom Title Translation One",
  "GROUP-TITLE2-TRANSLATION-KEY": "Custom Title Translation Two",
@@ -308,7 +312,12 @@
    "APP_NAME": "Nome applicazione",
    "APP_FILTER_MODE": "Filtra per nome applicazione",
    "ROLE_FILTER_MODE": "Filtra per ruolo",
-    "PRESELECT_VALIDATION": "Convalida preselezione"
+    "PRESELECT_VALIDATION": "Convalida preselezione",
+    "ALL_PRESELECTED_USERS": "Tutti gli utenti preselezionati",
+    "ALL_PRESELECTED_GROUPS": "Tutti i gruppi preselezionati",
+    "INVALID_USERS": "Utenti non validi",
+    "INVALID_GROUPS": "Gruppi non validi",
+    "READONLY_MODE": "Modalità sola lettura"
  },
  "SETTINGS_CLOUD": {
    "MULTISELECTION": "Selezione multipla",
@@ -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": "サイト",
@@ -119,7 +121,7 @@
  "DOCUMENT_LIST": {
    "MULTISELECT_CHECKBOXES": "複数選択 (チェックボックスを使用)",
    "THUMBNAILS": "サムネイルを有効にする",
-    "ALLOW_DROP_FILES": "フォルダへのドラッグ&ドロップを許可",
+    "ALLOW_DROP_FILES": "ファイルのドロップを許可",
    "MULTIPLE_FILE_UPLOAD": "複数ファイルのアップロード",
    "FOLDER_UPLOAD": "フォルダのアップロード",
    "CUSTOM_FILTER": "カスタム拡張子フィルタ",
@@ -270,14 +272,16 @@
    },
    "TOOLTIP_MESSAGE": {
      "START_INPUT": "開始ページ"
-    }
+    },
+    "TASK_CONTEXT_MENU": "タスクリストのコンテキストメニュー"
  },
  "PROCESS_LIST_DEMO": {
    "ERROR_MESSAGE": {
      "APP_ID_REQUIRED_ERROR": "アプリケーション ID を挿入してください",
      "APP_ID_TYPE_ERROR": "アプリケーション ID は数字でなければなりません",
      "NUMBER_GREATER_THAN": "値は {{ value }} 以上でなければなりません"
-    }
+    },
+    "PROCESS_CONTEXT_MENU": "プロセスリストのコンテキストメニュー"
  },
  "GROUP-TITLE1-TRANSLATION-KEY": "カスタムのタイトル翻訳 1",
  "GROUP-TITLE2-TRANSLATION-KEY": "カスタムのタイトル翻訳 2",
@@ -308,7 +312,12 @@
    "APP_NAME": "アプリケーション名",
    "APP_FILTER_MODE": "アプリケーション名でフィルタ",
    "ROLE_FILTER_MODE": "役割でフィルタ",
-    "PRESELECT_VALIDATION": "事前選択の検証"
+    "PRESELECT_VALIDATION": "事前選択の検証",
+    "ALL_PRESELECTED_USERS": "選択されている全ユーザー",
+    "ALL_PRESELECTED_GROUPS": "選択されている全グループ",
+    "INVALID_USERS": "無効なユーザー",
+    "INVALID_GROUPS": "無効なグループ",
+    "READONLY_MODE": "読み取り専用モード"
  },
  "SETTINGS_CLOUD": {
    "MULTISELECTION": "複数選択",
@@ -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": "Filtertittel",
    "HOME": "Hjem",
    "NODE-SELECTOR": "Nodevelger",
    "SITES": "Områder",
@@ -119,7 +121,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",
@@ -270,14 +272,16 @@
    },
    "TOOLTIP_MESSAGE": {
      "START_INPUT": "Starter side"
-    }
+    },
+    "TASK_CONTEXT_MENU": "Kontekstmeny for oppgaveliste"
  },
  "PROCESS_LIST_DEMO": {
    "ERROR_MESSAGE": {
      "APP_ID_REQUIRED_ERROR": "Sett inn app-ID",
      "APP_ID_TYPE_ERROR": "App-ID må være et tall",
      "NUMBER_GREATER_THAN": "Verdien må være høyere enn eller lik {{ value }}"
-    }
+    },
+    "PROCESS_CONTEXT_MENU": "Kontekstmeny for prosessliste"
  },
  "GROUP-TITLE1-TRANSLATION-KEY": "Egendefinert tittel, oversettelse én",
  "GROUP-TITLE2-TRANSLATION-KEY": "Egendefinert tittel, oversettelse to",
@@ -308,7 +312,12 @@
    "APP_NAME": "Programnavn",
    "APP_FILTER_MODE": "Filtrer etter programnavn",
    "ROLE_FILTER_MODE": "Filtrer etter rolle",
-    "PRESELECT_VALIDATION": "Forhåndsvelg validering"
+    "PRESELECT_VALIDATION": "Forhåndsvelg validering",
+    "ALL_PRESELECTED_USERS": "Alle forhåndsvalgte brukere",
+    "ALL_PRESELECTED_GROUPS": "Alle forhåndsvalgte grupper",
+    "INVALID_USERS": "Ugyldige brukere",
+    "INVALID_GROUPS": "Ugyldige grupper",
+    "READONLY_MODE": "Skrivebeskyttet modus"
  },
  "SETTINGS_CLOUD": {
    "MULTISELECTION": "Flervalg",
@@ -21,7 +21,8 @@
      "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.",
@@ -55,6 +56,7 @@
  "APP_LAYOUT": {
    "APP": "App",
    "APP_NAME": "ADF-demotoepassing",
+    "FILTERED_SEARCH": "Filterkoptekst",
    "HOME": "Home",
    "NODE-SELECTOR": "Selectiefunctie voor node",
    "SITES": "Sites",
@@ -119,7 +121,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",
@@ -270,14 +272,16 @@
    },
    "TOOLTIP_MESSAGE": {
      "START_INPUT": "Beginpagina"
-    }
+    },
+    "TASK_CONTEXT_MENU": "Contextmenu lijst met taken"
  },
  "PROCESS_LIST_DEMO": {
    "ERROR_MESSAGE": {
      "APP_ID_REQUIRED_ERROR": "App-id invoegen",
      "APP_ID_TYPE_ERROR": "App-id moet een getal zijn",
      "NUMBER_GREATER_THAN": "Waarde moet groter zijn dan of gelijk zijn aan {{ value }}"
-    }
+    },
+    "PROCESS_CONTEXT_MENU": "Contextmenu lijst met processen"
  },
  "GROUP-TITLE1-TRANSLATION-KEY": "Aangepaste titel vertaling één",
  "GROUP-TITLE2-TRANSLATION-KEY": "Aangepaste titel vertaling twee",
@@ -308,7 +312,12 @@
    "APP_NAME": "Toepassingsnaam",
    "APP_FILTER_MODE": "Filteren op toepassingsnaam",
    "ROLE_FILTER_MODE": "Filteren op rol",
-    "PRESELECT_VALIDATION": "Validatie voorselecteren"
+    "PRESELECT_VALIDATION": "Validatie voorselecteren",
+    "ALL_PRESELECTED_USERS": "Alle voorgeselecteerde gebruikers",
+    "ALL_PRESELECTED_GROUPS": "Alle voorgeselecteerde groepen",
+    "INVALID_USERS": "Ongeldige gebruikers",
+    "INVALID_GROUPS": "Ongeldige groepen",
+    "READONLY_MODE": "Alleen-lezenmodus"
  },
  "SETTINGS_CLOUD": {
    "MULTISELECTION": "Multiselectie",
@@ -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": "Tytuły filtra",
    "HOME": "Strona główna",
    "NODE-SELECTOR": "Selektor węzłów",
    "SITES": "Witryny",
@@ -119,7 +121,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ń",
@@ -270,14 +272,16 @@
    },
    "TOOLTIP_MESSAGE": {
      "START_INPUT": "Strona początkowa"
-    }
+    },
+    "TASK_CONTEXT_MENU": "Menu kontekstowe listy zadań"
  },
  "PROCESS_LIST_DEMO": {
    "ERROR_MESSAGE": {
      "APP_ID_REQUIRED_ERROR": "Wstaw identyfikator aplikacji",
      "APP_ID_TYPE_ERROR": "Identyfikator aplikacji musi być liczbą.",
      "NUMBER_GREATER_THAN": "Wartość musi być większa od lub równa wartości {{ value }}"
-    }
+    },
+    "PROCESS_CONTEXT_MENU": "Menu kontekstowe listy procesów"
  },
  "GROUP-TITLE1-TRANSLATION-KEY": "Tytuł niestandardowy — tłumaczenie pierwsze",
  "GROUP-TITLE2-TRANSLATION-KEY": "Tytuł niestandardowy — tłumaczenie drugie",
@@ -308,7 +312,12 @@
    "APP_NAME": "Nazwa aplikacji",
    "APP_FILTER_MODE": "Filtruj według nazwy aplikacji",
    "ROLE_FILTER_MODE": "Filtruj według roli",
-    "PRESELECT_VALIDATION": "Sprawdzanie poprawności wstępnego wyboru"
+    "PRESELECT_VALIDATION": "Sprawdzanie poprawności wstępnego wyboru",
+    "ALL_PRESELECTED_USERS": "Wszyscy wstępnie wybrani użytkownicy",
+    "ALL_PRESELECTED_GROUPS": "Wszystkie wstępnie wybrane grupy",
+    "INVALID_USERS": "Nieprawidłowi użytkownicy",
+    "INVALID_GROUPS": "Nieprawidłowe grupy",
+    "READONLY_MODE": "Tryb tylko do odczytu"
  },
  "SETTINGS_CLOUD": {
    "MULTISELECTION": "Wybór wielokrotny",
@@ -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",
@@ -119,7 +121,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",
@@ -270,14 +272,16 @@
    },
    "TOOLTIP_MESSAGE": {
      "START_INPUT": "Iniciando a página"
-    }
+    },
+    "TASK_CONTEXT_MENU": "Menu de contexto da lista de tarefas"
  },
  "PROCESS_LIST_DEMO": {
    "ERROR_MESSAGE": {
      "APP_ID_REQUIRED_ERROR": "Inserir ID do aplicativo",
      "APP_ID_TYPE_ERROR": "O ID do aplicativo deve ser um número",
      "NUMBER_GREATER_THAN": "O valor deve ser maior ou igual a {{ value }}"
-    }
+    },
+    "PROCESS_CONTEXT_MENU": "Menu de contexto da lista de processamento"
  },
  "GROUP-TITLE1-TRANSLATION-KEY": "Tradução um de título personalizado",
  "GROUP-TITLE2-TRANSLATION-KEY": "Tradução dois de título personalizado",
@@ -308,7 +312,12 @@
    "APP_NAME": "Nome do aplicativo",
    "APP_FILTER_MODE": "Filtrar por nome do aplicativo",
    "ROLE_FILTER_MODE": "Filtrar por função",
-    "PRESELECT_VALIDATION": "Validação de pré-seleção"
+    "PRESELECT_VALIDATION": "Validação de pré-seleção",
+    "ALL_PRESELECTED_USERS": "Todos os usuários pré-selecionados",
+    "ALL_PRESELECTED_GROUPS": "Todos os grupos pré-selecionados",
+    "INVALID_USERS": "Usuários inválidos",
+    "INVALID_GROUPS": "Grupos inválidos",
+    "READONLY_MODE": "Modo somente leitura"
  },
  "SETTINGS_CLOUD": {
    "MULTISELECTION": "Seleção Múltipla",
@@ -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": "Сайты",
@@ -119,7 +121,7 @@
  "DOCUMENT_LIST": {
    "MULTISELECT_CHECKBOXES": "Выбор нескольких вариантов (с флажками)",
    "THUMBNAILS": "Включить эскизы",
-    "ALLOW_DROP_FILES": "Включить перетаскивание файлов в папку",
+    "ALLOW_DROP_FILES": "Включите перетаскивание файлов в папке или файле",
    "MULTIPLE_FILE_UPLOAD": "Загрузка нескольких файлов",
    "FOLDER_UPLOAD": "Загрузка папки",
    "CUSTOM_FILTER": "Пользовательский фильтр расширений",
@@ -270,14 +272,16 @@
    },
    "TOOLTIP_MESSAGE": {
      "START_INPUT": "Начальная страница"
-    }
+    },
+    "TASK_CONTEXT_MENU": "Контекстное меню списка задач"
  },
  "PROCESS_LIST_DEMO": {
    "ERROR_MESSAGE": {
      "APP_ID_REQUIRED_ERROR": "Вставить идентификатор приложения",
      "APP_ID_TYPE_ERROR": "Идентификатор приложения должен быть числом",
      "NUMBER_GREATER_THAN": "Значение должно быть больше или равно {{ value }}"
-    }
+    },
+    "PROCESS_CONTEXT_MENU": "Контекстное меню списка процессов"
  },
  "GROUP-TITLE1-TRANSLATION-KEY": "Перевод пользовательского заголовка один",
  "GROUP-TITLE2-TRANSLATION-KEY": "Перевод пользовательского заголовка два",
@@ -308,7 +312,12 @@
    "APP_NAME": "Имя приложения",
    "APP_FILTER_MODE": "Фильтровать по имени приложения",
    "ROLE_FILTER_MODE": "Фильтровать по роли",
-    "PRESELECT_VALIDATION": "Проверка предварительного выбора"
+    "PRESELECT_VALIDATION": "Проверка предварительного выбора",
+    "ALL_PRESELECTED_USERS": "Все заранее заданные пользователи",
+    "ALL_PRESELECTED_GROUPS": "Все заранее заданные группы",
+    "INVALID_USERS": "Недействительные пользователи",
+    "INVALID_GROUPS": "Недействительные группы",
+    "READONLY_MODE": "Режим только для чтения"
  },
  "SETTINGS_CLOUD": {
    "MULTISELECTION": "Выбор нескольких",
@@ -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",
    "HOME": "Hem",
    "NODE-SELECTOR": "Nodväljare",
    "SITES": "Webbplatser",
@@ -119,7 +121,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",
@@ -270,14 +272,16 @@
    },
    "TOOLTIP_MESSAGE": {
      "START_INPUT": "Startsida"
-    }
+    },
+    "TASK_CONTEXT_MENU": "Innehållsmeny till uppgiftslista"
  },
  "PROCESS_LIST_DEMO": {
    "ERROR_MESSAGE": {
      "APP_ID_REQUIRED_ERROR": "Infoga program-ID",
      "APP_ID_TYPE_ERROR": "Program-ID måste vara ett nummer",
      "NUMBER_GREATER_THAN": "Värdet måste vara större än eller lika med {{ value }}"
-    }
+    },
+    "PROCESS_CONTEXT_MENU": "Innehållsmeny för processlista"
  },
  "GROUP-TITLE1-TRANSLATION-KEY": "Anpassad titelöversättning ett",
  "GROUP-TITLE2-TRANSLATION-KEY": "Anpassad titelöversättning två",
@@ -308,7 +312,12 @@
    "APP_NAME": "Programnamn",
    "APP_FILTER_MODE": "Filterera på programnamn",
    "ROLE_FILTER_MODE": "Filtrera på roll",
-    "PRESELECT_VALIDATION": "Förval validering"
+    "PRESELECT_VALIDATION": "Förval validering",
+    "ALL_PRESELECTED_USERS": "Alla förvalda användare",
+    "ALL_PRESELECTED_GROUPS": "Alla förvalda grupper",
+    "INVALID_USERS": "Ogiltiga användare",
+    "INVALID_GROUPS": "Ogiltiga grupper",
+    "READONLY_MODE": "Skrivskyddat läge"
  },
  "SETTINGS_CLOUD": {
    "MULTISELECTION": "Flerval",
@@ -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": "站点",
@@ -119,7 +121,7 @@
  "DOCUMENT_LIST": {
    "MULTISELECT_CHECKBOXES": "多选（含复选框）",
    "THUMBNAILS": "启用缩略图",
-    "ALLOW_DROP_FILES": "在文件夹中启用“文件拖放”",
+    "ALLOW_DROP_FILES": "在文件夹或文件中启用拖动文件",
    "MULTIPLE_FILE_UPLOAD": "上传多个文件",
    "FOLDER_UPLOAD": "文件夹上传",
    "CUSTOM_FILTER": "自定义扩展过滤器",
@@ -270,14 +272,16 @@
    },
    "TOOLTIP_MESSAGE": {
      "START_INPUT": "开始页面"
-    }
+    },
+    "TASK_CONTEXT_MENU": "任务列表上下文菜单"
  },
  "PROCESS_LIST_DEMO": {
    "ERROR_MESSAGE": {
      "APP_ID_REQUIRED_ERROR": "插入应用程序 ID",
      "APP_ID_TYPE_ERROR": "应用程序 ID 必须为数字",
      "NUMBER_GREATER_THAN": "值必须大于或等于 {{ value }}"
-    }
+    },
+    "PROCESS_CONTEXT_MENU": "流程列表上下文菜单"
  },
  "GROUP-TITLE1-TRANSLATION-KEY": "自定义标题翻译 1",
  "GROUP-TITLE2-TRANSLATION-KEY": "自定义标题翻译 2",
@@ -308,7 +312,12 @@
    "APP_NAME": "应用程序名称",
    "APP_FILTER_MODE": "按应用程序名称筛选",
    "ROLE_FILTER_MODE": "按角色筛选",
-    "PRESELECT_VALIDATION": "预先选择验证"
+    "PRESELECT_VALIDATION": "预先选择验证",
+    "ALL_PRESELECTED_USERS": "所有预选用户",
+    "ALL_PRESELECTED_GROUPS": "所有预选组",
+    "INVALID_USERS": "无效用户",
+    "INVALID_GROUPS": "无效组",
+    "READONLY_MODE": "Read-only（只读）模式"
  },
  "SETTINGS_CLOUD": {
    "MULTISELECTION": "多重选择",
@@ -2,7 +2,7 @@
  "$schema": "../../lib/core/app-config/schema.json",
  "ecmHost": "{protocol}//{hostname}{:port}",
  "bpmHost": "{protocol}//{hostname}{:port}",
-  "identityHost": "{protocol}//{hostname}{:port}/auth/realms/alfresco",
+  "identityHost": "{protocol}//{hostname}{:port}/auth/admin/realms/alfresco",
  "loginRoute": "login",
  "providers": "ALL",
  "contextRootBpm": "activiti-app",
@@ -22,7 +22,10 @@
    "redirectSilentIframeUri": "{protocol}//{hostname}{:port}/assets/silent-refresh.html",
    "redirectUri": "/",
    "redirectUriLogout": "/logout",
-    "publicUrls": ["**/preview/s/*", "**/settings"]
+    "publicUrls": [
+      "**/preview/s/*",
+      "**/settings"
+    ]
  },
  "application": {
    "storagePrefix": "ADF",
@@ -81,26 +84,27 @@
    },
    {
      "key": "cs",
-      "label": "Czech"
+      "label": "Čeština"
    },
    {
      "key": "pl",
-      "label": "Polish"
+      "label": "Polski"
    },
    {
      "key": "fi",
-      "label": "Finnish"
+      "label": "Suomi"
    },
    {
      "key": "da",
-      "label": "Danish"
+      "label": "Dansk"
    },
    {
      "key": "sv",
-      "label": "Swedish"
+      "label": "Svenska"
    }
  ],
  "search": {
+    "filterWithContains": true,
    "app:fields": [
      "cm:name",
      "cm:title",
@@ -378,7 +382,8 @@
          "selector": "date-range",
          "settings": {
            "field": "cm:created",
-            "dateFormat": "DD-MMM-YY"
+            "dateFormat": "DD-MMM-YY",
+            "maxDate": "today"
          }
        }
      },
@@ -430,6 +435,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": [
@@ -459,6 +627,14 @@
      "nocase": true
    }
  },
+  "folders": {
+    "excluded": [
+      ".git"
+    ],
+    "match-options": {
+      "nocase": true
+    }
+  },
  "logLevel": "trace",
  "activiti": {
    "rest": {
@@ -540,7 +716,8 @@
          "type": "text",
          "title": "ADF-DOCUMENT-LIST.LAYOUT.NAME",
          "cssClass": "full-width ellipsis-cell",
-          "sortable": true
+          "sortable": true,
+          "sortingKey": "name"
        },
        {
          "key": "visibility",
@@ -752,7 +929,7 @@
  },
  "adf-cloud-start-process": {
    "name": "My Default Cloud Name"
-   },
+  },
  "adf-process-list": {
    "presets": {
      "default": [
@@ -814,9 +991,29 @@
    "presets": {
      "default": {
        "exif:exif": "*"
-      }
+      },
+      "all-aspects": "*",
+      "custom-title": [{
+        "title": "Exif",
+        "items": [
+          {
+            "aspect": "exif:exif",
+            "editing": false,
+            "properties": [
+              "exif:pixelXDimension",
+              {
+                "title": "Custom YDimension Name",
+                "name": "exif:pixelYDimension"
+              }
+            ]
+          }
+        ]
+      }]
    },
-    "multi-value-pipe-separator": ", "
+    "multi-value-pipe-separator": ", ",
+    "multi-value-chips": true,
+    "copy-to-clipboard-action": true,
+    "selectFilterLimit": 5
  },
  "sideNav": {
    "expandedSidenav": true,
@@ -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',
@@ -22,8 +22,8 @@ import { FlexLayoutModule } from '@angular/flex-layout';
 import { ChartsModule } from 'ng2-charts';
 import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
 import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations';
-
-import { AppConfigService, TRANSLATION_PROVIDER, DebugAppConfigService, CoreModule, CoreAutomationService } from '@alfresco/adf-core';
+import { TranslateModule } from '@ngx-translate/core';
+import { AppConfigService, TRANSLATION_PROVIDER, DebugAppConfigService, CoreModule, CoreAutomationService, AuthBearerInterceptor } from '@alfresco/adf-core';
 import { ExtensionsModule } from '@alfresco/adf-extensions';
 import { AppComponent } from './app.component';
 import { MaterialModule } from './material.module';
@@ -47,22 +47,17 @@ 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 { PreviewService } from './services/preview.service';
 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 { AuthBearerInterceptor } from './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';
@@ -83,12 +78,9 @@ 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,
-    UserPreferenceCloudService,
-    PROCESS_FILTERS_SERVICE_TOKEN,
-    TASK_FILTERS_SERVICE_TOKEN
-} from '@alfresco/adf-process-services-cloud';
+import { ProcessServicesCloudModule } from '@alfresco/adf-process-services-cloud';
+import { FilteredSearchComponent } from './components/files/filtered-search.component';
+import { RouterModule } from '@angular/router';

 import { registerLocaleData } from '@angular/common';
 import localeFr from '@angular/common/locales/fr';
@@ -130,17 +122,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,
@@ -162,6 +154,7 @@ registerLocaleData(localeSv);
        FormNodeViewerComponent,
        AppsViewComponent,
        FilesComponent,
+        FilteredSearchComponent,
        FormComponent,
        FormListComponent,
        VersionManagerDialogAdapterComponent,
@@ -199,8 +192,6 @@ registerLocaleData(localeSv);
            provide: HTTP_INTERCEPTORS, useClass:
            AuthBearerInterceptor, multi: true
        },
-        { provide: PROCESS_FILTERS_SERVICE_TOKEN, useClass: UserPreferenceCloudService },
-        { provide: TASK_FILTERS_SERVICE_TOKEN, useClass: UserPreferenceCloudService },
        { provide: AppConfigService, useClass: DebugAppConfigService }, // not use this service in production
        {
            provide: TRANSLATION_PROVIDER,
@@ -217,13 +208,7 @@ registerLocaleData(localeSv);
                name: 'lazy-loading',
                source: 'resources/lazy-loading'
            }
-        },
-        PreviewService,
-        CoreAutomationService
-    ],
-    entryComponents: [
-        VersionManagerDialogAdapterComponent,
-        MetadataDialogAdapterComponent
+        }
    ],
    bootstrap: [AppComponent]
 })
@@ -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';
@@ -59,12 +52,14 @@ 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';
+
 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 +70,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 +95,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 +108,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 +124,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 +133,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 +142,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 +151,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 +160,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)
                    }
                ]
            },
@@ -168,7 +176,6 @@ export const appRoutes: Routes = [
                path: 'cloud',
                canActivate: [AuthGuardSsoRoleService],
                data: { roles: ['ACTIVITI_USER'], redirectUrl: '/error/403' },
-
                children: [
                    {
                        path: '',
@@ -184,7 +191,7 @@ export const appRoutes: Routes = [
                    },
                    {
                        path: 'community',
-                        loadChildren: 'app/components/cloud/community/community.module#AppCommunityModule'
+                        loadChildren: () => import('./components/cloud/community/community.module').then(m => m.AppCommunityModule)
                    },
                    {
                        path: ':appName',
@@ -232,7 +239,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',
@@ -240,22 +247,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',
@@ -270,16 +292,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',
@@ -353,17 +375,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',
@@ -377,11 +399,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 },
@@ -398,11 +420,11 @@ export const appRoutes: Routes = [
            },
            {
                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',
@@ -411,12 +433,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',
@@ -444,5 +466,3 @@ export const appRoutes: Routes = [
        redirectTo: 'error/404'
    }
 ];
-
-export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes, { initialNavigation: true });
@@ -1,12 +1,11 @@
-<adf-about-github-link
-    [url]="url"
-    [version]="version">
-</adf-about-github-link>
+<adf-about-github-link [application]="application" [url]="url" [version]="version"></adf-about-github-link>

-<adf-about-product-version>
-</adf-about-product-version>
+<adf-about-server-settings></adf-about-server-settings>
+
+<adf-about-product-version> </adf-about-product-version>

 <adf-about-application-modules
    [dependencies]="dependencies"
-    [showExtensions]="showExtensions">
+    [showExtensions]="showExtensions"
+>
 </adf-about-application-modules>
@@ -15,22 +15,32 @@
 * limitations under the License.
 */

-import { Component } from '@angular/core';
-import { name, version, commit, dependencies } from '../../../../../package.json';
+import { Component, OnInit } from '@angular/core';
+import {
+    name,
+    version,
+    commit,
+    dependencies
+} from '../../../../../package.json';
+import { AppConfigService } from '@alfresco/adf-core';

@Component({
    selector: 'app-about-page',
    templateUrl: './about.component.html',
    styleUrls: ['about.component.scss']
 })
-export class AboutComponent {
-
+export class AboutComponent implements OnInit {
    url = `https://github.com/Alfresco/${name}/commits/${commit}`;
    version = version;
    dependencies = dependencies;
    showExtensions = true;
+    application = '';

-    constructor() {
+    constructor(private appConfigService: AppConfigService) {}

+    ngOnInit() {
+        this.application = this.appConfigService.get<string>(
+            'application.name'
+        );
    }
 }
@@ -31,7 +31,7 @@ const routes: Routes = [
@NgModule({
    imports: [
        CommonModule,
-        CoreModule.forChild(),
+        CoreModule,
        RouterModule.forChild(routes)
    ],
    declarations: [AboutComponent]
@@ -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' },
@@ -16,13 +16,16 @@
 */

 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { FormFieldModel, NotificationService, FormRenderingService, CoreAutomationService, FormModel } from '@alfresco/adf-core';
-import { FormCloudService, UploadCloudWidgetComponent } from '@alfresco/adf-process-services-cloud';
+import { FormFieldModel, NotificationService, CoreAutomationService, FormModel, FormRenderingService } from '@alfresco/adf-core';
+import { FormCloudService, CloudFormRenderingService } from '@alfresco/adf-process-services-cloud';
 import { Subscription } from 'rxjs';

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

@@ -43,10 +46,8 @@ export class FormCloudDemoComponent implements OnInit, OnDestroy {

    constructor(
        private notificationService: NotificationService,
-        private formRenderingService: FormRenderingService,
        private formService: FormCloudService,
        private automationService: CoreAutomationService) {
-        this.formRenderingService.setComponentTypeResolver('upload', () => UploadCloudWidgetComponent, true);
    }

    logErrors(errorFields: FormFieldModel[]) {
@@ -32,7 +32,7 @@ const routes: Routes = [
@NgModule({
    imports: [
        CommonModule,
-        CoreModule.forChild(),
+        CoreModule,
        RouterModule.forChild(routes),
        ContentModule.forChild()
    ],
@@ -4,7 +4,7 @@
    <mat-card class="app-card-view">
        <adf-card-view
            [properties]="properties"
-            [editable]="true"
+            [editable]="isEditable"
            [displayClearAction]="showClearDateAction"
            [displayNoneOption]="showNoneOption">
        </adf-card-view>
@@ -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;
@@ -78,8 +78,43 @@ export class CardViewComponent implements OnInit, OnDestroy {
                value: 'Spock',
                key: 'name',
                default: 'default bar',
+                editable: this.isEditable
+            }),
+            new CardViewTextItemModel({
+                label: 'CardView Text Item - Protected value',
+                value: 'Spock',
+                key: 'name',
+                default: 'default bar',
                multiline: false,
                icon: 'icon',
+                editable: false
+            }),
+            new CardViewTextItemModel({
+                label: 'CardView Text Item - Multiline',
+                value: 'Spock',
+                key: 'name',
+                default: 'default bar',
+                multiline: true,
+                icon: 'icon',
+                editable: this.isEditable
+            }),
+            new CardViewTextItemModel({
+                label: 'CardView Text Item - Default Value',
+                value: '',
+                key: 'name',
+                default: 'default bar',
+                multiline: false,
+                icon: 'icon',
+                editable: this.isEditable
+            }),
+            new CardViewTextItemModel({
+                label: 'CardView Text Item - Multivalue (chips)',
+                value: [1, 2, 3],
+                key: 'name',
+                default: 'default bar',
+                multiline: true,
+                multivalued: true,
+                icon: 'icon',
                editable: this.isEditable
            }),
            new CardViewDateItemModel({
@@ -105,6 +140,13 @@ export class CardViewComponent implements OnInit, OnDestroy {
                default: false,
                editable: this.isEditable
            }),
+            new CardViewBoolItemModel({
+                label: 'Agree to all terms and conditions',
+                value: true,
+                key: 'boolean',
+                default: false,
+                editable: this.isEditable
+            }),
            new CardViewIntItemModel({
                label: 'CardView Int Item',
                value: 213,
@@ -118,14 +160,20 @@ export class CardViewComponent implements OnInit, OnDestroy {
                key: 'float',
                default: 0.0,
                editable: this.isEditable,
-                pipes: [{ pipe: this.decimalNumberPipe}]
+                pipes: [{ pipe: this.decimalNumberPipe }]
            }),
            new CardViewKeyValuePairsItemModel({
                label: 'CardView Key-Value Pairs Item',
-                value: [],
+                value: [{ name: 'hey', value: 'you' }, { name: 'hey', value: 'you' }],
                key: 'key-value-pairs',
                editable: this.isEditable
            }),
+            new CardViewKeyValuePairsItemModel({
+                label: 'CardView Key-Value Pairs Item',
+                value: [{ name: 'hey', value: 'you' }, { name: 'hey', value: 'you' }],
+                key: 'key-value-pairs',
+                editable: false
+            }),
            new CardViewSelectItemModel({
                label: 'CardView Select Item',
                value: 'one',
@@ -146,17 +194,24 @@ export class CardViewComponent implements OnInit, OnDestroy {
                default: 'click here',
                editable: this.isEditable,
                clickable: true,
+                icon: 'close',
                clickCallBack: () => {
                    this.respondToCardClick();
                }
            }),
            new CardViewArrayItemModel({
                label: 'CardView Array of items',
-                value: of(['Zlatan', 'Lionel Messi', 'Mohamed', 'Ronaldo']),
+                value: of([
+                    { icon: 'directions_bike', value: 'Zlatan' },
+                    { icon: 'directions_bike', value: 'Lionel Messi' },
+                    { value: 'Mohamed', directions_bike: 'save' },
+                    { value: 'Ronaldo' }
+                ]),
                key: 'array',
-                icon: 'directions_bike',
+                icon: 'edit',
                default: 'Empty',
-                noOfItemsToDisplay: 2
+                noOfItemsToDisplay: 2,
+                editable: this.isEditable
            })
        ];
    }
@@ -31,7 +31,7 @@ const routes: Routes = [
@NgModule({
    imports: [
        CommonModule,
-        CoreModule.forChild(),
+        CoreModule,
        RouterModule.forChild(routes)
    ],
    declarations: [CardViewComponent]
@@ -63,15 +63,11 @@ export class CloudFiltersDemoComponent implements OnInit {
    }

    onTaskFilterSelected(filter) {
-        this.cloudLayoutService.setCurrentTaskFilterParam({id: filter && filter.id ? filter.id : ''});
-        const currentFilter = Object.assign({}, filter);
-        this.router.navigate([`/cloud/${this.appName}/tasks/`], { queryParams: currentFilter });
+        this.router.navigate([`/cloud/${this.appName}/tasks/`], { queryParams: filter });
    }

    onProcessFilterSelected(filter) {
-        this.cloudLayoutService.setCurrentProcessFilterParam({id: filter && filter.id ? filter.id : ''});
-        const currentFilter = Object.assign({}, filter);
-        this.router.navigate([`/cloud/${this.appName}/processes/`], { queryParams: currentFilter });
+        this.router.navigate([`/cloud/${this.appName}/processes/`], { queryParams: filter });
    }

    onTaskFilterOpen(): boolean {
@@ -16,8 +16,7 @@
 */

 import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { Params } from '@angular/router/src/shared';
+import { ActivatedRoute, Params } from '@angular/router';

@Component({
    selector: 'app-cloud-viewer',
@@ -33,8 +33,6 @@ import { CloudLayoutService } from '../services/cloud-layout.service';
 })
 export class CommunityCloudComponent  {

-    appName: string = '';
-
    constructor(
        private router: Router,
        private route: ActivatedRoute,
@@ -7,7 +7,6 @@
      </mat-expansion-panel-header>
      <adf-cloud-task-filters
          *ngIf="expandTaskFilter"
-          [appName]="appName"
          [showIcons]="true"
          [filterParam]="currentTaskFilter$ | async"
          (filterClick)="onTaskFilterSelected($event)">
@@ -22,7 +21,6 @@
      </mat-expansion-panel-header>
      <adf-cloud-process-filters
          *ngIf="expandProcessFilter"
-          [appName]="appName"
          [showIcons]="true"
          [filterParam]="currentProcessFilter$ | async"
          (filterClick)="onProcessFilterSelected($event)">
@@ -15,7 +15,7 @@
 * limitations under the License.
 */

-import { Component, ViewEncapsulation, Input, OnInit } from '@angular/core';
+import { Component, ViewEncapsulation, OnInit } from '@angular/core';
 import { Observable } from 'rxjs';
 import { Router, ActivatedRoute } from '@angular/router';
 import { CloudLayoutService } from '../services/cloud-layout.service';
@@ -26,9 +26,6 @@ import { CloudLayoutService } from '../services/cloud-layout.service';
 })
 export class CommunityCloudFiltersDemoComponent implements OnInit {

-    @Input()
-    appName: string = 'community';
-
    currentTaskFilter$: Observable<any>;
    currentProcessFilter$: Observable<any>;

@@ -3,14 +3,13 @@
    <mat-icon>arrow_back</mat-icon> Go Back
 </button>

-<h4 data-automation-id="process-details-header">Simple page to show the process instance: {{ processInstanceId }} of the app: {{ appName }}</h4>
+<h4 data-automation-id="process-details-header">Simple page to show the process instance: {{ processInstanceId }}</h4>

 <div class="app-process-cloud-container">

    <adf-cloud-task-list
        fxFlex
        class="app-cloud-layout-overflow"
-        [appName]="''"
        [processInstanceId]="processInstanceId"
        (rowClick)="onRowClick($event)"
        #taskCloud>
@@ -18,7 +17,6 @@

    <adf-cloud-process-header
        class="app-process-cloud-header"
-        [appName]="''"
        [processInstanceId]="processInstanceId">
    </adf-cloud-process-header>
 </div>
@@ -25,16 +25,11 @@ import { ActivatedRoute, Router } from '@angular/router';
 export class CommunityProcessDetailsCloudDemoComponent {

    processInstanceId: string;
-    appName: string;

    constructor(private route: ActivatedRoute, private router: Router) {
        this.route.params.subscribe((params) => {
            this.processInstanceId = params.processInstanceId;
        });
-
-        this.route.parent.params.subscribe((params) => {
-            this.appName = params.appName;
-        });
    }

    onGoBack() {
@@ -1,7 +1,6 @@
 <div fxLayout="column" fxFill fxLayoutGap="2px">
    <adf-cloud-edit-process-filter
        [id]="filterId"
-        [appName]="'community'"
        [filterProperties]="processFilterProperties.filterProperties"
        [sortProperties]="processFilterProperties.sortProperties"
        [actions]="processFilterProperties.actions"
@@ -11,7 +10,6 @@
    <div fxLayout="column" fxFlex fxLayoutAlign="space-between" *ngIf="editedFilter">
        <adf-cloud-process-list #processCloud
            fxFlex
-            [appName]="''"
            class="app-cloud-layout-overflow"
            [initiator]="editedFilter.initiator"
            [processDefinitionId]="editedFilter.processDefinitionId"
@@ -19,7 +17,7 @@
            [id]="editedFilter.processInstanceId"
            [status]="editedFilter.status"
            [name]="editedFilter.processName"
-            [businessKey]="editedFilter.businessKey"
+            [businessKey]="editedFilter['businessKey']"
            [lastModifiedFrom]="editedFilter.lastModifiedFrom"
            [lastModifiedTo]="editedFilter.lastModifiedTo"
            [sorting]="sortArray"
@@ -44,15 +44,13 @@ export class CommunityProcessesCloudDemoComponent implements OnInit, OnDestroy {
    @ViewChild('processFiltersCloud')
    processFiltersCloud: ProcessFiltersCloudComponent;

-    appName: string = '';
    isFilterLoaded: boolean;
-
    filterId: string = '';
    sortArray: any = [];
    selectedRow: any;
    multiselect: boolean;
    selectionMode: string;
-    selectedRows: string[] = [];
+    selectedRows: any[] = [];
    testingMode: boolean;
    processFilterProperties: any  = { filterProperties: [], sortProperties: [], actions: [] };

@@ -79,10 +77,6 @@ export class CommunityProcessesCloudDemoComponent implements OnInit, OnDestroy {
    ngOnInit() {
        this.isFilterLoaded = false;

-        this.route.parent.params.subscribe((params) => {
-            this.appName = params.appName;
-        });
-
        this.route.queryParams.subscribe((params) => {
            if (Object.keys(params).length > 0) {
                this.isFilterLoaded = true;
@@ -1,6 +1,5 @@
 <adf-cloud-start-process
    [name]="processName"
-    [appName]="''"
    (error)="openSnackMessage($event)"
    (success)="onStartProcessSuccess()"
    (cancel)="onCancelStartProcess()">
@@ -34,7 +34,7 @@ export class CommunityStartProcessCloudDemoComponent implements OnInit {
    }

    ngOnInit() {
-        this.processName = this.appConfig.get<string>('adf-start-process.name');
+        this.processName = this.appConfig.get<string>('adf-start-process-cloud.name');
    }

    onStartProcessSuccess() {
@@ -1,5 +1,4 @@
 <adf-cloud-start-task
-    [appName]="''"
    (error)="openSnackMessage($event)"
    (success)="onStartTaskSuccess()"
    (cancel)="onCancelStartTask()">
@@ -1,7 +1,6 @@
 <div fxLayout="column" fxFill fxLayoutGap="2px">
    <adf-cloud-edit-task-filter
        [id]="filterId"
-        [appName]="'community'"
        [filterProperties]="taskFilterProperties.filterProperties"
        [sortProperties]="taskFilterProperties.sortProperties"
        [actions]="taskFilterProperties.actions"
@@ -11,7 +10,6 @@
    <div fxLayout="column" fxFlex fxLayoutAlign="space-between" *ngIf="editedFilter">
        <adf-cloud-task-list #taskCloud
            fxFlex
-            [appName]="''"
            class="app-cloud-layout-overflow"
            [processDefinitionId]="editedFilter.processDefinitionId"
            [processInstanceId]="editedFilter.processInstanceId"
@@ -1,10 +1,9 @@
-<h4 data-automation-id="task-details-header">Simple page to show the taskId: {{ taskId }} of the app: {{ appName }}</h4>
+<h4 data-automation-id="task-details-header">Simple page to show the taskId: {{ taskId }}</h4>

 <div fxLayout="column" fxFill fxLayoutGap="2px">
    <div fxLayout="row" fxFill>
        <div fxLayout="column" fxFlex="80%">
            <adf-cloud-task-form
-                [appName]="''"
                [taskId]="taskId"
                (cancelClick)="goBack()"
                (taskClaimed)="onClaimTask()"
@@ -14,7 +13,6 @@
            </adf-cloud-task-form>
        </div>
        <adf-cloud-task-header fxFlex
-            [appName]="''"
            [taskId]="taskId">
        </adf-cloud-task-header>
    </div>
@@ -26,7 +26,6 @@ import { NotificationService } from '@alfresco/adf-core';
 export class CommunityTaskDetailsCloudDemoComponent {

    taskId: string;
-    appName: string;

    constructor(
        private route: ActivatedRoute,
@@ -36,13 +35,10 @@ export class CommunityTaskDetailsCloudDemoComponent {
        this.route.params.subscribe((params) => {
            this.taskId = params.taskId;
        });
-        this.route.parent.params.subscribe((params) => {
-            this.appName = params.appName;
-        });
    }

    isTaskValid(): boolean {
-        return this.appName !== undefined && this.taskId !== undefined;
+        return this.taskId !== undefined;
    }

    goBack() {
@@ -73,7 +73,7 @@ const routes: Routes = [
@NgModule({
    imports: [
        CommonModule,
-        CoreModule.forChild(),
+        CoreModule,
        ProcessServicesCloudModule,
        RouterModule.forChild(routes),
        AppCloudSharedModule,
@@ -6,51 +6,65 @@
    <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="{{ peopleSingleMode }}">{{
+            <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="{{ peopleMultipleMode }}">{{
+            <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>
            </mat-radio-group>
            <mat-form-field *ngIf="!isPeopleAppNameSelected()" class="app-preselect-value">
                <mat-label>{{ 'PEOPLE_GROUPS_CLOUD.ROLE' | translate }} ["ACTIVITI_ADMIN", "ACTIVITI_USER"]</mat-label>
-                <input matInput (input)="setPeopleRoles($event)" data-automation-id="app-people-roles-input" />
+                <input matInput (input)="setPeopleRoles($event.target?.value)" data-automation-id="app-people-roles-input" />
            </mat-form-field>
            <mat-form-field *ngIf="isPeopleAppNameSelected()" class="app-preselect-value">
                <mat-label>{{ 'PEOPLE_GROUPS_CLOUD.APP_NAME' | translate }}</mat-label>
-                <input matInput (input)="setPeopleAppName($event)" data-automation-id="app-people-app-input" />
+                <input matInput (input)="setPeopleAppName($event.target?.value)" data-automation-id="app-people-app-input" />
            </mat-form-field>
            <mat-form-field class="app-preselect-value-full">
                <mat-label>{{ 'PEOPLE_GROUPS_CLOUD.PRESELECTED_VALUE' | translate }} {{ DEFAULT_PEOPLE_PLACEHOLDER }}</mat-label>
-                <input matInput (input)="setPeoplePreselectValue($event)"  data-automation-id="app-people-preselect-input" />
+                <input matInput (input)="setPeoplePreselectValue($event.target?.value)"  data-automation-id="app-people-preselect-input" />
            </mat-form-field>
            <mat-checkbox class="app-preselect-value" (change)="onChangePeopleValidation($event)">{{
                'PEOPLE_GROUPS_CLOUD.PRESELECT_VALIDATION' | translate }}</mat-checkbox>
+            <mat-checkbox data-automation-id="app-people-readonly" value="{{ peopleReadonly }}" (change)="onChangePeopleReadonly($event)">{{
+                'PEOPLE_GROUPS_CLOUD.READONLY_MODE' | translate }}</mat-checkbox>
        </div>
        <div>
            <adf-cloud-people
                [preSelectUsers]="preSelectUsers"
+                [readOnly]="peopleReadonly"
                [validate]="peoplePreselectValidation"
                [appName]="peopleAppName"
                [roles]="peopleRoles"
-                [appName]="peopleAppName"
                [title]="'ADF_TASK_LIST.START_TASK.FORM.LABEL.ASSIGNEE'"
-                [mode]="peopleMode"></adf-cloud-people>
+                [mode]="peopleMode"
+                (warning)="onUsersWarning($event)"></adf-cloud-people>
        </div>

-        <div class="app-people-list" *ngIf="canShowPeopleList()">
+        <div class="app-people-list" *ngIf="peopleMode === 'multiple'">
+            <h4>{{ 'PEOPLE_GROUPS_CLOUD.ALL_PRESELECTED_USERS' | translate }}</h4>
            <mat-list role="list">
                <mat-list-item *ngFor="let item of preSelectUsers" role="listitem">
                    <mat-icon mat-list-icon>person</mat-icon>
-                    {{ item?.firstName }} {{ item?.lastName }}
+                    {{item | fullName}}
                </mat-list-item>
            </mat-list>
+
+            <div *ngIf="invalidUsers.length > 0">
+                <h4>{{ 'PEOPLE_GROUPS_CLOUD.INVALID_USERS' | translate }} <mat-icon>warning</mat-icon> </h4>
+                <mat-list role="list">
+                    <mat-list-item *ngFor="let invalidUser of invalidUsers" role="listitem">
+                        <mat-icon mat-list-icon>person</mat-icon>
+                        {{invalidUser | fullName}}
+                    </mat-list-item>
+                </mat-list>
+            </div>
        </div>
    </mat-card-content>
 </mat-card>
@@ -63,43 +77,75 @@
    <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="{{ groupSingleMode }}">{{
+            <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="{{ groupMultipleMode }}">{{
+            <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>
            </mat-radio-group>
            <mat-form-field *ngIf="!isGroupAppNameSelected()" class="app-preselect-value">
                <mat-label>{{ 'PEOPLE_GROUPS_CLOUD.ROLE' | translate }} ["ACTIVITI_ADMIN", "ACTIVITI_USER"]</mat-label>
-                <input matInput (input)="setGroupRoles($event)" data-automation-id="app-group-roles-input"/>
+                <input matInput
+                    (input)="setGroupRoles($event.target?.value)"
+                    data-automation-id="app-group-roles-input"/>
            </mat-form-field>
            <mat-form-field *ngIf="isGroupAppNameSelected()" class="app-preselect-value">
                <mat-label>{{ 'PEOPLE_GROUPS_CLOUD.APP_NAME' | translate }}</mat-label>
-                <input matInput (input)="setGroupAppName($event)" data-automation-id="app-group-app-input"/>
+                <input matInput
+                    (input)="setGroupAppName($event.target?.value)"
+                    data-automation-id="app-group-app-input"/>
            </mat-form-field>
            <mat-form-field class="app-preselect-value-full">
                <mat-label>Preselect: {{ DEFAULT_GROUP_PLACEHOLDER }}</mat-label>
-                <input matInput (input)="setGroupsPreselectValue($event)" data-automation-id="app-group-preselect-input" />
+                <input matInput
+                    (input)="setGroupsPreselectValue($event.target?.value)"
+                    data-automation-id="app-group-preselect-input" />
            </mat-form-field>
+            <mat-checkbox class="app-preselect-value" (change)="onChangeGroupValidation($event)">
+                {{ 'PEOPLE_GROUPS_CLOUD.PRESELECT_VALIDATION' | translate }}
+            </mat-checkbox>
+            <mat-checkbox
+                data-automation-id="app-group-readonly"
+                value="{{ groupReadonly }}"
+                (change)="onChangeGroupReadonly($event)">
+                {{ 'PEOPLE_GROUPS_CLOUD.READONLY_MODE' | translate }}
+            </mat-checkbox>
        </div>
        <div>
-            <adf-cloud-group [mode]="groupMode" [roles]="groupRoles" [appName]="groupAppName" [preSelectGroups]="preSelectGroup"
-                (selectGroup)="onSelectGroup($event)" (removeGroup)="onRemoveGroup($event)"></adf-cloud-group>
+            <adf-cloud-group
+                [mode]="groupMode"
+                [readOnly]="groupReadonly"
+                [validate]="groupPreselectValidation"
+                [roles]="groupRoles"
+                [appName]="groupAppName"
+                [preSelectGroups]="preSelectGroup"
+                (warning)="onGroupsWarning($event)"></adf-cloud-group>
        </div>

-        <div class="app-group-list" *ngIf="canShowGroupList()">
+        <div class="app-group-list" *ngIf="groupMode === 'multiple'">
+            <h4>{{ 'PEOPLE_GROUPS_CLOUD.ALL_PRESELECTED_GROUPS' | translate }}</h4>
            <mat-list role="list">
                <mat-list-item *ngFor="let item of preSelectGroup" role="listitem">
                    <mat-icon mat-list-icon>group</mat-icon>
                    {{ item.name }}
                </mat-list-item>
            </mat-list>
+
+            <div *ngIf="invalidGroups.length > 0">
+                <h4>{{ 'PEOPLE_GROUPS_CLOUD.INVALID_GROUPS' | translate }} <mat-icon>warning</mat-icon> </h4>
+                <mat-list role="list">
+                    <mat-list-item *ngFor="let invalidGroup of invalidGroups" role="listitem">
+                        <mat-icon mat-list-icon>group</mat-icon>
+                        {{invalidGroup?.name}}
+                    </mat-list-item>
+                </mat-list>
+            </div>
        </div>
    </mat-card-content>
 </mat-card>
@@ -16,9 +16,10 @@
 */

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

@Component({
    selector: 'app-people-groups-cloud',
@@ -32,73 +33,83 @@ export class PeopleGroupCloudDemoComponent {
    DEFAULT_GROUP_PLACEHOLDER: string = `[{"id": "1", "name":"activitiUserGroup"}]`;
    DEFAULT_PEOPLE_PLACEHOLDER: string = `[{"id": "1", email": "user@user.com", "firstName":"user", "lastName": "lastName", "username": "user"}]`;

-    peopleMode: string = PeopleCloudComponent.MODE_SINGLE;
-    preSelectUsers: string[] = [];
+    peopleMode: ComponentSelectionMode = 'single';
+    preSelectUsers: IdentityUserModel[] = [];
+    invalidUsers: IdentityUserModel[] = [];
    peopleRoles: string[] = [];
    peopleAppName: string;
    peopleFilterMode: string = this.DEFAULT_FILTER_MODE;
-    peoplePreselectValidation: Boolean = false;
+    peoplePreselectValidation = false;
+    groupPreselectValidation = false;
+    peopleReadonly = false;
+    groupReadonly = false;

-    groupMode: string = GroupCloudComponent.MODE_SINGLE;
+    groupMode: ComponentSelectionMode = 'single';
    preSelectGroup: IdentityGroupModel[] = [];
-    selectedGroupList: IdentityGroupModel[] = [];
+    invalidGroups: IdentityGroupModel[] = [];
    groupRoles: string[];
    groupAppName: string;
    groupFilterMode: string = this.DEFAULT_FILTER_MODE;

-    setPeoplePreselectValue(event: any) {
-        this.preSelectUsers = this.getArrayFromString(event.target.value);
+    setPeoplePreselectValue(value: string): void {
+        this.preSelectUsers = this.getArrayFromString(value);
    }

-    setGroupsPreselectValue(event: any) {
-        this.preSelectGroup = this.getArrayFromString(event.target.value);
+    setGroupsPreselectValue(value: string): void {
+        this.preSelectGroup = this.getArrayFromString(value);
    }

-    setPeopleRoles(event: any) {
-        this.peopleRoles = this.getArrayFromString(event.target.value);
+    setPeopleRoles(value: string): void {
+        this.peopleRoles = this.getArrayFromString(value);
    }

-    setGroupRoles(event: any) {
-        this.groupRoles = this.getArrayFromString(event.target.value);
+    setGroupRoles(value: string): void {
+        this.groupRoles = this.getArrayFromString(value);
    }

-    setPeopleAppName(event: any) {
-        this.peopleAppName = event.target.value;
+    setPeopleAppName(value: string): void {
+        this.peopleAppName = value;
    }

-    setGroupAppName(event: any) {
-        this.groupAppName = event.target.value;
+    setGroupAppName(value: string): void {
+        this.groupAppName = value;
    }

-    onChangePeopleMode(event: MatRadioChange) {
+    onChangePeopleMode(event: MatRadioChange): void {
       this.peopleMode = event.value;
-       this.preSelectUsers = [...this.preSelectUsers];
    }

-    onChangeGroupsMode(event: MatRadioChange) {
+    onChangePeopleReadonly(event: MatCheckboxChange): void {
+        this.peopleReadonly = event.checked;
+    }
+
+    onChangeGroupReadonly(event: MatCheckboxChange): void {
+        this.groupReadonly = event.checked;
+    }
+
+    onChangeGroupsMode(event: MatRadioChange): void {
        this.groupMode = event.value;
-        this.preSelectGroup = [...this.preSelectGroup];
    }

-    onChangePeopleFilterMode(event: MatRadioChange) {
+    onChangePeopleFilterMode(event: MatRadioChange): void {
        this.peopleFilterMode = event.value;
        this.resetPeopleFilter();
    }

-    onChangeGroupsFilterMode(event: MatRadioChange) {
+    onChangeGroupsFilterMode(event: MatRadioChange): void {
        this.groupFilterMode = event.value;
        this.restGroupFilter();
    }

-    isPeopleAppNameSelected() {
+    isPeopleAppNameSelected(): boolean {
        return this.peopleFilterMode === 'appName';
    }

-    isGroupAppNameSelected() {
+    isGroupAppNameSelected(): boolean {
        return this.groupFilterMode === 'appName';
    }

-    resetPeopleFilter() {
+    resetPeopleFilter(): void {
        if (this.isPeopleAppNameSelected()) {
            this.peopleRoles = [];
        } else {
@@ -106,7 +117,7 @@ export class PeopleGroupCloudDemoComponent {
        }
    }

-    restGroupFilter() {
+    restGroupFilter(): void {
        if (this.isGroupAppNameSelected()) {
            this.groupRoles = [];
        } else {
@@ -114,12 +125,23 @@ export class PeopleGroupCloudDemoComponent {
        }
    }

-    onChangePeopleValidation(event: MatCheckboxChange) {
+    onChangePeopleValidation(event: MatCheckboxChange): void {
        this.peoplePreselectValidation = event.checked;
-        this.preSelectUsers = [...this.preSelectUsers];
    }

-    isStringArray(str: string) {
+    onChangeGroupValidation(event: MatCheckboxChange): void {
+        this.groupPreselectValidation = event.checked;
+    }
+
+    onGroupsWarning(warning: any): void {
+        this.invalidGroups = warning.groups;
+    }
+
+    onUsersWarning(warning: any): void {
+        this.invalidUsers = warning.users;
+    }
+
+    isStringArray(str: string): boolean {
        try {
            const result = JSON.parse(str);
            return Array.isArray(result);
@@ -128,46 +150,11 @@ export class PeopleGroupCloudDemoComponent {
        }
    }

-    private getArrayFromString(value: string) {
-
+    private getArrayFromString<T = any>(value: string): T[] {
        if (this.isStringArray(value)) {
            return JSON.parse(value);
        } else {
            return [];
        }
    }
-
-    canShowPeopleList() {
-        return this.peopleMode === GroupCloudComponent.MODE_MULTIPLE;
-    }
-
-    canShowGroupList() {
-        return this.groupMode === GroupCloudComponent.MODE_MULTIPLE;
-    }
-
-    onRemoveGroup(group: IdentityGroupModel) {
-        this.preSelectGroup = this.preSelectGroup.filter((value: any) => value.id !== group.id);
-    }
-
-    onSelectGroup(group: IdentityGroupModel) {
-        if (this.groupMode === GroupCloudComponent.MODE_MULTIPLE) {
-            this.preSelectGroup.push(group);
-        }
-    }
-
-    get peopleSingleMode() {
-        return PeopleCloudComponent.MODE_SINGLE;
-    }
-
-    get peopleMultipleMode() {
-        return PeopleCloudComponent.MODE_MULTIPLE;
-    }
-
-    get groupSingleMode() {
-        return GroupCloudComponent.MODE_SINGLE;
-    }
-
-    get groupMultipleMode() {
-        return GroupCloudComponent.MODE_MULTIPLE;
-    }
 }
@@ -1,4 +1,3 @@
-
 <button data-automation-id="go-back" mat-icon-button (click)="onGoBack()">
    <mat-icon>arrow_back</mat-icon> Go Back
 </button>
@@ -22,4 +21,3 @@
        [processInstanceId]="processInstanceId">
    </adf-cloud-process-header>
 </div>
-
@@ -11,4 +11,5 @@
        margin-left: 10px;
        width: 25%;
    }
+
 }
@@ -15,11 +15,12 @@
            [appName]="editedFilter.appName"
            [initiator]="editedFilter.initiator"
            [processDefinitionId]="editedFilter.processDefinitionId"
+            [processDefinitionName]="editedFilter.processDefinitionName"
            [processDefinitionKey]="editedFilter.processDefinitionKey"
            [id]="editedFilter.processInstanceId"
            [status]="editedFilter.status"
            [name]="editedFilter.processName"
-            [businessKey]="editedFilter.businessKey"
+            [businessKey]="editedFilter['businessKey']"
            [lastModifiedFrom]="editedFilter.lastModifiedFrom"
            [lastModifiedTo]="editedFilter.lastModifiedTo"
            [sorting]="sortArray"
@@ -37,6 +37,7 @@ import { Pagination } from '@alfresco/js-api';
 export class ProcessesCloudDemoComponent implements OnInit, OnDestroy {

    public static ACTION_SAVE_AS = 'saveAs';
+    public static ACTION_DELETE = 'delete';
    static PROCESS_FILTER_PROPERTY_KEYS = 'adf-edit-process-filter';

    @ViewChild('processCloud')
@@ -53,7 +54,7 @@ export class ProcessesCloudDemoComponent implements OnInit, OnDestroy {
    selectedRow: any;
    multiselect: boolean;
    selectionMode: string;
-    selectedRows: string[] = [];
+    selectedRows: any[] = [];
    testingMode: boolean;
    actionMenu: boolean;
    contextMenu: boolean;
@@ -140,7 +141,12 @@ export class ProcessesCloudDemoComponent implements OnInit, OnDestroy {
    }

    onProcessFilterAction(filterAction: any) {
-        this.cloudLayoutService.setCurrentProcessFilterParam({ id: filterAction.filter.id });
+        if (filterAction.actionType === ProcessesCloudDemoComponent.ACTION_DELETE) {
+            this.cloudLayoutService.setCurrentProcessFilterParam({ index: 0 });
+        } else {
+            this.cloudLayoutService.setCurrentProcessFilterParam({ id: filterAction.filter.id });
+        }
+
        if (filterAction.actionType === ProcessesCloudDemoComponent.ACTION_SAVE_AS) {
            this.router.navigate([`/cloud/${this.appName}/processes/`], { queryParams: filterAction.filter });
        }
@@ -18,14 +18,17 @@
 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';

@NgModule({
    imports: [
        CommonModule,
-        CoreModule.forChild(),
+        CoreModule,
        MatDialogModule,
        MatInputModule,
        MatSelectModule,
@@ -5,5 +5,6 @@
    [variables]="variables"
    (error)="openSnackMessage($event)"
    (success)="onStartProcessSuccess()"
+    (formContentClicked)="onFormContentClicked($event)"
    (cancel)="onCancelStartProcess()">
 </adf-cloud-start-process>
@@ -17,12 +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 '../../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 {

@@ -34,6 +39,7 @@ export class StartProcessCloudDemoComponent implements OnInit {
    constructor(private appConfig: AppConfigService,
                private cloudLayoutService: CloudLayoutService,
                private route: ActivatedRoute,
+                private previewService: PreviewService,
                private notificationService: NotificationService,
                private router: Router) {
    }
@@ -61,4 +67,8 @@ export class StartProcessCloudDemoComponent implements OnInit {
    openSnackMessage(event: any) {
        this.notificationService.openSnackMessage(event.response.body.entry.message);
    }
+
+    onFormContentClicked(resourceClicked: any) {
+        this.previewService.showResource(resourceClicked.nodeId);
+    }
 }
@@ -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;
@@ -30,6 +30,7 @@ import { takeUntil } from 'rxjs/operators';
 export class TasksCloudDemoComponent implements OnInit, OnDestroy {

    public static ACTION_SAVE_AS = 'saveAs';
+    public static ACTION_DELETE = 'delete';
    static TASK_FILTER_PROPERTY_KEYS = 'adf-edit-task-filter';

    @ViewChild('taskCloud')
@@ -133,7 +134,13 @@ export class TasksCloudDemoComponent implements OnInit, OnDestroy {
    }

    onTaskFilterAction(filterAction: any) {
-        this.cloudLayoutService.setCurrentTaskFilterParam({ id: filterAction.filter.id });
+
+        if (filterAction.actionType === TasksCloudDemoComponent.ACTION_DELETE) {
+            this.cloudLayoutService.setCurrentTaskFilterParam({ index: 0 });
+        } else {
+            this.cloudLayoutService.setCurrentTaskFilterParam({ id: filterAction.filter.id });
+        }
+
        if (filterAction.actionType === TasksCloudDemoComponent.ACTION_SAVE_AS) {
            this.router.navigate([`/cloud/${this.appName}/tasks/`], { queryParams: filterAction.filter });
        }
@@ -32,7 +32,7 @@ const routes: Routes = [
@NgModule({
    imports: [
        CommonModule,
-        CoreModule.forChild(),
+        CoreModule,
        RouterModule.forChild(routes),
        MonacoEditorModule
    ],
@@ -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({
@@ -227,5 +227,24 @@
                </adf-content-node-selector-panel>
            </div>
        </mat-expansion-panel>
+        <mat-expansion-panel>
+            <mat-expansion-panel-header>
+                <mat-panel-title>
+                    <h2>shows files</h2>
+                </mat-panel-title>
+                <mat-panel-description>
+                    <label class="app-content-node-selector-demo-basic-label">
+                       Shows files in search result
+                    </label>
+                </mat-panel-description>
+            </mat-expansion-panel-header>
+
+            <div class="app-content-node-selector-demo-basic-table">
+                <adf-content-node-selector-panel
+                    [currentFolderId]="'-root-'"
+                    [showFilesInResult]="true">
+                </adf-content-node-selector-panel>
+            </div>
+        </mat-expansion-panel>
    </mat-accordion>
 </main>
@@ -33,7 +33,7 @@ const routes: Routes = [
    imports: [
        CommonModule,
        RouterModule.forChild(routes),
-        CoreModule.forChild(),
+        CoreModule,
        ContentModule.forChild()
    ],
    declarations: [ContentNodeSelectorComponent]
@@ -32,7 +32,7 @@ const routes: Routes = [
@NgModule({
    imports: [
        CommonModule,
-        CoreModule.forChild(),
+        CoreModule,
        RouterModule.forChild(routes),
        ContentModule.forChild()
    ],
@@ -49,7 +49,7 @@
 <div>
    <p>{{ 'DATATABLE.MULTISELECT_DESCRIPTION'| translate }}</p>
    <mat-form-field>
-        <mat-select placeholder="Selection Mode" [(ngModel)]="selectionMode" name="food">
+        <mat-select placeholder="Selection Mode" [(ngModel)]="selectionMode" name="food" data-automation-id="datatable-selection-mode">
            <mat-option *ngFor="let mode of selectionModes" [value]="mode.value">
                {{mode.viewValue}}
            </mat-option>
@@ -32,7 +32,7 @@ const routes: Routes = [
@NgModule({
    imports: [
        CommonModule,
-        CoreModule.forChild(),
+        CoreModule,
        RouterModule.forChild(routes),
        ContentModule.forChild()
    ],
@@ -33,7 +33,7 @@ const routes: Routes = [
    imports: [
        CommonModule,
        RouterModule.forChild(routes),
-        CoreModule.forChild(),
+        CoreModule,
        ContentModule.forChild()
    ],
    declarations: [DataTableDnDComponent]
@@ -34,17 +34,14 @@ const routes: Routes = [
@NgModule({
    imports: [
        CommonModule,
-        CoreModule.forChild(),
+        CoreModule,
        RouterModule.forChild(routes),
        ContentModule.forChild(),
-        ExtensionsModule.forChild()
+        ExtensionsModule
    ],
    declarations: [
        ExtensionPresetsComponent,
        NameColumnComponent
-    ],
-    entryComponents: [
-        NameColumnComponent
    ]
 })
 export class ExtensionPresetsModule {
@@ -49,7 +49,7 @@
                        [color]="'primary'"
                        (change)="toggleMulti()"
                        [checked]="multi">
-                        multi accordion
+                        Multi accordion
                    </mat-slide-toggle>
                </p>

@@ -59,7 +59,7 @@
                        [color]="'primary'"
                        (change)="toggleReadOnly()"
                        [checked]="isReadOnly">
-                        Editable
+                        Read Only
                    </mat-slide-toggle>
                </p>

@@ -108,7 +108,8 @@
                <mat-card>
                    <mat-card-content>
                        <adf-version-manager [node]="node"
-                                             (uploadError)="uploadError($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"
@@ -328,7 +330,7 @@
        [allowRightSidebar]="allowRightSidebar"
        [allowLeftSidebar]="allowLeftSidebar"
        [urlFile]="urlFile"
-        (showViewerChange)="onViewerVisibilityChanged($event)"
+        (showViewerChange)="onViewerVisibilityChanged()"
        [sidebarLeftTemplate]="sidebarLeftTemplate"
        [sidebarRightTemplate]="sidebarRightTemplate">

@@ -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);
@@ -33,7 +33,7 @@ const routes: Routes = [
    imports: [
        CommonModule,
        RouterModule.forChild(routes),
-        CoreModule.forChild(),
+        CoreModule,
        InfoDrawerModule,
        ContentDirectiveModule,
        ContentMetadataModule,
@@ -1,7 +1,7 @@
 <adf-toolbar>
    <adf-toolbar-title>
        <mat-form-field>
-            <mat-select [(ngModel)]="selectedSource">
+            <mat-select [(ngModel)]="selectedSource" data-automation-id="custom-sources-select">
                <mat-option *ngFor="let source of sources" [value]="source.value">
                    {{ source.title }}
                </mat-option>
@@ -27,7 +27,7 @@ export class CustomSourcesComponent {
    @Input()
    selectedSource = '-recent-';

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

    sources = [
@@ -33,7 +33,7 @@ const routes: Routes = [
    imports: [
        CommonModule,
        RouterModule.forChild(routes),
-        CoreModule.forChild(),
+        CoreModule,
        ContentModule.forChild()
    ],
    declarations: [CustomSourcesComponent]
@@ -41,7 +41,8 @@
                              [versioning]="versioning"
                              [adf-check-allowable-operation]="'create'"
                              [adf-nodes]="disableDragArea ? getCurrentDocumentListNode() : []"
-                              (beginUpload)="onBeginUpload($event)">
+                              (beginUpload)="onBeginUpload($event)"
+                              (updateFileVersion)="onUploadNewVersion($event)">
            <div *ngIf="errorMessage" class="app-error-message">
                <button (click)="resetError()" mat-icon-button>
                    <mat-icon>highlight_off</mat-icon>
@@ -113,7 +114,9 @@
                        <mat-icon>get_app</mat-icon>
                    </button>
                    <button mat-icon-button
+                            data-automation-id="delete-toolbar-button"
                            adf-check-allowable-operation="delete"
+                            permanent=true
                            [adf-nodes]="documentList.selection"
                            title="{{ 'DOCUMENT_LIST.TOOLBAR.DELETE' | translate }}"
                            (delete)="onDeleteActionSuccess($event)"
@@ -197,13 +200,6 @@
                        <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"
@@ -241,6 +237,20 @@
                (folderChange)="onFolderChange($event)"
                (permissionError)="handlePermissionError($event)"
                (name-click)="documentList.onNodeDblClick($event.detail?.node)">
+                <adf-custom-header-filter-template *ngIf="enableCustomHeaderFilter">
+                    <ng-template let-col>
+                        <adf-search-header [col]="col"
+                                           [value]="paramValues? paramValues[col.key] : null"
+                                           [currentFolderNodeId]="currentFolderId"
+                                           [sorting]="filterSorting"
+                                           [maxItems]="pagination?.maxItems"
+                                           [skipCount]="pagination?.skipCount"
+                                           (update)="onFilterUpdate($event)"
+                                           (clear)="onAllFilterCleared()"
+                                           (selection)="onFilterSelected($event)">
+                        </adf-search-header>
+                    </ng-template>
+                </adf-custom-header-filter-template>
                <adf-custom-no-permission-template *ngIf="enableCustomPermissionMessage">
                    <h1>You don't have permissions</h1>
                </adf-custom-no-permission-template>
@@ -260,6 +270,7 @@
                    <data-column
                        *ngIf="showNameColumn && hyperlinkNavigation"
                        key="name"
+                        sortingKey="name"
                        class="app-ellipsis-cell"
                        title="{{'DOCUMENT_LIST.COLUMNS.DISPLAY_NAME' | translate}}"
                        [formatTooltip]="getNodeNameTooltip">
@@ -270,6 +281,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">
@@ -287,6 +299,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
@@ -313,11 +326,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">
@@ -329,11 +346,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">
@@ -443,7 +462,7 @@
            <adf-infinite-pagination
                [hidden]="!infiniteScrolling"
                [target]="documentList"
-                [loading]="documentList.infiniteLoading">
+                [loading]="documentList.loading">
                {{ 'ADF-DOCUMENT-LIST.LAYOUT.LOAD_MORE' | translate }}
            </adf-infinite-pagination>
        </adf-upload-drag-area>
@@ -525,7 +544,7 @@
        </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>
@@ -562,8 +581,8 @@
        </section>

        <section>
-            <mat-slide-toggle id="adf-document-list-enable-drop-files" [color]="'primary'" [(ngModel)]="allowDropFiles"
-                              (click)="toggleAllowDropFiles()">
+            <mat-slide-toggle id="adf-document-list-enable-drop-files" [color]="'primary'" [checked]="allowDropFiles"
+                              (change)="toggleAllowDropFiles()">
                {{'DOCUMENT_LIST.ALLOW_DROP_FILES' | translate}}
            </mat-slide-toggle>
        </section>
@@ -29,8 +29,9 @@
        }
    }

-    .app-datatable-card .app-lock-button {
+    .adf-datatable-card .app-lock-button {
        top: -10px;
+        position: absolute;
    }

    .app-site-container-style {
@@ -21,15 +21,15 @@ import {
 } 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 {
-    AlfrescoApiService, AuthenticationService, AppConfigService, AppConfigValues, ContentService, TranslationService,
-    FileUploadEvent, FolderCreatedEvent, LogService, NotificationService,
+    AlfrescoApiService, AuthenticationService, AppConfigService, AppConfigValues, ContentService, TranslationService, FolderCreatedEvent, LogService, NotificationService,
    UploadService, DataRow, UserPreferencesService,
-    PaginationComponent, FormValues, DisplayMode, InfinitePaginationComponent, HighlightDirective,
-    SharedLinksApiService
+    PaginationComponent, FormValues, DisplayMode, ShowHeaderMode, InfinitePaginationComponent, HighlightDirective,
+    SharedLinksApiService,
+    FormRenderingService
 } from '@alfresco/adf-core';

 import {
@@ -41,20 +41,23 @@ import {
    ContentMetadataService
 } 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 } 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 +69,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 +78,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 +92,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 +107,7 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
    showSettingsPanel = true;

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

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

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

@@ -178,13 +193,13 @@ 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)
@@ -195,6 +210,7 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
    stickyHeader: boolean;
    warnOnMultipleUploads = false;
    thumbnails = false;
+
    enableCustomPermissionMessage = false;
    enableMediumTimeFormat = false;
    displayEmptyMetadata = false;
@@ -237,6 +253,7 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
    }

    toggleAllowDropFiles() {
+        this.allowDropFiles = !this.allowDropFiles;
        this.documentList.reload();
    }

@@ -260,17 +277,6 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
            });
        }

-        this.uploadService.fileUploadComplete
-            .pipe(
-                debounceTime(300),
-                takeUntil(this.onDestroy$)
-            )
-            .subscribe(value => this.onFileUploadEvent(value));
-
-        this.uploadService.fileUploadDeleted
-            .pipe(takeUntil(this.onDestroy$))
-            .subscribe(value => this.onFileUploadEvent(value));
-
        this.contentService.folderCreated
            .pipe(takeUntil(this.onDestroy$))
            .subscribe(value => this.onFolderCreated(value));
@@ -322,7 +328,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 [];
        }
@@ -338,12 +344,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);
@@ -360,7 +360,7 @@ 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) {
@@ -427,7 +427,7 @@ 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: contentEntry, showComments: showComments, allowDownload: allowDownload},
                panelClass: 'adf-version-manager-dialog',
                width: '630px'
            });
@@ -518,22 +518,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);
    }

@@ -581,16 +591,34 @@ 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) {
        this.logService.log(event);
    }

+    onUploadNewVersion(ev) {
+        const contentEntry = ev.detail.data.node.entry;
+        const showComments = this.showVersionComments;
+        const allowDownload = this.allowVersionDownload;
+        const newFileVersion = ev.detail.files[0].file;
+
+        if (this.contentService.hasAllowableOperations(contentEntry, 'update')) {
+            this.dialog.open(VersionManagerDialogAdapterComponent, {
+                data: {
+                    contentEntry: contentEntry, showComments: showComments, allowDownload: allowDownload,
+                    newFileVersion: newFileVersion, showComparison: true
+                },
+                panelClass: 'adf-version-manager-dialog',
+                width: '630px'
+            });
+        } else {
+            const translatedErrorMessage: any = this.translateService.instant('OPERATION.ERROR.PERMISSION');
+            this.openSnackMessage(translatedErrorMessage);
+        }
+    }
+
    getFileFiltering(): string {
        return this.acceptedFilesTypeShow ? this.acceptedFilesType : '*';
    }
@@ -611,4 +639,34 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
        }
        return '';
    }
+
+    onFilterUpdate(newNodePaging: NodePaging) {
+        this.nodeResult = newNodePaging;
+    }
+
+    onAllFilterCleared() {
+        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();
+    }
+
+    onFilterSelected(currentActiveFilters: Map<string, string>) {
+        const objectFromMap = {};
+        currentActiveFilters.forEach((value: any, key) => {
+            let paramValue = null;
+            if (value && value.from && value.to) {
+                paramValue = `${value.from}||${value.to}`;
+            } else {
+                paramValue = value;
+            }
+            objectFromMap[key] = paramValue;
+        });
+
+        this.router.navigate([], { relativeTo: this.route, queryParams: objectFromMap });
+    }
+
 }
@@ -0,0 +1,11 @@
+<app-files-component [sortingMode]="'server'"
+                     [showRecentFiles]="false"
+                     [showSitePicker]="true"
+                     [showSettingsPanel]="false"
+                     [navigationRoute]="navigationRoute"
+                     [currentFolderId]="currentFolderId"
+                     [filterSorting]="filterSorting"
+                     [enableCustomHeaderFilter]="true"
+                     [paramValues]="queryParams"
+                     (sorting-changed)="onSortingChanged($event)">
+</app-files-component>
@@ -0,0 +1,54 @@
+/*!
+ * @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 { SEARCH_QUERY_SERVICE_TOKEN, SearchHeaderQueryBuilderService } from '@alfresco/adf-content-services';
+import { ActivatedRoute, Params } from '@angular/router';
+
+@Component({
+    selector: 'app-filtered-search-component',
+    templateUrl: './filtered-search.component.html',
+    providers: [{ provide: SEARCH_QUERY_SERVICE_TOKEN, useClass: SearchHeaderQueryBuilderService}]
+})
+export class FilteredSearchComponent {
+
+    navigationRoute = '/filtered-search';
+    currentFolderId = '-my-';
+
+    queryParams = null;
+    filterSorting: string = 'name-asc';
+
+    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;
+            });
+        }
+    }
+
+    onSortingChanged(event) {
+        this.filterSorting = event.detail.key + '-' + event.detail.direction;
+    }
+
+}
@@ -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({
--- a/Show More
+++ b/Show More