diff --git a/Commands/ImportReports.php b/Commands/ImportReports.php
index 06b353df2..b98911b57 100644
--- a/Commands/ImportReports.php
+++ b/Commands/ImportReports.php
@@ -53,6 +53,8 @@ protected function configure()
*/
protected function doExecute() : int
{
+ $this->getOutput()->writeln("GA3 Import disabled");
+ return self::FAILURE;
try {
return $this->executeImpl();
} catch (ImportWasCancelledException $ex) {
diff --git a/Controller.php b/Controller.php
index 5a385fe93..92abbf134 100644
--- a/Controller.php
+++ b/Controller.php
@@ -247,68 +247,7 @@ public function changeImportEndDate()
Notification\Manager::notify('GoogleAnalyticsImporter_changeImportEndDate_failure', $notification);
}
}
- public function startImport()
- {
- Piwik::checkUserHasSuperUserAccess();
- $this->checkTokenInUrl();
- Json::sendHeaderJSON();
- try {
- Nonce::checkNonce('GoogleAnalyticsImporter.startImportNonce', Common::getRequestVar('nonce'));
- $startDate = trim(Common::getRequestVar('startDate', ''));
- if (!empty($startDate)) {
- $startDate = Date::factory($startDate . ' 00:00:00');
- }
- $endDate = trim(Common::getRequestVar('endDate', ''));
- $inputEndDate = StaticContainer::get(EndDate::class);
- $endDate = $inputEndDate->limitMaxEndDateIfNeeded($endDate);
- if (!empty($endDate)) {
- $endDate = Date::factory($endDate)->getStartOfDay();
- }
- // set credentials in google client
- $googleAuth = StaticContainer::get(Authorization::class);
- $googleAuth->getConfiguredClient();
- /** @var Importer $importer */
- $importer = StaticContainer::get(\Piwik\Plugins\GoogleAnalyticsImporter\Importer::class);
- $propertyId = trim(Common::getRequestVar('propertyId'));
- $viewId = trim(Common::getRequestVar('viewId'));
- $accountId = trim(Common::getRequestVar('accountId', \false));
- $account = $accountId ?: ImportReports::guessAccountFromProperty($propertyId);
- $isMobileApp = Common::getRequestVar('isMobileApp', 0, 'int') == 1;
- $timezone = trim(Common::getRequestVar('timezone', '', 'string'));
- $extraCustomDimensions = Common::getRequestVar('extraCustomDimensions', [], $type = 'array');
- $isVerboseLoggingEnabled = Common::getRequestVar('isVerboseLoggingEnabled', 0, $type = 'int') == 1;
- $forceCustomDimensionSlotCheck = Common::getRequestVar('forceCustomDimensionSlotCheck', 1, $type = 'int') == 1;
- $idSite = $importer->makeSite($account, $propertyId, $viewId, $timezone, $isMobileApp ? Type::ID : \Piwik\Plugins\WebsiteMeasurable\Type::ID, $extraCustomDimensions, $forceCustomDimensionSlotCheck);
- try {
- if (empty($idSite)) {
- throw new \Exception("Unable to import site entity.");
- // sanity check
- }
- /** @var ImportStatus $importStatus */
- $importStatus = StaticContainer::get(\Piwik\Plugins\GoogleAnalyticsImporter\ImportStatus::class);
- if (!empty($startDate) || !empty($endDate)) {
- // we set the last imported date to one day before the start date
- $importStatus->setImportDateRange($idSite, $startDate ?: null, $endDate ?: null);
- }
- if ($isVerboseLoggingEnabled) {
- $importStatus->setIsVerboseLoggingEnabled($idSite, $isVerboseLoggingEnabled);
- }
- // start import now since the scheduled task may not run until tomorrow
- \Piwik\Plugins\GoogleAnalyticsImporter\Tasks::startImport($importStatus->getImportStatus($idSite));
- } catch (\Exception $ex) {
- $importStatus->erroredImport($idSite, $ex->getMessage());
- throw $ex;
- }
- echo json_encode(['result' => 'ok']);
- } catch (\Exception $ex) {
- $this->logException($ex, __FUNCTION__);
- $notification = new Notification($this->getNotificationExceptionText($ex));
- $notification->type = Notification::TYPE_TRANSIENT;
- $notification->context = Notification::CONTEXT_ERROR;
- $notification->title = Piwik::translate('General_Error');
- Notification\Manager::notify('GoogleAnalyticsImporter_startImport_failure', $notification);
- }
- }
+
public function startImportGA4()
{
Piwik::checkUserHasSuperUserAccess();
@@ -393,8 +332,6 @@ public function resumeImport()
}
if ($isGA4) {
\Piwik\Plugins\GoogleAnalyticsImporter\Tasks::startImportGA4($status);
- } else {
- \Piwik\Plugins\GoogleAnalyticsImporter\Tasks::startImport($status);
}
echo json_encode(['result' => 'ok']);
} catch (\Exception $ex) {
@@ -437,8 +374,6 @@ public function scheduleReImport()
// start import now since the scheduled task may not run until tomorrow
if ($isGA4) {
\Piwik\Plugins\GoogleAnalyticsImporter\Tasks::startImportGA4($importStatus->getImportStatus($idSite));
- } else {
- \Piwik\Plugins\GoogleAnalyticsImporter\Tasks::startImport($importStatus->getImportStatus($idSite));
}
echo json_encode(['result' => 'ok']);
} catch (\Exception $ex) {
@@ -492,7 +427,7 @@ public function displayConfigureImportNotification()
}
if (empty($status)) {
$siteContentDetector = new \Piwik\SiteContentDetector();
- $siteContentDetector->detectContent([GoogleAnalytics3::getId(), GoogleAnalytics4::getId()], $currentIdSite);
+ $siteContentDetector->detectContent([GoogleAnalytics4::getId()], $currentIdSite);
if ($siteContentDetector->wasDetected(GoogleAnalytics3::getId()) || $siteContentDetector->wasDetected(GoogleAnalytics4::getId())) {
$showNotification = \true;
$settingsUrl = SettingsPiwik::getPiwikUrl() . 'index.php?' . Url::getQueryStringFromParameters(['idSite' => $currentIdSite, 'module' => 'GoogleAnalyticsImporter', 'action' => 'index']);
diff --git a/GoogleAnalyticsImporter.php b/GoogleAnalyticsImporter.php
index 6540e2a9b..505b22f52 100644
--- a/GoogleAnalyticsImporter.php
+++ b/GoogleAnalyticsImporter.php
@@ -223,7 +223,7 @@ public function getClientSideTranslationKeys(&$translationKeys)
$translationKeys[] = 'GoogleAnalyticsImporter_GAImportNoDataScreenStep03';
$translationKeys[] = 'GoogleAnalyticsImporter_GAImportNoDataScreenStep04';
$translationKeys[] = 'GoogleAnalyticsImporter_GAImportNoDataScreenStep05';
- $translationKeys[] = 'GoogleAnalyticsImporter_GAImportNoDataScreenStep06';
+ $translationKeys[] = 'GoogleAnalyticsImporter_GAImportNoDataScreenStep06GA4';
$translationKeys[] = 'GoogleAnalyticsImporter_GAImportNoDataScreenStep07';
$translationKeys[] = 'GoogleAnalyticsImporter_GAImportNoDataScreenStep07Note';
$translationKeys[] = 'GoogleAnalyticsImporter_GAImportNoDataScreenStep08';
diff --git a/SiteContentDetection/GoogleAnalyticsImporter.php b/SiteContentDetection/GoogleAnalyticsImporter.php
index f9122d659..bf77cbda2 100644
--- a/SiteContentDetection/GoogleAnalyticsImporter.php
+++ b/SiteContentDetection/GoogleAnalyticsImporter.php
@@ -65,7 +65,7 @@ public function renderInstructionsTab(SiteContentDetector $detector) : string
$view->auth_nonce = Nonce::getNonce('gaimport.auth', 1200);
$view->isConnectAccountsActivated = $isConnectAccountsPluginActivated;
$view->strategy = $isConnectAccountsPluginActivated && GoogleConnect::isStrategyActive() ? GoogleConnect::getStrategyName() : 'CUSTOM';
- $view->isGA3 = $detector->wasDetected(GoogleAnalytics3::getId());
+ $view->isGA3 = false;
$view->configureConnectionProps = \Piwik\Plugins\GoogleAnalyticsImporter\GoogleAnalyticsImporter::getConfigureConnectProps($nonce);
$view->extensions = Controller::getComponentExtensions(\true);
$view->hasClientConfiguration = $authorization->hasClientConfiguration();
diff --git a/TESTING.md b/TESTING.md
index 53ccd4834..32758c323 100644
--- a/TESTING.md
+++ b/TESTING.md
@@ -1,4 +1,4 @@
-## Testing
+## Testing (Deprecated)
This document outlines how to run the automated tests for the Google Analytics Importer plugin - GA3(Universal Analytics).
diff --git a/Tasks.php b/Tasks.php
index 622ab55be..b2fc555b7 100644
--- a/Tasks.php
+++ b/Tasks.php
@@ -58,8 +58,6 @@ public function resumeScheduledImports()
}
if (!empty($status['isGA4'])) {
self::startImportGA4($status);
- } else {
- self::startImport($status);
}
}
$logger->info('Done scheduling imports.');
@@ -74,44 +72,6 @@ public function archiveImportedReports()
}
$logger->info('Done running archive commands.');
}
- public static function startImport($status)
- {
- if (\Piwik\Plugins\GoogleAnalyticsImporter\ImportStatus::isImportRunning($status)) {
- return;
- }
- $logToSingleFile = StaticContainer::get('GoogleAnalyticsImporter.logToSingleFile');
- $idSite = $status['idSite'];
- $isVerboseLoggingEnabled = !empty($status['is_verbose_logging_enabled']);
- $hostname = SettingsPiwik::getPiwikInstanceId();
- $importLogFile = self::getImportLogFile($idSite, $hostname, $logToSingleFile);
- if (!is_writable($importLogFile) && !is_writable(dirname($importLogFile))) {
- $importLogFile = '/dev/null';
- }
- $cliPhp = new CliPhp();
- $phpBinary = $cliPhp->findPhpBinary() ?: 'php';
- $pathToConsole = '/console';
- if (defined('PIWIK_TEST_MODE')) {
- $pathToConsole = '/tests/PHPUnit/proxy/console';
- }
- $nohup = self::getNohupCommandIfPresent();
- $command = "{$nohup} {$phpBinary} " . PIWIK_INCLUDE_PATH . $pathToConsole . ' ';
- if (!empty($hostname)) {
- $command .= '--matomo-domain=' . escapeshellarg($hostname) . ' ';
- }
- $command .= 'googleanalyticsimporter:import-reports --idsite=' . (int) $idSite;
- if ($isVerboseLoggingEnabled) {
- $command .= ' -vvv';
- }
- if ($logToSingleFile || !$isVerboseLoggingEnabled) {
- $command .= ' >> ';
- } else {
- $command .= ' > ';
- }
- $command .= $importLogFile . ' 2>&1 &';
- $logger = StaticContainer::get(LoggerInterface::class);
- $logger->debug("Import command: {command}", ['command' => $command]);
- static::exec($shouldUsePassthru = \false, $command);
- }
public static function startImportGA4($status)
{
if (\Piwik\Plugins\GoogleAnalyticsImporter\ImportStatus::isImportRunning($status)) {
diff --git a/lang/en.json b/lang/en.json
index 6bfd0cd0e..63a5b267e 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -145,6 +145,7 @@
"GAImportNoDataScreenStep04": "Navigate to the %1$sGoogle Analytics Import admin page%2$s. %3$sLearn more%4$s.",
"GAImportNoDataScreenStep05": "Select the Import type.",
"GAImportNoDataScreenStep06": "Fill out the Schedule an Import form.",
+ "GAImportNoDataScreenStep06GA4": "Fill out the Schedule an Import for Google Analytics 4 (GA4) form.",
"GAImportNoDataScreenStep07": "Click \"%1$s\".",
"GAImportNoDataScreenStep07Note": "%1$sNote:%2$s Once you click \"%3$s\", Matomo will automatically create a new Matomo website for each selected property.",
"GAImportNoDataScreenStep08": "Importing data takes time, %1$sclick here to monitor the status of your data import%2$s.",
diff --git a/tests/Integration/TasksTest.php b/tests/Integration/TasksTest.php
index 7bec6c309..26474ec60 100644
--- a/tests/Integration/TasksTest.php
+++ b/tests/Integration/TasksTest.php
@@ -70,47 +70,7 @@ public function test_resumeScheduledImports_runANormalStatusCommandCorrectly()
Option::set(ImportStatus::OPTION_NAME_PREFIX . 1, json_encode(['idSite' => 1, 'status' => ImportStatus::STATUS_STARTED]));
$tasks = new \Piwik\Plugins\GoogleAnalyticsImporter\tests\Integration\TasksWithMockExec();
$tasks->resumeScheduledImports();
- $this->assertEquals([
- // nohup /home/travis/.phpenv/versions/7.2.27/bin/php -q /home/travis/build/matomo-org/plugin-GoogleAnalyticsImporter/matomo/tests/PHPUnit/proxy/console --matomo-domain='localhost' googleanalyticsimporter:import-reports --idsite=1 >> /home/travis/build/matomo-org/plugin-GoogleAnalyticsImporter/matomo/tmp/logs/gaimportlog.1.localhost.log 2>&1 &
- [\false, 'nohup ' . $this->getPhpBinary() . ' ' . PIWIK_INCLUDE_PATH . "/tests/PHPUnit/proxy/console{$this->getCommandHostOption()} googleanalyticsimporter:import-reports --idsite=1 >> " . $this->tmpPath . '/logs/gaimportlog.1.' . SettingsPiwik::getPiwikInstanceId() . '.log 2>&1 &'],
- ], \Piwik\Plugins\GoogleAnalyticsImporter\tests\Integration\TasksWithMockExec::$commandsRun);
- }
- public function test_resumeScheduledImports_runAStatusWithVerboseLoggingCorrectly()
- {
- Option::set(ImportStatus::OPTION_NAME_PREFIX . 1, json_encode(['idSite' => 1, 'is_verbose_logging_enabled' => 1, 'status' => ImportStatus::STATUS_STARTED]));
- $tasks = new \Piwik\Plugins\GoogleAnalyticsImporter\tests\Integration\TasksWithMockExec();
- $tasks->resumeScheduledImports();
- $this->assertEquals([[\false, 'nohup ' . $this->getPhpBinary() . ' ' . PIWIK_INCLUDE_PATH . "/tests/PHPUnit/proxy/console{$this->getCommandHostOption()} googleanalyticsimporter:import-reports --idsite=1 -vvv > " . $this->tmpPath . '/logs/gaimportlog.1.' . SettingsPiwik::getPiwikInstanceId() . '.log 2>&1 &']], \Piwik\Plugins\GoogleAnalyticsImporter\tests\Integration\TasksWithMockExec::$commandsRun);
- }
- public function test_resumeScheduledImports_runAStatusWithVerboseLoggingCorrectlyWithInstanceIdUpdated()
- {
- $oldValue = GeneralConfig::getConfigValue('instance_id');
- GeneralConfig::setConfigValue('instance_id', 'touch /tmp/success');
- Option::set(ImportStatus::OPTION_NAME_PREFIX . 1, json_encode(['idSite' => 1, 'is_verbose_logging_enabled' => 1, 'status' => ImportStatus::STATUS_STARTED]));
- $tasks = new \Piwik\Plugins\GoogleAnalyticsImporter\tests\Integration\TasksWithMockExec();
- $tasks->resumeScheduledImports();
- $expected = 'nohup ' . $this->getPhpBinary() . ' ' . PIWIK_INCLUDE_PATH . "/tests/PHPUnit/proxy/console{$this->getCommandHostOption()} googleanalyticsimporter:import-reports --idsite=1 -vvv > /dev/null 2>&1 &";
- //since instance id is now sanitized in Matomo 5.x
- if (version_compare(Version::VERSION, '5.0.0-b1', '>=')) {
- $expected = 'nohup ' . $this->getPhpBinary() . ' ' . PIWIK_INCLUDE_PATH . "/tests/PHPUnit/proxy/console{$this->getCommandHostOption()} googleanalyticsimporter:import-reports --idsite=1 -vvv > " . PIWIK_INCLUDE_PATH . '/tmp/logs/gaimportlog.1.touchtmpsuccess.log' . " 2>&1 &";
- }
- $this->assertEquals([[\false, $expected]], \Piwik\Plugins\GoogleAnalyticsImporter\tests\Integration\TasksWithMockExec::$commandsRun);
- GeneralConfig::setConfigValue('instance_id', $oldValue);
- }
- public function test_resumeScheduledImports_runAStatusWithVerboseLoggingCorrectlyWithInstanceIdUpdated_1()
- {
- $oldValue = GeneralConfig::getConfigValue('instance_id');
- GeneralConfig::setConfigValue('instance_id', 'test; rm -rf .');
- Option::set(ImportStatus::OPTION_NAME_PREFIX . 1, json_encode(['idSite' => 1, 'is_verbose_logging_enabled' => 1, 'status' => ImportStatus::STATUS_STARTED]));
- $tasks = new \Piwik\Plugins\GoogleAnalyticsImporter\tests\Integration\TasksWithMockExec();
- $tasks->resumeScheduledImports();
- $expected = 'nohup ' . $this->getPhpBinary() . ' ' . PIWIK_INCLUDE_PATH . "/tests/PHPUnit/proxy/console{$this->getCommandHostOption()} googleanalyticsimporter:import-reports --idsite=1 -vvv > " . $this->tmpPath . '/logs/gaimportlog.1.test\\; rm -rf ..log 2>&1 &';
- //since instance id is now sanitized in Matomo 5.x
- if (version_compare(Version::VERSION, '5.0.0-b1', '>=')) {
- $expected = 'nohup ' . $this->getPhpBinary() . ' ' . PIWIK_INCLUDE_PATH . "/tests/PHPUnit/proxy/console{$this->getCommandHostOption()} googleanalyticsimporter:import-reports --idsite=1 -vvv > " . $this->tmpPath . '/logs/gaimportlog.1.testrm-rf..log 2>&1 &';
- }
- $this->assertEquals([[\false, $expected]], \Piwik\Plugins\GoogleAnalyticsImporter\tests\Integration\TasksWithMockExec::$commandsRun);
- GeneralConfig::setConfigValue('instance_id', $oldValue);
+ $this->assertEquals([], \Piwik\Plugins\GoogleAnalyticsImporter\tests\Integration\TasksWithMockExec::$commandsRun);
}
public function test_archiveImportedReports_shouldSkipBrokenStatusEntries_ImportsThatHaveNotImportedAnything_OrLastArchivedDateIsEqualOrGreaterToLastImportedDate()
{
diff --git a/tests/System/ImportTest.php b/tests/System/ImportTest.php
deleted file mode 100644
index 2452c7563..000000000
--- a/tests/System/ImportTest.php
+++ /dev/null
@@ -1,159 +0,0 @@
-markTestSkipped('Skipping tests for lower version');
- }
- if (version_compare(Version::VERSION, '5.2.0-alpha', '<') && is_array($api) && in_array('Goals.get', $api)) {
- $keyToDelete = array_search('Goals.get', $api);
- unset($api[$keyToDelete]);
- }
- $this->runApiTests($api, $params);
- }
- public function getApiTestsToRun()
- {
- $apiToTest = [];
- $apiNotToTest = $secondaryApiToTest = ['Actions.getPageUrls', 'Actions.getEntryPageUrls', 'Actions.getExitPageUrls', 'Actions.getPageTitles', 'Actions.getEntryPageTitles', 'Actions.getExitPageTitles', 'DevicesDetection.getType', 'DevicesDetection.getBrand', 'DevicesDetection.getModel', 'DevicesDetection.getOsFamilies', 'DevicesDetection.getOsVersions', 'DevicesDetection.getBrowsers', 'DevicesDetection.getBrowserVersions', 'DevicesDetection.getBrowserEngines', 'Goals.get', 'Goals.getMetrics', 'Goals.getDaysToConversion', 'Goals.getVisitsUntilConversion', 'Referrers.getReferrerType', 'Resolution.getResolution', 'Resolution.getConfiguration', 'UserCountry.getCountry', 'UserCountry.getContinent', 'UserCountry.getRegion', 'UserCountry.getCity', 'UserLanguage.getLanguage', 'UserLanguage.getLanguageCode', 'VisitFrequency.get', 'VisitTime.getVisitInformationPerLocalTime', 'VisitTime.getVisitInformationPerServerTime', 'VisitTime.getByDayOfWeek', 'Actions.getSiteSearchKeywords', 'VisitsSummary.get', 'VisitsSummary.getVisitsConverted', 'VisitsSummary.getSumVisitsLength'];
- // This one needs a little extra handling
- $apiNotToTest[] = 'Goals.getGoals';
- $config = (require PIWIK_INCLUDE_PATH . '/plugins/GoogleAnalyticsImporter/config/config.php');
- $recordImporterClasses = $config['GoogleAnalyticsImporter.recordImporters'];
- foreach ($recordImporterClasses as $class) {
- if ($class::PLUGIN_NAME == 'MarketingCampaignsReporting') {
- continue;
- }
- $apiToTest[] = $class::PLUGIN_NAME;
- }
- if (version_compare(Version::VERSION, '4.6.0', '<')) {
- $apiNotToTest[] = 'DevicesDetection.getBrowserEngines';
- }
-
- if (version_compare(Version::VERSION, '5.1.0-rc1') <= 0) {
- $apiNotToTest[] = 'CustomDimensions.getConfiguredCustomDimensions';
- }
-
- return [
- [$apiToTest, ['idSite' => self::$fixture->idSite, 'date' => self::$fixture->dateTime, 'periods' => ['day', 'week', 'month', 'year'], 'apiNotToCall' => $apiNotToTest]],
- [$secondaryApiToTest, ['idSite' => self::$fixture->idSite, 'date' => self::$fixture->dateTime, 'periods' => ['day', 'week', 'month']]],
- [array_merge($secondaryApiToTest, ['Goals.getGoals']), ['idSite' => self::$fixture->idSite, 'date' => self::$fixture->dateTime, 'periods' => ['year'], 'testSuffix' => version_compare(Version::VERSION, '5.0.0-b1', '<=') ? '_5b1' : '']],
- [['Goals.getDaysToConversion', 'Goals.getVisitsUntilConversion'], ['idSite' => self::$fixture->idSite, 'date' => self::$fixture->dateTime, 'periods' => ['day', 'week', 'month', 'year'], 'idGoal' => 'ecommerceOrder', 'testSuffix' => '_ecommerceOrder']],
- // custom dimensions
- ['CustomDimensions.getCustomDimension', ['idSite' => self::$fixture->idSite, 'date' => self::$fixture->dateTime, 'periods' => ['day', 'week', 'month', 'year'], 'testSuffix' => '_action', 'otherRequestParameters' => ['idDimension' => '6']]],
- ['CustomDimensions.getCustomDimension', ['idSite' => self::$fixture->idSite, 'date' => self::$fixture->dateTime, 'periods' => ['day', 'week', 'month', 'year'], 'testSuffix' => '_visit', 'otherRequestParameters' => ['idDimension' => '4']]],
- ['CustomDimensions.getCustomDimension', ['idSite' => self::$fixture->idSite, 'date' => self::$fixture->dateTime, 'periods' => ['day', 'week', 'month', 'year'], 'testSuffix' => '_extraCustomDim', 'otherRequestParameters' => ['idDimension' => '7']]],
- // flattened
- [['Referrers.getSearchEngines'], ['idSite' => self::$fixture->idSite, 'date' => self::$fixture->dateTime, 'periods' => ['day'], 'testSuffix' => '_flat', 'otherRequestParameters' => ['flat' => '1']]],
- ['MarketingCampaignsReporting', ['idSite' => self::$fixture->campaignIdSite, 'date' => self::$fixture->campaignDataDateTime, 'periods' => ['day', 'week', 'month', 'year']]],
- // test aggregated w/ real visit
- ['VisitsSummary.get', ['idSite' => self::$fixture->idSite, 'date' => '2019-07-03', 'periods' => 'week', 'testSuffix' => '_aggregatedWithTrackedVisit' . (version_compare(Version::VERSION, '5.0.0-b1', '<=') ? '_5b1' : '')]],
- ];
- }
- /**
- * @dataProvider getTestDataForTestApiColumns
- */
- public function testApiColumns($method, $columns)
- {
- $this->markTestSkipped("skipping for now, this test never really worked anyway");
- $expectedApiColumns = self::getExpectedApiColumns();
- if (!isset($expectedApiColumns[$method])) {
- throw new \Exception("No expected columns for {$method}");
- }
- $expectedColumns = $expectedApiColumns[$method];
- $expectedColumns = array_values($expectedColumns);
- $columns = array_values($columns);
- sort($expectedColumns);
- sort($columns);
- $this->assertEquals($expectedColumns, $columns);
- }
- public static function getOutputPrefix()
- {
- return '';
- }
- public static function getPathToTestDirectory()
- {
- return dirname(__FILE__);
- }
- public function getTestDataForTestApiColumns()
- {
- $tests = [];
- $checkedApiMethods = [];
- $expectedPath = PIWIK_INCLUDE_PATH . '/plugins/GoogleAnalyticsImporter/tests/System/expected';
- $contents = scandir($expectedPath);
- foreach ($contents as $filename) {
- if (!preg_match('/([^_]+)_year.xml$/', $filename, $matches)) {
- continue;
- }
- $method = $matches[1];
- if (!empty($checkedApiMethods[$method])) {
- continue;
- }
- if (preg_match('/^VisitorInterest\\./', $method)) {
- continue;
- }
- $importedPath = $expectedPath . '/' . $filename;
- $columns = $this->getColumnsFromXml($importedPath);
- if (empty($columns)) {
- continue;
- }
- $tests[] = [$method, $columns];
- }
- return $tests;
- }
- private function getColumnsFromXml($importedPath)
- {
- $contents = file_get_contents($importedPath);
- $element = new \SimpleXMLElement($contents);
- if (empty($element->row) || empty($element->row[0])) {
- return null;
- }
- $tagNames = [];
- for ($j = 0; $j != $element->children()->count(); ++$j) {
- $row = $element->row[$j];
- $children = $row->children();
- for ($i = 0; $i != $children->count(); ++$i) {
- $tagName = $children[$i]->getName();
- if ($tagName == 'segment' || $tagName == 'subtable' || $tagName == 'label') {
- continue;
- }
- $tagNames[] = $tagName;
- }
- }
- return array_unique($tagNames);
- }
- private static function getExpectedApiColumns()
- {
- return ['Referrers.getWebsites' => self::$CONVERSION_AWARE_VISIT_METRICS, 'Referrers.getReferrerType' => self::$CONVERSION_AWARE_VISIT_METRICS, 'Referrers.getAll' => array_merge(self::$CONVERSION_AWARE_VISIT_METRICS, ['referer_type', 'logo', 'url']), 'Referrers.getKeywords' => self::$CONVERSION_AWARE_VISIT_METRICS, 'Referrers.getKeywordsForPageUrl' => [], 'Referrers.getKeywordsForPageTitle' => [], 'Referrers.getSearchEnginesFromKeywordId' => self::$CONVERSION_AWARE_VISIT_METRICS, 'Referrers.getSearchEngines' => array_merge(self::$CONVERSION_AWARE_VISIT_METRICS, ['url', 'logo']), 'Referrers.getCampaigns' => self::$CONVERSION_AWARE_VISIT_METRICS, 'Referrers.getKeywordsFromCampaignId' => self::$CONVERSION_AWARE_VISIT_METRICS, 'Referrers.getUrlsFromWebsiteId' => self::$CONVERSION_AWARE_VISIT_METRICS, 'Referrers.getSocials' => array_merge(self::$CONVERSION_AWARE_VISIT_METRICS, ['url', 'logo']), 'Referrers.getUrlsForSocial' => array_merge(self::$CONVERSION_AWARE_VISIT_METRICS, ['url']), 'Actions.getPageTitles' => self::$ACTION_METRICS, 'Actions.getPageUrls' => array_merge(self::$ACTION_METRICS, ['url']), 'Actions.getExitPageTitles' => self::$ACTION_METRICS, 'Actions.getExitPageUrls' => array_merge(self::$ACTION_METRICS, ['url']), 'Actions.getEntryPageTitles' => self::$ACTION_METRICS, 'Actions.getEntryPageUrls' => array_merge(self::$ACTION_METRICS, ['url']), 'Actions.getSiteSearchKeywords' => self::$SITESEARCH_METRICS, 'Actions.getSiteSearchCategories' => ['nb_visits', 'nb_actions', 'sum_visit_length', 'bounce_count', 'nb_visits_converted', 'nb_conversions', 'revenue', 'nb_hits', 'sum_daily_nb_uniq_visitors', 'nb_pages_per_search'], 'VisitTime.getByDayOfWeek' => array_merge(self::$VISIT_TIME_METRICS, ['day_of_week']), 'UserLanguage.getLanguage' => self::$CONVERSION_AWARE_VISIT_METRICS, 'UserLanguage.getLanguageCode' => self::$CONVERSION_AWARE_VISIT_METRICS, 'UserCountry.getContinent' => array_merge(self::$CONVERSION_AWARE_VISIT_METRICS, ['code']), 'UserCountry.getRegion' => array_merge(self::$CONVERSION_AWARE_VISIT_METRICS, ['country', 'country_name', 'region', 'region_name', 'logo']), 'UserCountry.getCountry' => array_merge(self::$CONVERSION_AWARE_VISIT_METRICS, ['code', 'logo', 'logoHeight']), 'UserCountry.getCity' => array_merge(self::$CONVERSION_AWARE_VISIT_METRICS, ['city', 'city_name', 'country', 'country_name', 'region', 'region_name', 'logo', 'lat', 'long']), 'Resolution.getResolution' => self::$CONVERSION_AWARE_VISIT_METRICS, 'Resolution.getConfiguration' => self::$CONVERSION_AWARE_VISIT_METRICS, 'Goals.getItemsSku' => self::$ECOMMERCE_ITEM_METRICS, 'Goals.getItemsName' => self::$ECOMMERCE_ITEM_METRICS, 'Goals.getItemsCategory' => self::$ECOMMERCE_ITEM_METRICS, 'Events.getName' => array_merge(self::$CONVERSION_AWARE_VISIT_METRICS, ['avg_event_value']), 'Events.getCategory' => array_merge(self::$CONVERSION_AWARE_VISIT_METRICS, ['avg_event_value']), 'Events.getAction' => array_merge(self::$CONVERSION_AWARE_VISIT_METRICS, ['avg_event_value']), 'VisitTime.getVisitInformationPerLocalTime' => self::$CONVERSION_AWARE_VISIT_METRICS, 'DevicesDetection.getType' => array_merge(self::$CONVERSION_AWARE_VISIT_METRICS, ['logo']), 'DevicesDetection.getOsVersions' => array_merge(self::$CONVERSION_AWARE_VISIT_METRICS, ['logo']), 'DevicesDetection.getOsFamilies' => array_merge(self::$CONVERSION_AWARE_VISIT_METRICS, ['logo']), 'DevicesDetection.getModel' => self::$CONVERSION_AWARE_VISIT_METRICS, 'DevicesDetection.getBrowsers' => array_merge(self::$CONVERSION_AWARE_VISIT_METRICS, ['logo']), 'DevicesDetection.getBrowserVersions' => array_merge(self::$CONVERSION_AWARE_VISIT_METRICS, ['logo']), 'DevicesDetection.getBrowserFamilies' => array_merge(self::$CONVERSION_AWARE_VISIT_METRICS, ['logo']), 'DevicesDetection.getBrand' => array_merge(self::$CONVERSION_AWARE_VISIT_METRICS, ['logo'])];
- }
-}
-\Piwik\Plugins\GoogleAnalyticsImporter\tests\System\ImportTest::$fixture = new ImportedFromGoogle();
diff --git a/tests/UI/EmptySite_GA_spec.js b/tests/UI/EmptySite_GA_spec.js
index 2ff57f93e..255ea6b74 100644
--- a/tests/UI/EmptySite_GA_spec.js
+++ b/tests/UI/EmptySite_GA_spec.js
@@ -27,7 +27,7 @@ describe("EmptySite_GA", function () {
testEnvironment.save();
});
- it('should show no data screen with GA import recommended', async function () {
+ it('should not show no data screen with GA3 import recommended', async function () {
testEnvironment.detectedContentDetections = ['GoogleAnalytics3', 'Cloudflare'];
testEnvironment.connectedConsentManagers = [];
testEnvironment.save();
@@ -39,13 +39,6 @@ describe("EmptySite_GA", function () {
expect(await pageElement.screenshot()).to.matchImage('list');
});
- it('should show import details with ga3 offset banner', async function () {
- await page.evaluate(() => $('#start-tracking-detection a[href="#googleanalyticsimporter"]')[0].click());
-
- const pageElement = await page.$('.page');
- expect(await pageElement.screenshot()).to.matchImage('details_ga3');
- });
-
it('should show no data screen with GA import recommended', async function () {
testEnvironment.detectedContentDetections = ['GoogleAnalytics4', 'Cloudflare'];
testEnvironment.connectedConsentManagers = [];
diff --git a/tests/UI/GoogleAnalyticsImporter_spec.js b/tests/UI/GoogleAnalyticsImporter_spec.js
deleted file mode 100644
index 6bf7ec6b1..000000000
--- a/tests/UI/GoogleAnalyticsImporter_spec.js
+++ /dev/null
@@ -1,140 +0,0 @@
-/*!
- * Piwik - free/libre analytics platform
- *
- * GA importer tests
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-describe("GoogleAnalyticsImporter", function () {
- this.timeout(0);
-
- this.fixture = 'Piwik\\Plugins\\GoogleAnalyticsImporter\\tests\\Fixtures\\MockApiResponses';
-
- var url = "?module=GoogleAnalyticsImporter&action=index&idSite=1&period=day&date=yesterday";
-
- async function removeStartResumeFinishTime() {
- await page.evaluate(() => $('td.import-start-finish-times').html(''));
- }
-
- async function updateStatusToStartedIfOnGoing() {
- await page.evaluate(() => {
- var status = $('.importStatusesTable tbody td.status:first').text();
- if (status && status.trim() === 'ongoing') {
- $('.importStatusesTable tbody td.status:first').html('started');
- }
- });
- }
-
- it("should load the settings correctly", async function () {
- await page.goto(url);
-
- const content = await page.$('.pageWrap');
- expect(await content.screenshot()).to.matchImage('load');
- });
-
- it("should load the settings correctly with UA option selected", async function () {
- await page.goto(url);
-
- const content = await page.$('.pageWrap');
- await page.evaluate(() => $('input:radio[name=selectedImporter]').val('ua').change());
- expect(await content.screenshot()).to.matchImage('load_ua');
- });
-
- it("should start an import properly", async function () {
- await page.type('input#startDate', '2019-06-27');
- await page.type('input#endDate', '2019-07-02');
- await page.type('input#propertyId', 'UA-12345-6 '); // whitespace on purpose to test trim
- await page.type('input#accountId', ' 12345'); // whitespace on purpose to test trim
- await page.type('input#viewId', '1234567');
- await page.evaluate(() => $('div[name=extraCustomDimensions] input.control_text').val('ga:networkLocation').change());
- await page.evaluate(() => $('div[name=extraCustomDimensions] select:eq(0)').val('string:visit').change());
- await page.click('[name=isVerboseLoggingEnabled] label');
-
- await page.click('#startImportSubmit');
- await page.waitForNetworkIdle();
- await page.waitForSelector('.pageWrap');
-
- await removeStartResumeFinishTime();
- await updateStatusToStartedIfOnGoing();
-
- const content = await page.$('.pageWrap');
- expect(await content.screenshot()).to.matchImage('start_import');
- });
-
- it('should show the error in the UI when an import fails', async function () {
- await page.waitForTimeout(70000);
-
- await page.reload({ timeout: 0 });
- await page.waitForSelector('.pageWrap');
-
- await removeStartResumeFinishTime();
-
- const content = await page.$('.pageWrap');
- expect(await content.screenshot()).to.matchImage('errored_import');
- });
-
- it('should manually resume an import when the resume button is clicked', async function () {
- await page.click('td.actions > a.icon-play');
- await page.waitForNetworkIdle();
- await page.waitForSelector('.pageWrap');
-
- await removeStartResumeFinishTime();
-
- const content = await page.$('.pageWrap');
- expect(await content.screenshot()).to.matchImage('resumed_import');
- });
-
-
-
- it("should show that the import finished when the import finishes", async function () {
- let totalTime = 0;
- while (true) { // wait until import finishes
- await page.waitForTimeout(30000);
-
- await page.reload();
- await page.waitForSelector('.pageWrap');
-
- const elem = await page.$('td.actions > a.icon-delete');
- if (elem) {
- break;
- }
-
- console.log('waiting...');
-
- totalTime += 30;
-
- if (totalTime > 60 * 7) {
- throw new Error('timeout waiting for import to finish...');
- }
- }
-
- await removeStartResumeFinishTime();
-
- const content = await page.$('.pageWrap');
- expect(await content.screenshot()).to.matchImage('finished_import');
- });
-
- it('should remove the status when the trash icon is clicked', async function () {
- await page.click('td.actions > a.icon-delete');
- await page.waitForNetworkIdle();
- await page.waitForSelector('.pageWrap');
-
- await removeStartResumeFinishTime();
-
- const content = await page.$('.pageWrap');
- expect(await content.screenshot()).to.matchImage('removed_import');
- });
-
- it('should remove client configuration when the button is pressed', async function () {
- await page.click('#removeConfigForm button[type=submit]');
- await page.waitForNetworkIdle();
- await page.waitForSelector('.pageWrap');
-
- await removeStartResumeFinishTime();
-
- const content = await page.$('.pageWrap');
- expect(await content.screenshot()).to.matchImage('removed_client_config');
- });
-});
diff --git a/tests/UI/expected-ui-screenshots/EmptySite_GA_details_ga4.png b/tests/UI/expected-ui-screenshots/EmptySite_GA_details_ga4.png
index 1af170a8c..435d96bcb 100644
Binary files a/tests/UI/expected-ui-screenshots/EmptySite_GA_details_ga4.png and b/tests/UI/expected-ui-screenshots/EmptySite_GA_details_ga4.png differ
diff --git a/tests/UI/expected-ui-screenshots/GoogleAnalyticsImporterGA4_errored_import.png b/tests/UI/expected-ui-screenshots/GoogleAnalyticsImporterGA4_errored_import.png
index fced166fb..8c3c9adee 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 8279760a8..6854d72c8 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_load.png b/tests/UI/expected-ui-screenshots/GoogleAnalyticsImporterGA4_load.png
index 5b0bf0892..8c6e5a691 100644
Binary files a/tests/UI/expected-ui-screenshots/GoogleAnalyticsImporterGA4_load.png and b/tests/UI/expected-ui-screenshots/GoogleAnalyticsImporterGA4_load.png differ
diff --git a/tests/UI/expected-ui-screenshots/GoogleAnalyticsImporterGA4_load_ga4.png b/tests/UI/expected-ui-screenshots/GoogleAnalyticsImporterGA4_load_ga4.png
index e57aebe15..8c6e5a691 100644
Binary files a/tests/UI/expected-ui-screenshots/GoogleAnalyticsImporterGA4_load_ga4.png and b/tests/UI/expected-ui-screenshots/GoogleAnalyticsImporterGA4_load_ga4.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 058cb54c8..65c5d218a 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_removed_import.png b/tests/UI/expected-ui-screenshots/GoogleAnalyticsImporterGA4_removed_import.png
index 5b0bf0892..8c6e5a691 100644
Binary files a/tests/UI/expected-ui-screenshots/GoogleAnalyticsImporterGA4_removed_import.png and b/tests/UI/expected-ui-screenshots/GoogleAnalyticsImporterGA4_removed_import.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 b5f9d3061..508c768ce 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 481e6bf0d..a94abdad4 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/vue/dist/GoogleAnalyticsImporter.umd.js b/vue/dist/GoogleAnalyticsImporter.umd.js
index d29b3d9c3..72967925c 100644
--- a/vue/dist/GoogleAnalyticsImporter.umd.js
+++ b/vue/dist/GoogleAnalyticsImporter.umd.js
@@ -125,9 +125,7 @@ module.exports = __WEBPACK_EXTERNAL_MODULE_a5a2__;
__webpack_require__.r(__webpack_exports__);
// EXPORTS
-__webpack_require__.d(__webpack_exports__, "ImportScheduler", function() { return /* reexport */ ImportScheduler; });
__webpack_require__.d(__webpack_exports__, "ImportSchedulerGA4", function() { return /* reexport */ ImportSchedulerGA4; });
-__webpack_require__.d(__webpack_exports__, "ImportSelector", function() { return /* reexport */ ImportSelector; });
__webpack_require__.d(__webpack_exports__, "ImportStatus", function() { return /* reexport */ ImportStatus; });
__webpack_require__.d(__webpack_exports__, "ConfigureConnection", function() { return /* reexport */ ConfigureConnection; });
__webpack_require__.d(__webpack_exports__, "ClientConfig", function() { return /* reexport */ ClientConfig; });
@@ -199,295 +197,40 @@ external_CoreHome_["Matomo"].on('widget:loaded', function (_ref) {
// EXTERNAL MODULE: external {"commonjs":"vue","commonjs2":"vue","root":"Vue"}
var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__("8bbf");
-// 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/ImportScheduler/ImportScheduler.vue?vue&type=template&id=3f3025d8
+// 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/ImportScheduler/ImportSchedulerGA4.vue?vue&type=template&id=8da8e6d8
var _hoisted_1 = {
- name: "startDate"
+ name: "startDateGA4"
};
var _hoisted_2 = {
- name: "endDate"
+ name: "endDateGA4"
};
var _hoisted_3 = {
- name: "propertyId"
+ name: "propertyIdGA4"
};
var _hoisted_4 = {
- name: "accountId"
+ name: "streamIds"
};
var _hoisted_5 = {
- name: "viewId"
+ name: "isMobileAppGA4"
};
var _hoisted_6 = {
- name: "isMobileApp"
+ name: "timezoneGA4"
};
var _hoisted_7 = {
- name: "timezone"
+ name: "extraCustomDimensionsGA4"
};
var _hoisted_8 = {
- name: "extraCustomDimensions"
+ name: "forceIgnoreOutOfCustomDimSlotErrorGA4"
};
var _hoisted_9 = {
- name: "forceIgnoreOutOfCustomDimSlotError"
-};
-var _hoisted_10 = {
- name: "isVerboseLoggingEnabled"
+ name: "isVerboseLoggingEnabledGA4"
};
-var _hoisted_11 = ["disabled"];
+var _hoisted_10 = ["disabled"];
function render(_ctx, _cache, $props, $setup, $data, $options) {
var _component_Field = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("Field");
return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", null, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("p", null, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_ScheduleImportDescription')), 1), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", _hoisted_1, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_Field, {
- uicontrol: "text",
- name: "startDate",
- modelValue: _ctx.startDate,
- "onUpdate:modelValue": _cache[0] || (_cache[0] = function ($event) {
- return _ctx.startDate = $event;
- }),
- title: _ctx.translate('GoogleAnalyticsImporter_StartDate'),
- placeholder: "".concat(_ctx.translate('GoogleAnalyticsImporter_CreationDate'), " (YYYY-MM-DD)"),
- "inline-help": _ctx.translate('GoogleAnalyticsImporter_StartDateHelp')
- }, null, 8, ["modelValue", "title", "placeholder", "inline-help"])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", _hoisted_2, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_Field, {
- uicontrol: "text",
- name: "endDate",
- modelValue: _ctx.endDate,
- "onUpdate:modelValue": _cache[1] || (_cache[1] = function ($event) {
- return _ctx.endDate = $event;
- }),
- title: _ctx.translate('GoogleAnalyticsImporter_EndDate'),
- placeholder: _ctx.translate('GoogleAnalyticsImporter_None'),
- "inline-help": _ctx.endDateHelp
- }, null, 8, ["modelValue", "title", "placeholder", "inline-help"])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", _hoisted_3, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_Field, {
- uicontrol: "text",
- name: "propertyId",
- modelValue: _ctx.propertyId,
- "onUpdate:modelValue": _cache[2] || (_cache[2] = function ($event) {
- return _ctx.propertyId = $event;
- }),
- placeholder: "eg. UA-XXXXX-X",
- title: _ctx.translate('GoogleAnalyticsImporter_PropertyId'),
- "inline-help": _ctx.translate('GoogleAnalyticsImporter_PropertyIdHelp')
- }, null, 8, ["modelValue", "title", "inline-help"])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", _hoisted_4, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_Field, {
- uicontrol: "text",
- name: "accountId",
- placeholder: "eg. 1234567",
- modelValue: _ctx.accountId,
- "onUpdate:modelValue": _cache[3] || (_cache[3] = function ($event) {
- return _ctx.accountId = $event;
- }),
- title: _ctx.translate('GoogleAnalyticsImporter_AccountId'),
- "inline-help": _ctx.translate('GoogleAnalyticsImporter_AccountIdHelp')
- }, null, 8, ["modelValue", "title", "inline-help"])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", _hoisted_5, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_Field, {
- uicontrol: "text",
- name: "viewId",
- placeholder: "eg. 1234567",
- modelValue: _ctx.viewId,
- "onUpdate:modelValue": _cache[4] || (_cache[4] = function ($event) {
- return _ctx.viewId = $event;
- }),
- title: _ctx.translate('GoogleAnalyticsImporter_ViewId'),
- "inline-help": _ctx.translate('GoogleAnalyticsImporter_ViewIdHelp')
- }, null, 8, ["modelValue", "title", "inline-help"])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", _hoisted_6, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_Field, {
- uicontrol: "checkbox",
- name: "isMobileApp",
- modelValue: _ctx.isMobileApp,
- "onUpdate:modelValue": _cache[5] || (_cache[5] = function ($event) {
- return _ctx.isMobileApp = $event;
- }),
- title: _ctx.translate('GoogleAnalyticsImporter_IsMobileApp'),
- "inline-help": _ctx.translate('GoogleAnalyticsImporter_IsMobileAppHelp')
- }, null, 8, ["modelValue", "title", "inline-help"])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", _hoisted_7, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_Field, {
- uicontrol: "text",
- name: "timezone",
- modelValue: _ctx.timezone,
- "onUpdate:modelValue": _cache[6] || (_cache[6] = function ($event) {
- return _ctx.timezone = $event;
- }),
- title: _ctx.translate('GoogleAnalyticsImporter_Timezone'),
- placeholder: _ctx.translate('GoogleAnalyticsImporter_Optional'),
- "inline-help": _ctx.timezoneHelp
- }, null, 8, ["modelValue", "title", "placeholder", "inline-help"])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", _hoisted_8, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_Field, {
- uicontrol: "multituple",
- name: "extraCustomDimensions",
- modelValue: _ctx.extraCustomDimensions,
- "onUpdate:modelValue": _cache[7] || (_cache[7] = function ($event) {
- return _ctx.extraCustomDimensions = $event;
- }),
- title: _ctx.translate('GoogleAnalyticsImporter_ExtraCustomDimensions'),
- "inline-help": _ctx.extraCustomDimensionsHelp,
- "ui-control-attributes": _ctx.extraCustomDimensionsField
- }, null, 8, ["modelValue", "title", "inline-help", "ui-control-attributes"])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", _hoisted_9, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_Field, {
- uicontrol: "checkbox",
- name: "forceIgnoreOutOfCustomDimSlotError",
- modelValue: _ctx.ignoreCustomDimensionSlotCheck,
- "onUpdate:modelValue": _cache[8] || (_cache[8] = function ($event) {
- return _ctx.ignoreCustomDimensionSlotCheck = $event;
- }),
- title: _ctx.translate('GoogleAnalyticsImporter_ForceCustomDimensionSlotCheck'),
- "inline-help": _ctx.forceIgnoreOutOfCustomDimSlotErrorHelp
- }, null, 8, ["modelValue", "title", "inline-help"])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("h3", null, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_Troubleshooting')), 1), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", _hoisted_10, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_Field, {
- uicontrol: "checkbox",
- name: "isVerboseLoggingEnabled",
- modelValue: _ctx.isVerboseLoggingEnabled,
- "onUpdate:modelValue": _cache[9] || (_cache[9] = function ($event) {
- return _ctx.isVerboseLoggingEnabled = $event;
- }),
- title: _ctx.translate('GoogleAnalyticsImporter_IsVerboseLoggingEnabled'),
- "inline-help": _ctx.isVerboseLoggingEnabledHelp
- }, null, 8, ["modelValue", "title", "inline-help"])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("button", {
- type: "submit",
- id: "startImportSubmit",
- class: "btn",
- onClick: _cache[10] || (_cache[10] = function ($event) {
- return _ctx.startImport();
- }),
- disabled: _ctx.isStartingImport
- }, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_Start')), 9, _hoisted_11)]);
-}
-// CONCATENATED MODULE: ./plugins/GoogleAnalyticsImporter/vue/src/ImportScheduler/ImportScheduler.vue?vue&type=template&id=3f3025d8
-
-// EXTERNAL MODULE: external "CorePluginsAdmin"
-var external_CorePluginsAdmin_ = __webpack_require__("a5a2");
-
-// 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/ImportScheduler/ImportScheduler.vue?vue&type=script&lang=ts
-
-
-
-/* harmony default export */ var ImportSchedulervue_type_script_lang_ts = (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
- props: {
- startImportNonce: {
- type: String,
- required: true
- },
- maxEndDateDesc: String,
- extraCustomDimensionsField: {
- type: Object,
- required: true
- }
- },
- components: {
- Field: external_CorePluginsAdmin_["Field"]
- },
- data: function data() {
- return {
- isStartingImport: false,
- extraCustomDimensions: [],
- isVerboseLoggingEnabled: false,
- ignoreCustomDimensionSlotCheck: false,
- startDate: '',
- endDate: '',
- propertyId: '',
- accountId: '',
- viewId: '',
- isMobileApp: false,
- timezone: ''
- };
- },
- created: function created() {
- return this;
- },
- methods: {
- startImport: function startImport() {
- if (this.startDate) {
- try {
- Object(external_CoreHome_["parseDate"])(this.startDate);
- } catch (e) {
- var instanceId = external_CoreHome_["NotificationsStore"].show({
- message: Object(external_CoreHome_["translate"])('GoogleAnalyticsImporter_InvalidDateFormat', ['YYYY-MM-DD']),
- context: 'error',
- type: 'transient'
- });
- external_CoreHome_["NotificationsStore"].scrollToNotification(instanceId);
- return undefined;
- }
- }
-
- this.isStartingImport = true;
- var forceCustomDimensionSlotCheck = !this.ignoreCustomDimensionSlotCheck;
- return external_CoreHome_["AjaxHelper"].post({
- module: 'GoogleAnalyticsImporter',
- action: 'startImport',
- startDate: this.startDate,
- endDate: this.endDate,
- propertyId: this.propertyId,
- viewId: this.viewId,
- nonce: this.startImportNonce,
- accountId: this.accountId,
- isMobileApp: this.isMobileApp ? '1' : '0',
- timezone: this.timezone,
- extraCustomDimensions: this.extraCustomDimensions,
- isVerboseLoggingEnabled: this.isVerboseLoggingEnabled ? '1' : '0',
- forceCustomDimensionSlotCheck: forceCustomDimensionSlotCheck ? '1' : '0'
- }, {}, {
- withTokenInUrl: true
- }).finally(function () {
- window.location.reload();
- });
- }
- },
- computed: {
- endDateHelp: function endDateHelp() {
- var endDateHelp = Object(external_CoreHome_["translate"])('GoogleAnalyticsImporter_EndDateHelpText');
- var maxEndDateDesc = this.maxEndDateDesc && Object(external_CoreHome_["translate"])('
GoogleAnalyticsImporter_MaxEndDateHelp', this.maxEndDateDesc);
- return "".concat(endDateHelp, " ").concat(maxEndDateDesc || '');
- },
- timezoneHelp: function timezoneHelp() {
- var url = 'https://www.php.net/manual/en/timezones.php';
- return Object(external_CoreHome_["translate"])('GoogleAnalyticsImporter_TimezoneHelp', ""), '');
- },
- extraCustomDimensionsHelp: function extraCustomDimensionsHelp() {
- var link = 'https://ga-dev-tools.appspot.com/dimensions-metrics-explorer/';
- return Object(external_CoreHome_["translate"])('GoogleAnalyticsImporter_ExtraCustomDimensionsHelp', ""), '');
- },
- forceIgnoreOutOfCustomDimSlotErrorHelp: function forceIgnoreOutOfCustomDimSlotErrorHelp() {
- return Object(external_CoreHome_["translate"])('GoogleAnalyticsImporter_ForceCustomDimensionSlotCheckHelp', Object(external_CoreHome_["externalLink"])('https://matomo.org/docs/custom-dimensions/'), '');
- },
- isVerboseLoggingEnabledHelp: function isVerboseLoggingEnabledHelp() {
- return Object(external_CoreHome_["translate"])('GoogleAnalyticsImporter_IsVerboseLoggingEnabledHelp', '/path/to/matomo/tmp/logs/', 'gaimportlog.$idSite.$matomoDomain.log');
- }
- }
-}));
-// CONCATENATED MODULE: ./plugins/GoogleAnalyticsImporter/vue/src/ImportScheduler/ImportScheduler.vue?vue&type=script&lang=ts
-
-// CONCATENATED MODULE: ./plugins/GoogleAnalyticsImporter/vue/src/ImportScheduler/ImportScheduler.vue
-
-
-
-ImportSchedulervue_type_script_lang_ts.render = render
-
-/* harmony default export */ var ImportScheduler = (ImportSchedulervue_type_script_lang_ts);
-// 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/ImportScheduler/ImportSchedulerGA4.vue?vue&type=template&id=8da8e6d8
-
-var ImportSchedulerGA4vue_type_template_id_8da8e6d8_hoisted_1 = {
- name: "startDateGA4"
-};
-var ImportSchedulerGA4vue_type_template_id_8da8e6d8_hoisted_2 = {
- name: "endDateGA4"
-};
-var ImportSchedulerGA4vue_type_template_id_8da8e6d8_hoisted_3 = {
- name: "propertyIdGA4"
-};
-var ImportSchedulerGA4vue_type_template_id_8da8e6d8_hoisted_4 = {
- name: "streamIds"
-};
-var ImportSchedulerGA4vue_type_template_id_8da8e6d8_hoisted_5 = {
- name: "isMobileAppGA4"
-};
-var ImportSchedulerGA4vue_type_template_id_8da8e6d8_hoisted_6 = {
- name: "timezoneGA4"
-};
-var ImportSchedulerGA4vue_type_template_id_8da8e6d8_hoisted_7 = {
- name: "extraCustomDimensionsGA4"
-};
-var ImportSchedulerGA4vue_type_template_id_8da8e6d8_hoisted_8 = {
- name: "forceIgnoreOutOfCustomDimSlotErrorGA4"
-};
-var ImportSchedulerGA4vue_type_template_id_8da8e6d8_hoisted_9 = {
- name: "isVerboseLoggingEnabledGA4"
-};
-var ImportSchedulerGA4vue_type_template_id_8da8e6d8_hoisted_10 = ["disabled"];
-function ImportSchedulerGA4vue_type_template_id_8da8e6d8_render(_ctx, _cache, $props, $setup, $data, $options) {
- var _component_Field = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("Field");
-
- return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", null, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("p", null, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_ScheduleImportDescription')), 1), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", ImportSchedulerGA4vue_type_template_id_8da8e6d8_hoisted_1, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_Field, {
uicontrol: "text",
name: "startDateGA4",
modelValue: _ctx.startDateGA4,
@@ -497,7 +240,7 @@ function ImportSchedulerGA4vue_type_template_id_8da8e6d8_render(_ctx, _cache, $p
title: _ctx.translate('GoogleAnalyticsImporter_StartDate'),
placeholder: "".concat(_ctx.translate('GoogleAnalyticsImporter_CreationDate'), " (YYYY-MM-DD)"),
"inline-help": _ctx.translate('GoogleAnalyticsImporter_StartDateHelp')
- }, null, 8, ["modelValue", "title", "placeholder", "inline-help"])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", ImportSchedulerGA4vue_type_template_id_8da8e6d8_hoisted_2, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_Field, {
+ }, null, 8, ["modelValue", "title", "placeholder", "inline-help"])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", _hoisted_2, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_Field, {
uicontrol: "text",
name: "endDateGA4",
modelValue: _ctx.endDateGA4,
@@ -507,7 +250,7 @@ function ImportSchedulerGA4vue_type_template_id_8da8e6d8_render(_ctx, _cache, $p
title: _ctx.translate('GoogleAnalyticsImporter_EndDate'),
placeholder: _ctx.translate('GoogleAnalyticsImporter_None'),
"inline-help": _ctx.endDateHelp
- }, null, 8, ["modelValue", "title", "placeholder", "inline-help"])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", ImportSchedulerGA4vue_type_template_id_8da8e6d8_hoisted_3, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_Field, {
+ }, null, 8, ["modelValue", "title", "placeholder", "inline-help"])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", _hoisted_3, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_Field, {
uicontrol: "text",
name: "propertyIdGA4",
modelValue: _ctx.propertyIdGA4,
@@ -517,7 +260,7 @@ function ImportSchedulerGA4vue_type_template_id_8da8e6d8_render(_ctx, _cache, $p
placeholder: "eg. properties/{PROPERTY_ID}",
title: _ctx.translate('GoogleAnalyticsImporter_PropertyIdGA4'),
"inline-help": _ctx.translate('GoogleAnalyticsImporter_PropertyIdGA4Help')
- }, null, 8, ["modelValue", "title", "inline-help"])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", ImportSchedulerGA4vue_type_template_id_8da8e6d8_hoisted_4, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_Field, {
+ }, null, 8, ["modelValue", "title", "inline-help"])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", _hoisted_4, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_Field, {
uicontrol: "multituple",
name: "streamIds",
modelValue: _ctx.streamIds,
@@ -527,7 +270,7 @@ function ImportSchedulerGA4vue_type_template_id_8da8e6d8_render(_ctx, _cache, $p
title: _ctx.translate('GoogleAnalyticsImporter_StreamIdFilter'),
"inline-help": _ctx.streamIdsFilterHelp,
"ui-control-attributes": _ctx.streamIdsField
- }, null, 8, ["modelValue", "title", "inline-help", "ui-control-attributes"])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", ImportSchedulerGA4vue_type_template_id_8da8e6d8_hoisted_5, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_Field, {
+ }, null, 8, ["modelValue", "title", "inline-help", "ui-control-attributes"])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", _hoisted_5, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_Field, {
uicontrol: "checkbox",
name: "isMobileAppGA4",
modelValue: _ctx.isMobileAppGA4,
@@ -536,7 +279,7 @@ function ImportSchedulerGA4vue_type_template_id_8da8e6d8_render(_ctx, _cache, $p
}),
title: _ctx.translate('GoogleAnalyticsImporter_IsMobileApp'),
"inline-help": _ctx.translate('GoogleAnalyticsImporter_IsMobileAppHelp')
- }, null, 8, ["modelValue", "title", "inline-help"])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", ImportSchedulerGA4vue_type_template_id_8da8e6d8_hoisted_6, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_Field, {
+ }, null, 8, ["modelValue", "title", "inline-help"])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", _hoisted_6, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_Field, {
uicontrol: "text",
name: "timezoneGA4",
modelValue: _ctx.timezoneGA4,
@@ -546,7 +289,7 @@ function ImportSchedulerGA4vue_type_template_id_8da8e6d8_render(_ctx, _cache, $p
title: _ctx.translate('GoogleAnalyticsImporter_Timezone'),
placeholder: _ctx.translate('GoogleAnalyticsImporter_Optional'),
"inline-help": _ctx.timezoneHelp
- }, null, 8, ["modelValue", "title", "placeholder", "inline-help"])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", ImportSchedulerGA4vue_type_template_id_8da8e6d8_hoisted_7, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_Field, {
+ }, null, 8, ["modelValue", "title", "placeholder", "inline-help"])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", _hoisted_7, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_Field, {
uicontrol: "multituple",
name: "extraCustomDimensionsGA4",
modelValue: _ctx.extraCustomDimensionsGA4,
@@ -556,7 +299,7 @@ function ImportSchedulerGA4vue_type_template_id_8da8e6d8_render(_ctx, _cache, $p
title: _ctx.translate('GoogleAnalyticsImporter_ExtraCustomDimensions'),
"inline-help": _ctx.extraCustomDimensionsHelp,
"ui-control-attributes": _ctx.extraCustomDimensionsField
- }, null, 8, ["modelValue", "title", "inline-help", "ui-control-attributes"])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", ImportSchedulerGA4vue_type_template_id_8da8e6d8_hoisted_8, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_Field, {
+ }, null, 8, ["modelValue", "title", "inline-help", "ui-control-attributes"])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", _hoisted_8, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_Field, {
uicontrol: "checkbox",
name: "forceIgnoreOutOfCustomDimSlotErrorGA4",
modelValue: _ctx.ignoreCustomDimensionSlotCheckGA4,
@@ -565,7 +308,7 @@ function ImportSchedulerGA4vue_type_template_id_8da8e6d8_render(_ctx, _cache, $p
}),
title: _ctx.translate('GoogleAnalyticsImporter_ForceCustomDimensionSlotCheck'),
"inline-help": _ctx.forceIgnoreOutOfCustomDimSlotErrorHelp
- }, null, 8, ["modelValue", "title", "inline-help"])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("h3", null, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_Troubleshooting')), 1), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", ImportSchedulerGA4vue_type_template_id_8da8e6d8_hoisted_9, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_Field, {
+ }, null, 8, ["modelValue", "title", "inline-help"])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("h3", null, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_Troubleshooting')), 1), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", _hoisted_9, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_Field, {
uicontrol: "checkbox",
name: "isVerboseLoggingEnabledGA4",
modelValue: _ctx.isVerboseLoggingEnabledGA4,
@@ -582,10 +325,13 @@ function ImportSchedulerGA4vue_type_template_id_8da8e6d8_render(_ctx, _cache, $p
return _ctx.startImportGA4();
}),
disabled: _ctx.isStartingImport
- }, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_Start')), 9, ImportSchedulerGA4vue_type_template_id_8da8e6d8_hoisted_10)]);
+ }, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_Start')), 9, _hoisted_10)]);
}
// CONCATENATED MODULE: ./plugins/GoogleAnalyticsImporter/vue/src/ImportScheduler/ImportSchedulerGA4.vue?vue&type=template&id=8da8e6d8
+// EXTERNAL MODULE: external "CorePluginsAdmin"
+var external_CorePluginsAdmin_ = __webpack_require__("a5a2");
+
// 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/ImportScheduler/ImportSchedulerGA4.vue?vue&type=script&lang=ts
@@ -700,79 +446,9 @@ function ImportSchedulerGA4vue_type_template_id_8da8e6d8_render(_ctx, _cache, $p
-ImportSchedulerGA4vue_type_script_lang_ts.render = ImportSchedulerGA4vue_type_template_id_8da8e6d8_render
+ImportSchedulerGA4vue_type_script_lang_ts.render = render
/* harmony default export */ var ImportSchedulerGA4 = (ImportSchedulerGA4vue_type_script_lang_ts);
-// 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/ImportScheduler/ImportSelector.vue?vue&type=template&id=302319fd
-
-function ImportSelectorvue_type_template_id_302319fd_render(_ctx, _cache, $props, $setup, $data, $options) {
- var _component_Field = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("Field");
-
- var _directive_form = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveDirective"])("form");
-
- return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withDirectives"])((Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", null, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", null, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_Field, {
- uicontrol: "radio",
- name: "selectedImporter",
- modelValue: _ctx.selectedImporter,
- "onUpdate:modelValue": _cache[0] || (_cache[0] = function ($event) {
- return _ctx.selectedImporter = $event;
- }),
- options: _ctx.importOptionsUa,
- "inline-help": _ctx.translate('GoogleAnalyticsImporter_SelectImporterUAInlineHelpText')
- }, null, 8, ["modelValue", "options", "inline-help"]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_Field, {
- uicontrol: "radio",
- name: "selectedImporter",
- modelValue: _ctx.selectedImporter,
- "onUpdate:modelValue": _cache[1] || (_cache[1] = function ($event) {
- return _ctx.selectedImporter = $event;
- }),
- options: _ctx.importOptionsGa4,
- "inline-help": _ctx.translate('GoogleAnalyticsImporter_SelectImporterGA4InlineHelpText')
- }, null, 8, ["modelValue", "options", "inline-help"])])], 512)), [[_directive_form]]);
-}
-// CONCATENATED MODULE: ./plugins/GoogleAnalyticsImporter/vue/src/ImportScheduler/ImportSelector.vue?vue&type=template&id=302319fd
-
-// 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/ImportScheduler/ImportSelector.vue?vue&type=script&lang=ts
-
-
-/* harmony default export */ var ImportSelectorvue_type_script_lang_ts = (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
- props: {
- importOptionsUa: {
- type: Object,
- required: true
- },
- importOptionsGa4: {
- type: Object,
- required: true
- }
- },
- components: {
- Field: external_CorePluginsAdmin_["Field"]
- },
- directives: {
- Form: external_CorePluginsAdmin_["Form"]
- },
- emits: ['update:selectedImporter'],
- watch: {
- selectedImporter: function selectedImporter(newVal) {
- this.$emit('update:selectedImporter', newVal);
- }
- },
- data: function data() {
- return {
- selectedImporter: ''
- };
- }
-}));
-// CONCATENATED MODULE: ./plugins/GoogleAnalyticsImporter/vue/src/ImportScheduler/ImportSelector.vue?vue&type=script&lang=ts
-
-// CONCATENATED MODULE: ./plugins/GoogleAnalyticsImporter/vue/src/ImportScheduler/ImportSelector.vue
-
-
-
-ImportSelectorvue_type_script_lang_ts.render = ImportSelectorvue_type_template_id_302319fd_render
-
-/* harmony default export */ var ImportSelector = (ImportSelectorvue_type_script_lang_ts);
// 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/ImportStatus.vue?vue&type=template&id=985a7fca
var ImportStatusvue_type_template_id_985a7fca_hoisted_1 = {
@@ -913,7 +589,7 @@ 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_68a359df_hoisted_11 = {
+var _hoisted_11 = {
key: 0
};
var _hoisted_12 = {
@@ -1020,7 +696,7 @@ function ImportStatusRowvue_type_template_id_68a359df_render(_ctx, _cache, $prop
}, 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", ImportStatusRowvue_type_template_id_68a359df_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", {
+ }, 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", {
@@ -1279,93 +955,92 @@ var ImportStatusvue_type_script_lang_ts_window = window,
ImportStatusvue_type_script_lang_ts.render = ImportStatusvue_type_template_id_985a7fca_render
/* harmony default export */ var ImportStatus = (ImportStatusvue_type_script_lang_ts);
-// 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/Configure/ConfigureConnection.vue?vue&type=template&id=4819839c
+// 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/Configure/ConfigureConnection.vue?vue&type=template&id=f623de7a
-var ConfigureConnectionvue_type_template_id_4819839c_hoisted_1 = {
+var ConfigureConnectionvue_type_template_id_f623de7a_hoisted_1 = {
key: 0,
class: "form-group row"
};
-var ConfigureConnectionvue_type_template_id_4819839c_hoisted_2 = {
+var ConfigureConnectionvue_type_template_id_f623de7a_hoisted_2 = {
class: "col s12 m6"
};
-var ConfigureConnectionvue_type_template_id_4819839c_hoisted_3 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("br", null, null, -1);
+var ConfigureConnectionvue_type_template_id_f623de7a_hoisted_3 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("br", null, null, -1);
-var ConfigureConnectionvue_type_template_id_4819839c_hoisted_4 = ["innerHTML"];
-var ConfigureConnectionvue_type_template_id_4819839c_hoisted_5 = {
+var ConfigureConnectionvue_type_template_id_f623de7a_hoisted_4 = ["innerHTML"];
+var ConfigureConnectionvue_type_template_id_f623de7a_hoisted_5 = {
class: "col s12 m6"
};
-var ConfigureConnectionvue_type_template_id_4819839c_hoisted_6 = ["innerHTML"];
-var ConfigureConnectionvue_type_template_id_4819839c_hoisted_7 = ["innerHTML"];
-var ConfigureConnectionvue_type_template_id_4819839c_hoisted_8 = ["textContent"];
-var ConfigureConnectionvue_type_template_id_4819839c_hoisted_9 = {
+var ConfigureConnectionvue_type_template_id_f623de7a_hoisted_6 = ["innerHTML"];
+var ConfigureConnectionvue_type_template_id_f623de7a_hoisted_7 = ["innerHTML"];
+var ConfigureConnectionvue_type_template_id_f623de7a_hoisted_8 = ["textContent"];
+var ConfigureConnectionvue_type_template_id_f623de7a_hoisted_9 = {
class: "form-group row"
};
-var ConfigureConnectionvue_type_template_id_4819839c_hoisted_10 = ["action"];
-var ConfigureConnectionvue_type_template_id_4819839c_hoisted_11 = {
+var ConfigureConnectionvue_type_template_id_f623de7a_hoisted_10 = ["action"];
+var ConfigureConnectionvue_type_template_id_f623de7a_hoisted_11 = {
key: 0,
type: "hidden",
name: "isNoDataPage",
value: "1"
};
-var ConfigureConnectionvue_type_template_id_4819839c_hoisted_12 = ["value"];
-var ConfigureConnectionvue_type_template_id_4819839c_hoisted_13 = ["disabled"];
+var ConfigureConnectionvue_type_template_id_f623de7a_hoisted_12 = ["value"];
+var ConfigureConnectionvue_type_template_id_f623de7a_hoisted_13 = ["disabled"];
-var ConfigureConnectionvue_type_template_id_4819839c_hoisted_14 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", {
+var ConfigureConnectionvue_type_template_id_f623de7a_hoisted_14 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", {
class: "icon-upload"
}, null, -1);
-var ConfigureConnectionvue_type_template_id_4819839c_hoisted_15 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", {
+var ConfigureConnectionvue_type_template_id_f623de7a_hoisted_15 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", {
class: "icon-upload"
}, null, -1);
-var ConfigureConnectionvue_type_template_id_4819839c_hoisted_16 = {
+var ConfigureConnectionvue_type_template_id_f623de7a_hoisted_16 = {
key: 1,
class: "system-success connected-message-successful"
};
-var ConfigureConnectionvue_type_template_id_4819839c_hoisted_17 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", {
+var ConfigureConnectionvue_type_template_id_f623de7a_hoisted_17 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", {
class: "icon-ok"
}, null, -1);
-var ConfigureConnectionvue_type_template_id_4819839c_hoisted_18 = {
+var ConfigureConnectionvue_type_template_id_f623de7a_hoisted_18 = {
key: 2
};
-var ConfigureConnectionvue_type_template_id_4819839c_hoisted_19 = ["innerHTML"];
-var ConfigureConnectionvue_type_template_id_4819839c_hoisted_20 = ["innerHTML"];
-var ConfigureConnectionvue_type_template_id_4819839c_hoisted_21 = ["action"];
-var ConfigureConnectionvue_type_template_id_4819839c_hoisted_22 = ["value"];
-var ConfigureConnectionvue_type_template_id_4819839c_hoisted_23 = ["disabled", "textContent"];
-var ConfigureConnectionvue_type_template_id_4819839c_hoisted_24 = {
+var ConfigureConnectionvue_type_template_id_f623de7a_hoisted_19 = ["innerHTML"];
+var ConfigureConnectionvue_type_template_id_f623de7a_hoisted_20 = ["innerHTML"];
+var ConfigureConnectionvue_type_template_id_f623de7a_hoisted_21 = ["action"];
+var ConfigureConnectionvue_type_template_id_f623de7a_hoisted_22 = ["value"];
+var ConfigureConnectionvue_type_template_id_f623de7a_hoisted_23 = ["disabled", "textContent"];
+var ConfigureConnectionvue_type_template_id_f623de7a_hoisted_24 = {
key: 0,
class: "system-success connected-message-successful"
};
-var ConfigureConnectionvue_type_template_id_4819839c_hoisted_25 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", {
+var ConfigureConnectionvue_type_template_id_f623de7a_hoisted_25 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", {
class: "icon-ok"
}, null, -1);
-var ConfigureConnectionvue_type_template_id_4819839c_hoisted_26 = ["innerHTML"];
-var ConfigureConnectionvue_type_template_id_4819839c_hoisted_27 = ["textContent"];
-var ConfigureConnectionvue_type_template_id_4819839c_hoisted_28 = ["textContent"];
-var ConfigureConnectionvue_type_template_id_4819839c_hoisted_29 = ["innerHTML"];
-var ConfigureConnectionvue_type_template_id_4819839c_hoisted_30 = ["innerHTML"];
-var ConfigureConnectionvue_type_template_id_4819839c_hoisted_31 = ["textContent"];
-function ConfigureConnectionvue_type_template_id_4819839c_render(_ctx, _cache, $props, $setup, $data, $options) {
- return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])(external_commonjs_vue_commonjs2_vue_root_Vue_["Fragment"], null, [!_ctx.isNoDataPage ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", ConfigureConnectionvue_type_template_id_4819839c_hoisted_1, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", ConfigureConnectionvue_type_template_id_4819839c_hoisted_2, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("p", null, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_ConfigureTheImporterLabel1')), 1), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("p", null, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_ConfigureTheImporterLabel2')), 1), ConfigureConnectionvue_type_template_id_4819839c_hoisted_3, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", {
+var ConfigureConnectionvue_type_template_id_f623de7a_hoisted_26 = ["innerHTML"];
+var ConfigureConnectionvue_type_template_id_f623de7a_hoisted_27 = ["textContent"];
+var ConfigureConnectionvue_type_template_id_f623de7a_hoisted_28 = ["innerHTML"];
+var ConfigureConnectionvue_type_template_id_f623de7a_hoisted_29 = ["innerHTML"];
+var ConfigureConnectionvue_type_template_id_f623de7a_hoisted_30 = ["textContent"];
+function ConfigureConnectionvue_type_template_id_f623de7a_render(_ctx, _cache, $props, $setup, $data, $options) {
+ return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])(external_commonjs_vue_commonjs2_vue_root_Vue_["Fragment"], null, [!_ctx.isNoDataPage ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", ConfigureConnectionvue_type_template_id_f623de7a_hoisted_1, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", ConfigureConnectionvue_type_template_id_f623de7a_hoisted_2, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("p", null, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_ConfigureTheImporterLabel1')), 1), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("p", null, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_ConfigureTheImporterLabel2')), 1), ConfigureConnectionvue_type_template_id_f623de7a_hoisted_3, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", {
innerHTML: _ctx.$sanitize(_ctx.setupGoogleAnalyticsImportFaq)
- }, null, 8, ConfigureConnectionvue_type_template_id_4819839c_hoisted_4)])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", ConfigureConnectionvue_type_template_id_4819839c_hoisted_5, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", {
+ }, null, 8, ConfigureConnectionvue_type_template_id_f623de7a_hoisted_4)])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", ConfigureConnectionvue_type_template_id_f623de7a_hoisted_5, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", {
class: "form-help",
innerHTML: _ctx.$sanitize(_ctx.translate('GoogleAnalyticsImporter_ConfigureTheImporterHelpNewDate', '', ''))
- }, null, 8, ConfigureConnectionvue_type_template_id_4819839c_hoisted_6)])])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), _ctx.isNoDataPage ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("li", {
+ }, null, 8, ConfigureConnectionvue_type_template_id_f623de7a_hoisted_6)])])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), _ctx.isNoDataPage ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("li", {
key: 1,
innerHTML: _ctx.$sanitize(_ctx.getAdvanceConnectStep01Text)
- }, null, 8, ConfigureConnectionvue_type_template_id_4819839c_hoisted_7)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createBlock"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveDynamicComponent"])(_ctx.isNoDataPage ? 'li' : 'div'), null, {
+ }, null, 8, ConfigureConnectionvue_type_template_id_f623de7a_hoisted_7)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createBlock"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveDynamicComponent"])(_ctx.isNoDataPage ? 'li' : 'div'), null, {
default: Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withCtx"])(function () {
return [_ctx.isNoDataPage ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", {
key: 0,
textContent: Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_GAImportNoDataScreenStep02'))
- }, null, 8, ConfigureConnectionvue_type_template_id_4819839c_hoisted_8)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", ConfigureConnectionvue_type_template_id_4819839c_hoisted_9, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", {
+ }, null, 8, ConfigureConnectionvue_type_template_id_f623de7a_hoisted_8)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", ConfigureConnectionvue_type_template_id_f623de7a_hoisted_9, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", {
class: Object(external_commonjs_vue_commonjs2_vue_root_Vue_["normalizeClass"])(_ctx.getClass)
}, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("form", {
id: "configFileUploadForm",
@@ -1383,26 +1058,26 @@ function ConfigureConnectionvue_type_template_id_4819839c_render(_ctx, _cache, $
style: {
"display": "none"
}
- }, null, 32), _ctx.isNoDataPage ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("input", ConfigureConnectionvue_type_template_id_4819839c_hoisted_11)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("input", {
+ }, null, 32), _ctx.isNoDataPage ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("input", ConfigureConnectionvue_type_template_id_f623de7a_hoisted_11)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("input", {
type: "hidden",
name: "config_nonce",
value: _ctx.manualConfigNonce
- }, null, 8, ConfigureConnectionvue_type_template_id_4819839c_hoisted_12), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("button", {
+ }, null, 8, ConfigureConnectionvue_type_template_id_f623de7a_hoisted_12), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("button", {
type: "button",
class: "btn advance-upload-button",
onClick: _cache[1] || (_cache[1] = function ($event) {
return _ctx.selectConfigFile();
}),
disabled: _ctx.isUploadButtonDisabled
- }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withDirectives"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", null, [ConfigureConnectionvue_type_template_id_4819839c_hoisted_14, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(" " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('General_Upload')), 1)], 512), [[external_commonjs_vue_commonjs2_vue_root_Vue_["vShow"], !_ctx.isUploadButtonDisabled]]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withDirectives"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", null, [ConfigureConnectionvue_type_template_id_4819839c_hoisted_15, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(" " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_Uploading')), 1)], 512), [[external_commonjs_vue_commonjs2_vue_root_Vue_["vShow"], _ctx.isUploadButtonDisabled]])], 8, ConfigureConnectionvue_type_template_id_4819839c_hoisted_13), _ctx.isNoDataPage && _ctx.hasClientConfiguration ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", ConfigureConnectionvue_type_template_id_4819839c_hoisted_16, [ConfigureConnectionvue_type_template_id_4819839c_hoisted_17, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(" " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_UploadSuccessful')), 1)])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)], 8, ConfigureConnectionvue_type_template_id_4819839c_hoisted_10)], 2)])];
+ }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withDirectives"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", null, [ConfigureConnectionvue_type_template_id_f623de7a_hoisted_14, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(" " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('General_Upload')), 1)], 512), [[external_commonjs_vue_commonjs2_vue_root_Vue_["vShow"], !_ctx.isUploadButtonDisabled]]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withDirectives"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", null, [ConfigureConnectionvue_type_template_id_f623de7a_hoisted_15, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(" " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_Uploading')), 1)], 512), [[external_commonjs_vue_commonjs2_vue_root_Vue_["vShow"], _ctx.isUploadButtonDisabled]])], 8, ConfigureConnectionvue_type_template_id_f623de7a_hoisted_13), _ctx.isNoDataPage && _ctx.hasClientConfiguration ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", ConfigureConnectionvue_type_template_id_f623de7a_hoisted_16, [ConfigureConnectionvue_type_template_id_f623de7a_hoisted_17, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(" " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_UploadSuccessful')), 1)])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)], 8, ConfigureConnectionvue_type_template_id_f623de7a_hoisted_10)], 2)])];
}),
_: 1
- })), _ctx.isNoDataPage ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("li", ConfigureConnectionvue_type_template_id_4819839c_hoisted_18, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", {
+ })), _ctx.isNoDataPage ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("li", ConfigureConnectionvue_type_template_id_f623de7a_hoisted_18, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", {
innerHTML: _ctx.$sanitize(_ctx.getAdvanceConnectStep03Text)
- }, null, 8, ConfigureConnectionvue_type_template_id_4819839c_hoisted_19), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", {
+ }, null, 8, ConfigureConnectionvue_type_template_id_f623de7a_hoisted_19), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", {
class: "complete-note-warning",
innerHTML: _ctx.$sanitize(_ctx.getOauthCompleteWarningMessage)
- }, null, 8, ConfigureConnectionvue_type_template_id_4819839c_hoisted_20), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("form", {
+ }, null, 8, ConfigureConnectionvue_type_template_id_f623de7a_hoisted_20), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("form", {
target: "_blank",
method: "post",
action: _ctx.authorizeUrl
@@ -1410,32 +1085,29 @@ function ConfigureConnectionvue_type_template_id_4819839c_render(_ctx, _cache, $
type: "hidden",
name: "auth_nonce",
value: _ctx.forwardToAuthNonce
- }, null, 8, ConfigureConnectionvue_type_template_id_4819839c_hoisted_22), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("button", {
+ }, null, 8, ConfigureConnectionvue_type_template_id_f623de7a_hoisted_22), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("button", {
disabled: _ctx.hasClientConfiguration === false,
textContent: Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.getAuthorizeText),
type: "submit",
class: "btn btn-forward-to-Oauth"
- }, null, 8, ConfigureConnectionvue_type_template_id_4819839c_hoisted_23), _ctx.isNoDataPage && _ctx.hasClientConfiguration && _ctx.isConfigured ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", ConfigureConnectionvue_type_template_id_4819839c_hoisted_24, [ConfigureConnectionvue_type_template_id_4819839c_hoisted_25, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(" " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_AccountsConnectedSuccessfully')), 1)])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)], 8, ConfigureConnectionvue_type_template_id_4819839c_hoisted_21)])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), _ctx.isNoDataPage ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("li", {
+ }, null, 8, ConfigureConnectionvue_type_template_id_f623de7a_hoisted_23), _ctx.isNoDataPage && _ctx.hasClientConfiguration && _ctx.isConfigured ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", ConfigureConnectionvue_type_template_id_f623de7a_hoisted_24, [ConfigureConnectionvue_type_template_id_f623de7a_hoisted_25, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(" " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_AccountsConnectedSuccessfully')), 1)])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)], 8, ConfigureConnectionvue_type_template_id_f623de7a_hoisted_21)])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), _ctx.isNoDataPage ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("li", {
key: 3,
innerHTML: _ctx.$sanitize(_ctx.getAdvanceConnectStep04Text)
- }, null, 8, ConfigureConnectionvue_type_template_id_4819839c_hoisted_26)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), _ctx.isNoDataPage ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("li", {
+ }, null, 8, ConfigureConnectionvue_type_template_id_f623de7a_hoisted_26)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), _ctx.isNoDataPage ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("li", {
key: 4,
- textContent: Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_GAImportNoDataScreenStep05'))
- }, null, 8, ConfigureConnectionvue_type_template_id_4819839c_hoisted_27)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), _ctx.isNoDataPage ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("li", {
+ textContent: Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_GAImportNoDataScreenStep06GA4'))
+ }, null, 8, ConfigureConnectionvue_type_template_id_f623de7a_hoisted_27)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), _ctx.isNoDataPage ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("li", {
key: 5,
- textContent: Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_GAImportNoDataScreenStep06'))
- }, null, 8, ConfigureConnectionvue_type_template_id_4819839c_hoisted_28)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), _ctx.isNoDataPage ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("li", {
- key: 6,
innerHTML: _ctx.$sanitize(_ctx.getAdvanceConnectStep07Text)
- }, null, 8, ConfigureConnectionvue_type_template_id_4819839c_hoisted_29)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), _ctx.isNoDataPage ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("li", {
- key: 7,
+ }, null, 8, ConfigureConnectionvue_type_template_id_f623de7a_hoisted_28)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), _ctx.isNoDataPage ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("li", {
+ key: 6,
innerHTML: _ctx.$sanitize(_ctx.getAdvanceConnectStep08Text)
- }, null, 8, ConfigureConnectionvue_type_template_id_4819839c_hoisted_30)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), _ctx.isNoDataPage ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("li", {
- key: 8,
+ }, null, 8, ConfigureConnectionvue_type_template_id_f623de7a_hoisted_29)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), _ctx.isNoDataPage ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("li", {
+ key: 7,
textContent: Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_GAImportNoDataScreenStep09'))
- }, null, 8, ConfigureConnectionvue_type_template_id_4819839c_hoisted_31)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)], 64);
+ }, null, 8, ConfigureConnectionvue_type_template_id_f623de7a_hoisted_30)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)], 64);
}
-// CONCATENATED MODULE: ./plugins/GoogleAnalyticsImporter/vue/src/Configure/ConfigureConnection.vue?vue&type=template&id=4819839c
+// CONCATENATED MODULE: ./plugins/GoogleAnalyticsImporter/vue/src/Configure/ConfigureConnection.vue?vue&type=template&id=f623de7a
// 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/Configure/ConfigureConnection.vue?vue&type=script&lang=ts
@@ -1555,7 +1227,7 @@ function ConfigureConnectionvue_type_template_id_4819839c_render(_ctx, _cache, $
-ConfigureConnectionvue_type_script_lang_ts.render = ConfigureConnectionvue_type_template_id_4819839c_render
+ConfigureConnectionvue_type_script_lang_ts.render = ConfigureConnectionvue_type_template_id_f623de7a_render
/* harmony default export */ var ConfigureConnection = (ConfigureConnectionvue_type_script_lang_ts);
// 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/ClientConfig/ClientConfig.vue?vue&type=template&id=3d935500
@@ -1672,33 +1344,26 @@ function ClientConfigvue_type_template_id_3d935500_render(_ctx, _cache, $props,
ClientConfigvue_type_script_lang_ts.render = ClientConfigvue_type_template_id_3d935500_render
/* harmony default export */ var ClientConfig = (ClientConfigvue_type_script_lang_ts);
-// 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/AdminPage/AdminPage.vue?vue&type=template&id=3ac4f3aa
+// 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/AdminPage/AdminPage.vue?vue&type=template&id=89ec9138
-var AdminPagevue_type_template_id_3ac4f3aa_hoisted_1 = {
- class: "hide-import-main-div ga-import-main-div ua-main-div"
-};
-var AdminPagevue_type_template_id_3ac4f3aa_hoisted_2 = {
+var AdminPagevue_type_template_id_89ec9138_hoisted_1 = {
class: "hide-import-main-div ga-import-main-div ga4-main-div"
};
-var AdminPagevue_type_template_id_3ac4f3aa_hoisted_3 = {
+var AdminPagevue_type_template_id_89ec9138_hoisted_2 = {
key: 0
};
-var AdminPagevue_type_template_id_3ac4f3aa_hoisted_4 = {
+var AdminPagevue_type_template_id_89ec9138_hoisted_3 = {
key: 3,
class: "ui-confirm",
id: "confirmCancelJob"
};
-var AdminPagevue_type_template_id_3ac4f3aa_hoisted_5 = ["value"];
-var AdminPagevue_type_template_id_3ac4f3aa_hoisted_6 = ["value"];
-function AdminPagevue_type_template_id_3ac4f3aa_render(_ctx, _cache, $props, $setup, $data, $options) {
+var AdminPagevue_type_template_id_89ec9138_hoisted_4 = ["value"];
+var AdminPagevue_type_template_id_89ec9138_hoisted_5 = ["value"];
+function AdminPagevue_type_template_id_89ec9138_render(_ctx, _cache, $props, $setup, $data, $options) {
var _component_CommonConnect = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("CommonConnect");
var _component_ClientConfig = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("ClientConfig");
- var _component_ImportSelector = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("ImportSelector");
-
- var _component_ImportScheduler = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("ImportScheduler");
-
var _component_ImportSchedulerGA4 = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("ImportSchedulerGA4");
var _component_ContentBlock = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("ContentBlock");
@@ -1715,32 +1380,18 @@ function AdminPagevue_type_template_id_3ac4f3aa_render(_ctx, _cache, $props, $se
"auth-nonce": _ctx.authNonce,
"config-nonce": _ctx.configNonce
}, null, 8, ["has-client-configuration", "is-configured", "auth-nonce", "config-nonce"])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), _ctx.hasClientConfiguration && _ctx.isConfigured ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createBlock"])(_component_ContentBlock, {
- key: 1,
- "content-title": _ctx.translate('GoogleAnalyticsImporter_SelectImporter')
+ key: 1
}, {
default: Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withCtx"])(function () {
- return [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("p", null, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_SelectImporterSelection')), 1), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_ImportSelector, {
- "import-options-ua": _ctx.importOptionsUa,
- "import-options-ga4": _ctx.importOptionsGa4,
- "onUpdate:selectedImporter": _cache[0] || (_cache[0] = function ($event) {
- return _ctx.selectedImporter = $event;
- })
- }, null, 8, ["import-options-ua", "import-options-ga4"]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withDirectives"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", AdminPagevue_type_template_id_3ac4f3aa_hoisted_1, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("h3", null, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_ScheduleAnImport')), 1), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_ImportScheduler, {
- "vue-entry": "GoogleAnalyticsImporter.ImportScheduler",
- "has-client-configuration": _ctx.hasClientConfiguration,
- "is-configured": _ctx.isConfigured,
- "start-import-nonce": _ctx.startImportNonce,
- "max-end-date-desc": _ctx.maxEndDateDesc,
- "extra-custom-dimensions-field": _ctx.extraCustomDimensionsField
- }, null, 8, ["has-client-configuration", "is-configured", "start-import-nonce", "max-end-date-desc", "extra-custom-dimensions-field"])], 512), [[external_commonjs_vue_commonjs2_vue_root_Vue_["vShow"], _ctx.selectedImporter === 'ua']]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withDirectives"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", AdminPagevue_type_template_id_3ac4f3aa_hoisted_2, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("h3", null, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_ScheduleAnImportGA4')), 1), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_ImportSchedulerGA4, {
+ return [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", AdminPagevue_type_template_id_89ec9138_hoisted_1, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("h2", null, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_ScheduleAnImportGA4')), 1), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_ImportSchedulerGA4, {
"start-import-nonce": _ctx.startImportNonce,
"max-end-date-desc": _ctx.maxEndDateDesc,
"extra-custom-dimensions-field": _ctx.extraCustomDimensionsFieldGa4,
"stream-ids-field": _ctx.streamIdsFieldGa4
- }, null, 8, ["start-import-nonce", "max-end-date-desc", "extra-custom-dimensions-field", "stream-ids-field"])], 512), [[external_commonjs_vue_commonjs2_vue_root_Vue_["vShow"], _ctx.selectedImporter === 'ga4']])];
+ }, null, 8, ["start-import-nonce", "max-end-date-desc", "extra-custom-dimensions-field", "stream-ids-field"])])];
}),
_: 1
- }, 8, ["content-title"])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), _ctx.hasClientConfiguration && _ctx.isConfigured ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createBlock"])(_component_ContentBlock, {
+ })) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), _ctx.hasClientConfiguration && _ctx.isConfigured ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createBlock"])(_component_ContentBlock, {
key: 2,
id: "importStatusContainer",
"content-title": _ctx.translate('GoogleAnalyticsImporter_ImportJobs')
@@ -1748,7 +1399,7 @@ function AdminPagevue_type_template_id_3ac4f3aa_render(_ctx, _cache, $props, $se
default: Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withCtx"])(function () {
var _ctx$statuses, _ctx$statuses2;
- return [!((_ctx$statuses = _ctx.statuses) !== null && _ctx$statuses !== void 0 && _ctx$statuses.length) ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("p", AdminPagevue_type_template_id_3ac4f3aa_hoisted_3, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_ThereAreNoImportJobs')), 1)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), (_ctx$statuses2 = _ctx.statuses) !== null && _ctx$statuses2 !== void 0 && _ctx$statuses2.length ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createBlock"])(_component_ImportStatus, {
+ return [!((_ctx$statuses = _ctx.statuses) !== null && _ctx$statuses !== void 0 && _ctx$statuses.length) ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("p", AdminPagevue_type_template_id_89ec9138_hoisted_2, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_ThereAreNoImportJobs')), 1)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), (_ctx$statuses2 = _ctx.statuses) !== null && _ctx$statuses2 !== void 0 && _ctx$statuses2.length ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createBlock"])(_component_ImportStatus, {
key: 1,
statuses: _ctx.statuses,
"stop-import-nonce": _ctx.stopImportNonce,
@@ -1758,17 +1409,17 @@ function AdminPagevue_type_template_id_3ac4f3aa_render(_ctx, _cache, $props, $se
}, null, 8, ["statuses", "stop-import-nonce", "change-import-end-date-nonce", "resume-import-nonce", "schedule-re-import-nonce"])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)];
}),
_: 1
- }, 8, ["content-title"])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), _ctx.hasClientConfiguration && _ctx.isConfigured ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", AdminPagevue_type_template_id_3ac4f3aa_hoisted_4, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("h2", null, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_CancelJobConfirm')), 1), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("input", {
+ }, 8, ["content-title"])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), _ctx.hasClientConfiguration && _ctx.isConfigured ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", AdminPagevue_type_template_id_89ec9138_hoisted_3, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("h2", null, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('GoogleAnalyticsImporter_CancelJobConfirm')), 1), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("input", {
role: "yes",
type: "button",
value: _ctx.translate('General_Yes')
- }, null, 8, AdminPagevue_type_template_id_3ac4f3aa_hoisted_5), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("input", {
+ }, null, 8, AdminPagevue_type_template_id_89ec9138_hoisted_4), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("input", {
role: "no",
type: "button",
value: _ctx.translate('General_No')
- }, null, 8, AdminPagevue_type_template_id_3ac4f3aa_hoisted_6)])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)]);
+ }, null, 8, AdminPagevue_type_template_id_89ec9138_hoisted_5)])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)]);
}
-// CONCATENATED MODULE: ./plugins/GoogleAnalyticsImporter/vue/src/AdminPage/AdminPage.vue?vue&type=template&id=3ac4f3aa
+// CONCATENATED MODULE: ./plugins/GoogleAnalyticsImporter/vue/src/AdminPage/AdminPage.vue?vue&type=template&id=89ec9138
// 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/AdminPage/CommonConnect.vue?vue&type=template&id=a5479d76
@@ -1886,8 +1537,6 @@ CommonConnectvue_type_script_lang_ts.render = CommonConnectvue_type_template_id_
-
-
/* harmony default export */ var AdminPagevue_type_script_lang_ts = (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
props: {
hasClientConfiguration: Boolean,
@@ -1951,9 +1600,7 @@ CommonConnectvue_type_script_lang_ts.render = CommonConnectvue_type_template_id_
ImportSchedulerGA4: ImportSchedulerGA4,
ContentBlock: external_CoreHome_["ContentBlock"],
ClientConfig: ClientConfig,
- ImportScheduler: ImportScheduler,
- ImportStatus: ImportStatus,
- ImportSelector: ImportSelector
+ ImportStatus: ImportStatus
},
data: function data() {
return {
@@ -1985,7 +1632,7 @@ CommonConnectvue_type_script_lang_ts.render = CommonConnectvue_type_template_id_
-AdminPagevue_type_script_lang_ts.render = AdminPagevue_type_template_id_3ac4f3aa_render
+AdminPagevue_type_script_lang_ts.render = AdminPagevue_type_template_id_89ec9138_render
/* harmony default export */ var AdminPage = (AdminPagevue_type_script_lang_ts);
// CONCATENATED MODULE: ./plugins/GoogleAnalyticsImporter/vue/src/index.ts
@@ -2002,8 +1649,6 @@ AdminPagevue_type_script_lang_ts.render = AdminPagevue_type_template_id_3ac4f3aa
-
-
// CONCATENATED MODULE: ./node_modules/@vue/cli-service/lib/commands/build/entry-lib-no-default.js
diff --git a/vue/dist/GoogleAnalyticsImporter.umd.min.js b/vue/dist/GoogleAnalyticsImporter.umd.min.js
index edd1682af..d2d1e6366 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,"ImportScheduler",(function(){return A})),n.d(t,"ImportSchedulerGA4",(function(){return M})),n.d(t,"ImportSelector",(function(){return P})),n.d(t,"ImportStatus",(function(){return We})),n.d(t,"ConfigureConnection",(function(){return Gt})),n.d(t,"ClientConfig",(function(){return Ft})),n.d(t,"AdminPage",(function(){return Zt})),n.d(t,"Connect",(function(){return Kt})),"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,p=a["Periods"].parse(s,m).getDateRange(),u=!(r.getTime()>p[1].getTime()||i.getTime()
{{ translate('GoogleAnalyticsImporter_SelectImporterSelection') }}
-