From b8d708874e06fd516b6c4300fce9855c813626c1 Mon Sep 17 00:00:00 2001 From: Benjamin Serfhos Date: Mon, 29 Oct 2018 15:11:25 +0100 Subject: [PATCH] [TASK] Revert to only one plugin based on feedback --- .../Configuration/ConfigurationContainer.php | 2 +- Configuration/TCA/Overrides/tt_content.php | 23 ++++++------------ .../Mod/Wizards/NewContentElement.tsconfig | 20 ++++------------ Resources/Private/Language/locallang_be.xlf | 12 +++------- Resources/Private/Templates/Search/Form.html | 11 --------- .../Private/Templates/Search/Results.html | 4 ++++ .../{PluginResults.svg => PluginSearch.svg} | 0 ext_localconf.php | 24 +++++++------------ 8 files changed, 28 insertions(+), 68 deletions(-) delete mode 100644 Resources/Private/Templates/Search/Form.html rename Resources/Public/Icons/{PluginResults.svg => PluginSearch.svg} (100%) diff --git a/Classes/Configuration/ConfigurationContainer.php b/Classes/Configuration/ConfigurationContainer.php index 476c94e..e454a24 100644 --- a/Classes/Configuration/ConfigurationContainer.php +++ b/Classes/Configuration/ConfigurationContainer.php @@ -45,7 +45,7 @@ class ConfigurationContainer implements ConfigurationContainerInterface $this->settings = $configurationManager->getConfiguration( ConfigurationManagerInterface::CONFIGURATION_TYPE_SETTINGS, 'SearchCore', - 'Results' + 'Search' ); if ($this->settings === null) { throw new NoConfigurationException('Could not fetch configuration.', 1484226842); diff --git a/Configuration/TCA/Overrides/tt_content.php b/Configuration/TCA/Overrides/tt_content.php index 59ad7ed..5bb389a 100644 --- a/Configuration/TCA/Overrides/tt_content.php +++ b/Configuration/TCA/Overrides/tt_content.php @@ -3,21 +3,12 @@ use TYPO3\CMS\Extbase\Utility\ExtensionUtility; call_user_func(function ($extension, $table) { - $plugin = ExtensionUtility::registerPlugin( - 'Codappix.' . $extension, - 'Results', - 'LLL:EXT:search_core/Resources/Private/Language/locallang_be.xlf:plugin.results.title', - 'EXT:search_core/Resources/Public/Icons/PluginResults.svg' - ) ?? 'searchcore_results'; + ExtensionUtility::registerPlugin( + 'Codappix.' . $extension, + 'Search', + 'LLL:EXT:search_core/Resources/Private/Language/locallang_be.xlf:plugin.search.title', + 'plugin-' . $extension . '-search' + ); - $GLOBALS['TCA'][$table]['types']['list']['subtypes_excludelist'][$plugin] = 'recursive,pages'; - - $plugin = ExtensionUtility::registerPlugin( - 'Codappix.' . $extension, - 'Form', - 'LLL:EXT:search_core/Resources/Private/Language/locallang_be.xlf:plugin.form.title', - 'EXT:search_core/Resources/Public/Icons/PluginForm.svg' - ) ?? 'searchcore_form'; - - $GLOBALS['TCA'][$table]['types']['list']['subtypes_excludelist'][$plugin] = 'recursive,pages'; + $GLOBALS['TCA'][$table]['types']['list']['subtypes_excludelist']['searchcore_search'] = 'recursive,pages'; }, 'search_core', 'tt_content'); diff --git a/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.tsconfig b/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.tsconfig index e65d17b..d2d6938 100644 --- a/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.tsconfig +++ b/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.tsconfig @@ -1,22 +1,12 @@ mod.wizards.newContentElement.wizardItems.plugins { elements { - searchcore_results { - title = LLL:EXT:search_core/Resources/Private/Language/locallang_be.xlf:plugin.results.title - description = LLL:EXT:search_core/Resources/Private/Language/locallang_be.xlf:plugin.results.description - iconIdentifier = plugin-search_core-results + searchcore_search { + title = LLL:EXT:search_core/Resources/Private/Language/locallang_be.xlf:plugin.search.title + description = LLL:EXT:search_core/Resources/Private/Language/locallang_be.xlf:plugin.search.description + iconIdentifier = plugin-search_core-search tt_content_defValues { CType = list - list_type = searchcore_results - } - } - - searchcore_form { - title = LLL:EXT:search_core/Resources/Private/Language/locallang_be.xlf:plugin.form.title - description = LLL:EXT:search_core/Resources/Private/Language/locallang_be.xlf:plugin.form.description - iconIdentifier = plugin-search_core-form - tt_content_defValues { - CType = list - list_type = searchcore_form + list_type = searchcore_search } } } diff --git a/Resources/Private/Language/locallang_be.xlf b/Resources/Private/Language/locallang_be.xlf index 28a7bb8..524d5e0 100644 --- a/Resources/Private/Language/locallang_be.xlf +++ b/Resources/Private/Language/locallang_be.xlf @@ -3,18 +3,12 @@
- - Search Core: Results + + Search Core: Search - + List results from search - - Search Core: Form - - - Just a search form to list page - diff --git a/Resources/Private/Templates/Search/Form.html b/Resources/Private/Templates/Search/Form.html deleted file mode 100644 index a7002c4..0000000 --- a/Resources/Private/Templates/Search/Form.html +++ /dev/null @@ -1,11 +0,0 @@ - - - - -
- -
- - - diff --git a/Resources/Private/Templates/Search/Results.html b/Resources/Private/Templates/Search/Results.html index f2efc3d..095d275 100644 --- a/Resources/Private/Templates/Search/Results.html +++ b/Resources/Private/Templates/Search/Results.html @@ -3,6 +3,10 @@ +
+ +
+
    diff --git a/Resources/Public/Icons/PluginResults.svg b/Resources/Public/Icons/PluginSearch.svg similarity index 100% rename from Resources/Public/Icons/PluginResults.svg rename to Resources/Public/Icons/PluginSearch.svg diff --git a/ext_localconf.php b/ext_localconf.php index afc2a45..8452ac8 100644 --- a/ext_localconf.php +++ b/ext_localconf.php @@ -12,9 +12,9 @@ call_user_func(function ($extension, $configuration) { ['source' => 'EXT:search_core/Resources/Public/Icons/PluginForm.svg'] ); $iconRegistry->registerIcon( - 'plugin-' . $extension . '-results', + 'plugin-' . $extension . '-search', \TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider::class, - ['source' => 'EXT:search_core/Resources/Public/Icons/PluginResults.svg'] + ['source' => 'EXT:search_core/Resources/Public/Icons/PluginSearch.svg'] ); // TODO: Add hook for Extbase -> to handle records modified through @@ -45,18 +45,10 @@ call_user_func(function ($extension, $configuration) { TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin( 'Codappix.' . $extension, - 'Results', - ['Search' => 'results'], + 'Search', ['Search' => 'results'] ); - TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin( - 'Codappix.' . $extension, - 'Form', - ['Search' => 'form'], - ['Search' => 'form'] - ); - \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig( '' ); @@ -65,10 +57,10 @@ call_user_func(function ($extension, $configuration) { (isset($configuration['disable.']['elasticsearch']) && filter_var($configuration['disable.']['elasticsearch'], FILTER_VALIDATE_BOOLEAN) === false) ) { - \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\Container\Container::class) - ->registerImplementation( - \Codappix\SearchCore\Connection\ConnectionInterface::class, - \Codappix\SearchCore\Connection\Elasticsearch::class - ); + $container = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\Container\Container::class); + $container->registerImplementation( + \Codappix\SearchCore\Connection\ConnectionInterface::class, + \Codappix\SearchCore\Connection\Elasticsearch::class + ); } }, $_EXTKEY, $_EXTCONF);