-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
EZP-32097: Expose EzSystemInfo in Admin UI and SystemInfoDumpCommand (#…
…69)
- Loading branch information
1 parent
f7e3e79
commit c47d5a1
Showing
14 changed files
with
342 additions
and
156 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,35 +1,63 @@ | ||
| dist: xenial | ||
| sudo: required | ||
|
|
||
| language: php | ||
|
|
||
| cache: | ||
| directories: | ||
| - $HOME/.composer/cache/files | ||
|
|
||
| matrix: | ||
| fast_finish: true | ||
| include: | ||
| - php: 7.3 | ||
| env: CHECK_CS=true | ||
|
|
||
| # test only on matching branches (+ Pull requests) | ||
| branches: | ||
| only: | ||
| - master | ||
| - /^\d.\d+$/ | ||
|
|
||
| before_script: | ||
| - travis_retry composer selfupdate | ||
| # Avoid memory issues on composer install | ||
| - phpenv config-rm xdebug.ini | ||
| - echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini | ||
| # Install packages | ||
| - travis_retry composer install --prefer-dist --no-interaction | ||
|
|
||
| script: | ||
| - php vendor/bin/phpunit | ||
| - if [ "$CHECK_CS" = "true" ]; then vendor/bin/php-cs-fixer fix -v --dry-run --diff --show-progress=estimating; fi | ||
|
|
||
| notifications: | ||
| email: false | ||
| dist: xenial | ||
| language: php | ||
|
|
||
| cache: | ||
| directories: | ||
| - $HOME/.composer/cache/files | ||
|
|
||
| matrix: | ||
| fast_finish: true | ||
| include: | ||
| - php: 7.3 | ||
| name: "Code style" | ||
| env: CHECK_CS=true | ||
| - php: 7.3 | ||
| name: "Unit tests" | ||
| env: UNIT_TESTS=true | ||
| - php: 7.3 | ||
| name: "System informarion browser tests" | ||
| env: | ||
| - EZPLATFORM_REPO="https://github.com/ezsystems/ezplatform.git" | ||
| - APP_ENV=behat | ||
| - APP_DEBUG=1 | ||
| - COMPOSE_FILE="doc/docker/base-dev.yml:doc/docker/selenium.yml" | ||
| - BEHAT_OPTS="--profile=adminui --suite=adminui --tags=@systemInformation" | ||
|
|
||
| # test only on matching branches (+ Pull requests) | ||
| branches: | ||
| only: | ||
| - master | ||
| - /^\d.\d+$/ | ||
|
|
||
| notifications: | ||
| slack: | ||
| rooms: | ||
| - secure: "2f0W8DM1YKXN/AHjSTYKExKxss+XUrSqATrl2yrGr0qJAwTHxVZSfXCgpHqbKk3bSMeS08/xg5hsk4i5H0MBZVcqYNyP6XvKQ+8IlO9KCXrKbw6iK/9iPnG795wDbqyF9Aj0M5CzJ1AP3flR1/fuaq4at1Oyv7g5CUcHn/WigR262ByWuCEiCfJGAYDyEZ35WpE+LBDqVQ1fIhEThRxOnZH4EQpdY7wzKh8Ujo4V0c465OT6mcJ7XWkrJAcc0MVPpUP6Cgov9Nkc4Ahrdsv128LW6Mvb2Cf4wcrm1QUjeqoVcVb3Zm4h4ve4Px3nPP82wYgrDbe/eD2PUU0XRcmqYr7MTxjhieW/Eq6P5lY/peROb3WQrG0WNoFNWKciiNFOBgJ5xJyENMe77dt2ZJ2G/tqZ3/VWBAzmUoAFX0X2EXB3qMfNK1dnBzUrbBaG7C1UQLEvpV7PfHJB8inss+i29844lKxdJTDiilHMFEfyVbjXK/CsQlz7lqzgyGlPvr4iT9WW1x2UuRJlZDS0GRHGWaPZe8S+LRIP0o7k/MKsaIBO+sxm52UDWBwXbRz5FFHV26TG8d7HHvPUa3sXI4xGePcdW1qare4o+92ivmzxMLgQ+LZP2Pro+t+pTchotyeOgO7umZOQXPR5t92afxyewEQ8mpzo+1CDDfxp14tRcn4=" | ||
| on_success: change | ||
| on_failure: always | ||
| on_pull_requests: false | ||
|
|
||
| before_script: | ||
| - travis_retry composer selfupdate | ||
| # Avoid memory issues on composer install | ||
| - phpenv config-rm xdebug.ini | ||
| - echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini | ||
| # Install packages | ||
| - if [ "${CHECK_CS}" != "" -o "${UNIT_TESTS}" != "" ] ; then travis_retry composer install ; fi | ||
| - if [ "${BEHAT_OPTS}" != "" ] ; then ./.travis/prepare_ezplatform.sh; fi | ||
|
|
||
| script: | ||
| - if [ "${UNIT_TESTS}" != "" ] ; then php vendor/bin/phpunit ; fi | ||
| - if [ "$CHECK_CS" = "true" ]; then vendor/bin/php-cs-fixer fix -v --dry-run --diff --show-progress=estimating; fi | ||
| - if [ "${BEHAT_OPTS}" != "" ] ; then cd "$HOME/build/ezplatform"; docker-compose exec --user www-data app sh -c "bin/ezbehat ${BEHAT_OPTS}" ; fi | ||
|
|
||
| after_failure: | ||
| # Will show us the last bit of the log of container's main processes | ||
| # (not counting shell process above running php and behat) | ||
| # NOTE: errors during docker setup of travis build won't show up here (can't output all as it is too much in debug/verbose mode) | ||
| - docker-compose logs -t --tail=15 | ||
| # Will show us what is up, and how long it's been up | ||
| - docker ps -s | ||
|
|
||
| after_script: | ||
| - if [ "${BEHAT_OPTS}" != "" ] ; then bin/ezreport ; fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| #!/bin/bash | ||
|
|
||
| EZPLATFORM_BRANCH=`php -r 'echo json_decode(file_get_contents("./composer.json"))->extra->_ezplatform_branch_for_behat_tests;'` | ||
| EZPLATFORM_BRANCH="${EZPLATFORM_BRANCH:-master}" | ||
| PACKAGE_BUILD_DIR=$PWD | ||
| EZPLATFORM_BUILD_DIR=${HOME}/build/ezplatform | ||
|
|
||
| echo "> Cloning ezsystems/ezplatform:${EZPLATFORM_BRANCH}" | ||
| git clone --depth 1 --single-branch --branch "${EZPLATFORM_BRANCH}" ${EZPLATFORM_REPO} ${EZPLATFORM_BUILD_DIR} | ||
| cd ${EZPLATFORM_BUILD_DIR} | ||
|
|
||
| # Copy over auth.json | ||
| cp $TRAVIS_BUILD_DIR/auth.json . | ||
|
|
||
| /bin/bash ./bin/.travis/trusty/setup_ezplatform.sh "${COMPOSE_FILE}" '' "${PACKAGE_BUILD_DIR}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,43 +1,45 @@ | ||
| { | ||
| "name": "ezsystems/ez-support-tools", | ||
| "description": "Providing information about the system eZ Platform/Enterprise/Commerce is running on, and eZ install itself", | ||
| "license": "GPL-2.0", | ||
| "type": "ezplatform-bundle", | ||
| "authors": [ | ||
| { | ||
| "name": "eZ Systems", | ||
| "email": "dev-team@ez.no" | ||
| } | ||
| ], | ||
| "require": { | ||
| "php": "^7.3", | ||
| "ezsystems/ezplatform-kernel": "~1.2.0@dev", | ||
| "ezsystems/ezplatform-core": "^2.1@dev", | ||
| "ezsystems/ezplatform-admin-ui": "^2.2@dev", | ||
| "ocramius/proxy-manager": "^2.2", | ||
| "symfony/proxy-manager-bridge": "^5.0", | ||
| "zetacomponents/system-information": "^1.1.1", | ||
| "doctrine/inflector": "^1.3" | ||
| }, | ||
| "require-dev": { | ||
| "ezsystems/ezplatform-code-style": "^0.1", | ||
| "friendsofphp/php-cs-fixer": "^2.16", | ||
| "ezsystems/doctrine-dbal-schema": "^1.0@dev", | ||
| "phpunit/phpunit": "^8.2", | ||
| "matthiasnoback/symfony-dependency-injection-test": "^4.0" | ||
| }, | ||
| "autoload": { | ||
| "psr-4": { | ||
| "EzSystems\\EzSupportToolsBundle\\": "src/bundle/", | ||
| "EzSystems\\EzSupportTools\\": "src/lib/" | ||
| } | ||
| }, | ||
| "extra": { | ||
| "branch-alias": { | ||
| "dev-master": "2.2.x-dev" | ||
| } | ||
| }, | ||
| "scripts": { | ||
| "fix-cs": "@php ./vendor/bin/php-cs-fixer fix -v --show-progress=estimating" | ||
| } | ||
| } | ||
| { | ||
| "name": "ezsystems/ez-support-tools", | ||
| "description": "Providing information about the system eZ Platform/Enterprise/Commerce is running on, and eZ install itself", | ||
| "license": "GPL-2.0", | ||
| "type": "ezplatform-bundle", | ||
| "authors": [ | ||
| { | ||
| "name": "eZ Systems", | ||
| "email": "dev-team@ez.no" | ||
| } | ||
| ], | ||
| "require": { | ||
| "php": "^7.3", | ||
| "ezsystems/ezplatform-kernel": "~1.2.0@dev", | ||
| "ezsystems/ezplatform-core": "^2.1@dev", | ||
| "ezsystems/ezplatform-admin-ui": "^2.2@dev", | ||
| "ocramius/proxy-manager": "^2.2", | ||
| "symfony/proxy-manager-bridge": "^5.0", | ||
| "zetacomponents/system-information": "^1.1.1", | ||
| "doctrine/inflector": "^1.3" | ||
| }, | ||
| "require-dev": { | ||
| "ezsystems/ezplatform-code-style": "^0.1", | ||
| "friendsofphp/php-cs-fixer": "^2.16", | ||
| "ezsystems/doctrine-dbal-schema": "^1.0@dev", | ||
| "phpunit/phpunit": "^8.2", | ||
| "matthiasnoback/symfony-dependency-injection-test": "^4.0" | ||
| }, | ||
| "autoload": { | ||
| "psr-4": { | ||
| "EzSystems\\EzSupportToolsBundle\\": "src/bundle/", | ||
| "EzSystems\\EzSupportTools\\": "src/lib/" | ||
| } | ||
| }, | ||
| "extra": { | ||
| "_ezplatform_branch_for_behat_tests": "3.2", | ||
| "branch-alias": { | ||
| "dev-master": "2.2.x-dev", | ||
| "dev-tmp_ci_branch": "2.2.x-dev" | ||
| } | ||
| }, | ||
| "scripts": { | ||
| "fix-cs": "@php ./vendor/bin/php-cs-fixer fix -v --show-progress=estimating" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
56 changes: 56 additions & 0 deletions
56
src/bundle/Resources/views/themes/admin/system_info/my_ibexa.html.twig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| {% trans_default_domain "systeminfo" %} | ||
|
|
||
| <!-- Tab name: {{ 'tab.name.ibexa'|trans|desc('My Ibexa') }} --> | ||
|
|
||
| <section class="ez-fieldgroup"> | ||
| <h2 class="ez-fieldgroup__name">{{ 'ibexa.product'|trans|desc('Product') }}</h2> | ||
| <div class="ez-fieldgroup__content"> | ||
| <table class="table ez-table ez-table--list ez-table--to-left"> | ||
| <tbody> | ||
| <tr class="ez-table__row"> | ||
| <td class="ez-table__cell">{{ 'ibexa.name'|trans|desc('Name') }}</td> | ||
| <td class="ez-table__cell">{{ info.name }}</td> | ||
| </tr> | ||
| <tr class="ez-table__row"> | ||
| <td class="ez-table__cell">{{ 'ibexa.version'|trans|desc('Version') }}</td> | ||
| <td class="ez-table__cell">{{ info.release }}</td> | ||
| </tr> | ||
| <tr class="ez-table__row"> | ||
| <td class="ez-table__cell">{{ 'ibexa.is_trial'|trans|desc('Is Trial') }}</td> | ||
| <td class="ez-table__cell"> | ||
| <svg class="ez-icon ez-icon--small"> | ||
| <use xlink:href="{{ ez_icon_path(info.isTrial ? 'checkmark' : 'discard') }}"></use> | ||
| </svg> | ||
| </td> | ||
| </tr> | ||
| <tr class="ez-table__row"> | ||
| <td class="ez-table__cell">{{ 'ibexa.stability'|trans|desc('Stability') }}</td> | ||
| <td class="ez-table__cell">{{ info.stability }}</td> | ||
| </tr> | ||
| {% if info.isEnterprise %} | ||
| <tr class="ez-table__row"> | ||
| <td class="ez-table__cell">{{ 'ibexa.eom'|trans|desc('End of Maintenance') }}*</td> | ||
| <td class="ez-table__cell"> | ||
| {{ info.endOfMaintenanceDate is empty ? '' : info.endOfMaintenanceDate|date('F Y') }} | ||
| </td> | ||
| </tr> | ||
| <tr class="ez-table__row"> | ||
| <td class="ez-table__cell">{{ 'ibexa.eol'|trans|desc('End of Life') }}*</td> | ||
| <td class="ez-table__cell"> | ||
| {{ info.endOfLifeDate is empty ? '' : info.endOfLifeDate|date('F Y') }} | ||
| </td> | ||
| </tr> | ||
| <tr class="ez-table__row"> | ||
| <td colspan="2"> | ||
| <hr/> | ||
| * {{ 'ibexa.read_more'|trans|desc('You can read more about Service Life for Ibexa DXP with a business license at') }} | ||
| <a target="_blank" href="https://support.ibexa.co/Public/Service-Life"> | ||
| https://support.ibexa.co/Public/Service-Life | ||
| </a> | ||
| </td> | ||
| </tr> | ||
| {% endif %} | ||
| </tbody> | ||
| </table> | ||
| </div> | ||
| </section> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.