espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Possibility to check new versions of extensions

Browse Source
This commit is contained in:
Taras Machyshyn
2018-06-29 12:10:25 +03:00
parent 0398137ba7
commit ed6256da2c
9 changed files with 189 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Core/defaults/config.php
+1
View File
@@ -111,6 +111,7 @@ return array (
'adminNotifications' => true,
'adminNotificationsNewVersion' => true,
'adminNotificationsCronIsNotConfigured' => true,
'adminNotificationsNewExtensionVersion' => true,
'assignmentEmailNotifications' => false,
'assignmentEmailNotificationsEntityList' => ['Lead', 'Opportunity', 'Task', 'Case'],
'assignmentNotificationsEntityList' => ['Meeting', 'Call', 'Task', 'Email'],
application/Espo/Core/defaults/systemConfig.php
+5 -1
View File
@@ -154,7 +154,11 @@ return array ( 'defaultPermissions' =>
'ldapUserTeamsIds',
'ldapUserTeamsNames',
'cleanupJobPeriod',
'cleanupActionHistoryPeriod'
'cleanupActionHistoryPeriod',
'adminNotifications',
'adminNotificationsNewVersion',
'adminNotificationsCronIsNotConfigured',
'adminNotificationsNewExtensionVersion'
),
'userItems' =>
array (
application/Espo/Jobs/CheckNewExtensionsVersions.php
+54
View File
@@ -0,0 +1,54 @@
<?php
/************************************************************************
* This file is part of EspoCRM.
*
* EspoCRM - Open Source CRM application.
* Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
* Website: http://www.espocrm.com
*
* EspoCRM is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* EspoCRM is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with EspoCRM. If not, see http://www.gnu.org/licenses/.
*
* The interactive user interfaces in modified source and object code versions
* of this program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU General Public License version 3.
*
* In accordance with Section 7(b) of the GNU General Public License version 3,
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
namespace Espo\Jobs;
use Espo\Core\Exceptions;
class CheckNewExtensionsVersions extends CheckNewVersion
{
public function run()
{
if (!$this->getConfig()->get('adminNotifications') || !$this->getConfig()->get('adminNotificationsNewExtensionVersion')) {
return true;
}
$job = $this->getEntityManager()->getEntity('Job');
$job->set(array(
'name' => 'Check for New Version of installed extensions (job)',
'serviceName' => 'AdminNotifications',
'methodName' => 'jobCheckNewExtensionsVersions',
'executeTime' => $this->getRunTime()
));
$this->getEntityManager()->saveEntity($job);
return true;
}
}
application/Espo/Resources/i18n/en_US/Settings.json
+1
View File
@@ -93,6 +93,7 @@
"aclAllowDeleteCreated": "Allow to remove created records",
"adminNotifications": "System notifications in administration panel",
"adminNotificationsNewVersion": "Show notification when new EspoCRM version is available",
"adminNotificationsNewExtensionVersion": "Show notification when new version of extensions are available",
"textFilterUseContainsForVarchar": "Use 'contains' operator when filtering varchar fields",
"authTokenPreventConcurrent": "Only one auth token per user",
"scopeColorsDisabled": "Disable scope colors",
application/Espo/Resources/layouts/Settings/notifications.json
+1 -1
View File
@@ -19,7 +19,7 @@
"label": "Admin Notifications",
"rows": [
[{"name": "adminNotifications"}, false],
[{"name": "adminNotificationsNewVersion"}, false]
[{"name": "adminNotificationsNewVersion"}, {"name": "adminNotificationsNewExtensionVersion"}]
]
}
]
application/Espo/Resources/metadata/entityDefs/ScheduledJob.json
+5
View File
@@ -82,6 +82,11 @@
"name": "Check for New Version",
"isSystem": true,
"scheduling": "15 5 * * *"
},
"CheckNewExtensionsVersions": {
"name": "Check for New Version of Installed Extensions",
"isSystem": true,
"scheduling": "25 5 * * *"
}
}
}
application/Espo/Resources/metadata/entityDefs/Settings.json
+3
View File
@@ -453,6 +453,9 @@
"adminNotificationsNewVersion": {
"type": "bool"
},
"adminNotificationsNewExtensionVersion": {
"type": "bool"
},
"textFilterUseContainsForVarchar": {
"type": "bool",
"tooltip": true
application/Espo/Services/AdminNotifications.php
+117 -5
View File
@@ -31,6 +31,13 @@ namespace Espo\Services;
class AdminNotifications extends \Espo\Core\Services\Base
{
/**
* Job for checking a new version of EspoCRM
*
* @param object $data
*
* @return boolean
*/
public function jobCheckNewVersion($data)
{
$config = $this->getConfig();
@@ -40,24 +47,129 @@ class AdminNotifications extends \Espo\Core\Services\Base
}
$latestRelease = $this->getLatestRelease();
if (!empty($latestRelease['version']) && $config->get('latestVersion') != $latestRelease['version']) {
if (empty($latestRelease['version'])) {
$config->set('latestVersion', $latestRelease['version']);
$config->save();
return true;
}
if ($config->get('latestVersion') != $latestRelease['version']) {
$config->set('latestVersion', $latestRelease['version']);
if (!empty($latestRelease['notes'])) {
//todo: create notification
}
$config->save();
return true;
}
if (!empty($latestRelease['notes'])) {
//todo: find and modify notification
}
return true;
}
/**
* Job for cheking a new version of installed extensions
*
* @param object $data
*
* @return boolean
*/
public function jobCheckNewExtensionsVersions($data)
{
$config = $this->getConfig();
if (!$config->get('adminNotifications') || !$config->get('adminNotificationsNewExtensionVersion')) {
return true;
}
$pdo = $this->getEntityManager()->getPDO();
$query = "
SELECT id, name, version, check_version_url as url
FROM extension
WHERE deleted = 0
AND is_installed = 1
ORDER BY created_at
";
$sth = $pdo->prepare($query);
$sth->execute();
$rowList = $sth->fetchAll(\PDO::FETCH_ASSOC);
$latestReleases = [];
foreach ($rowList as $row) {
$url = !empty($row['url']) ? $row['url'] : null;
$extensionName = $row['name'];
$latestRelease = $this->getLatestRelease($url, [
'response' => 'latestRelease',
'name' => $extensionName,
]);
if (!empty($latestRelease) && !isset($latestRelease['error'])) {
$latestReleases[$extensionName] = $latestRelease;
}
}
$latestExtensionVersions = $config->get('latestExtensionVersions', []);
$save = false;
foreach ($latestReleases as $extensionName => $extensionData) {
if (empty($latestExtensionVersions[$extensionName])) {
$latestExtensionVersions[$extensionName] = $extensionData['version'];
$save = true;
continue;
}
if ($latestExtensionVersions[$extensionName] != $extensionData['version']) {
$latestExtensionVersions[$extensionName] = $extensionData['version'];
if (!empty($extensionData['notes'])) {
//todo: create notification
}
$save = true;
continue;
}
if (!empty($extensionData['notes'])) {
//todo: find and modify notification
}
}
if ($save) {
$config->set('latestExtensionVersions', $latestExtensionVersions);
$config->save();
}
return true;
}
protected function getLatestRelease($url = null, array $requestData = ['action' => 'latestRelease'])
/**
* Get latest version
*
* @param string $url
* @param array $requestData
*
* @return array|null
*/
protected function getLatestRelease($url = null, array $requestData = ['response' => 'latestRelease'])
{
if (function_exists('curl_version')) {
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $url ? $url : base64_decode('aHR0cHM6Ly9zLmVzcG9jcm0uY29tLw=='));
$requestUrl = $url ? $url : base64_decode('aHR0cHM6Ly9zLmVzcG9jcm0uY29tLw==');
curl_setopt($ch, CURLOPT_URL, $requestUrl. '?' . http_build_query($requestData));
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 60);
curl_setopt($ch, CURLOPT_POST, true);
curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($requestData));
$result = curl_exec($ch);
$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
client/src/views/admin/notifications.js
+2 -2
View File
@@ -54,14 +54,14 @@ Espo.define('views/admin/notifications', 'views/settings/record/edit', function
true: [
{
action: 'show',
fields: ['adminNotificationsNewVersion']
fields: ['adminNotificationsNewVersion', 'adminNotificationsNewExtensionVersion']
}
]
},
default: [
{
action: 'hide',
fields: ['adminNotificationsNewVersion']
fields: ['adminNotificationsNewVersion', 'adminNotificationsNewExtensionVersion']
}
]
}