[FEATURE] Add site filter for Analysis/Content

in2code-de · Feb 22, 2024 · a94ba72 · a94ba72
1 parent 6169b09
commit a94ba72
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 24 deletions.
diff --git a/Classes/Controller/AnalysisController.php b/Classes/Controller/AnalysisController.php
@@ -106,7 +106,6 @@ public function contentAction(FilterDto $filter, string $export = ''): ResponseI
             'downloads' => $this->downloadRepository->findCombinedByHref($filter),
             'languageData' => GeneralUtility::makeInstance(LanguagesDataProvider::class, $filter),
             'domainData' => GeneralUtility::makeInstance(DomainDataProvider::class, $filter),
-            'domains' => $this->pagevisitsRepository->getAllDomains($filter),
         ]);
 
         $this->addDocumentHeaderForCurrentController();

diff --git a/Classes/Domain/DataProvider/DomainDataProvider.php b/Classes/Domain/DataProvider/DomainDataProvider.php
@@ -3,7 +3,6 @@
 declare(strict_types=1);
 namespace In2code\Lux\Domain\DataProvider;
 
-use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Driver\Exception as ExceptionDbalDriver;
 use In2code\Lux\Domain\Repository\PagevisitRepository;
 use In2code\Lux\Utility\LocalizationUtility;
@@ -27,7 +26,6 @@ class DomainDataProvider extends AbstractDataProvider
      *  ]
      *
      * @return void
-     * @throws DBALException
      * @throws ExceptionDbalDriver
      */
     public function prepareData(): void
@@ -41,7 +39,6 @@ public function prepareData(): void
 
     /**
      * @return array
-     * @throws DBALException
      * @throws ExceptionDbalDriver
      */
     protected function getDomains(): array

diff --git a/Classes/Domain/DataProvider/LanguagesDataProvider.php b/Classes/Domain/DataProvider/LanguagesDataProvider.php
@@ -3,7 +3,6 @@
 declare(strict_types=1);
 namespace In2code\Lux\Domain\DataProvider;
 
-use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Driver\Exception as ExceptionDbalDriver;
 use In2code\Lux\Domain\Repository\LanguageRepository;
 use In2code\Lux\Domain\Repository\PagevisitRepository;
@@ -28,7 +27,6 @@ class LanguagesDataProvider extends AbstractDataProvider
      *  ]
      *
      * @return void
-     * @throws DBALException
      * @throws ExceptionDbalDriver
      */
     public function prepareData(): void
@@ -42,7 +40,6 @@ public function prepareData(): void
 
     /**
      * @return array
-     * @throws DBALException
      * @throws ExceptionDbalDriver
      */
     protected function getLanguagesFromSystem(): array

diff --git a/Classes/Domain/Repository/PagevisitRepository.php b/Classes/Domain/Repository/PagevisitRepository.php
@@ -386,7 +386,7 @@ public function getDomainsWithAmountOfVisits(FilterDto $filter): array
             . ' left join ' . Visitor::TABLE_NAME . ' v on v.uid = pv.visitor'
             . ' left join ' . Categoryscoring::TABLE_NAME . ' cs on v.uid = cs.visitor'
             . ' where pv.domain!="" ' . $this->extendWhereClauseWithFilterTime($filter, true, 'pv')
-            . $this->extendWhereClauseWithFilterDomain($filter, 'pv')
+            . $this->extendWhereClauseWithFilterSite($filter, 'pv')
             . $this->extendWhereClauseWithFilterScoring($filter, 'v')
             . $this->extendWhereClauseWithFilterCategoryScoring($filter, 'cs')
             . ' group by domain order by count desc';
@@ -432,7 +432,7 @@ public function getAllLanguages(FilterDto $filter): array
             . ' left join ' . Visitor::TABLE_NAME . ' v on v.uid = pv.visitor'
             . ' left join ' . Categoryscoring::TABLE_NAME . ' cs on v.uid = cs.visitor'
             . ' where ' . $this->extendWhereClauseWithFilterTime($filter, false, 'pv')
-            . $this->extendWhereClauseWithFilterDomain($filter, 'pv')
+            . $this->extendWhereClauseWithFilterSite($filter, 'pv')
             . $this->extendWhereClauseWithFilterScoring($filter, 'v')
             . $this->extendWhereClauseWithFilterCategoryScoring($filter, 'cs')
             . ' group by pv.language order by count desc ';

diff --git a/Resources/Private/Partials/Filter/Analysis/Content.html b/Resources/Private/Partials/Filter/Analysis/Content.html
@@ -79,21 +79,21 @@ <h5><f:translate key="LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:mo
                         </button>
                     </div>
 
-                    <f:if condition="{domains -> f:count()} > 0">
-                        <div class="input-group form-group">
-                            <f:form.select property="domain" class="form-control form-select" id="domain">
-                                <f:form.select.option value="">
-                                    <f:translate key="LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:module.list.filter.firstoption.domain">Domain</f:translate>
-                                </f:form.select.option>
-                                <f:for each="{domains}" as="domain">
-                                    <f:form.select.option value="{domain}">{domain}</f:form.select.option>
-                                </f:for>
-                            </f:form.select>
-                            <button type="button" class="btn btn-default" data-global-event="click" data-action-focus="#domain">
-                                <core:icon identifier="actions-globe" />
-                            </button>
-                        </div>
-                    </f:if>
+                    <div class="input-group form-group">
+                        <f:form.select
+                            id="site"
+                            class="form-control form-select"
+                            property="site"
+                            options="{filter.allowedSites}"
+                            prependOptionLabel="{f:translate(key:'LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:module.analysis.dashboard.filter.sitesall')}"
+                            prependOptionValue=""
+                            optionValueField="identifier"
+                            optionLabelField="configuration.websiteTitle"
+                            value="{filter.site}" />
+                        <button type="button" class="btn btn-default" data-global-event="click" data-action-focus="#site">
+                            <core:icon identifier="actions-globe" size="small" />
+                        </button>
+                    </div>
                 </div>
             </div>