' + localeService.t("prod:mapboxgl: title info") + '' + localeService.t("prod:mapboxgl: description info : right click to add position") + '
' + localeService.t("prod:mapboxgl: title info") + '' + localeService.t("prod:mapboxgl: description info : right click to add position") + '' + localeService.t("mapboxgl title info") + '' + localeService.t("mapboxgl description info") + '' + localeService.t("prod:mapboxjs: title notice") + '' + localeService.t("prod:mapboxjs: description notice") + '' + localeService.t("mapboxjs title notice") + '' + localeService.t("mapboxjs description notice") + '' + localeService.t("prod:mapboxjs: title info") + '' + localeService.t("prod:mapboxjs: description info : right click to add position") + '' + localeService.t("mapboxjs title info") + '' + localeService.t("mapboxjs description info") + '' + localeService.t("prod:mapboxgl: title info") + '' + localeService.t("prod:mapboxgl: description info : right click to add position") + '' + localeService.t("mapboxgl title info") + '' + localeService.t("mapboxgl description info") + '' + localeService.t("prod:mapboxjs: title notice") + '' + localeService.t("prod:mapboxjs: description notice") + '' + localeService.t("mapboxjs title notice") + '' + localeService.t("mapboxjs description notice") + '' + localeService.t("prod:mapboxjs: title info") + '' + localeService.t("prod:mapboxjs: description info : right click to add position") + '' + localeService.t("mapboxjs title info") + '' + localeService.t("mapboxjs description info") + '' +
- localeService.t("prod:mapboxgl: title info") + '' + localeService.t("prod:mapboxgl: description info : right click to add position") + '');
controlContainerEdit.append($noticeButton);
controlContainerEdit.append($noticeBox);
@@ -495,7 +495,7 @@ const leafletMap = (services) => {
$noticeButtonJs = $('');
$noticeBoxJs = $('' +
- localeService.t("prod:mapboxjs: title notice") + '' + localeService.t("prod:mapboxjs: description notice") + '');
controlContainerSearch.append($noticeButtonJs);
controlContainerSearch.append($noticeBoxJs);
@@ -505,7 +505,7 @@ const leafletMap = (services) => {
$noticeButtonJs = $('');
$noticeBoxJs = $('' +
- localeService.t("prod:mapboxjs: title info") + '' + localeService.t("prod:mapboxjs: description info : right click to add position") + '');
controlContainerEdit.append($noticeButtonJs);
controlContainerEdit.append($noticeBoxJs);
diff --git a/Phraseanet-production-client/src/components/geolocalisation/providers/markerGLCollection.js b/Phraseanet-production-client/src/components/geolocalisation/providers/markerGLCollection.js
index adc9e71b48..ff09e0f4d3 100644
--- a/Phraseanet-production-client/src/components/geolocalisation/providers/markerGLCollection.js
+++ b/Phraseanet-production-client/src/components/geolocalisation/providers/markerGLCollection.js
@@ -39,8 +39,20 @@ const markerGLCollection = (services) => {
};
const setPoint = (marker) => {
+ let markerId = marker.properties.recordIndex;
- let markerElement = getMarker(marker.properties._rid);
+ if (marker.properties._rid !== undefined) {
+ markerId = marker.properties._rid;
+ }
+
+ let markerElement = getMarker(markerId);
+
+ if (markerElement === undefined) {
+ let el = document.createElement('div');
+ el.className = 'mapboxGl-phrasea-marker';
+
+ markerElement = markerGl[markerId] = new mapboxgl.Marker(el);
+ }
markerElement.feature = {
properties : {
@@ -134,7 +146,6 @@ const markerGLCollection = (services) => {
markerSelected.togglePopup();
- cachedGeoJson.features[0].geometry.coordinates = [marker._originalPosition.lng, marker._originalPosition.lat];
resetMarkerPosition($content, markerSelected);
});
}
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php b/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php
index fd780d1a31..db213e6a63 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php
@@ -159,12 +159,12 @@ class LanguageController
'description notice' => $translator->trans('prod:mapboxgl: description notice'),
'title-map-dialog' => $translator->trans('prod:mapboxgl: title map dialog'),
'create new user' => $translator->trans('prod:push: create new user'),
- 'prod:mapboxjs: title notice' => $translator->trans('prod:mapboxjs: title notice'),
- 'prod:mapboxjs: description notice' => $translator->trans('prod:mapboxjs: description notice'),
- 'prod:mapboxjs: title info' => $translator->trans('prod:mapboxjs: title info'),
- 'prod:mapboxjs: description info : right click to add position' => $translator->trans('prod:mapboxjs: description info : right click to add position'),
- 'prod:mapboxgl: title info' => $translator->trans('prod:mapboxgl: title info'),
- 'prod:mapboxgl: description info : right click to add position' => $translator->trans('prod:mapboxgl: description info : right click to add position'),
+ 'mapboxjs title notice' => $translator->trans('prod:mapboxjs: title notice'),
+ 'mapboxjs description notice' => $translator->trans('prod:mapboxjs: description notice'),
+ 'mapboxjs title info' => $translator->trans('prod:mapboxjs: title info'),
+ 'mapboxjs description info' => $translator->trans('prod:mapboxjs: description info : right click to add position'),
+ 'mapboxgl title info' => $translator->trans('prod:mapboxgl: title info'),
+ 'mapboxgl description info' => $translator->trans('prod:mapboxgl: description info : right click to add position'),
'prod:videoeditor:subtitletab:message:: error' => $translator->trans('prod:videoeditor:subtitletab:message:: error'),
'prod:videoeditor:subtitletab:message:: success' => $translator->trans('prod:videoeditor:subtitletab:message:: success'),
'Edit expose title' => $translator->trans('prod:workzone:expose:modal:: title'),
diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticsearchOptions.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticsearchOptions.php
index 28f8a83613..4f7de4c7af 100644
--- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticsearchOptions.php
+++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticsearchOptions.php
@@ -60,7 +60,7 @@ class ElasticsearchOptions
'replicas' => 0,
'minScore' => 4,
'highlight' => true,
- 'max_result_window' => 500000,
+ 'maxResultWindow' => 500000,
'populate_order' => self::POPULATE_ORDER_RID,
'populate_direction' => self::POPULATE_DIRECTION_DESC,
'activeTab' => null,
@@ -76,7 +76,7 @@ class ElasticsearchOptions
$self->setReplicas($options['replicas']);
$self->setMinScore($options['minScore']);
$self->setHighlight($options['highlight']);
- $self->setMaxResultWindow($options['max_result_window']);
+ $self->setMaxResultWindow($options['maxResultWindow']);
$self->setPopulateOrder($options['populate_order']);
$self->setPopulateDirection($options['populate_direction']);
$self->setActiveTab($options['activeTab']);
diff --git a/lib/Alchemy/Phrasea/WorkerManager/Controller/AdminConfigurationController.php b/lib/Alchemy/Phrasea/WorkerManager/Controller/AdminConfigurationController.php
index c4ecbd1150..1477ceba94 100644
--- a/lib/Alchemy/Phrasea/WorkerManager/Controller/AdminConfigurationController.php
+++ b/lib/Alchemy/Phrasea/WorkerManager/Controller/AdminConfigurationController.php
@@ -229,6 +229,29 @@ class AdminConfigurationController extends Controller
]);
}
+ public function validationReminderAction(PhraseaApplication $app, Request $request)
+ {
+ $interval = $app['conf']->get(['workers', 'validationReminder', 'interval'], 7200);
+
+ if ($request->getMethod() == 'POST') {
+ $reminderInterval = (int)$request->request->get('worker_reminder_interval');
+ // save the period interval in second
+ $app['conf']->set(['workers', 'validationReminder', 'interval'], $reminderInterval);
+
+ /** @var AMQPConnection $serverConnection */
+ $serverConnection = $this->app['alchemy_worker.amqp.connection'];
+ // reinitialize the validation reminder queues
+ $serverConnection->reinitializeQueue([MessagePublisher::VALIDATION_REMINDER_QUEUE]);
+ $this->app['alchemy_worker.message.publisher']->initializeLoopQueue(MessagePublisher::VALIDATION_REMINDER_TYPE);
+
+ return $app->redirectPath('worker_admin');
+ }
+
+ return $this->render('admin/worker-manager/worker_validation_reminder.html.twig', [
+ 'interval' => $interval
+ ]);
+ }
+
public function populateStatusAction(PhraseaApplication $app, Request $request)
{
$databoxIds = $request->get('sbasIds');
@@ -255,7 +278,7 @@ class AdminConfigurationController extends Controller
// reinitialize the pull queues
$serverConnection->reinitializeQueue([MessagePublisher::PULL_QUEUE]);
- $this->app['alchemy_worker.message.publisher']->initializePullAssets();
+ $this->app['alchemy_worker.message.publisher']->initializeLoopQueue(MessagePublisher::PULL_ASSETS_TYPE);
return $app->redirectPath('worker_admin');
}
diff --git a/lib/Alchemy/Phrasea/WorkerManager/Provider/AlchemyWorkerServiceProvider.php b/lib/Alchemy/Phrasea/WorkerManager/Provider/AlchemyWorkerServiceProvider.php
index 71d965de42..44496f4849 100644
--- a/lib/Alchemy/Phrasea/WorkerManager/Provider/AlchemyWorkerServiceProvider.php
+++ b/lib/Alchemy/Phrasea/WorkerManager/Provider/AlchemyWorkerServiceProvider.php
@@ -20,6 +20,7 @@ use Alchemy\Phrasea\WorkerManager\Worker\PullAssetsWorker;
use Alchemy\Phrasea\WorkerManager\Worker\Resolver\TypeBasedWorkerResolver;
use Alchemy\Phrasea\WorkerManager\Worker\SubdefCreationWorker;
use Alchemy\Phrasea\WorkerManager\Worker\SubtitleWorker;
+use Alchemy\Phrasea\WorkerManager\Worker\ValidationReminderWorker;
use Alchemy\Phrasea\WorkerManager\Worker\WebhookWorker;
use Alchemy\Phrasea\WorkerManager\Worker\WorkerInvoker;
use Alchemy\Phrasea\WorkerManager\Worker\WriteMetadatasWorker;
@@ -151,6 +152,10 @@ class AlchemyWorkerServiceProvider implements PluginProviderInterface
$app['alchemy_worker.type_based_worker_resolver']->addFactory(MessagePublisher::FTP_TYPE, new CallableWorkerFactory(function () use ($app) {
return new FtpWorker($app);
}));
+
+ $app['alchemy_worker.type_based_worker_resolver']->addFactory(MessagePublisher::VALIDATION_REMINDER_TYPE, new CallableWorkerFactory(function () use ($app) {
+ return new ValidationReminderWorker($app);
+ }));
}
/**
diff --git a/lib/Alchemy/Phrasea/WorkerManager/Provider/ControllerServiceProvider.php b/lib/Alchemy/Phrasea/WorkerManager/Provider/ControllerServiceProvider.php
index 772c899e5f..a53aa5e91d 100644
--- a/lib/Alchemy/Phrasea/WorkerManager/Provider/ControllerServiceProvider.php
+++ b/lib/Alchemy/Phrasea/WorkerManager/Provider/ControllerServiceProvider.php
@@ -88,6 +88,10 @@ class ControllerServiceProvider implements ControllerProviderInterface, ServiceP
->method('GET|POST')
->bind('worker_admin_pullAssets');
+ $controllers->match('/validation-reminder', 'controller.worker.admin.configuration:validationReminderAction')
+ ->method('GET|POST')
+ ->bind('worker_admin_validationReminder');
+
$controllers->match('/queue-monitor', 'controller.worker.admin.configuration:queueMonitorAction')
->method('GET')
->bind('worker_admin_queue_monitor');
diff --git a/lib/Alchemy/Phrasea/WorkerManager/Queue/AMQPConnection.php b/lib/Alchemy/Phrasea/WorkerManager/Queue/AMQPConnection.php
index bf355ae04d..421921f1c0 100644
--- a/lib/Alchemy/Phrasea/WorkerManager/Queue/AMQPConnection.php
+++ b/lib/Alchemy/Phrasea/WorkerManager/Queue/AMQPConnection.php
@@ -27,13 +27,14 @@ class AMQPConnection
MessagePublisher::WEBHOOK_TYPE => MessagePublisher::WEBHOOK_QUEUE,
MessagePublisher::ASSETS_INGEST_TYPE => MessagePublisher::ASSETS_INGEST_QUEUE,
MessagePublisher::CREATE_RECORD_TYPE => MessagePublisher::CREATE_RECORD_QUEUE,
- MessagePublisher::PULL_QUEUE => MessagePublisher::PULL_QUEUE,
+ MessagePublisher::PULL_ASSETS_TYPE => MessagePublisher::PULL_QUEUE,
MessagePublisher::POPULATE_INDEX_TYPE => MessagePublisher::POPULATE_INDEX_QUEUE,
MessagePublisher::DELETE_RECORD_TYPE => MessagePublisher::DELETE_RECORD_QUEUE,
MessagePublisher::MAIN_QUEUE_TYPE => MessagePublisher::MAIN_QUEUE,
MessagePublisher::SUBTITLE_TYPE => MessagePublisher::SUBTITLE_QUEUE,
MessagePublisher::EXPOSE_UPLOAD_TYPE => MessagePublisher::EXPOSE_UPLOAD_QUEUE,
- MessagePublisher::FTP_TYPE => MessagePublisher::FTP_QUEUE
+ MessagePublisher::FTP_TYPE => MessagePublisher::FTP_QUEUE,
+ MessagePublisher::VALIDATION_REMINDER_TYPE => MessagePublisher::VALIDATION_REMINDER_QUEUE,
];
// the corresponding worker queues and retry queues, loop queue
@@ -46,7 +47,8 @@ class AMQPConnection
MessagePublisher::CREATE_RECORD_QUEUE => MessagePublisher::RETRY_CREATE_RECORD_QUEUE,
MessagePublisher::POPULATE_INDEX_QUEUE => MessagePublisher::RETRY_POPULATE_INDEX_QUEUE,
MessagePublisher::PULL_QUEUE => MessagePublisher::LOOP_PULL_QUEUE,
- MessagePublisher::FTP_QUEUE => MessagePublisher::RETRY_FTP_QUEUE
+ MessagePublisher::FTP_QUEUE => MessagePublisher::RETRY_FTP_QUEUE,
+ MessagePublisher::VALIDATION_REMINDER_QUEUE => MessagePublisher::LOOP_VALIDATION_REMINDER_QUEUE
];
public static $defaultFailedQueues = [
@@ -65,6 +67,11 @@ class AMQPConnection
MessagePublisher::SUBDEF_QUEUE => MessagePublisher::DELAYED_SUBDEF_QUEUE
];
+ public static $defaultLoopTypes = [
+ MessagePublisher::PULL_ASSETS_TYPE,
+ MessagePublisher::VALIDATION_REMINDER_TYPE
+ ];
+
// default message TTL in retry queue in millisecond
const RETRY_DELAY = 10000;
@@ -271,6 +278,18 @@ class AMQPConnection
isset($config['pull_assets']['pullInterval']) ) {
// convert in milli second
return (int)($config['pull_assets']['pullInterval']) * 1000;
+ } elseif ($routing == MessagePublisher::VALIDATION_REMINDER_QUEUE) {
+
+ if (isset($config['validationReminder']) &&
+ isset($config['validationReminder']['interval'])) {
+
+ // convert in milli second
+ return (int)($config['validationReminder']['interval']) * 1000;
+ }
+
+ // default value to 2 hour if not set
+ return (int) 7200 * 1000;
+
} elseif (isset($config['retry_queue']) &&
isset($config['retry_queue'][array_search($routing, AMQPConnection::$defaultQueues)])) {
diff --git a/lib/Alchemy/Phrasea/WorkerManager/Queue/MessageHandler.php b/lib/Alchemy/Phrasea/WorkerManager/Queue/MessageHandler.php
index b06bbab265..7f13668903 100644
--- a/lib/Alchemy/Phrasea/WorkerManager/Queue/MessageHandler.php
+++ b/lib/Alchemy/Phrasea/WorkerManager/Queue/MessageHandler.php
@@ -4,6 +4,7 @@ namespace Alchemy\Phrasea\WorkerManager\Queue;
use Alchemy\Phrasea\WorkerManager\Worker\ProcessPool;
use Alchemy\Phrasea\WorkerManager\Worker\WorkerInvoker;
+use PhpAmqpLib\Channel\AMQPChannel;
use PhpAmqpLib\Message\AMQPMessage;
use PhpAmqpLib\Wire\AMQPTable;
use Ramsey\Uuid\Uuid;
@@ -61,7 +62,7 @@ class MessageHandler
}
// if message is yet executed 3 times, save the unprocessed message in the corresponding failed queues
- if ($count > self::MAX_OF_TRY && $data['message_type'] != MessagePublisher::PULL_ASSETS_TYPE) {
+ if ($count > self::MAX_OF_TRY && !in_array($data['message_type'], AMQPConnection::$defaultLoopTypes)) {
$this->messagePublisher->publishFailedMessage($data['payload'], $headers, AMQPConnection::$defaultFailedQueues[$data['message_type']]);
$logMessage = sprintf("Rabbit message executed 3 times, it's to be saved in %s , payload >>> %s",
@@ -75,8 +76,8 @@ class MessageHandler
try {
$workerInvoker->invokeWorker($data['message_type'], json_encode($data['payload']));
- if ($data['message_type'] == MessagePublisher::PULL_ASSETS_TYPE) {
- // make a loop for the pull assets
+ if (in_array($data['message_type'], AMQPConnection::$defaultLoopTypes)) {
+ // make a loop for the loop type
$channel->basic_nack($message->delivery_info['delivery_tag']);
} else {
$channel->basic_ack($message->delivery_info['delivery_tag']);
@@ -101,19 +102,26 @@ class MessageHandler
foreach (AMQPConnection::$defaultQueues as $queueName) {
if ($argQueueName ) {
if (in_array($queueName, $argQueueName)) {
- $serverConnection->setQueue($queueName);
-
- // give prefetch message to a worker consumer at a time
- $channel->basic_qos(null, $prefetchCount, null);
- $channel->basic_consume($queueName, Uuid::uuid4(), false, false, false, false, $callback);
+ $this->runConsumer($queueName, $serverConnection, $channel, $prefetchCount, $callback);
}
} else {
- $serverConnection->setQueue($queueName);
-
- // give prefetch message to a worker consumer at a time
- $channel->basic_qos(null, $prefetchCount, null);
- $channel->basic_consume($queueName, Uuid::uuid4(), false, false, false, false, $callback);
+ $this->runConsumer($queueName, $serverConnection, $channel, $prefetchCount, $callback);
}
}
}
+
+ private function runConsumer($queueName, AMQPConnection $serverConnection, AMQPChannel $channel, $prefetchCount, $callback)
+ {
+ // initialize validation reminder when starting consumer
+ if ($queueName == MessagePublisher::VALIDATION_REMINDER_QUEUE) {
+ $serverConnection->reinitializeQueue([MessagePublisher::VALIDATION_REMINDER_QUEUE]);
+ $this->messagePublisher->initializeLoopQueue(MessagePublisher::VALIDATION_REMINDER_TYPE);
+ }
+
+ $serverConnection->setQueue($queueName);
+
+ // give prefetch message to a worker consumer at a time
+ $channel->basic_qos(null, $prefetchCount, null);
+ $channel->basic_consume($queueName, Uuid::uuid4(), false, false, false, false, $callback);
+ }
}
diff --git a/lib/Alchemy/Phrasea/WorkerManager/Queue/MessagePublisher.php b/lib/Alchemy/Phrasea/WorkerManager/Queue/MessagePublisher.php
index cc455c37b7..6abfc198ce 100644
--- a/lib/Alchemy/Phrasea/WorkerManager/Queue/MessagePublisher.php
+++ b/lib/Alchemy/Phrasea/WorkerManager/Queue/MessagePublisher.php
@@ -18,6 +18,7 @@ class MessagePublisher
const POPULATE_INDEX_TYPE = 'populateIndex';
const PULL_ASSETS_TYPE = 'pullAssets';
const SUBDEF_CREATION_TYPE = 'subdefCreation';
+ const VALIDATION_REMINDER_TYPE = 'validationReminder';
const WRITE_METADATAS_TYPE = 'writeMetadatas';
const WEBHOOK_TYPE = 'webhook';
@@ -40,6 +41,7 @@ class MessagePublisher
const POPULATE_INDEX_QUEUE = 'populateindex-queue';
const PULL_QUEUE = 'pull-queue';
const SUBDEF_QUEUE = 'subdef-queue';
+ const VALIDATION_REMINDER_QUEUE = 'validationReminder-queue';
const WEBHOOK_QUEUE = 'webhook-queue';
// retry queue
@@ -53,8 +55,10 @@ class MessagePublisher
const RETRY_SUBDEF_QUEUE = 'retry-subdef-queue';
const RETRY_WEBHOOK_QUEUE = 'retry-webhook-queue';
- // use this queue to make a loop on a consumer
- const LOOP_PULL_QUEUE = 'loop-pull-queue';
+ // use those queue to make a loop on a consumer
+ const LOOP_PULL_QUEUE = 'loop-pull-queue';
+ const LOOP_VALIDATION_REMINDER_QUEUE = 'loop-validationReminder-queue';
+
// all failed queue, if message is treated over 3 times it goes to the failed queue
const FAILED_ASSETS_INGEST_QUEUE = 'failed-ingest-queue';
@@ -126,16 +130,16 @@ class MessagePublisher
return true;
}
- public function initializePullAssets()
+ public function initializeLoopQueue($type)
{
$payload = [
- 'message_type' => self::PULL_ASSETS_TYPE,
+ 'message_type' => $type,
'payload' => [
'initTimestamp' => new \DateTime('now', new \DateTimeZone('UTC'))
]
];
- $this->publishMessage($payload, self::PULL_QUEUE);
+ $this->publishMessage($payload, AMQPConnection::$defaultQueues[$type]);
}
public function connectionClose()
diff --git a/lib/Alchemy/Phrasea/WorkerManager/Worker/ValidationReminderWorker.php b/lib/Alchemy/Phrasea/WorkerManager/Worker/ValidationReminderWorker.php
new file mode 100644
index 0000000000..4801d209d2
--- /dev/null
+++ b/lib/Alchemy/Phrasea/WorkerManager/Worker/ValidationReminderWorker.php
@@ -0,0 +1,193 @@
+app = $app;
+ $this->messagePublisher = $this->app['alchemy_worker.message.publisher'];
+ $this->logger = $this->app['alchemy_worker.logger'];
+ }
+
+ public function process(array $payload)
+ {
+ $this->setDelivererLocator(new LazyLocator($this->app, 'notification.deliverer'));
+
+ $days = (int)$this->getConf()->get(['registry', 'actions', 'validation-reminder-days']);
+
+ $interval = sprintf('P%dD', $days);
+ $now = new DateTime();
+
+ $dateTo = clone($now);
+ try {
+ $dateTo->add(new DateInterval($interval));
+ } catch(\Exception $e) {
+ $this->logger->error(sprintf('