From 41f7becda5af76659d929765c427051e5c82b28c Mon Sep 17 00:00:00 2001 From: DavidBruchmann Date: Fri, 29 Mar 2024 17:11:30 +0700 Subject: [PATCH 1/7] fix #746 --- Resources/Private/CodeTemplates/Extbase/extEmconf.phpt | 1 - Tests/Fixtures/TestExtensions/test_extension/ext_emconf.php | 1 - 2 files changed, 2 deletions(-) diff --git a/Resources/Private/CodeTemplates/Extbase/extEmconf.phpt b/Resources/Private/CodeTemplates/Extbase/extEmconf.phpt index 0c1139875..9f0844a2b 100644 --- a/Resources/Private/CodeTemplates/Extbase/extEmconf.phpt +++ b/Resources/Private/CodeTemplates/Extbase/extEmconf.phpt @@ -8,7 +8,6 @@ $EM_CONF[$_EXTKEY] = [ 'author' => ', {person.name}', 'author_email' => ', {person.email}', 'state' => '{extension.readableState}', - 'clearCacheOnLoad' => 0, 'version' => '{extension.version}', 'constraints' => [ 'depends' => [ diff --git a/Tests/Fixtures/TestExtensions/test_extension/ext_emconf.php b/Tests/Fixtures/TestExtensions/test_extension/ext_emconf.php index bdb53dd5d..c936a140d 100644 --- a/Tests/Fixtures/TestExtensions/test_extension/ext_emconf.php +++ b/Tests/Fixtures/TestExtensions/test_extension/ext_emconf.php @@ -7,7 +7,6 @@ 'author' => 'John Doe', 'author_email' => 'mail@typo3.com', 'state' => 'alpha', - 'clearCacheOnLoad' => 0, 'version' => '1.0.0', 'constraints' => [ 'depends' => [ From 20823c7f9ed3e5da3295b1262263e21080678a40 Mon Sep 17 00:00:00 2001 From: DavidBruchmann Date: Fri, 29 Mar 2024 17:23:06 +0700 Subject: [PATCH 2/7] fix #745 --- .../FlexForms/plugin_flexform.phpt | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/Resources/Private/CodeTemplates/Extbase/Configuration/FlexForms/plugin_flexform.phpt b/Resources/Private/CodeTemplates/Extbase/Configuration/FlexForms/plugin_flexform.phpt index f296f90c1..b8562246c 100644 --- a/Resources/Private/CodeTemplates/Extbase/Configuration/FlexForms/plugin_flexform.phpt +++ b/Resources/Private/CodeTemplates/Extbase/Configuration/FlexForms/plugin_flexform.phpt @@ -6,20 +6,16 @@ - - Plugin Options - + Plugin Options array - - - - input - 50 - trim - - + + + input + 50 + trim + From 989c2e0657b0a8f064753cb1e3613c07f535839b Mon Sep 17 00:00:00 2001 From: DavidBruchmann Date: Fri, 29 Mar 2024 17:27:24 +0700 Subject: [PATCH 3/7] fix #744 --- Classes/Service/ValidationService.php | 1 - .../CodeTemplates/Extbase/Configuration/TCA/tableName.phpt | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Classes/Service/ValidationService.php b/Classes/Service/ValidationService.php index d741885d2..d0be1136d 100644 --- a/Classes/Service/ValidationService.php +++ b/Classes/Service/ValidationService.php @@ -333,7 +333,6 @@ class ValidationService implements SingletonInterface 'fe_group', 'hidden', 'deleted', - 'cruser_id', 'crdate', 'tstamp', 'sys_language', diff --git a/Resources/Private/CodeTemplates/Extbase/Configuration/TCA/tableName.phpt b/Resources/Private/CodeTemplates/Extbase/Configuration/TCA/tableName.phpt index b06bd7d4d..ec80ef8fa 100644 --- a/Resources/Private/CodeTemplates/Extbase/Configuration/TCA/tableName.phpt +++ b/Resources/Private/CodeTemplates/Extbase/Configuration/TCA/tableName.phpt @@ -4,8 +4,7 @@ return [ 'title' => 'LLL:EXT:{extension.extensionKey}/Resources/Private/Language/locallang_db.xlf:{domainObject.databaseTableName}', 'label' => '{domainObject.listModuleValueLabel}', 'tstamp' => 'tstamp', - 'crdate' => 'crdate', - 'cruser_id' => 'cruser_id', + 'crdate' => 'crdate', 'sortby' => 'sorting', 'versioningWS' => true, 'languageField' => 'sys_language_uid', From 12d5a62ee434ac1d7a37b928a79b6e5c547bc00d Mon Sep 17 00:00:00 2001 From: DavidBruchmann Date: Fri, 29 Mar 2024 17:40:38 +0700 Subject: [PATCH 4/7] fix #743 --- .../Configuration/TCA/Overrides/tt_content.phpt | 8 ++++---- .../Extbase/Configuration/TCA/tableName.phpt | 15 ++++++--------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/Resources/Private/CodeTemplates/Extbase/Configuration/TCA/Overrides/tt_content.phpt b/Resources/Private/CodeTemplates/Extbase/Configuration/TCA/Overrides/tt_content.phpt index 63eb5054a..01648c26e 100644 --- a/Resources/Private/CodeTemplates/Extbase/Configuration/TCA/Overrides/tt_content.phpt +++ b/Resources/Private/CodeTemplates/Extbase/Configuration/TCA/Overrides/tt_content.phpt @@ -20,10 +20,10 @@ if (!is_array($GLOBALS['TCA']['tt_content']['types']['{extension.extensionKey}_{ 'tt_content', 'CType', [ - '{plugin.name -> k:format.quoteString()}', - '{extension.extensionKey}_{plugin.key}', - '{extension.extensionKey}-plugin-{plugin.key}', - '{extension.extensionKey}' + 'label' => '{plugin.name -> k:format.quoteString()}', + 'value' => '{extension.extensionKey}_{plugin.key}', + 'icon' => '{extension.extensionKey}-plugin-{plugin.key}', + 'group' => '{extension.extensionKey}' ] ); diff --git a/Resources/Private/CodeTemplates/Extbase/Configuration/TCA/tableName.phpt b/Resources/Private/CodeTemplates/Extbase/Configuration/TCA/tableName.phpt index ec80ef8fa..d718609f5 100644 --- a/Resources/Private/CodeTemplates/Extbase/Configuration/TCA/tableName.phpt +++ b/Resources/Private/CodeTemplates/Extbase/Configuration/TCA/tableName.phpt @@ -41,7 +41,7 @@ return [ 'renderType' => 'selectSingle', 'default' => 0, 'items' => [ - ['', 0], + ['label' => '', 'value' => 0], ], 'foreign_table' => '{domainObject.databaseTableName}', 'foreign_table_where' => 'AND #{domainObject.databaseTableName}.#pid=###CURRENT_PID### AND #{domainObject.databaseTableName}.#sys_language_uid IN (-1,0)', @@ -60,8 +60,7 @@ return [ 'renderType' => 'checkboxToggle', 'items' => [ [ - 0 => '', - 1 => '', + 'label' => '', 'invertStateDisplay' => true ] ], @@ -71,9 +70,8 @@ return [ 'exclude' => true, 'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.starttime', 'config' => [ - 'type' => 'input', - 'renderType' => 'inputDateTime', - 'eval' => 'datetime,int', + 'type' => 'datetime', + 'format' => 'datetime', 'default' => 0, 'behaviour' => [ 'allowLanguageSynchronization' => true @@ -84,9 +82,8 @@ return [ 'exclude' => true, 'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.endtime', 'config' => [ - 'type' => 'input', - 'renderType' => 'inputDateTime', - 'eval' => 'datetime,int', + 'type' => 'datetime', + 'format' => 'datetime', 'default' => 0, 'range' => [ 'upper' => mktime(0, 0, 0, 1, 1, 2038) From 5579b9dbcfbe54b5c84c490543d7402c37ef8e87 Mon Sep 17 00:00:00 2001 From: DavidBruchmann Date: Thu, 4 Apr 2024 01:12:00 +0700 Subject: [PATCH 5/7] [TASK] sort list of local extensions for optional editing --- Classes/Controller/BuilderModuleController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Classes/Controller/BuilderModuleController.php b/Classes/Controller/BuilderModuleController.php index 46d80cfcf..b06d24fa0 100644 --- a/Classes/Controller/BuilderModuleController.php +++ b/Classes/Controller/BuilderModuleController.php @@ -527,14 +527,15 @@ protected function rpcActionSave(): array } /** - * Shows a list with available extensions (if they have an ExtensionBuilder.json - * file). + * Shows a list with locally available extensions for editing + * (if they have a file `ExtensionBuilder.json`). * * @return array */ protected function rpcActionList(): array { $extensions = $this->extensionRepository->findAll(); + sort($extensions); return [ 'success' => true, 'result' => $extensions, From 3f2eb38625a7ab4618353d4d5b4a6b2744c2f910 Mon Sep 17 00:00:00 2001 From: DavidBruchmann Date: Fri, 5 Apr 2024 17:39:45 +0700 Subject: [PATCH 6/7] fix #768, show another message when no extensions to open are available --- .../components/ActionButtonsComponent.jsx | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/Build/Sources/components/ActionButtonsComponent.jsx b/Build/Sources/components/ActionButtonsComponent.jsx index f12a4c890..2ec9ca7cd 100644 --- a/Build/Sources/components/ActionButtonsComponent.jsx +++ b/Build/Sources/components/ActionButtonsComponent.jsx @@ -308,20 +308,24 @@ export const ActionButtonsComponent = (props) => { setShow(true); setModalTitle('Available extensions'); setModalClassname('bg-info text-dark'); + let message = 'Currently no extensions are found for editing.'; + if (extensions.result.length > 0) { + message = 'Please select an extension to open'; + } setModalBodyJsx( <> -

Please select an extension to open

+

{message}

- {extensions.result.map((extension) => ( - - ))} + {extensions.result.map((extension) => ( + + ))}
); From 9006adbfc97a8e1c27a19c2e77224480e54edf05 Mon Sep 17 00:00:00 2001 From: DavidBruchmann Date: Fri, 5 Apr 2024 18:15:40 +0700 Subject: [PATCH 7/7] modal window: recover intendation, add colon --- .../components/ActionButtonsComponent.jsx | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Build/Sources/components/ActionButtonsComponent.jsx b/Build/Sources/components/ActionButtonsComponent.jsx index 2ec9ca7cd..b9a5a9e1d 100644 --- a/Build/Sources/components/ActionButtonsComponent.jsx +++ b/Build/Sources/components/ActionButtonsComponent.jsx @@ -310,22 +310,22 @@ export const ActionButtonsComponent = (props) => { setModalClassname('bg-info text-dark'); let message = 'Currently no extensions are found for editing.'; if (extensions.result.length > 0) { - message = 'Please select an extension to open'; + message = 'Please select an extension to open:'; } setModalBodyJsx( <>

{message}

- {extensions.result.map((extension) => ( - - ))} + {extensions.result.map((extension) => ( + + ))}
);