-
Notifications
You must be signed in to change notification settings - Fork 13
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Basic version & system info on Editorial Dashboard #28
Conversation
🚀 Welcome to the open source {{ ez.release }} release. Using the community friendly | ||
<a target="_blank" href="https://ez.no/About-our-Software/Licenses-and-agreements">GPL</a> license, | ||
<a target="_blank" href="https://www.gnu.org/licenses/old-licenses/gpl-2.0-faq.en.html#GPLModuleLicense">sharing code</a> | ||
is what it's ❤️ about. |
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
{% set status %} | ||
{% if not ez.release %} | ||
<div class="alert alert-warning" role="alert"> | ||
🤷 Could not find your <code>composer.lock</code> file, it's needed in order to determine information about |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🤷 Could not find your <code>composer.lock</code> file, it's needed in order to determine information about | |
The system could not find your <code>composer.lock</code> file. It's needed to determine information about your eZ Platform installation. We recommend to keep this file during project development to make sure same package versions are used across all environments. |
<div class="alert alert-warning" role="alert"> | ||
💁 Your setup is running with unstable packages. | ||
{% if ez.isEnterpise %} | ||
This is not supported unless told otherwise, if you need assistance <a href="https://support.ez.no">get in touch</a>. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is not supported unless told otherwise, if you need assistance <a href="https://support.ez.no">get in touch</a>. | |
This is not supported unless communicated otherwise. If you need assistance, <a href="https://support.ez.no">get in touch with us</a>. |
</div> | ||
{% elseif not ez.debug and ez.stability != 'stable' %} | ||
<div class="alert alert-warning" role="alert"> | ||
💁 Your setup is running with unstable packages. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💁 Your setup is running with unstable packages. | |
Your setup is running with unstable packages. |
{% if ez.isEnterpise %} | ||
This is not supported unless told otherwise, if you need assistance <a href="https://support.ez.no">get in touch</a>. | ||
{% else %} | ||
This is not recommended, unless for testing updates. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is not recommended, unless for testing updates. | |
This is not recommended. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
New string is Your setup is running with unstable packages, this is not recommended besides when testing updates.
ok @SylvainGuittard ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perfect!
{% if ez.isEndOfLife %} | ||
{% set badge = '<span class="badge badge-pill badge-danger">Trial</span>' %} | ||
<div class="alert alert-danger" role="alert"> | ||
⚠️ Unfortunately your trial has expired and your <a target="_blank" href="https://ez.no/About-our-Software/Licenses-and-agreements/eZ-Trial-and-Test-License-Agreement-eZ-TTL-v2.1">TTL license</a> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
⚠️ Unfortunately your trial has expired and your <a target="_blank" href="https://ez.no/About-our-Software/Licenses-and-agreements/eZ-Trial-and-Test-License-Agreement-eZ-TTL-v2.1">TTL license</a> | |
Unfortunately your trial period has expired and your <a target="_blank" href="https://ez.no/About-our-Software/Licenses-and-agreements/eZ-Trial-and-Test-License-Agreement-eZ-TTL-v2.1">TTL license</a> |
If you are in need of assistance, eZ Services like <a target="_blank" href="https://ez.no/Services/Consulting">Consulting</a> | ||
and <a target="_blank" href="https://ez.no/Services/Training">Training</a> help you get the most out your install. | ||
{% elseif rand == 1 %} | ||
To simplify the work involved in upgrading, <a target="_blank" href="https://ez.no/Products/eZ-Platform-Cloud">eZ Platform Cloud</a> might be a good option. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To simplify the work involved in upgrading, <a target="_blank" href="https://ez.no/Products/eZ-Platform-Cloud">eZ Platform Cloud</a> might be a good option. | |
If you want to accelerate your deployment process, <a target="_blank" href="https://ez.no/Products/eZ-Platform-Cloud">eZ Platform Cloud</a> is what you are looking for. |
{% elseif rand == 1 %} | ||
To simplify the work involved in upgrading, <a target="_blank" href="https://ez.no/Products/eZ-Platform-Cloud">eZ Platform Cloud</a> might be a good option. | ||
{% elseif rand == 2 %} | ||
Wondering about adding commerce capabilities while upgrading? <a target="_blank" href="https://ez.no/Products/eZ-Commerce">eZ Commerce</a> could be what you need. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wondering about adding commerce capabilities while upgrading? <a target="_blank" href="https://ez.no/Products/eZ-Commerce">eZ Commerce</a> could be what you need. | |
Wondering about adding commerce capabilities? <a target="_blank" href="https://ez.no/Products/eZ-Commerce">eZ Commerce</a> could be what you need. |
{% set badge = '<span class="badge badge-pill badge-light">GPL</span>' %} | ||
<div class="alert alert-info" role="alert"> | ||
🚀 Welcome to the open source {{ ez.release }} release. Using the community friendly | ||
<a target="_blank" href="https://ez.no/About-our-Software/Licenses-and-agreements">GPL</a> license, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
<a target="_blank" href="https://ez.no/About-our-Software/Licenses-and-agreements">GPL</a> license, | |
<a target="_blank" href="https://ez.no/About-our-Software/Licenses-and-agreements">GPL license</a>, |
{% elseif ez.isEndOfLife %} | ||
{# As we don't yet here know if subscription has expired this is a warning and not a error (subscription expiry on BUL would be a license violation, so similar like on TTL) #} | ||
<div class="alert alert-warning" role="alert"> | ||
⚠️ Unfortunately {{ ez.release }} has reached <a href="https://support.ez.no/Public/Service-Life">end of life</a>, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
⚠️ Unfortunately {{ ez.release }} has reached <a href="https://support.ez.no/Public/Service-Life">end of life</a>, | |
Unfortunately {{ ez.release }} has reached <a href="https://support.ez.no/Public/Service-Life">end of life</a>, |
{# As we don't yet here know if subscription has expired this is a warning and not a error (subscription expiry on BUL would be a license violation, so similar like on TTL) #} | ||
<div class="alert alert-warning" role="alert"> | ||
⚠️ Unfortunately {{ ez.release }} has reached <a href="https://support.ez.no/Public/Service-Life">end of life</a>, | ||
please plan to upgrade. If you are in need of assistance, don't hesitate to <a href="https://support.ez.no">get in touch</a>. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please plan to upgrade. If you are in need of assistance, don't hesitate to <a href="https://support.ez.no">get in touch</a>. | |
please plan to upgrade. If you need assistance, don't hesitate to <a target="_blank" href="https://ez.no/About-eZ/Contact-Us">contact eZ</a>. |
Shall we externalise links from templates to yaml? It will be easier to change it in case some of the pages will change/move. |
Also add license info.
Co-Authored-By: andrerom <[email protected]>
Co-Authored-By: andrerom <[email protected]>
Co-Authored-By: andrerom <[email protected]>
Co-Authored-By: andrerom <[email protected]>
Co-Authored-By: andrerom <[email protected]>
Co-Authored-By: andrerom <[email protected]>
@lserwatka @SylvainGuittard this more or less should be ready now for someone to take over on strings to do another round on that and generate translation strings. Translation system is now in use and URLs are not part of the strings anymore. |
<div class="alert alert-warning collapse" role="alert" id="systemInfoCollapse"> | ||
{% trans %} | ||
The system could not find your <code>composer.lock</code> file, it's needed in order to determine information about | ||
your eZ install, and recommended to be kept on project development to make sure same package versions are used across all environments. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
your eZ install, and recommended to be kept on project development to make sure same package versions are used across all environments. | |
your eZ Platform installation. We recommend to keep this file during project development to make sure same package versions are used across all environments. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hmm, this now kind of implies we only need this file during development, but actually we need it also after code is deployed in prod. Could we write this in a different way maybe?
@andrerom Final review done. |
Co-Authored-By: andrerom <[email protected]>
Co-Authored-By: andrerom <[email protected]>
Co-Authored-By: andrerom <[email protected]>
Co-Authored-By: andrerom <[email protected]>
Co-Authored-By: andrerom <[email protected]>
Co-Authored-By: andrerom <[email protected]>
Co-Authored-By: andrerom <[email protected]>
Co-Authored-By: andrerom <[email protected]>
Hi during extracting translations, I have took liberty to move urls from view to yml configuration. |
public function render(array $parameters = []): string | ||
{ | ||
$urls = $this->replaceUrlPlaceholders(); | ||
return $this->twig->render( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
missing empty line
/** | ||
* @return array | ||
*/ | ||
private function replaceUrlPlaceholders() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
missing return type hint
{% endspaceless %} | ||
{% endset %} | ||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
to many empty lines
*/ | ||
private $debug; | ||
|
||
public function __construct(JsonComposerLockSystemInfoCollector $composerCollector, $debug = false) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
public function __construct(JsonComposerLockSystemInfoCollector $composerCollector, $debug = false) | |
public function __construct(SystemInfoCollector $composerCollector, $debug = false) |
composer.json
Outdated
@@ -10,6 +10,7 @@ | |||
} | |||
], | |||
"require": { | |||
"php": "^5.6 || ^7.0", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"php": "^5.6 || ^7.0", | |
"php": "^7.1", |
and also ezsystems/ezplatform-admin-ui
should be added to dependencies // cc @lserwatka
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, and could you change branch alias to 1.0.x-dev
this package is super stable.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not for 0.2.x, for followup where we change admin ui to allow extensibility on system info tab and add eZ tab (ideally from this repo to avoid maintaining templates in admin ui) we can and should do things like this
This is 0.2.x for reasons explained in description, TL;DR to make all 2.x users aware if they are on a unsupported version.
"php": "^5.6 || ^7.0", | ||
"ezsystems/ezpublish-kernel": "~6.7.8 || ~6.13.4 || ^7.0", | ||
"php": ">=7.1", | ||
"ezsystems/ezpublish-kernel": "^7.4@dev", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please do these kernel and php changes post merge, half the point doing this from support side it to do a 0.2.x for v2 (2.0-2.4)* users letting them know if something is wrong with their install (including which version they are on and if it is expired)
* NB: Technically 0.2 is also used on 1.13 and updated 1.7 installs, hence we can't do php bump in 0.2, but we can in master when we bump version alias to 1.0.x there.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Then I think also \EzSystems\EzSupportToolsBundle\AdminUi\Component\EzInfoTwigComponent
should go to higher version, as it creates dependency on adminUI (and php7+).
So, for right now -> this will be merged to master as 1.0.x, and I will create new PR for 0.2 with compiler pass for compatibility with 1.13 and php5.6 |
From support/services/community side we are in need of people being able to:
The work here aims to do small first step, that can be shipped in a 0.2.x release of ez-support-tools so all existing 2.x installs gets access to this retroactively and gets info when version is out of date.
This is places on editorial dashboard for a few reasons:
Depends on the following:
EZP-29970: As a Developer I'd like to order components & tabs in Admin UI ezplatform-admin-ui#783For 2.4+ so this shows up above workflow blockScreenshoot