diff --git a/Exceptions/CloudApiQuotaExceeded.php b/Exceptions/CloudApiQuotaExceeded.php
index 00529c33..b5019158 100644
--- a/Exceptions/CloudApiQuotaExceeded.php
+++ b/Exceptions/CloudApiQuotaExceeded.php
@@ -8,6 +8,6 @@ class CloudApiQuotaExceeded extends \RuntimeException
{
public function __construct($limit = 0)
{
- parent::__construct(Piwik::translate('GoogleAnalyticsImporter_CloudRateLimitHelp', [$limit]));
+ parent::__construct(Piwik::translate('GoogleAnalyticsImporter_StatusCloudRateLimitedDescription', [$limit]));
}
}
diff --git a/Google/GoogleGA4ResponseDataTableFactory.php b/Google/GoogleGA4ResponseDataTableFactory.php
index f5a0379b..2f78b842 100644
--- a/Google/GoogleGA4ResponseDataTableFactory.php
+++ b/Google/GoogleGA4ResponseDataTableFactory.php
@@ -64,7 +64,7 @@ public function mergeGaResponse(\Matomo\Dependencies\GoogleAnalyticsImporter\Goo
$gaRowDimensions[] = $dimensionValues[$i]->getValue();
}
foreach (array_values($this->dimensions) as $index => $dimension) {
- $labelValue = $gaRowDimensions[$index] == '(not set)' ? null : $gaRowDimensions[$index];
+ $labelValue = (empty($gaRowDimensions[$index]) || $gaRowDimensions[$index] == '(not set)') ? null : $gaRowDimensions[$index];
$tableRow->setMetadata($dimension, $labelValue);
$label[$dimension] = $labelValue;
}
diff --git a/GoogleAnalyticsImporter.php b/GoogleAnalyticsImporter.php
index a6317afc..187dc8a2 100644
--- a/GoogleAnalyticsImporter.php
+++ b/GoogleAnalyticsImporter.php
@@ -137,6 +137,7 @@ public function getClientSideTranslationKeys(&$translationKeys)
$translationKeys[] = 'GoogleAnalyticsImporter_Start';
$translationKeys[] = 'GoogleAnalyticsImporter_RateLimitHelp';
$translationKeys[] = 'GoogleAnalyticsImporter_CloudRateLimitHelp';
+ $translationKeys[] = 'GoogleAnalyticsImporter_StatusCloudRateLimitedDescription';
$translationKeys[] = 'GoogleAnalyticsImporter_RateLimitHourlyHelp';
$translationKeys[] = 'GoogleAnalyticsImporter_KilledStatusHelp';
$translationKeys[] = 'GoogleAnalyticsImporter_ResumeDesc';
@@ -241,6 +242,7 @@ public function getClientSideTranslationKeys(&$translationKeys)
$translationKeys[] = "ConnectAccounts_OptionQuickConnectWithGa";
$translationKeys[] = "ConnectAccounts_OptionAdvancedConnectWithGa";
}
+ $translationKeys[] = "GoogleAnalyticsImporter_StatusErroredName";
}
public function getJsFiles(&$files)
{
diff --git a/ImportStatus.php b/ImportStatus.php
index 5464232c..a2c9a30d 100644
--- a/ImportStatus.php
+++ b/ImportStatus.php
@@ -269,7 +269,7 @@ private function enrichStatus($status, $checkKilledStatus)
}
if (!empty($status['ga'])) {
if (!empty($status['isGA4'])) {
- $status['gaInfoPretty'] = 'Import Type: GA4' . "\n" . 'Property: ' . $status['ga']['property'] . "\nAccount: " . $status['ga']['account'];
+ $status['gaInfoPretty'] = 'Import Type: GA4' . "\n" . 'Property: ' . str_replace('properties/', '', $status['ga']['property']) . "\nAccount: " . str_replace('accounts/', '', $status['ga']['account']);
if (!empty($status['streamIds'])) {
$status['gaInfoPretty'] .= "\nStreamIds: " . implode(', ', $status['streamIds']);
}
@@ -287,6 +287,45 @@ private function enrichStatus($status, $checkKilledStatus)
) {
$status['status'] = self::STATUS_KILLED;
}
+ $status['statusName'] = isset($status['status']) ? ucwords($status['status']) : '';
+ $status['statusDescription'] = '';
+ $status['errorDescription'] = '';
+ $status['errorCode'] = '';
+ $statuesToPretty = [
+ self::STATUS_ERRORED => Piwik::translate('GoogleAnalyticsImporter_StatusErroredDescription'),
+ self::STATUS_RATE_LIMITED => Piwik::translate('GoogleAnalyticsImporter_StatusRateLimitedDescription'),
+ self::STATUS_FUTURE_DATE_IMPORT_PENDING => Piwik::translate('GoogleAnalyticsImporter_StatusFutureDateImportPendingDescription'),
+ self::STATUS_RATE_LIMITED_HOURLY => Piwik::translate('GoogleAnalyticsImporter_StatusRateLimitedHourlyDescription'),
+ self::STATUS_CLOUD_RATE_LIMITED => $status['error'] ?? '',
+ self::STATUS_KILLED => Piwik::translate('GoogleAnalyticsImporter_StatusKilledDescription'),
+ ];
+ if (!empty($status['status']) && isset($statuesToPretty[$status['status']])) {
+ $status['statusName'] = str_replace(
+ array_keys($statuesToPretty),
+ [
+ Piwik::translate('GoogleAnalyticsImporter_StatusErroredName'),
+ Piwik::translate('GoogleAnalyticsImporter_StatusRateLimitedName'),
+ Piwik::translate('GoogleAnalyticsImporter_StatusFutureDateImportPendingName'),
+ Piwik::translate('GoogleAnalyticsImporter_StatusRateLimitedHourlyName'),
+ Piwik::translate('GoogleAnalyticsImporter_StatusCloudRateLimitedName'),
+ Piwik::translate('GoogleAnalyticsImporter_StatusKilledName'),
+ ],
+ $status['status']
+ );
+ $status['statusDescription'] = $statuesToPretty[$status['status']];
+ if (in_array($status['status'], [self::STATUS_KILLED, self::STATUS_ERRORED]) && !empty($status['error'])) {
+ $msg = str_replace('Error on day (unknown), ', '', $status['error']);
+ $jsonDecoded = json_decode($msg, true);
+ if (is_array($jsonDecoded) && !empty($jsonDecoded['error']['message'])) {
+ $msg = $jsonDecoded['error']['message'];
+ }
+ if (!empty($jsonDecoded['error']['code'])) {
+ $status['errorCode'] = $jsonDecoded['error']['code'];
+ }
+ $status['errorDescription'] = $msg;
+ }
+ }
+
return $status;
}
public static function getEstimatedDaysLeftToFinish($status)
diff --git a/Importers/VisitFrequency/RecordImporterGA4.php b/Importers/VisitFrequency/RecordImporterGA4.php
index 267ef8d7..4a705d47 100644
--- a/Importers/VisitFrequency/RecordImporterGA4.php
+++ b/Importers/VisitFrequency/RecordImporterGA4.php
@@ -21,7 +21,7 @@ class RecordImporterGA4 extends \Piwik\Plugins\GoogleAnalyticsImporter\RecordImp
public const PLUGIN_NAME = 'VisitFrequency';
public function importRecords(Date $day)
{
- $filters = ['dimensionFilter' => ['dimension' => 'newVsReturning', 'filterType' => 'inList', 'filterValue' => ['(not set)', 'returning']]];
+ $filters = ['dimensionFilter' => ['dimension' => 'newVsReturning', 'filterType' => 'inList', 'filterValue' => ['(not set)', '', 'returning']]];
$visitsSummaryRecordImporter = new VisitsSummaryAPI($this->getGaClient(), $this->getIdSite(), $this->getLogger(), null, $filters);
$importer = StaticContainer::get(ImporterGA4::class);
$importer->importDay(new \Piwik\Site($this->getIdSite()), $day, ['VisitsSummary' => $visitsSummaryRecordImporter], API::RETURNING_VISITOR_SEGMENT, 'VisitsSummary');
diff --git a/lang/en.json b/lang/en.json
index 8eb8bdee..dfb649f8 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -157,6 +157,19 @@
"RecommendationTitle": "Import Google Analytics data to Matomo (recommended for you)",
"RecommendationText": "We have detected Google Analytics on your site, so you can set up Matomo by importing your Google Analytics data.",
"RecommendationButton": "Import data",
- "NoteImportNotCountedAsHit": "%1$sNote:%2$s Data imported through the Google Analytics Import does not count towards your hits quota."
+ "NoteImportNotCountedAsHit": "%1$sNote:%2$s Data imported through the Google Analytics Import does not count towards your hits quota.",
+ "StatusErroredName": "Error",
+ "StatusErroredDescription": "An unexpected error occurred. Unexpected errors usually persist during a calendar day, and are automatically resolved the next day. If the error persists, please ask on the Matomo forum or contact the Matomo support team. Providing access to your Google Analytics account to a member of Matomo's support team can help speed up the resolution process.",
+ "StatusRateLimitedName": "Rate limited (daily)",
+ "StatusRateLimitedDescription": "By default, Google limits API requests for each project to 50,000 per day. This import job has exceeded that limit and will resume tomorrow.",
+ "StatusFutureDateImportPendingName": "Up to date",
+ "StatusFutureDateImportPendingDescription": "All available data has been imported. The importer will automatically retry tomorrow to ensure that newly available data is imported.",
+ "StatusRateLimitedHourlyName": "Rate limited (hourly)",
+ "StatusRateLimitedHourlyDescription": "By default, Google limits API requests for each project to 5,000 per hour. This import job has exceeded that limit and will continue after the hourly limit resets.",
+ "StatusCloudRateLimitedName": "Rate limited (account)",
+ "StatusCloudRateLimitedDescription": "Google limits API requests for data imports. This limit is prorated across Matomo cloud customers. For your account, this has been prorated to %1$s requests. You have reached this limit for today, and the importer will automatically retry tomorrow. You can bypass this limit by configuring your Google Analytics import via your Google Analytics account.",
+ "StatusKilledName": "Terminated",
+ "StatusKilledDescription": "The import job was terminated. If you did not initiate this, your host may have restricted long-running PHP processes. The import job will automatically restart within the next hour. If the problem persists, refer to the user guide for more information and workarounds, or contact Matomo support."
+
}
}
diff --git a/tests/Integration/ImportStatusTest.php b/tests/Integration/ImportStatusTest.php
index fee4bc93..ef93b6d6 100644
--- a/tests/Integration/ImportStatusTest.php
+++ b/tests/Integration/ImportStatusTest.php
@@ -357,21 +357,21 @@ public function test_getAllImportStatuses_returnsAllStatuses()
$this->assertEquals([['status' => 'started', 'idSite' => 10, 'ga' => ['property' => 'property3', 'account' => 'account3', 'view' => 'view3', 'import_type' => 'Universal Analytics'], 'last_date_imported' => null, 'import_end_time' => null, 'last_day_archived' => null, 'import_range_start' => null, 'import_range_end' => null, 'extra_custom_dimensions' => [], 'days_finished_since_rate_limit' => 0, 'site' => new Site(10), 'gaInfoPretty' => 'Import Type: Universal Analytics
Property: property3
Account: account3
-View: view3', 'reimport_ranges' => [], 'main_import_progress' => null, 'isGA4' => \false, 'streamIds' => []], ['status' => 'started', 'idSite' => 9, 'ga' => ['property' => 'properties/879821', 'account' => 'account2', 'view' => '', 'import_type' => 'GA4'], 'last_date_imported' => null, 'import_end_time' => null, 'last_day_archived' => null, 'import_range_start' => null, 'import_range_end' => null, 'extra_custom_dimensions' => [], 'days_finished_since_rate_limit' => 0, 'site' => new Site(9), 'gaInfoPretty' => 'Import Type: GA4
-Property: properties/879821
+View: view3', 'reimport_ranges' => [], 'main_import_progress' => null, 'isGA4' => \false, 'streamIds' => [], 'statusName' => 'Started', 'statusDescription' => '', 'errorDescription' => '', 'errorCode' => ''], ['status' => 'started', 'idSite' => 9, 'ga' => ['property' => 'properties/879821', 'account' => 'account2', 'view' => '', 'import_type' => 'GA4'], 'last_date_imported' => null, 'import_end_time' => null, 'last_day_archived' => null, 'import_range_start' => null, 'import_range_end' => null, 'extra_custom_dimensions' => [], 'days_finished_since_rate_limit' => 0, 'site' => new Site(9), 'gaInfoPretty' => 'Import Type: GA4
+Property: 879821
Account: account2
-StreamIds: streamId1, streamId2', 'reimport_ranges' => [], 'main_import_progress' => null, 'isGA4' => \true, 'streamIds' => ['streamId1', 'streamId2']], ['status' => 'started', 'idSite' => 5, 'ga' => ['property' => 'properties/1234', 'account' => 'account', 'view' => '', 'import_type' => 'GA4'], 'last_date_imported' => null, 'import_end_time' => null, 'last_day_archived' => null, 'import_range_start' => null, 'import_range_end' => null, 'extra_custom_dimensions' => [], 'days_finished_since_rate_limit' => 0, 'site' => new Site(5), 'gaInfoPretty' => 'Import Type: GA4
-Property: properties/1234
-Account: account', 'reimport_ranges' => [], 'main_import_progress' => null, 'isGA4' => \true, 'streamIds' => []], ['status' => 'started', 'idSite' => 3, 'ga' => ['property' => 'property3', 'account' => 'account3', 'view' => 'view3', 'import_type' => 'Universal Analytics'], 'last_date_imported' => null, 'import_end_time' => null, 'last_day_archived' => null, 'import_range_start' => null, 'import_range_end' => null, 'extra_custom_dimensions' => [], 'days_finished_since_rate_limit' => 0, 'site' => new Site(3), 'gaInfoPretty' => 'Import Type: Universal Analytics
+StreamIds: streamId1, streamId2', 'reimport_ranges' => [], 'main_import_progress' => null, 'isGA4' => \true, 'streamIds' => ['streamId1', 'streamId2'], 'statusName' => 'Started', 'statusDescription' => '', 'errorDescription' => '', 'errorCode' => ''], ['status' => 'started', 'idSite' => 5, 'ga' => ['property' => 'properties/1234', 'account' => 'account', 'view' => '', 'import_type' => 'GA4'], 'last_date_imported' => null, 'import_end_time' => null, 'last_day_archived' => null, 'import_range_start' => null, 'import_range_end' => null, 'extra_custom_dimensions' => [], 'days_finished_since_rate_limit' => 0, 'site' => new Site(5), 'gaInfoPretty' => 'Import Type: GA4
+Property: 1234
+Account: account', 'reimport_ranges' => [], 'main_import_progress' => null, 'isGA4' => \true, 'streamIds' => [], 'statusName' => 'Started', 'statusDescription' => '', 'errorDescription' => '', 'errorCode' => ''], ['status' => 'started', 'idSite' => 3, 'ga' => ['property' => 'property3', 'account' => 'account3', 'view' => 'view3', 'import_type' => 'Universal Analytics'], 'last_date_imported' => null, 'import_end_time' => null, 'last_day_archived' => null, 'import_range_start' => null, 'import_range_end' => null, 'extra_custom_dimensions' => [], 'days_finished_since_rate_limit' => 0, 'site' => new Site(3), 'gaInfoPretty' => 'Import Type: Universal Analytics
Property: property3
Account: account3
-View: view3', 'reimport_ranges' => [], 'main_import_progress' => null, 'isGA4' => \false, 'streamIds' => []], ['status' => 'started', 'idSite' => 2, 'ga' => ['property' => 'property2', 'account' => 'account2', 'view' => 'view2', 'import_type' => 'Universal Analytics'], 'last_date_imported' => null, 'import_end_time' => null, 'last_day_archived' => null, 'import_range_start' => null, 'import_range_end' => null, 'extra_custom_dimensions' => [], 'days_finished_since_rate_limit' => 0, 'site' => new Site(2), 'gaInfoPretty' => 'Import Type: Universal Analytics
+View: view3', 'reimport_ranges' => [], 'main_import_progress' => null, 'isGA4' => \false, 'streamIds' => [], 'statusName' => 'Started', 'statusDescription' => '', 'errorDescription' => '', 'errorCode' => ''], ['status' => 'started', 'idSite' => 2, 'ga' => ['property' => 'property2', 'account' => 'account2', 'view' => 'view2', 'import_type' => 'Universal Analytics'], 'last_date_imported' => null, 'import_end_time' => null, 'last_day_archived' => null, 'import_range_start' => null, 'import_range_end' => null, 'extra_custom_dimensions' => [], 'days_finished_since_rate_limit' => 0, 'site' => new Site(2), 'gaInfoPretty' => 'Import Type: Universal Analytics
Property: property2
Account: account2
-View: view2', 'reimport_ranges' => [], 'main_import_progress' => null, 'isGA4' => \false, 'streamIds' => []], ['status' => 'started', 'idSite' => 1, 'ga' => ['property' => 'property', 'account' => 'account', 'view' => 'view', 'import_type' => 'Universal Analytics'], 'last_date_imported' => null, 'import_end_time' => null, 'last_day_archived' => null, 'import_range_start' => null, 'import_range_end' => null, 'extra_custom_dimensions' => [], 'days_finished_since_rate_limit' => 0, 'site' => new Site(1), 'gaInfoPretty' => 'Import Type: Universal Analytics
+View: view2', 'reimport_ranges' => [], 'main_import_progress' => null, 'isGA4' => \false, 'streamIds' => [], 'statusName' => 'Started', 'statusDescription' => '', 'errorDescription' => '', 'errorCode' => ''], ['status' => 'started', 'idSite' => 1, 'ga' => ['property' => 'property', 'account' => 'account', 'view' => 'view', 'import_type' => 'Universal Analytics'], 'last_date_imported' => null, 'import_end_time' => null, 'last_day_archived' => null, 'import_range_start' => null, 'import_range_end' => null, 'extra_custom_dimensions' => [], 'days_finished_since_rate_limit' => 0, 'site' => new Site(1), 'gaInfoPretty' => 'Import Type: Universal Analytics
Property: property
Account: account
-View: view', 'reimport_ranges' => [], 'main_import_progress' => null, 'isGA4' => \false, 'streamIds' => []]], $statuses);
+View: view', 'reimport_ranges' => [], 'main_import_progress' => null, 'isGA4' => \false, 'streamIds' => [], 'statusName' => 'Started', 'statusDescription' => '', 'errorDescription' => '', 'errorCode' => '']], $statuses);
}
public function test_getAllImportStatuses_checksKilledStatusIfRequired()
{
@@ -413,23 +413,23 @@ public function test_getAllImportStatuses_checksKilledStatusIfRequired()
$statuses = $this->instance->getAllImportStatuses(\true);
$this->cleanStatuses($statuses);
$this->assertEquals([['status' => 'started', 'idSite' => 6, 'ga' => ['property' => 'properties/6', 'account' => 'account', 'view' => '', 'import_type' => 'GA4'], 'last_date_imported' => null, 'import_end_time' => null, 'last_day_archived' => null, 'import_range_start' => null, 'import_range_end' => null, 'extra_custom_dimensions' => [], 'days_finished_since_rate_limit' => 0, 'site' => new Site(6), 'gaInfoPretty' => 'Import Type: GA4
-Property: properties/6
-Account: account', 'reimport_ranges' => [], 'main_import_progress' => null, 'isGA4' => \true, 'streamIds' => []], ['status' => 'started', 'idSite' => 5, 'ga' => ['property' => 'property5', 'account' => 'account5', 'view' => 'view5', 'import_type' => 'Universal Analytics'], 'last_date_imported' => null, 'import_end_time' => null, 'last_day_archived' => null, 'import_range_start' => null, 'import_range_end' => null, 'extra_custom_dimensions' => [], 'days_finished_since_rate_limit' => 0, 'site' => new Site(5), 'gaInfoPretty' => 'Import Type: Universal Analytics
+Property: 6
+Account: account', 'reimport_ranges' => [], 'main_import_progress' => null, 'isGA4' => \true, 'streamIds' => [], 'statusName' => 'Started', 'statusDescription' => '', 'errorDescription' => '', 'errorCode' => ''], ['status' => 'started', 'idSite' => 5, 'ga' => ['property' => 'property5', 'account' => 'account5', 'view' => 'view5', 'import_type' => 'Universal Analytics'], 'last_date_imported' => null, 'import_end_time' => null, 'last_day_archived' => null, 'import_range_start' => null, 'import_range_end' => null, 'extra_custom_dimensions' => [], 'days_finished_since_rate_limit' => 0, 'site' => new Site(5), 'gaInfoPretty' => 'Import Type: Universal Analytics
Property: property5
Account: account5
-View: view5', 'reimport_ranges' => [], 'main_import_progress' => null, 'isGA4' => \false, 'streamIds' => []], ['status' => 'killed', 'idSite' => 4, 'ga' => ['property' => 'property4', 'account' => 'account4', 'view' => 'view4', 'import_type' => 'Universal Analytics'], 'last_date_imported' => null, 'import_end_time' => null, 'last_day_archived' => null, 'import_range_start' => null, 'import_range_end' => null, 'extra_custom_dimensions' => [], 'days_finished_since_rate_limit' => 0, 'site' => new Site(4), 'gaInfoPretty' => 'Import Type: Universal Analytics
+View: view5', 'reimport_ranges' => [], 'main_import_progress' => null, 'isGA4' => \false, 'streamIds' => [], 'statusName' => 'Started', 'statusDescription' => '', 'errorDescription' => '', 'errorCode' => ''], ['status' => 'killed', 'idSite' => 4, 'ga' => ['property' => 'property4', 'account' => 'account4', 'view' => 'view4', 'import_type' => 'Universal Analytics'], 'last_date_imported' => null, 'import_end_time' => null, 'last_day_archived' => null, 'import_range_start' => null, 'import_range_end' => null, 'extra_custom_dimensions' => [], 'days_finished_since_rate_limit' => 0, 'site' => new Site(4), 'gaInfoPretty' => 'Import Type: Universal Analytics
Property: property4
Account: account4
-View: view4', 'reimport_ranges' => [], 'main_import_progress' => null, 'isGA4' => \false, 'streamIds' => []], ['status' => 'started', 'idSite' => 3, 'ga' => ['property' => 'property3', 'account' => 'account3', 'view' => 'view3', 'import_type' => 'Universal Analytics'], 'last_date_imported' => null, 'import_end_time' => null, 'last_day_archived' => null, 'import_range_start' => null, 'import_range_end' => null, 'extra_custom_dimensions' => [], 'days_finished_since_rate_limit' => 0, 'site' => new Site(3), 'gaInfoPretty' => 'Import Type: Universal Analytics
+View: view4', 'reimport_ranges' => [], 'main_import_progress' => null, 'isGA4' => \false, 'streamIds' => [], 'statusName' => 'GoogleAnalyticsImporter_StatusKilledName', 'statusDescription' => 'GoogleAnalyticsImporter_StatusKilledDescription', 'errorDescription' => '', 'errorCode' => ''], ['status' => 'started', 'idSite' => 3, 'ga' => ['property' => 'property3', 'account' => 'account3', 'view' => 'view3', 'import_type' => 'Universal Analytics'], 'last_date_imported' => null, 'import_end_time' => null, 'last_day_archived' => null, 'import_range_start' => null, 'import_range_end' => null, 'extra_custom_dimensions' => [], 'days_finished_since_rate_limit' => 0, 'site' => new Site(3), 'gaInfoPretty' => 'Import Type: Universal Analytics
Property: property3
Account: account3
-View: view3', 'reimport_ranges' => [], 'main_import_progress' => null, 'isGA4' => \false, 'streamIds' => []], ['status' => 'killed', 'idSite' => 2, 'ga' => ['property' => 'property2', 'account' => 'account2', 'view' => 'view2', 'import_type' => 'Universal Analytics'], 'last_date_imported' => null, 'import_end_time' => null, 'last_day_archived' => null, 'import_range_start' => null, 'import_range_end' => null, 'extra_custom_dimensions' => [], 'days_finished_since_rate_limit' => 0, 'site' => new Site(2), 'gaInfoPretty' => 'Import Type: Universal Analytics
+View: view3', 'reimport_ranges' => [], 'main_import_progress' => null, 'isGA4' => \false, 'streamIds' => [], 'statusName' => 'Started', 'statusDescription' => '', 'errorDescription' => '', 'errorCode' => ''], ['status' => 'killed', 'idSite' => 2, 'ga' => ['property' => 'property2', 'account' => 'account2', 'view' => 'view2', 'import_type' => 'Universal Analytics'], 'last_date_imported' => null, 'import_end_time' => null, 'last_day_archived' => null, 'import_range_start' => null, 'import_range_end' => null, 'extra_custom_dimensions' => [], 'days_finished_since_rate_limit' => 0, 'site' => new Site(2), 'gaInfoPretty' => 'Import Type: Universal Analytics
Property: property2
Account: account2
-View: view2', 'reimport_ranges' => [], 'main_import_progress' => null, 'isGA4' => \false, 'streamIds' => []], ['status' => 'killed', 'idSite' => 1, 'ga' => ['property' => 'property', 'account' => 'account', 'view' => 'view', 'import_type' => 'Universal Analytics'], 'last_date_imported' => null, 'import_end_time' => null, 'last_day_archived' => null, 'import_range_start' => null, 'import_range_end' => null, 'extra_custom_dimensions' => [], 'days_finished_since_rate_limit' => 0, 'site' => new Site(1), 'gaInfoPretty' => 'Import Type: Universal Analytics
+View: view2', 'reimport_ranges' => [], 'main_import_progress' => null, 'isGA4' => \false, 'streamIds' => [], 'statusName' => 'GoogleAnalyticsImporter_StatusKilledName', 'statusDescription' => 'GoogleAnalyticsImporter_StatusKilledDescription', 'errorDescription' => '', 'errorCode' => ''], ['status' => 'killed', 'idSite' => 1, 'ga' => ['property' => 'property', 'account' => 'account', 'view' => 'view', 'import_type' => 'Universal Analytics'], 'last_date_imported' => null, 'import_end_time' => null, 'last_day_archived' => null, 'import_range_start' => null, 'import_range_end' => null, 'extra_custom_dimensions' => [], 'days_finished_since_rate_limit' => 0, 'site' => new Site(1), 'gaInfoPretty' => 'Import Type: Universal Analytics
Property: property
Account: account
-View: view', 'reimport_ranges' => [], 'main_import_progress' => null, 'isGA4' => \false, 'streamIds' => []]], $statuses);
+View: view', 'reimport_ranges' => [], 'main_import_progress' => null, 'isGA4' => \false, 'streamIds' => [], 'statusName' => 'GoogleAnalyticsImporter_StatusKilledName', 'statusDescription' => 'GoogleAnalyticsImporter_StatusKilledDescription', 'errorDescription' => '', 'errorCode' => '']], $statuses);
}
public function test_reImportDateRange_throwsIfRangeIsInvalid()
{
diff --git a/tests/UI/expected-ui-screenshots/GoogleAnalyticsImporterGA4_errored_import.png b/tests/UI/expected-ui-screenshots/GoogleAnalyticsImporterGA4_errored_import.png
index ba482d86..5cabdbf5 100644
Binary files a/tests/UI/expected-ui-screenshots/GoogleAnalyticsImporterGA4_errored_import.png and b/tests/UI/expected-ui-screenshots/GoogleAnalyticsImporterGA4_errored_import.png differ
diff --git a/tests/UI/expected-ui-screenshots/GoogleAnalyticsImporterGA4_finished_import.png b/tests/UI/expected-ui-screenshots/GoogleAnalyticsImporterGA4_finished_import.png
index 6854d72c..07d3ce1c 100644
Binary files a/tests/UI/expected-ui-screenshots/GoogleAnalyticsImporterGA4_finished_import.png and b/tests/UI/expected-ui-screenshots/GoogleAnalyticsImporterGA4_finished_import.png differ
diff --git a/tests/UI/expected-ui-screenshots/GoogleAnalyticsImporterGA4_reimport_range.png b/tests/UI/expected-ui-screenshots/GoogleAnalyticsImporterGA4_reimport_range.png
index 65c5d218..e0531a39 100644
Binary files a/tests/UI/expected-ui-screenshots/GoogleAnalyticsImporterGA4_reimport_range.png and b/tests/UI/expected-ui-screenshots/GoogleAnalyticsImporterGA4_reimport_range.png differ
diff --git a/tests/UI/expected-ui-screenshots/GoogleAnalyticsImporterGA4_resumed_import.png b/tests/UI/expected-ui-screenshots/GoogleAnalyticsImporterGA4_resumed_import.png
index 508c768c..920fb5f5 100644
Binary files a/tests/UI/expected-ui-screenshots/GoogleAnalyticsImporterGA4_resumed_import.png and b/tests/UI/expected-ui-screenshots/GoogleAnalyticsImporterGA4_resumed_import.png differ
diff --git a/tests/UI/expected-ui-screenshots/GoogleAnalyticsImporterGA4_start_import.png b/tests/UI/expected-ui-screenshots/GoogleAnalyticsImporterGA4_start_import.png
index a94abdad..3f3cf75a 100644
Binary files a/tests/UI/expected-ui-screenshots/GoogleAnalyticsImporterGA4_start_import.png and b/tests/UI/expected-ui-screenshots/GoogleAnalyticsImporterGA4_start_import.png differ
diff --git a/tests/resources/capturedresponses-ga4.log b/tests/resources/capturedresponses-ga4.log
index 328c2342..60c81deb 100644
--- a/tests/resources/capturedresponses-ga4.log
+++ b/tests/resources/capturedresponses-ga4.log
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:7217d0901710cd95063e28b25d98023f50a59a28a932d0cf73c3c2def04779d7
-size 40423959
+oid sha256:73ea95515a34658c0855675964625c908db070dbdc3eab17ef33b29492108ea8
+size 40423984
diff --git a/vue/dist/GoogleAnalyticsImporter.umd.js b/vue/dist/GoogleAnalyticsImporter.umd.js
index b0685f0d..7e3796de 100644
--- a/vue/dist/GoogleAnalyticsImporter.umd.js
+++ b/vue/dist/GoogleAnalyticsImporter.umd.js
@@ -562,155 +562,113 @@ function ImportStatusvue_type_template_id_985a7fca_render(_ctx, _cache, $props,
}
// CONCATENATED MODULE: ./plugins/GoogleAnalyticsImporter/vue/src/ImportStatus/ImportStatus.vue?vue&type=template&id=985a7fca
-// CONCATENATED MODULE: ./node_modules/@vue/cli-plugin-babel/node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/@vue/cli-plugin-babel/node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist/templateLoader.js??ref--6!./node_modules/@vue/cli-service/node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist??ref--0-1!./plugins/GoogleAnalyticsImporter/vue/src/ImportStatus/ImportStatusRow.vue?vue&type=template&id=68a359df
+// CONCATENATED MODULE: ./node_modules/@vue/cli-plugin-babel/node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/@vue/cli-plugin-babel/node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist/templateLoader.js??ref--6!./node_modules/@vue/cli-service/node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist??ref--0-1!./plugins/GoogleAnalyticsImporter/vue/src/ImportStatus/ImportStatusRow.vue?vue&type=template&id=7ef1732e
-var ImportStatusRowvue_type_template_id_68a359df_hoisted_1 = ["data-idsite"];
-var ImportStatusRowvue_type_template_id_68a359df_hoisted_2 = {
+var ImportStatusRowvue_type_template_id_7ef1732e_hoisted_1 = ["data-idsite"];
+var ImportStatusRowvue_type_template_id_7ef1732e_hoisted_2 = {
class: "sitename"
};
-var ImportStatusRowvue_type_template_id_68a359df_hoisted_3 = ["href"];
-var ImportStatusRowvue_type_template_id_68a359df_hoisted_4 = {
+var ImportStatusRowvue_type_template_id_7ef1732e_hoisted_3 = ["href"];
+var ImportStatusRowvue_type_template_id_7ef1732e_hoisted_4 = {
key: 1,
style: {
"text-transform": "uppercase"
}
};
-var ImportStatusRowvue_type_template_id_68a359df_hoisted_5 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("br", null, null, -1);
+var ImportStatusRowvue_type_template_id_7ef1732e_hoisted_5 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("br", null, null, -1);
-var ImportStatusRowvue_type_template_id_68a359df_hoisted_6 = ["innerHTML"];
-var ImportStatusRowvue_type_template_id_68a359df_hoisted_7 = {
+var ImportStatusRowvue_type_template_id_7ef1732e_hoisted_6 = ["innerHTML"];
+var ImportStatusRowvue_type_template_id_7ef1732e_hoisted_7 = {
class: "status"
};
-var ImportStatusRowvue_type_template_id_68a359df_hoisted_8 = {
- key: 0
+var ImportStatusRowvue_type_template_id_7ef1732e_hoisted_8 = ["title"];
+var ImportStatusRowvue_type_template_id_7ef1732e_hoisted_9 = {
+ key: 1,
+ style: {
+ "word-wrap": "break-word"
+ }
};
-var ImportStatusRowvue_type_template_id_68a359df_hoisted_9 = ["title"];
-var ImportStatusRowvue_type_template_id_68a359df_hoisted_10 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("br", null, null, -1);
+var ImportStatusRowvue_type_template_id_7ef1732e_hoisted_10 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("br", null, null, -1);
var _hoisted_11 = {
key: 0
};
var _hoisted_12 = {
- key: 1
-};
-var _hoisted_13 = ["title"];
-
-var _hoisted_14 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("br", null, null, -1);
-
-var _hoisted_15 = {
- key: 0
-};
-var _hoisted_16 = {
- key: 2
-};
-var _hoisted_17 = ["title"];
-var _hoisted_18 = {
- key: 3
-};
-var _hoisted_19 = ["title"];
-var _hoisted_20 = {
- key: 4
-};
-
-var _hoisted_21 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("br", null, null, -1);
-
-var _hoisted_22 = ["innerHTML"];
-var _hoisted_23 = {
- key: 5
-};
-var _hoisted_24 = ["title"];
-
-var _hoisted_25 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("br", null, null, -1);
-
-var _hoisted_26 = {
class: "last-date-imported"
};
-var _hoisted_27 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("br", null, null, -1);
+var _hoisted_13 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("br", null, null, -1);
-var _hoisted_28 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("br", null, null, -1);
+var _hoisted_14 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("br", null, null, -1);
-var _hoisted_29 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("br", null, null, -1);
+var _hoisted_15 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("br", null, null, -1);
-var _hoisted_30 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("br", null, null, -1);
+var _hoisted_16 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("br", null, null, -1);
-var _hoisted_31 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("br", null, null, -1);
+var _hoisted_17 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("br", null, null, -1);
-var _hoisted_32 = {
+var _hoisted_18 = {
key: 0
};
-var _hoisted_33 = {
+var _hoisted_19 = {
class: "scheduled-reimports"
};
-var _hoisted_34 = {
+var _hoisted_20 = {
key: 0
};
-var _hoisted_35 = {
+var _hoisted_21 = {
key: 1
};
-var _hoisted_36 = {
+var _hoisted_22 = {
class: "import-start-finish-times"
};
-var _hoisted_37 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("br", null, null, -1);
+var _hoisted_23 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("br", null, null, -1);
-var _hoisted_38 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("br", null, null, -1);
+var _hoisted_24 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("br", null, null, -1);
-var _hoisted_39 = {
+var _hoisted_25 = {
key: 0
};
-var _hoisted_40 = {
+var _hoisted_26 = {
key: 1
};
-var _hoisted_41 = {
+var _hoisted_27 = {
key: 0
};
-var _hoisted_42 = {
+var _hoisted_28 = {
key: 1
};
-var _hoisted_43 = {
+var _hoisted_29 = {
key: 2
};
-var _hoisted_44 = {
+var _hoisted_30 = {
key: 3
};
-var _hoisted_45 = {
+var _hoisted_31 = {
class: "actions"
};
-var _hoisted_46 = ["title"];
-var _hoisted_47 = ["title"];
-function ImportStatusRowvue_type_template_id_68a359df_render(_ctx, _cache, $props, $setup, $data, $options) {
+var _hoisted_32 = ["title"];
+var _hoisted_33 = ["title"];
+function ImportStatusRowvue_type_template_id_7ef1732e_render(_ctx, _cache, $props, $setup, $data, $options) {
var _ctx$status$reimport_;
return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("tr", {
"data-idsite": _ctx.status.idSite
- }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("td", ImportStatusRowvue_type_template_id_68a359df_hoisted_2, [_ctx.status.site ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("a", {
+ }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("td", ImportStatusRowvue_type_template_id_7ef1732e_hoisted_2, [_ctx.status.site ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("a", {
key: 0,
target: "_blank",
href: _ctx.siteUrl
- }, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.siteName), 9, ImportStatusRowvue_type_template_id_68a359df_hoisted_3)) : (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", ImportStatusRowvue_type_template_id_68a359df_hoisted_4, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_SiteDeleted')), 1)), ImportStatusRowvue_type_template_id_68a359df_hoisted_5, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(" " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_SiteID')) + ": " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.status.idSite), 1)]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("td", {
+ }, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.siteName), 9, ImportStatusRowvue_type_template_id_7ef1732e_hoisted_3)) : (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", ImportStatusRowvue_type_template_id_7ef1732e_hoisted_4, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_SiteDeleted')), 1)), ImportStatusRowvue_type_template_id_7ef1732e_hoisted_5, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(" " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_SiteID')) + ": " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.status.idSite), 1)]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("td", {
class: "ga-info",
innerHTML: _ctx.$sanitize(_ctx.gaInfoPretty)
- }, null, 8, ImportStatusRowvue_type_template_id_68a359df_hoisted_6), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("td", ImportStatusRowvue_type_template_id_68a359df_hoisted_7, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.status.status) + " ", 1), _ctx.status.status === 'rate_limited' ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", ImportStatusRowvue_type_template_id_68a359df_hoisted_8, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", {
- class: "icon icon-help",
- title: _ctx.translate('GoogleAnalyticsImporter_RateLimitHelp')
- }, null, 8, ImportStatusRowvue_type_template_id_68a359df_hoisted_9), ImportStatusRowvue_type_template_id_68a359df_hoisted_10, _ctx.status.days_finished_since_rate_limit ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", _hoisted_11, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_FinishedImportingDaysWaiting', _ctx.status.days_finished_since_rate_limit)), 1)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), _ctx.status.status === 'cloud_rate_limited' ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", _hoisted_12, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", {
- class: "icon icon-help",
- title: _ctx.status.error
- }, null, 8, _hoisted_13), _hoisted_14, _ctx.status.days_finished_since_rate_limit ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", _hoisted_15, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_FinishedImportingDaysWaiting', _ctx.status.days_finished_since_rate_limit)), 1)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), _ctx.status.status === 'rate_limited_hourly' ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", _hoisted_16, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", {
- class: "icon icon-help",
- title: _ctx.translate('GoogleAnalyticsImporter_RateLimitHourlyHelp')
- }, null, 8, _hoisted_17)])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), _ctx.status.status === 'future_date_import_pending' ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", _hoisted_18, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", {
- class: "icon icon-help",
- title: _ctx.translate('GoogleAnalyticsImporter_FutureDateHelp', _ctx.status.future_resume_date)
- }, null, 8, _hoisted_19)])) : _ctx.status.status === 'errored' ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", _hoisted_20, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_ErrorMessage')) + ": " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.status.error || 'no message') + " ", 1), _hoisted_21, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", {
- innerHTML: _ctx.$sanitize(_ctx.errorMessageBugReportRequest)
- }, null, 8, _hoisted_22)])) : _ctx.status.status === 'killed' ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", _hoisted_23, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", {
+ }, null, 8, ImportStatusRowvue_type_template_id_7ef1732e_hoisted_6), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("td", ImportStatusRowvue_type_template_id_7ef1732e_hoisted_7, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.status.statusName) + " ", 1), _ctx.status.statusDescription ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", {
+ key: 0,
class: "icon icon-help",
- title: _ctx.translate('GoogleAnalyticsImporter_KilledStatusHelp')
- }, null, 8, _hoisted_24), _hoisted_25, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(" " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_ErrorMessage')) + ": " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.status.error || 'no message'), 1)])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("td", _hoisted_26, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", null, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_LastDayImported')) + ": " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.status.last_date_imported || _ctx.noneText), 1), _hoisted_27, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(" " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_LastDayArchived')) + ": " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.status.last_day_archived || _ctx.noneText), 1), _hoisted_28, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(" " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_ImportStartDate')) + ": " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.status.import_range_start || _ctx.websiteCreationTime) + " ", 1), _hoisted_29, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(" " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_ImportEndDate')) + ": " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.status.import_range_end || _ctx.noneText) + " ", 1), _hoisted_30, _hoisted_31]), _ctx.status.status !== 'finished' ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", _hoisted_32, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("a", {
+ title: _ctx.status.statusDescription
+ }, null, 8, ImportStatusRowvue_type_template_id_7ef1732e_hoisted_8)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), _ctx.status.errorDescription ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", ImportStatusRowvue_type_template_id_7ef1732e_hoisted_9, [ImportStatusRowvue_type_template_id_7ef1732e_hoisted_10, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(" " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_StatusErroredName')), 1), _ctx.status.errorCode ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", _hoisted_11, " " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.status.errorCode), 1)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(": " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.status.errorDescription), 1)])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("td", _hoisted_12, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", null, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_LastDayImported')) + ": " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.status.last_date_imported || _ctx.noneText), 1), _hoisted_13, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(" " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_LastDayArchived')) + ": " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.status.last_day_archived || _ctx.noneText), 1), _hoisted_14, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(" " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_ImportStartDate')) + ": " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.status.import_range_start || _ctx.websiteCreationTime) + " ", 1), _hoisted_15, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(" " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_ImportEndDate')) + ": " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.status.import_range_end || _ctx.noneText) + " ", 1), _hoisted_16, _hoisted_17]), _ctx.status.status !== 'finished' ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", _hoisted_18, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("a", {
class: "edit-import-end-link table-command-link",
href: "",
onClick: _cache[0] || (_cache[0] = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withModifiers"])(function ($event) {
@@ -724,11 +682,11 @@ function ImportStatusRowvue_type_template_id_68a359df_render(_ctx, _cache, $prop
onClick: _cache[1] || (_cache[1] = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withModifiers"])(function ($event) {
return _ctx.$emit('reimport');
}, ["prevent"]))
- }, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_ReimportDate')), 1)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("td", _hoisted_33, [(_ctx$status$reimport_ = _ctx.status.reimport_ranges) !== null && _ctx$status$reimport_ !== void 0 && _ctx$status$reimport_.length ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("ul", _hoisted_34, [(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(true), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])(external_commonjs_vue_commonjs2_vue_root_Vue_["Fragment"], null, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["renderList"])(_ctx.status.reimport_ranges, function (entry, index) {
+ }, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_ReimportDate')), 1)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("td", _hoisted_19, [(_ctx$status$reimport_ = _ctx.status.reimport_ranges) !== null && _ctx$status$reimport_ !== void 0 && _ctx$status$reimport_.length ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("ul", _hoisted_20, [(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(true), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])(external_commonjs_vue_commonjs2_vue_root_Vue_["Fragment"], null, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["renderList"])(_ctx.status.reimport_ranges, function (entry, index) {
return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("li", {
key: index
}, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(entry[0]) + "," + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(entry[1]), 1);
- }), 128))])) : (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", _hoisted_35, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_None')), 1))]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("td", _hoisted_36, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_ImportStartTime')) + ": " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.status.import_start_time || _ctx.noneText), 1), _hoisted_37, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(" " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_LastResumeTime')) + ": " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.status.last_job_start_time || _ctx.noneText), 1), _hoisted_38, _ctx.status.status === 'finished' ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", _hoisted_39, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_TimeFinished')) + ": " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.status.import_end_time || _ctx.noneText), 1)) : _ctx.status.estimated_days_left_to_finish ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", _hoisted_40, [_ctx.thisJobShouldFinishToday ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", _hoisted_41, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_ThisJobShouldFinishToday')), 1)) : (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", _hoisted_42, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_EstimatedFinishIn', _ctx.status.estimated_days_left_to_finish)), 1))])) : _ctx.status.import_range_end ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", _hoisted_43, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_JobWillRunUntilManuallyCancelled')), 1)) : (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", _hoisted_44, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('General_Unknown')), 1))]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("td", _hoisted_45, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("a", {
+ }), 128))])) : (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", _hoisted_21, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_None')), 1))]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("td", _hoisted_22, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_ImportStartTime')) + ": " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.status.import_start_time || _ctx.noneText), 1), _hoisted_23, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(" " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_LastResumeTime')) + ": " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.status.last_job_start_time || _ctx.noneText), 1), _hoisted_24, _ctx.status.status === 'finished' ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", _hoisted_25, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_TimeFinished')) + ": " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.status.import_end_time || _ctx.noneText), 1)) : _ctx.status.estimated_days_left_to_finish ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", _hoisted_26, [_ctx.thisJobShouldFinishToday ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", _hoisted_27, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_ThisJobShouldFinishToday')), 1)) : (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", _hoisted_28, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_EstimatedFinishIn', _ctx.status.estimated_days_left_to_finish)), 1))])) : _ctx.status.import_range_end ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", _hoisted_29, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_JobWillRunUntilManuallyCancelled')), 1)) : (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", _hoisted_30, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('General_Unknown')), 1))]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("td", _hoisted_31, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("a", {
class: Object(external_commonjs_vue_commonjs2_vue_root_Vue_["normalizeClass"])(["table-action", {
'icon-delete': _ctx.isDone,
'icon-close': !_ctx.isDone
@@ -739,16 +697,16 @@ function ImportStatusRowvue_type_template_id_68a359df_render(_ctx, _cache, $prop
});
}, ["prevent"])),
title: _ctx.isDone ? _ctx.translate('General_Remove') : _ctx.translate('General_Cancel')
- }, null, 10, _hoisted_46), ['finished', 'ongoing', 'started'].indexOf(_ctx.status.status) === -1 ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("a", {
+ }, null, 10, _hoisted_32), ['finished', 'ongoing', 'started'].indexOf(_ctx.status.status) === -1 ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("a", {
key: 0,
class: "table-action icon-play",
onClick: _cache[3] || (_cache[3] = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withModifiers"])(function ($event) {
return _ctx.$emit('manuallyResume');
}, ["prevent"])),
title: _ctx.translate('GoogleAnalyticsImporter_ResumeDesc')
- }, null, 8, _hoisted_47)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)])], 8, ImportStatusRowvue_type_template_id_68a359df_hoisted_1);
+ }, null, 8, _hoisted_33)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)])], 8, ImportStatusRowvue_type_template_id_7ef1732e_hoisted_1);
}
-// CONCATENATED MODULE: ./plugins/GoogleAnalyticsImporter/vue/src/ImportStatus/ImportStatusRow.vue?vue&type=template&id=68a359df
+// CONCATENATED MODULE: ./plugins/GoogleAnalyticsImporter/vue/src/ImportStatus/ImportStatusRow.vue?vue&type=template&id=7ef1732e
// CONCATENATED MODULE: ./node_modules/@vue/cli-plugin-typescript/node_modules/cache-loader/dist/cjs.js??ref--14-0!./node_modules/babel-loader/lib!./node_modules/@vue/cli-plugin-typescript/node_modules/ts-loader??ref--14-2!./node_modules/@vue/cli-service/node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist??ref--0-1!./plugins/GoogleAnalyticsImporter/vue/src/ImportStatus/ImportStatusRow.vue?vue&type=script&lang=ts
@@ -803,7 +761,7 @@ function ImportStatusRowvue_type_template_id_68a359df_render(_ctx, _cache, $prop
-ImportStatusRowvue_type_script_lang_ts.render = ImportStatusRowvue_type_template_id_68a359df_render
+ImportStatusRowvue_type_script_lang_ts.render = ImportStatusRowvue_type_template_id_7ef1732e_render
/* harmony default export */ var ImportStatusRow = (ImportStatusRowvue_type_script_lang_ts);
// CONCATENATED MODULE: ./node_modules/@vue/cli-plugin-typescript/node_modules/cache-loader/dist/cjs.js??ref--14-0!./node_modules/babel-loader/lib!./node_modules/@vue/cli-plugin-typescript/node_modules/ts-loader??ref--14-2!./node_modules/@vue/cli-service/node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist??ref--0-1!./plugins/GoogleAnalyticsImporter/vue/src/ImportStatus/ImportStatus.vue?vue&type=script&lang=ts
diff --git a/vue/dist/GoogleAnalyticsImporter.umd.min.js b/vue/dist/GoogleAnalyticsImporter.umd.min.js
index 7167218d..9c97bb84 100644
--- a/vue/dist/GoogleAnalyticsImporter.umd.min.js
+++ b/vue/dist/GoogleAnalyticsImporter.umd.min.js
@@ -1,4 +1,4 @@
-(function(e,t){"object"===typeof exports&&"object"===typeof module?module.exports=t(require("CoreHome"),require("vue"),require("CorePluginsAdmin")):"function"===typeof define&&define.amd?define(["CoreHome",,"CorePluginsAdmin"],t):"object"===typeof exports?exports["GoogleAnalyticsImporter"]=t(require("CoreHome"),require("vue"),require("CorePluginsAdmin")):e["GoogleAnalyticsImporter"]=t(e["CoreHome"],e["Vue"],e["CorePluginsAdmin"])})("undefined"!==typeof self?self:this,(function(e,t,n){return function(e){var t={};function n(o){if(t[o])return t[o].exports;var r=t[o]={i:o,l:!1,exports:{}};return e[o].call(r.exports,r,r.exports,n),r.l=!0,r.exports}return n.m=e,n.c=t,n.d=function(e,t,o){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:o})},n.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"===typeof e&&e&&e.__esModule)return e;var o=Object.create(null);if(n.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var r in e)n.d(o,r,function(t){return e[t]}.bind(null,r));return o},n.n=function(e){var t=e&&e.__esModule?function(){return e["default"]}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="plugins/GoogleAnalyticsImporter/vue/dist/",n(n.s="fae3")}({"19dc":function(t,n){t.exports=e},"8bbf":function(e,n){e.exports=t},a5a2:function(e,t){e.exports=n},fae3:function(e,t,n){"use strict";if(n.r(t),n.d(t,"ImportSchedulerGA4",(function(){return I})),n.d(t,"ImportStatus",(function(){return ve})),n.d(t,"ConfigureConnection",(function(){return ct})),n.d(t,"ClientConfig",(function(){return ht})),n.d(t,"AdminPage",(function(){return _t})),n.d(t,"Connect",(function(){return Gt})),"undefined"!==typeof window){var o=window.document.currentScript,r=o&&o.src.match(/(.+\/)[^/]+\.js(\?.*)?$/);r&&(n.p=r[1])}var a=n("19dc"),l=["Transitions.getTransitions","UsersFlow.getUsersFlow","UsersFlow.getUsersFlowPretty","UsersFlow.getInteractionActions"],i=window,c=i.$;a["Matomo"].on("widget:loaded",(function(e){var t=e.parameters,n=e.element,o="".concat(t.module,".").concat(t.action);if(-1!==l.indexOf(o)){var r=a["Matomo"].importedFromGoogleStartDate,i=a["Matomo"].importedFromGoogleEndDate;if(r&&i){r=Object(a["parseDate"])(r),i=Object(a["parseDate"])(i);var s=a["MatomoUrl"].parsed.value.period,m=a["MatomoUrl"].parsed.value.date,u=a["Periods"].parse(s,m).getDateRange(),d=!(r.getTime()>u[1].getTime()||i.getTime()
GoogleAnalyticsImporter_MaxEndDateHelp",this.maxEndDateDesc);return"".concat(e," ").concat(t||"")},timezoneHelp:function(){var e="https://www.php.net/manual/en/timezones.php";return Object(a["translate"])("GoogleAnalyticsImporter_TimezoneGA4Help",''),"")},extraCustomDimensionsHelp:function(){var e="https://ga-dev-tools.web.app/ga4/dimensions-metrics-explorer/";return Object(a["translate"])("GoogleAnalyticsImporter_ExtraCustomDimensionsGA4Help",''),"")},streamIdsFilterHelp:function(){var e="https://matomo.org/faq/what-is-data-stream-in-google-analytics-4/";return Object(a["translate"])("GoogleAnalyticsImporter_StreamIdFilterHelpText",''),"","
","")},forceIgnoreOutOfCustomDimSlotErrorHelp:function(){return Object(a["translate"])("GoogleAnalyticsImporter_ForceCustomDimensionSlotCheckHelp",Object(a["externalLink"])("https://matomo.org/docs/custom-dimensions/"),"")},isVerboseLoggingEnabledHelp:function(){return Object(a["translate"])("GoogleAnalyticsImporter_IsVerboseLoggingEnabledHelp","/path/to/matomo/tmp/logs/","gaimportlog.$idSite.$matomoDomain.log")}}});A.render=h;var I=A,D={ref:"root"},N={class:"entityTable importStatusesTable"},k={class:"modal",id:"openScheduleReimportModal"},E={class:"modal-content"},S={class:"modal-footer"},G={class:"modal",id:"editImportEndDate"},V={class:"modal-content"},_={class:"modal-footer"};function v(e,t,n,o,r,a){var l=Object(s["resolveComponent"])("ImportStatusRow"),i=Object(s["resolveComponent"])("Field"),c=Object(s["resolveDirective"])("tooltips");return Object(s["withDirectives"])((Object(s["openBlock"])(),Object(s["createElementBlock"])("div",D,[Object(s["createElementVNode"])("table",N,[Object(s["createElementVNode"])("thead",null,[Object(s["createElementVNode"])("tr",null,[Object(s["createElementVNode"])("th",null,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_MatomoSite")),1),Object(s["createElementVNode"])("th",null,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_GoogleAnalyticsInfo")),1),Object(s["createElementVNode"])("th",null,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_Status")),1),Object(s["createElementVNode"])("th",null,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_LatestDayProcessed")),1),Object(s["createElementVNode"])("th",null,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_ScheduledReImports")),1),Object(s["createElementVNode"])("th",null,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_StartFinishTimes")),1),Object(s["createElementVNode"])("th",null,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_Actions")),1)])]),Object(s["createElementVNode"])("tbody",null,[(Object(s["openBlock"])(!0),Object(s["createElementBlock"])(s["Fragment"],null,Object(s["renderList"])(e.statuses,(function(t,n){return Object(s["openBlock"])(),Object(s["createBlock"])(l,{status:t,key:n,onEndImport:function(n){return e.showEditImportEndDateModal(t.idSite,t.isGA4)},onReimport:function(n){return e.openScheduleReimportModal(t.idSite,t.isGA4)},onDelete:function(n){return e.deleteImportStatus(t.idSite,n.isDone)},onManuallyResume:function(n){return e.manuallyResume(t.idSite,t.isGA4)}},null,8,["status","onEndImport","onReimport","onDelete","onManuallyResume"])})),128))])]),Object(s["createElementVNode"])("div",k,[Object(s["createElementVNode"])("div",E,[Object(s["createElementVNode"])("h3",null,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_EnterImportDateRange")),1),Object(s["createElementVNode"])("div",null,[Object(s["createVNode"])(i,{name:"re-import-start-date",uicontrol:"text",modelValue:e.reimportStartDate,"onUpdate:modelValue":t[0]||(t[0]=function(t){return e.reimportStartDate=t}),placeholder:"".concat(e.translate("GoogleAnalyticsImporter_StartDate")," (YYYY-MM-DD)")},null,8,["modelValue","placeholder"])]),Object(s["createElementVNode"])("div",null,[Object(s["createVNode"])(i,{name:"re-import-end-date",uicontrol:"text",modelValue:e.reimportEndDate,"onUpdate:modelValue":t[1]||(t[1]=function(t){return e.reimportEndDate=t}),placeholder:"".concat(e.translate("GoogleAnalyticsImporter_EndDate")," (YYYY-MM-DD)")},null,8,["modelValue","placeholder"])])]),Object(s["createElementVNode"])("div",S,[Object(s["createElementVNode"])("a",{id:"scheduleReimportSubmit",href:"",class:"modal-action modal-close btn",onClick:t[2]||(t[2]=Object(s["withModifiers"])((function(t){return e.scheduleReimport()}),["prevent"])),style:{"margin-right":"3.5px"}},Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_Schedule")),1),Object(s["createElementVNode"])("a",{href:"",class:"modal-action modal-close modal-no",onClick:t[3]||(t[3]=Object(s["withModifiers"])((function(){}),["prevent"]))},Object(s["toDisplayString"])(e.translate("General_Cancel")),1)])]),Object(s["createElementVNode"])("div",G,[Object(s["createElementVNode"])("div",V,[Object(s["createElementVNode"])("h3",null,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_EnterImportEndDate")),1),Object(s["createElementVNode"])("p",null,[Object(s["createElementVNode"])("em",null,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_LeaveEmptyToRemove")),1)]),Object(s["createElementVNode"])("div",null,[Object(s["createVNode"])(i,{name:"new-import-end-date",uicontrol:"text",modelValue:e.newImportEndDate,"onUpdate:modelValue":t[4]||(t[4]=function(t){return e.newImportEndDate=t}),placeholder:"".concat(e.translate("GoogleAnalyticsImporter_EndDate")," (YYYY-MM-DD)")},null,8,["modelValue","placeholder"])])]),Object(s["createElementVNode"])("div",_,[Object(s["createElementVNode"])("a",{href:"",class:"modal-action modal-close btn",onClick:t[5]||(t[5]=function(t){return e.changeImportEndDateModal()}),style:{"margin-right":"3.5px"}},Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_Change")),1),Object(s["createElementVNode"])("a",{href:"",class:"modal-action modal-close modal-no",onClick:t[6]||(t[6]=function(t){return e.cancelEditImportEndDateModal()})},Object(s["toDisplayString"])(e.translate("General_Cancel")),1)])])],512)),[[c,{content:e.tooltipContent,delay:500,duration:200}]])}var x=["data-idsite"],B={class:"sitename"},T=["href"],w={key:1,style:{"text-transform":"uppercase"}},M=Object(s["createElementVNode"])("br",null,null,-1),P=["innerHTML"],U={class:"status"},F={key:0},H=["title"],L=Object(s["createElementVNode"])("br",null,null,-1),R={key:0},q={key:1},z=["title"],Y=Object(s["createElementVNode"])("br",null,null,-1),$={key:0},J={key:2},W=["title"],K={key:3},Q=["title"],X={key:4},Z=Object(s["createElementVNode"])("br",null,null,-1),ee=["innerHTML"],te={key:5},ne=["title"],oe=Object(s["createElementVNode"])("br",null,null,-1),re={class:"last-date-imported"},ae=Object(s["createElementVNode"])("br",null,null,-1),le=Object(s["createElementVNode"])("br",null,null,-1),ie=Object(s["createElementVNode"])("br",null,null,-1),ce=Object(s["createElementVNode"])("br",null,null,-1),se=Object(s["createElementVNode"])("br",null,null,-1),me={key:0},ue={class:"scheduled-reimports"},de={key:0},pe={key:1},be={class:"import-start-finish-times"},ge=Object(s["createElementVNode"])("br",null,null,-1),Oe=Object(s["createElementVNode"])("br",null,null,-1),je={key:0},fe={key:1},ye={key:0},he={key:1},Ce={key:2},Ae={key:3},Ie={class:"actions"},De=["title"],Ne=["title"];function ke(e,t,n,o,r,a){var l;return Object(s["openBlock"])(),Object(s["createElementBlock"])("tr",{"data-idsite":e.status.idSite},[Object(s["createElementVNode"])("td",B,[e.status.site?(Object(s["openBlock"])(),Object(s["createElementBlock"])("a",{key:0,target:"_blank",href:e.siteUrl},Object(s["toDisplayString"])(e.siteName),9,T)):(Object(s["openBlock"])(),Object(s["createElementBlock"])("span",w,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_SiteDeleted")),1)),M,Object(s["createTextVNode"])(" "+Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_SiteID"))+": "+Object(s["toDisplayString"])(e.status.idSite),1)]),Object(s["createElementVNode"])("td",{class:"ga-info",innerHTML:e.$sanitize(e.gaInfoPretty)},null,8,P),Object(s["createElementVNode"])("td",U,[Object(s["createTextVNode"])(Object(s["toDisplayString"])(e.status.status)+" ",1),"rate_limited"===e.status.status?(Object(s["openBlock"])(),Object(s["createElementBlock"])("div",F,[Object(s["createElementVNode"])("span",{class:"icon icon-help",title:e.translate("GoogleAnalyticsImporter_RateLimitHelp")},null,8,H),L,e.status.days_finished_since_rate_limit?(Object(s["openBlock"])(),Object(s["createElementBlock"])("span",R,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_FinishedImportingDaysWaiting",e.status.days_finished_since_rate_limit)),1)):Object(s["createCommentVNode"])("",!0)])):Object(s["createCommentVNode"])("",!0),"cloud_rate_limited"===e.status.status?(Object(s["openBlock"])(),Object(s["createElementBlock"])("div",q,[Object(s["createElementVNode"])("span",{class:"icon icon-help",title:e.status.error},null,8,z),Y,e.status.days_finished_since_rate_limit?(Object(s["openBlock"])(),Object(s["createElementBlock"])("span",$,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_FinishedImportingDaysWaiting",e.status.days_finished_since_rate_limit)),1)):Object(s["createCommentVNode"])("",!0)])):Object(s["createCommentVNode"])("",!0),"rate_limited_hourly"===e.status.status?(Object(s["openBlock"])(),Object(s["createElementBlock"])("div",J,[Object(s["createElementVNode"])("span",{class:"icon icon-help",title:e.translate("GoogleAnalyticsImporter_RateLimitHourlyHelp")},null,8,W)])):Object(s["createCommentVNode"])("",!0),"future_date_import_pending"===e.status.status?(Object(s["openBlock"])(),Object(s["createElementBlock"])("div",K,[Object(s["createElementVNode"])("span",{class:"icon icon-help",title:e.translate("GoogleAnalyticsImporter_FutureDateHelp",e.status.future_resume_date)},null,8,Q)])):"errored"===e.status.status?(Object(s["openBlock"])(),Object(s["createElementBlock"])("div",X,[Object(s["createTextVNode"])(Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_ErrorMessage"))+": "+Object(s["toDisplayString"])(e.status.error||"no message")+" ",1),Z,Object(s["createElementVNode"])("span",{innerHTML:e.$sanitize(e.errorMessageBugReportRequest)},null,8,ee)])):"killed"===e.status.status?(Object(s["openBlock"])(),Object(s["createElementBlock"])("div",te,[Object(s["createElementVNode"])("span",{class:"icon icon-help",title:e.translate("GoogleAnalyticsImporter_KilledStatusHelp")},null,8,ne),oe,Object(s["createTextVNode"])(" "+Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_ErrorMessage"))+": "+Object(s["toDisplayString"])(e.status.error||"no message"),1)])):Object(s["createCommentVNode"])("",!0)]),Object(s["createElementVNode"])("td",re,[Object(s["createElementVNode"])("div",null,[Object(s["createTextVNode"])(Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_LastDayImported"))+": "+Object(s["toDisplayString"])(e.status.last_date_imported||e.noneText),1),ae,Object(s["createTextVNode"])(" "+Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_LastDayArchived"))+": "+Object(s["toDisplayString"])(e.status.last_day_archived||e.noneText),1),le,Object(s["createTextVNode"])(" "+Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_ImportStartDate"))+": "+Object(s["toDisplayString"])(e.status.import_range_start||e.websiteCreationTime)+" ",1),ie,Object(s["createTextVNode"])(" "+Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_ImportEndDate"))+": "+Object(s["toDisplayString"])(e.status.import_range_end||e.noneText)+" ",1),ce,se]),"finished"!==e.status.status?(Object(s["openBlock"])(),Object(s["createElementBlock"])("div",me,[Object(s["createElementVNode"])("a",{class:"edit-import-end-link table-command-link",href:"",onClick:t[0]||(t[0]=Object(s["withModifiers"])((function(t){return e.$emit("end-import")}),["prevent"]))},Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_EditEndDate")),1)])):Object(s["createCommentVNode"])("",!0),Object(s["createElementVNode"])("div",null,[e.status.isGA4?(Object(s["openBlock"])(),Object(s["createElementBlock"])("a",{key:0,id:"reimport-date-range",class:"table-command-link",href:"",onClick:t[1]||(t[1]=Object(s["withModifiers"])((function(t){return e.$emit("reimport")}),["prevent"]))},Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_ReimportDate")),1)):Object(s["createCommentVNode"])("",!0)])]),Object(s["createElementVNode"])("td",ue,[null!==(l=e.status.reimport_ranges)&&void 0!==l&&l.length?(Object(s["openBlock"])(),Object(s["createElementBlock"])("ul",de,[(Object(s["openBlock"])(!0),Object(s["createElementBlock"])(s["Fragment"],null,Object(s["renderList"])(e.status.reimport_ranges,(function(e,t){return Object(s["openBlock"])(),Object(s["createElementBlock"])("li",{key:t},Object(s["toDisplayString"])(e[0])+","+Object(s["toDisplayString"])(e[1]),1)})),128))])):(Object(s["openBlock"])(),Object(s["createElementBlock"])("span",pe,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_None")),1))]),Object(s["createElementVNode"])("td",be,[Object(s["createTextVNode"])(Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_ImportStartTime"))+": "+Object(s["toDisplayString"])(e.status.import_start_time||e.noneText),1),ge,Object(s["createTextVNode"])(" "+Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_LastResumeTime"))+": "+Object(s["toDisplayString"])(e.status.last_job_start_time||e.noneText),1),Oe,"finished"===e.status.status?(Object(s["openBlock"])(),Object(s["createElementBlock"])("span",je,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_TimeFinished"))+": "+Object(s["toDisplayString"])(e.status.import_end_time||e.noneText),1)):e.status.estimated_days_left_to_finish?(Object(s["openBlock"])(),Object(s["createElementBlock"])("span",fe,[e.thisJobShouldFinishToday?(Object(s["openBlock"])(),Object(s["createElementBlock"])("span",ye,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_ThisJobShouldFinishToday")),1)):(Object(s["openBlock"])(),Object(s["createElementBlock"])("span",he,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_EstimatedFinishIn",e.status.estimated_days_left_to_finish)),1))])):e.status.import_range_end?(Object(s["openBlock"])(),Object(s["createElementBlock"])("span",Ce,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_JobWillRunUntilManuallyCancelled")),1)):(Object(s["openBlock"])(),Object(s["createElementBlock"])("span",Ae,Object(s["toDisplayString"])(e.translate("General_Unknown")),1))]),Object(s["createElementVNode"])("td",Ie,[Object(s["createElementVNode"])("a",{class:Object(s["normalizeClass"])(["table-action",{"icon-delete":e.isDone,"icon-close":!e.isDone}]),onClick:t[2]||(t[2]=Object(s["withModifiers"])((function(t){return e.$emit("delete",{isDone:e.isDone})}),["prevent"])),title:e.isDone?e.translate("General_Remove"):e.translate("General_Cancel")},null,10,De),-1===["finished","ongoing","started"].indexOf(e.status.status)?(Object(s["openBlock"])(),Object(s["createElementBlock"])("a",{key:0,class:"table-action icon-play",onClick:t[3]||(t[3]=Object(s["withModifiers"])((function(t){return e.$emit("manuallyResume")}),["prevent"])),title:e.translate("GoogleAnalyticsImporter_ResumeDesc")},null,8,Ne)):Object(s["createCommentVNode"])("",!0)])],8,x)}var Ee=Object(s["defineComponent"])({props:{status:{type:Object,required:!0}},emits:["end-import","reimport","delete","manuallyResume"],computed:{isDone:function(){return"finished"===this.status.status},siteUrl:function(){return"?".concat(a["MatomoUrl"].stringify(Object.assign(Object.assign({period:"day",date:"today"},a["MatomoUrl"].urlParsed.value),{},{idSite:this.status.idSite,module:"CoreHome",action:"index"})))},gaInfoPretty:function(){return(this.status.gaInfoPretty||"").replace(/\n/g,"
")},errorMessageBugReportRequest:function(){return Object(a["translate"])("GoogleAnalyticsImporter_ErrorMessageBugReportRequest",Object(a["externalLink"])("https://forum.matomo.org/"),"")},thisJobShouldFinishToday:function(){return 0===this.status.estimated_days_left_to_finish||"0"===this.status.estimated_days_left_to_finish},siteName:function(){var e;return a["Matomo"].helper.htmlDecode(null===(e=this.status.site)||void 0===e?void 0:e.name)},noneText:function(){return Object(a["translate"])("GoogleAnalyticsImporter_None")},websiteCreationTime:function(){return Object(a["translate"])("GoogleAnalyticsImporter_CreationDate")}}});Ee.render=ke;var Se=Ee,Ge=window,Ve=Ge.$,_e=Object(s["defineComponent"])({props:{statuses:{type:Array,required:!0},stopImportNonce:{type:String,required:!0},changeImportEndDateNonce:{type:String,required:!0},resumeImportNonce:{type:String,required:!0},scheduleReImportNonce:{type:String,required:!0}},components:{Field:C["Field"],ImportStatusRow:Se},directives:{Tooltips:a["Tooltips"]},data:function(){return{editImportEndDateIdSite:null,reimportDateRangeIdSite:null,reimportStartDate:"",reimportEndDate:"",newImportEndDate:"",isGA4:!1}},methods:{showEditImportEndDateModal:function(e,t){this.editImportEndDateIdSite=e,this.isGA4=t,Ve("#editImportEndDate").modal({dismissible:!1}).modal("open")},cancelEditImportEndDateModal:function(){this.editImportEndDateIdSite=null,this.isGA4=!1},manuallyResume:function(e,t){return a["AjaxHelper"].post({module:"GoogleAnalyticsImporter",action:"resumeImport",idSite:e,isGA4:t?1:0,nonce:this.resumeImportNonce},{},{withTokenInUrl:!0}).finally((function(){window.location.reload()}))},deleteImportStatus:function(e,t){var n=this;if(t)return a["AjaxHelper"].post({module:"GoogleAnalyticsImporter",action:"deleteImportStatus",idSite:e,nonce:this.stopImportNonce},{},{withTokenInUrl:!0}).finally((function(){window.location.reload()}));a["Matomo"].helper.modalConfirm("#confirmCancelJob",{yes:function(){n.deleteImportStatus(e,!0)}})},openScheduleReimportModal:function(e,t){this.reimportDateRangeIdSite=e,this.isGA4=t,Ve("#openScheduleReimportModal").modal({dismissible:!1}).modal("open")},changeImportEndDateModal:function(){return a["AjaxHelper"].post({module:"GoogleAnalyticsImporter",action:"changeImportEndDate",idSite:this.editImportEndDateIdSite,nonce:this.changeImportEndDateNonce,endDate:this.newImportEndDate},{},{withTokenInUrl:!0}).finally((function(){window.location.reload()}))},scheduleReimport:function(){return a["AjaxHelper"].post({module:"GoogleAnalyticsImporter",action:"scheduleReImport",idSite:this.reimportDateRangeIdSite,startDate:this.reimportStartDate,endDate:this.reimportEndDate,nonce:this.scheduleReImportNonce,isGA4:this.isGA4?1:0},{},{withTokenInUrl:!0}).finally((function(){window.location.reload()}))}},computed:{tooltipContent:function(){return function(){var e=Ve(this).attr("title")||"";return window.vueSanitize(e.replace(/\n/g,"
"))}}}});_e.render=v;var ve=_e,xe={key:0,class:"form-group row"},Be={class:"col s12 m12"},Te=["innerHTML"],we=["innerHTML"],Me=["textContent"],Pe={class:"form-group row"},Ue=["action"],Fe={key:0,type:"hidden",name:"isNoDataPage",value:"1"},He=["value"],Le=["disabled"],Re=Object(s["createElementVNode"])("span",{class:"icon-upload"},null,-1),qe=Object(s["createElementVNode"])("span",{class:"icon-upload"},null,-1),ze={key:1,class:"system-success connected-message-successful"},Ye=Object(s["createElementVNode"])("span",{class:"icon-ok"},null,-1),$e={key:2},Je=["innerHTML"],We=["innerHTML"],Ke=["action"],Qe=["value"],Xe=["disabled","textContent"],Ze={key:0,class:"system-success connected-message-successful"},et=Object(s["createElementVNode"])("span",{class:"icon-ok"},null,-1),tt=["innerHTML"],nt=["textContent"],ot=["innerHTML"],rt=["innerHTML"],at=["textContent"];function lt(e,t,n,o,r,a){return Object(s["openBlock"])(),Object(s["createElementBlock"])(s["Fragment"],null,[e.isNoDataPage?Object(s["createCommentVNode"])("",!0):(Object(s["openBlock"])(),Object(s["createElementBlock"])("div",xe,[Object(s["createElementVNode"])("div",Be,[Object(s["createElementVNode"])("p",null,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_ConfigureTheImporterLabel1")),1),Object(s["createElementVNode"])("p",null,[Object(s["createTextVNode"])(Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_ConfigureTheImporterLabel2"))+" ",1),Object(s["createElementVNode"])("span",{innerHTML:e.$sanitize(e.setupGoogleAnalyticsImportFaq)},null,8,Te)])])])),e.isNoDataPage?(Object(s["openBlock"])(),Object(s["createElementBlock"])("li",{key:1,innerHTML:e.$sanitize(e.getAdvanceConnectStep01Text)},null,8,we)):Object(s["createCommentVNode"])("",!0),(Object(s["openBlock"])(),Object(s["createBlock"])(Object(s["resolveDynamicComponent"])(e.isNoDataPage?"li":"div"),null,{default:Object(s["withCtx"])((function(){return[e.isNoDataPage?(Object(s["openBlock"])(),Object(s["createElementBlock"])("span",{key:0,textContent:Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_GAImportNoDataScreenStep02"))},null,8,Me)):Object(s["createCommentVNode"])("",!0),Object(s["createElementVNode"])("div",Pe,[Object(s["createElementVNode"])("div",{class:Object(s["normalizeClass"])(e.getClass)},[Object(s["createElementVNode"])("form",{id:"configFileUploadForm",action:e.manualActionUrl,method:"POST",enctype:"multipart/form-data"},[Object(s["createElementVNode"])("input",{type:"file",id:"clientfile",name:"clientfile",accept:".json",onChange:t[0]||(t[0]=function(){return e.processFileChange&&e.processFileChange.apply(e,arguments)}),style:{display:"none"}},null,32),e.isNoDataPage?(Object(s["openBlock"])(),Object(s["createElementBlock"])("input",Fe)):Object(s["createCommentVNode"])("",!0),Object(s["createElementVNode"])("input",{type:"hidden",name:"config_nonce",value:e.manualConfigNonce},null,8,He),Object(s["createElementVNode"])("button",{type:"button",class:"btn advance-upload-button",onClick:t[1]||(t[1]=function(t){return e.selectConfigFile()}),disabled:e.isUploadButtonDisabled},[Object(s["withDirectives"])(Object(s["createElementVNode"])("span",null,[Re,Object(s["createTextVNode"])(" "+Object(s["toDisplayString"])(e.translate("General_Upload")),1)],512),[[s["vShow"],!e.isUploadButtonDisabled]]),Object(s["withDirectives"])(Object(s["createElementVNode"])("span",null,[qe,Object(s["createTextVNode"])(" "+Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_Uploading")),1)],512),[[s["vShow"],e.isUploadButtonDisabled]])],8,Le),e.isNoDataPage&&e.hasClientConfiguration?(Object(s["openBlock"])(),Object(s["createElementBlock"])("span",ze,[Ye,Object(s["createTextVNode"])(" "+Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_UploadSuccessful")),1)])):Object(s["createCommentVNode"])("",!0)],8,Ue)],2)])]})),_:1})),e.isNoDataPage?(Object(s["openBlock"])(),Object(s["createElementBlock"])("li",$e,[Object(s["createElementVNode"])("span",{innerHTML:e.$sanitize(e.getAdvanceConnectStep03Text)},null,8,Je),Object(s["createElementVNode"])("div",{class:"complete-note-warning",innerHTML:e.$sanitize(e.getOauthCompleteWarningMessage)},null,8,We),Object(s["createElementVNode"])("form",{target:"_blank",method:"post",action:e.authorizeUrl},[Object(s["createElementVNode"])("input",{type:"hidden",name:"auth_nonce",value:e.forwardToAuthNonce},null,8,Qe),Object(s["createElementVNode"])("button",{disabled:!1===e.hasClientConfiguration,textContent:Object(s["toDisplayString"])(e.getAuthorizeText),type:"submit",class:"btn btn-forward-to-Oauth"},null,8,Xe),e.isNoDataPage&&e.hasClientConfiguration&&e.isConfigured?(Object(s["openBlock"])(),Object(s["createElementBlock"])("span",Ze,[et,Object(s["createTextVNode"])(" "+Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_AccountsConnectedSuccessfully")),1)])):Object(s["createCommentVNode"])("",!0)],8,Ke)])):Object(s["createCommentVNode"])("",!0),e.isNoDataPage?(Object(s["openBlock"])(),Object(s["createElementBlock"])("li",{key:3,innerHTML:e.$sanitize(e.getAdvanceConnectStep04Text)},null,8,tt)):Object(s["createCommentVNode"])("",!0),e.isNoDataPage?(Object(s["openBlock"])(),Object(s["createElementBlock"])("li",{key:4,textContent:Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_GAImportNoDataScreenStep06GA4"))},null,8,nt)):Object(s["createCommentVNode"])("",!0),e.isNoDataPage?(Object(s["openBlock"])(),Object(s["createElementBlock"])("li",{key:5,innerHTML:e.$sanitize(e.getAdvanceConnectStep07Text)},null,8,ot)):Object(s["createCommentVNode"])("",!0),e.isNoDataPage?(Object(s["openBlock"])(),Object(s["createElementBlock"])("li",{key:6,innerHTML:e.$sanitize(e.getAdvanceConnectStep08Text)},null,8,rt)):Object(s["createCommentVNode"])("",!0),e.isNoDataPage?(Object(s["openBlock"])(),Object(s["createElementBlock"])("li",{key:7,textContent:Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_GAImportNoDataScreenStep09"))},null,8,at)):Object(s["createCommentVNode"])("",!0)],64)}var it=Object(s["defineComponent"])({data:function(){return{isSelectingFile:!1,isUploading:!1}},props:{manualConfigNonce:{type:String,required:!0},manualActionUrl:{type:String,required:!0},isNoDataPage:Boolean,hasClientConfiguration:Boolean,indexActionUrl:{type:String,required:!0},authorizeUrl:String,forwardToAuthNonce:String,isConfigured:Boolean},methods:{selectConfigFile:function(){this.isSelectingFile=!0;var e=document.getElementById("clientfile");e&&e.click()},processFileChange:function(){var e=document.getElementById("clientfile"),t=document.getElementById("configFileUploadForm");e&&e.value&&t&&(this.isUploading=!0,t.submit())},checkForCancel:function(){if(this.isSelectingFile&&!this.isUploading){var e=document.getElementById("clientfile");e&&!e.value&&(this.isSelectingFile=!1)}}},computed:{setupGoogleAnalyticsImportFaq:function(){return Object(a["translate"])("GoogleAnalyticsImporter_ConfigureTheImporterLabel3",Object(a["externalLink"])("https://matomo.org/faq/general/set-up-google-analytics-import/"),"")},isUploadButtonDisabled:function(){return this.isSelectingFile||this.isUploading},getAdvanceConnectStep01Text:function(){return this.translate("GoogleAnalyticsImporter_GAImportNoDataScreenStep01",Object(a["externalLink"])("https://matomo.org/faq/general/set-up-google-analytics-import/"),"")},getAdvanceConnectStep03Text:function(){return this.translate("GoogleAnalyticsImporter_GAImportNoDataScreenStep03",this.translate("GoogleAnalyticsImporter_Authorize"))},getAdvanceConnectStep04Text:function(){return this.translate("GoogleAnalyticsImporter_GAImportNoDataScreenStep04",''),"",Object(a["externalLink"])("https://matomo.org/faq/general/running-the-google-analytics-import/"),"")},getAdvanceConnectStep05Text:function(){return this.translate("GoogleAnalyticsImporter_GAImportNoDataScreenStep05",Object(a["externalLink"])(this.indexActionUrl),"")},getAdvanceConnectStep07Text:function(){return"".concat(this.translate("GoogleAnalyticsImporter_GAImportNoDataScreenStep07",this.translate("GoogleAnalyticsImporter_Start")),"
","")},componentExtensions:function(){var e=this.extensions;return Object(s["markRaw"])(e.map((function(e){return Object(a["useExternalPluginComponent"])(e.plugin,e.component)})))},configConnectProps:function(){return this.configureConnectionProps}}});Vt.render=kt;var _t=Vt;
+(function(e,t){"object"===typeof exports&&"object"===typeof module?module.exports=t(require("CoreHome"),require("vue"),require("CorePluginsAdmin")):"function"===typeof define&&define.amd?define(["CoreHome",,"CorePluginsAdmin"],t):"object"===typeof exports?exports["GoogleAnalyticsImporter"]=t(require("CoreHome"),require("vue"),require("CorePluginsAdmin")):e["GoogleAnalyticsImporter"]=t(e["CoreHome"],e["Vue"],e["CorePluginsAdmin"])})("undefined"!==typeof self?self:this,(function(e,t,n){return function(e){var t={};function n(o){if(t[o])return t[o].exports;var r=t[o]={i:o,l:!1,exports:{}};return e[o].call(r.exports,r,r.exports,n),r.l=!0,r.exports}return n.m=e,n.c=t,n.d=function(e,t,o){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:o})},n.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"===typeof e&&e&&e.__esModule)return e;var o=Object.create(null);if(n.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var r in e)n.d(o,r,function(t){return e[t]}.bind(null,r));return o},n.n=function(e){var t=e&&e.__esModule?function(){return e["default"]}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="plugins/GoogleAnalyticsImporter/vue/dist/",n(n.s="fae3")}({"19dc":function(t,n){t.exports=e},"8bbf":function(e,n){e.exports=t},a5a2:function(e,t){e.exports=n},fae3:function(e,t,n){"use strict";if(n.r(t),n.d(t,"ImportSchedulerGA4",(function(){return I})),n.d(t,"ImportStatus",(function(){return fe})),n.d(t,"ConfigureConnection",(function(){return Je})),n.d(t,"ClientConfig",(function(){return lt})),n.d(t,"AdminPage",(function(){return jt})),n.d(t,"Connect",(function(){return bt})),"undefined"!==typeof window){var o=window.document.currentScript,r=o&&o.src.match(/(.+\/)[^/]+\.js(\?.*)?$/);r&&(n.p=r[1])}var a=n("19dc"),l=["Transitions.getTransitions","UsersFlow.getUsersFlow","UsersFlow.getUsersFlowPretty","UsersFlow.getInteractionActions"],i=window,c=i.$;a["Matomo"].on("widget:loaded",(function(e){var t=e.parameters,n=e.element,o="".concat(t.module,".").concat(t.action);if(-1!==l.indexOf(o)){var r=a["Matomo"].importedFromGoogleStartDate,i=a["Matomo"].importedFromGoogleEndDate;if(r&&i){r=Object(a["parseDate"])(r),i=Object(a["parseDate"])(i);var s=a["MatomoUrl"].parsed.value.period,m=a["MatomoUrl"].parsed.value.date,u=a["Periods"].parse(s,m).getDateRange(),d=!(r.getTime()>u[1].getTime()||i.getTime()
GoogleAnalyticsImporter_MaxEndDateHelp",this.maxEndDateDesc);return"".concat(e," ").concat(t||"")},timezoneHelp:function(){var e="https://www.php.net/manual/en/timezones.php";return Object(a["translate"])("GoogleAnalyticsImporter_TimezoneGA4Help",''),"")},extraCustomDimensionsHelp:function(){var e="https://ga-dev-tools.web.app/ga4/dimensions-metrics-explorer/";return Object(a["translate"])("GoogleAnalyticsImporter_ExtraCustomDimensionsGA4Help",''),"")},streamIdsFilterHelp:function(){var e="https://matomo.org/faq/what-is-data-stream-in-google-analytics-4/";return Object(a["translate"])("GoogleAnalyticsImporter_StreamIdFilterHelpText",''),"","
","")},forceIgnoreOutOfCustomDimSlotErrorHelp:function(){return Object(a["translate"])("GoogleAnalyticsImporter_ForceCustomDimensionSlotCheckHelp",Object(a["externalLink"])("https://matomo.org/docs/custom-dimensions/"),"")},isVerboseLoggingEnabledHelp:function(){return Object(a["translate"])("GoogleAnalyticsImporter_IsVerboseLoggingEnabledHelp","/path/to/matomo/tmp/logs/","gaimportlog.$idSite.$matomoDomain.log")}}});A.render=h;var I=A,D={ref:"root"},N={class:"entityTable importStatusesTable"},S={class:"modal",id:"openScheduleReimportModal"},k={class:"modal-content"},E={class:"modal-footer"},G={class:"modal",id:"editImportEndDate"},V={class:"modal-content"},v={class:"modal-footer"};function _(e,t,n,o,r,a){var l=Object(s["resolveComponent"])("ImportStatusRow"),i=Object(s["resolveComponent"])("Field"),c=Object(s["resolveDirective"])("tooltips");return Object(s["withDirectives"])((Object(s["openBlock"])(),Object(s["createElementBlock"])("div",D,[Object(s["createElementVNode"])("table",N,[Object(s["createElementVNode"])("thead",null,[Object(s["createElementVNode"])("tr",null,[Object(s["createElementVNode"])("th",null,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_MatomoSite")),1),Object(s["createElementVNode"])("th",null,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_GoogleAnalyticsInfo")),1),Object(s["createElementVNode"])("th",null,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_Status")),1),Object(s["createElementVNode"])("th",null,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_LatestDayProcessed")),1),Object(s["createElementVNode"])("th",null,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_ScheduledReImports")),1),Object(s["createElementVNode"])("th",null,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_StartFinishTimes")),1),Object(s["createElementVNode"])("th",null,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_Actions")),1)])]),Object(s["createElementVNode"])("tbody",null,[(Object(s["openBlock"])(!0),Object(s["createElementBlock"])(s["Fragment"],null,Object(s["renderList"])(e.statuses,(function(t,n){return Object(s["openBlock"])(),Object(s["createBlock"])(l,{status:t,key:n,onEndImport:function(n){return e.showEditImportEndDateModal(t.idSite,t.isGA4)},onReimport:function(n){return e.openScheduleReimportModal(t.idSite,t.isGA4)},onDelete:function(n){return e.deleteImportStatus(t.idSite,n.isDone)},onManuallyResume:function(n){return e.manuallyResume(t.idSite,t.isGA4)}},null,8,["status","onEndImport","onReimport","onDelete","onManuallyResume"])})),128))])]),Object(s["createElementVNode"])("div",S,[Object(s["createElementVNode"])("div",k,[Object(s["createElementVNode"])("h3",null,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_EnterImportDateRange")),1),Object(s["createElementVNode"])("div",null,[Object(s["createVNode"])(i,{name:"re-import-start-date",uicontrol:"text",modelValue:e.reimportStartDate,"onUpdate:modelValue":t[0]||(t[0]=function(t){return e.reimportStartDate=t}),placeholder:"".concat(e.translate("GoogleAnalyticsImporter_StartDate")," (YYYY-MM-DD)")},null,8,["modelValue","placeholder"])]),Object(s["createElementVNode"])("div",null,[Object(s["createVNode"])(i,{name:"re-import-end-date",uicontrol:"text",modelValue:e.reimportEndDate,"onUpdate:modelValue":t[1]||(t[1]=function(t){return e.reimportEndDate=t}),placeholder:"".concat(e.translate("GoogleAnalyticsImporter_EndDate")," (YYYY-MM-DD)")},null,8,["modelValue","placeholder"])])]),Object(s["createElementVNode"])("div",E,[Object(s["createElementVNode"])("a",{id:"scheduleReimportSubmit",href:"",class:"modal-action modal-close btn",onClick:t[2]||(t[2]=Object(s["withModifiers"])((function(t){return e.scheduleReimport()}),["prevent"])),style:{"margin-right":"3.5px"}},Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_Schedule")),1),Object(s["createElementVNode"])("a",{href:"",class:"modal-action modal-close modal-no",onClick:t[3]||(t[3]=Object(s["withModifiers"])((function(){}),["prevent"]))},Object(s["toDisplayString"])(e.translate("General_Cancel")),1)])]),Object(s["createElementVNode"])("div",G,[Object(s["createElementVNode"])("div",V,[Object(s["createElementVNode"])("h3",null,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_EnterImportEndDate")),1),Object(s["createElementVNode"])("p",null,[Object(s["createElementVNode"])("em",null,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_LeaveEmptyToRemove")),1)]),Object(s["createElementVNode"])("div",null,[Object(s["createVNode"])(i,{name:"new-import-end-date",uicontrol:"text",modelValue:e.newImportEndDate,"onUpdate:modelValue":t[4]||(t[4]=function(t){return e.newImportEndDate=t}),placeholder:"".concat(e.translate("GoogleAnalyticsImporter_EndDate")," (YYYY-MM-DD)")},null,8,["modelValue","placeholder"])])]),Object(s["createElementVNode"])("div",v,[Object(s["createElementVNode"])("a",{href:"",class:"modal-action modal-close btn",onClick:t[5]||(t[5]=function(t){return e.changeImportEndDateModal()}),style:{"margin-right":"3.5px"}},Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_Change")),1),Object(s["createElementVNode"])("a",{href:"",class:"modal-action modal-close modal-no",onClick:t[6]||(t[6]=function(t){return e.cancelEditImportEndDateModal()})},Object(s["toDisplayString"])(e.translate("General_Cancel")),1)])])],512)),[[c,{content:e.tooltipContent,delay:500,duration:200}]])}var x=["data-idsite"],B={class:"sitename"},T=["href"],w={key:1,style:{"text-transform":"uppercase"}},P=Object(s["createElementVNode"])("br",null,null,-1),U=["innerHTML"],M={class:"status"},F=["title"],H={key:1,style:{"word-wrap":"break-word"}},L=Object(s["createElementVNode"])("br",null,null,-1),R={key:0},q={class:"last-date-imported"},z=Object(s["createElementVNode"])("br",null,null,-1),Y=Object(s["createElementVNode"])("br",null,null,-1),$=Object(s["createElementVNode"])("br",null,null,-1),J=Object(s["createElementVNode"])("br",null,null,-1),W=Object(s["createElementVNode"])("br",null,null,-1),K={key:0},Q={class:"scheduled-reimports"},X={key:0},Z={key:1},ee={class:"import-start-finish-times"},te=Object(s["createElementVNode"])("br",null,null,-1),ne=Object(s["createElementVNode"])("br",null,null,-1),oe={key:0},re={key:1},ae={key:0},le={key:1},ie={key:2},ce={key:3},se={class:"actions"},me=["title"],ue=["title"];function de(e,t,n,o,r,a){var l;return Object(s["openBlock"])(),Object(s["createElementBlock"])("tr",{"data-idsite":e.status.idSite},[Object(s["createElementVNode"])("td",B,[e.status.site?(Object(s["openBlock"])(),Object(s["createElementBlock"])("a",{key:0,target:"_blank",href:e.siteUrl},Object(s["toDisplayString"])(e.siteName),9,T)):(Object(s["openBlock"])(),Object(s["createElementBlock"])("span",w,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_SiteDeleted")),1)),P,Object(s["createTextVNode"])(" "+Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_SiteID"))+": "+Object(s["toDisplayString"])(e.status.idSite),1)]),Object(s["createElementVNode"])("td",{class:"ga-info",innerHTML:e.$sanitize(e.gaInfoPretty)},null,8,U),Object(s["createElementVNode"])("td",M,[Object(s["createTextVNode"])(Object(s["toDisplayString"])(e.status.statusName)+" ",1),e.status.statusDescription?(Object(s["openBlock"])(),Object(s["createElementBlock"])("span",{key:0,class:"icon icon-help",title:e.status.statusDescription},null,8,F)):Object(s["createCommentVNode"])("",!0),e.status.errorDescription?(Object(s["openBlock"])(),Object(s["createElementBlock"])("div",H,[L,Object(s["createTextVNode"])(" "+Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_StatusErroredName")),1),e.status.errorCode?(Object(s["openBlock"])(),Object(s["createElementBlock"])("span",R," "+Object(s["toDisplayString"])(e.status.errorCode),1)):Object(s["createCommentVNode"])("",!0),Object(s["createTextVNode"])(": "+Object(s["toDisplayString"])(e.status.errorDescription),1)])):Object(s["createCommentVNode"])("",!0)]),Object(s["createElementVNode"])("td",q,[Object(s["createElementVNode"])("div",null,[Object(s["createTextVNode"])(Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_LastDayImported"))+": "+Object(s["toDisplayString"])(e.status.last_date_imported||e.noneText),1),z,Object(s["createTextVNode"])(" "+Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_LastDayArchived"))+": "+Object(s["toDisplayString"])(e.status.last_day_archived||e.noneText),1),Y,Object(s["createTextVNode"])(" "+Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_ImportStartDate"))+": "+Object(s["toDisplayString"])(e.status.import_range_start||e.websiteCreationTime)+" ",1),$,Object(s["createTextVNode"])(" "+Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_ImportEndDate"))+": "+Object(s["toDisplayString"])(e.status.import_range_end||e.noneText)+" ",1),J,W]),"finished"!==e.status.status?(Object(s["openBlock"])(),Object(s["createElementBlock"])("div",K,[Object(s["createElementVNode"])("a",{class:"edit-import-end-link table-command-link",href:"",onClick:t[0]||(t[0]=Object(s["withModifiers"])((function(t){return e.$emit("end-import")}),["prevent"]))},Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_EditEndDate")),1)])):Object(s["createCommentVNode"])("",!0),Object(s["createElementVNode"])("div",null,[e.status.isGA4?(Object(s["openBlock"])(),Object(s["createElementBlock"])("a",{key:0,id:"reimport-date-range",class:"table-command-link",href:"",onClick:t[1]||(t[1]=Object(s["withModifiers"])((function(t){return e.$emit("reimport")}),["prevent"]))},Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_ReimportDate")),1)):Object(s["createCommentVNode"])("",!0)])]),Object(s["createElementVNode"])("td",Q,[null!==(l=e.status.reimport_ranges)&&void 0!==l&&l.length?(Object(s["openBlock"])(),Object(s["createElementBlock"])("ul",X,[(Object(s["openBlock"])(!0),Object(s["createElementBlock"])(s["Fragment"],null,Object(s["renderList"])(e.status.reimport_ranges,(function(e,t){return Object(s["openBlock"])(),Object(s["createElementBlock"])("li",{key:t},Object(s["toDisplayString"])(e[0])+","+Object(s["toDisplayString"])(e[1]),1)})),128))])):(Object(s["openBlock"])(),Object(s["createElementBlock"])("span",Z,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_None")),1))]),Object(s["createElementVNode"])("td",ee,[Object(s["createTextVNode"])(Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_ImportStartTime"))+": "+Object(s["toDisplayString"])(e.status.import_start_time||e.noneText),1),te,Object(s["createTextVNode"])(" "+Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_LastResumeTime"))+": "+Object(s["toDisplayString"])(e.status.last_job_start_time||e.noneText),1),ne,"finished"===e.status.status?(Object(s["openBlock"])(),Object(s["createElementBlock"])("span",oe,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_TimeFinished"))+": "+Object(s["toDisplayString"])(e.status.import_end_time||e.noneText),1)):e.status.estimated_days_left_to_finish?(Object(s["openBlock"])(),Object(s["createElementBlock"])("span",re,[e.thisJobShouldFinishToday?(Object(s["openBlock"])(),Object(s["createElementBlock"])("span",ae,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_ThisJobShouldFinishToday")),1)):(Object(s["openBlock"])(),Object(s["createElementBlock"])("span",le,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_EstimatedFinishIn",e.status.estimated_days_left_to_finish)),1))])):e.status.import_range_end?(Object(s["openBlock"])(),Object(s["createElementBlock"])("span",ie,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_JobWillRunUntilManuallyCancelled")),1)):(Object(s["openBlock"])(),Object(s["createElementBlock"])("span",ce,Object(s["toDisplayString"])(e.translate("General_Unknown")),1))]),Object(s["createElementVNode"])("td",se,[Object(s["createElementVNode"])("a",{class:Object(s["normalizeClass"])(["table-action",{"icon-delete":e.isDone,"icon-close":!e.isDone}]),onClick:t[2]||(t[2]=Object(s["withModifiers"])((function(t){return e.$emit("delete",{isDone:e.isDone})}),["prevent"])),title:e.isDone?e.translate("General_Remove"):e.translate("General_Cancel")},null,10,me),-1===["finished","ongoing","started"].indexOf(e.status.status)?(Object(s["openBlock"])(),Object(s["createElementBlock"])("a",{key:0,class:"table-action icon-play",onClick:t[3]||(t[3]=Object(s["withModifiers"])((function(t){return e.$emit("manuallyResume")}),["prevent"])),title:e.translate("GoogleAnalyticsImporter_ResumeDesc")},null,8,ue)):Object(s["createCommentVNode"])("",!0)])],8,x)}var pe=Object(s["defineComponent"])({props:{status:{type:Object,required:!0}},emits:["end-import","reimport","delete","manuallyResume"],computed:{isDone:function(){return"finished"===this.status.status},siteUrl:function(){return"?".concat(a["MatomoUrl"].stringify(Object.assign(Object.assign({period:"day",date:"today"},a["MatomoUrl"].urlParsed.value),{},{idSite:this.status.idSite,module:"CoreHome",action:"index"})))},gaInfoPretty:function(){return(this.status.gaInfoPretty||"").replace(/\n/g,"
")},errorMessageBugReportRequest:function(){return Object(a["translate"])("GoogleAnalyticsImporter_ErrorMessageBugReportRequest",Object(a["externalLink"])("https://forum.matomo.org/"),"")},thisJobShouldFinishToday:function(){return 0===this.status.estimated_days_left_to_finish||"0"===this.status.estimated_days_left_to_finish},siteName:function(){var e;return a["Matomo"].helper.htmlDecode(null===(e=this.status.site)||void 0===e?void 0:e.name)},noneText:function(){return Object(a["translate"])("GoogleAnalyticsImporter_None")},websiteCreationTime:function(){return Object(a["translate"])("GoogleAnalyticsImporter_CreationDate")}}});pe.render=de;var ge=pe,be=window,Oe=be.$,je=Object(s["defineComponent"])({props:{statuses:{type:Array,required:!0},stopImportNonce:{type:String,required:!0},changeImportEndDateNonce:{type:String,required:!0},resumeImportNonce:{type:String,required:!0},scheduleReImportNonce:{type:String,required:!0}},components:{Field:C["Field"],ImportStatusRow:ge},directives:{Tooltips:a["Tooltips"]},data:function(){return{editImportEndDateIdSite:null,reimportDateRangeIdSite:null,reimportStartDate:"",reimportEndDate:"",newImportEndDate:"",isGA4:!1}},methods:{showEditImportEndDateModal:function(e,t){this.editImportEndDateIdSite=e,this.isGA4=t,Oe("#editImportEndDate").modal({dismissible:!1}).modal("open")},cancelEditImportEndDateModal:function(){this.editImportEndDateIdSite=null,this.isGA4=!1},manuallyResume:function(e,t){return a["AjaxHelper"].post({module:"GoogleAnalyticsImporter",action:"resumeImport",idSite:e,isGA4:t?1:0,nonce:this.resumeImportNonce},{},{withTokenInUrl:!0}).finally((function(){window.location.reload()}))},deleteImportStatus:function(e,t){var n=this;if(t)return a["AjaxHelper"].post({module:"GoogleAnalyticsImporter",action:"deleteImportStatus",idSite:e,nonce:this.stopImportNonce},{},{withTokenInUrl:!0}).finally((function(){window.location.reload()}));a["Matomo"].helper.modalConfirm("#confirmCancelJob",{yes:function(){n.deleteImportStatus(e,!0)}})},openScheduleReimportModal:function(e,t){this.reimportDateRangeIdSite=e,this.isGA4=t,Oe("#openScheduleReimportModal").modal({dismissible:!1}).modal("open")},changeImportEndDateModal:function(){return a["AjaxHelper"].post({module:"GoogleAnalyticsImporter",action:"changeImportEndDate",idSite:this.editImportEndDateIdSite,nonce:this.changeImportEndDateNonce,endDate:this.newImportEndDate},{},{withTokenInUrl:!0}).finally((function(){window.location.reload()}))},scheduleReimport:function(){return a["AjaxHelper"].post({module:"GoogleAnalyticsImporter",action:"scheduleReImport",idSite:this.reimportDateRangeIdSite,startDate:this.reimportStartDate,endDate:this.reimportEndDate,nonce:this.scheduleReImportNonce,isGA4:this.isGA4?1:0},{},{withTokenInUrl:!0}).finally((function(){window.location.reload()}))}},computed:{tooltipContent:function(){return function(){var e=Oe(this).attr("title")||"";return window.vueSanitize(e.replace(/\n/g,"
"))}}}});je.render=_;var fe=je,ye={key:0,class:"form-group row"},he={class:"col s12 m12"},Ce=["innerHTML"],Ae=["innerHTML"],Ie=["textContent"],De={class:"form-group row"},Ne=["action"],Se={key:0,type:"hidden",name:"isNoDataPage",value:"1"},ke=["value"],Ee=["disabled"],Ge=Object(s["createElementVNode"])("span",{class:"icon-upload"},null,-1),Ve=Object(s["createElementVNode"])("span",{class:"icon-upload"},null,-1),ve={key:1,class:"system-success connected-message-successful"},_e=Object(s["createElementVNode"])("span",{class:"icon-ok"},null,-1),xe={key:2},Be=["innerHTML"],Te=["innerHTML"],we=["action"],Pe=["value"],Ue=["disabled","textContent"],Me={key:0,class:"system-success connected-message-successful"},Fe=Object(s["createElementVNode"])("span",{class:"icon-ok"},null,-1),He=["innerHTML"],Le=["textContent"],Re=["innerHTML"],qe=["innerHTML"],ze=["textContent"];function Ye(e,t,n,o,r,a){return Object(s["openBlock"])(),Object(s["createElementBlock"])(s["Fragment"],null,[e.isNoDataPage?Object(s["createCommentVNode"])("",!0):(Object(s["openBlock"])(),Object(s["createElementBlock"])("div",ye,[Object(s["createElementVNode"])("div",he,[Object(s["createElementVNode"])("p",null,Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_ConfigureTheImporterLabel1")),1),Object(s["createElementVNode"])("p",null,[Object(s["createTextVNode"])(Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_ConfigureTheImporterLabel2"))+" ",1),Object(s["createElementVNode"])("span",{innerHTML:e.$sanitize(e.setupGoogleAnalyticsImportFaq)},null,8,Ce)])])])),e.isNoDataPage?(Object(s["openBlock"])(),Object(s["createElementBlock"])("li",{key:1,innerHTML:e.$sanitize(e.getAdvanceConnectStep01Text)},null,8,Ae)):Object(s["createCommentVNode"])("",!0),(Object(s["openBlock"])(),Object(s["createBlock"])(Object(s["resolveDynamicComponent"])(e.isNoDataPage?"li":"div"),null,{default:Object(s["withCtx"])((function(){return[e.isNoDataPage?(Object(s["openBlock"])(),Object(s["createElementBlock"])("span",{key:0,textContent:Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_GAImportNoDataScreenStep02"))},null,8,Ie)):Object(s["createCommentVNode"])("",!0),Object(s["createElementVNode"])("div",De,[Object(s["createElementVNode"])("div",{class:Object(s["normalizeClass"])(e.getClass)},[Object(s["createElementVNode"])("form",{id:"configFileUploadForm",action:e.manualActionUrl,method:"POST",enctype:"multipart/form-data"},[Object(s["createElementVNode"])("input",{type:"file",id:"clientfile",name:"clientfile",accept:".json",onChange:t[0]||(t[0]=function(){return e.processFileChange&&e.processFileChange.apply(e,arguments)}),style:{display:"none"}},null,32),e.isNoDataPage?(Object(s["openBlock"])(),Object(s["createElementBlock"])("input",Se)):Object(s["createCommentVNode"])("",!0),Object(s["createElementVNode"])("input",{type:"hidden",name:"config_nonce",value:e.manualConfigNonce},null,8,ke),Object(s["createElementVNode"])("button",{type:"button",class:"btn advance-upload-button",onClick:t[1]||(t[1]=function(t){return e.selectConfigFile()}),disabled:e.isUploadButtonDisabled},[Object(s["withDirectives"])(Object(s["createElementVNode"])("span",null,[Ge,Object(s["createTextVNode"])(" "+Object(s["toDisplayString"])(e.translate("General_Upload")),1)],512),[[s["vShow"],!e.isUploadButtonDisabled]]),Object(s["withDirectives"])(Object(s["createElementVNode"])("span",null,[Ve,Object(s["createTextVNode"])(" "+Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_Uploading")),1)],512),[[s["vShow"],e.isUploadButtonDisabled]])],8,Ee),e.isNoDataPage&&e.hasClientConfiguration?(Object(s["openBlock"])(),Object(s["createElementBlock"])("span",ve,[_e,Object(s["createTextVNode"])(" "+Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_UploadSuccessful")),1)])):Object(s["createCommentVNode"])("",!0)],8,Ne)],2)])]})),_:1})),e.isNoDataPage?(Object(s["openBlock"])(),Object(s["createElementBlock"])("li",xe,[Object(s["createElementVNode"])("span",{innerHTML:e.$sanitize(e.getAdvanceConnectStep03Text)},null,8,Be),Object(s["createElementVNode"])("div",{class:"complete-note-warning",innerHTML:e.$sanitize(e.getOauthCompleteWarningMessage)},null,8,Te),Object(s["createElementVNode"])("form",{target:"_blank",method:"post",action:e.authorizeUrl},[Object(s["createElementVNode"])("input",{type:"hidden",name:"auth_nonce",value:e.forwardToAuthNonce},null,8,Pe),Object(s["createElementVNode"])("button",{disabled:!1===e.hasClientConfiguration,textContent:Object(s["toDisplayString"])(e.getAuthorizeText),type:"submit",class:"btn btn-forward-to-Oauth"},null,8,Ue),e.isNoDataPage&&e.hasClientConfiguration&&e.isConfigured?(Object(s["openBlock"])(),Object(s["createElementBlock"])("span",Me,[Fe,Object(s["createTextVNode"])(" "+Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_AccountsConnectedSuccessfully")),1)])):Object(s["createCommentVNode"])("",!0)],8,we)])):Object(s["createCommentVNode"])("",!0),e.isNoDataPage?(Object(s["openBlock"])(),Object(s["createElementBlock"])("li",{key:3,innerHTML:e.$sanitize(e.getAdvanceConnectStep04Text)},null,8,He)):Object(s["createCommentVNode"])("",!0),e.isNoDataPage?(Object(s["openBlock"])(),Object(s["createElementBlock"])("li",{key:4,textContent:Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_GAImportNoDataScreenStep06GA4"))},null,8,Le)):Object(s["createCommentVNode"])("",!0),e.isNoDataPage?(Object(s["openBlock"])(),Object(s["createElementBlock"])("li",{key:5,innerHTML:e.$sanitize(e.getAdvanceConnectStep07Text)},null,8,Re)):Object(s["createCommentVNode"])("",!0),e.isNoDataPage?(Object(s["openBlock"])(),Object(s["createElementBlock"])("li",{key:6,innerHTML:e.$sanitize(e.getAdvanceConnectStep08Text)},null,8,qe)):Object(s["createCommentVNode"])("",!0),e.isNoDataPage?(Object(s["openBlock"])(),Object(s["createElementBlock"])("li",{key:7,textContent:Object(s["toDisplayString"])(e.translate("GoogleAnalyticsImporter_GAImportNoDataScreenStep09"))},null,8,ze)):Object(s["createCommentVNode"])("",!0)],64)}var $e=Object(s["defineComponent"])({data:function(){return{isSelectingFile:!1,isUploading:!1}},props:{manualConfigNonce:{type:String,required:!0},manualActionUrl:{type:String,required:!0},isNoDataPage:Boolean,hasClientConfiguration:Boolean,indexActionUrl:{type:String,required:!0},authorizeUrl:String,forwardToAuthNonce:String,isConfigured:Boolean},methods:{selectConfigFile:function(){this.isSelectingFile=!0;var e=document.getElementById("clientfile");e&&e.click()},processFileChange:function(){var e=document.getElementById("clientfile"),t=document.getElementById("configFileUploadForm");e&&e.value&&t&&(this.isUploading=!0,t.submit())},checkForCancel:function(){if(this.isSelectingFile&&!this.isUploading){var e=document.getElementById("clientfile");e&&!e.value&&(this.isSelectingFile=!1)}}},computed:{setupGoogleAnalyticsImportFaq:function(){return Object(a["translate"])("GoogleAnalyticsImporter_ConfigureTheImporterLabel3",Object(a["externalLink"])("https://matomo.org/faq/general/set-up-google-analytics-import/"),"")},isUploadButtonDisabled:function(){return this.isSelectingFile||this.isUploading},getAdvanceConnectStep01Text:function(){return this.translate("GoogleAnalyticsImporter_GAImportNoDataScreenStep01",Object(a["externalLink"])("https://matomo.org/faq/general/set-up-google-analytics-import/"),"")},getAdvanceConnectStep03Text:function(){return this.translate("GoogleAnalyticsImporter_GAImportNoDataScreenStep03",this.translate("GoogleAnalyticsImporter_Authorize"))},getAdvanceConnectStep04Text:function(){return this.translate("GoogleAnalyticsImporter_GAImportNoDataScreenStep04",''),"",Object(a["externalLink"])("https://matomo.org/faq/general/running-the-google-analytics-import/"),"")},getAdvanceConnectStep05Text:function(){return this.translate("GoogleAnalyticsImporter_GAImportNoDataScreenStep05",Object(a["externalLink"])(this.indexActionUrl),"")},getAdvanceConnectStep07Text:function(){return"".concat(this.translate("GoogleAnalyticsImporter_GAImportNoDataScreenStep07",this.translate("GoogleAnalyticsImporter_Start")),"
","")},componentExtensions:function(){var e=this.extensions;return Object(s["markRaw"])(e.map((function(e){return Object(a["useExternalPluginComponent"])(e.plugin,e.component)})))},configConnectProps:function(){return this.configureConnectionProps}}});Ot.render=dt;var jt=Ot;
/*!
* Matomo - free/libre analytics platform
*
diff --git a/vue/src/ImportStatus/ImportStatusRow.vue b/vue/src/ImportStatus/ImportStatusRow.vue
index d5d2a7c9..c61d0a2c 100644
--- a/vue/src/ImportStatus/ImportStatusRow.vue
+++ b/vue/src/ImportStatus/ImportStatusRow.vue
@@ -20,56 +20,17 @@