From aca55f1d6dbdce58e6d2c232a0d5ed808681acbe Mon Sep 17 00:00:00 2001 From: vin0401 Date: Wed, 24 Jan 2024 11:15:58 +0100 Subject: [PATCH] AP-83 Rename workbench into studio --- .github/ci/files/config/bundles.php | 2 +- .github/ci/files/config/services.yaml | 8 ++++---- README.md | 2 +- assets/js/components/example/example.stories.tsx | 2 +- codeception.dist.yml | 4 ++-- composer.json | 10 +++++----- config/pimcore/routing.yaml | 4 ++-- config/services.yaml | 4 ++-- doc/01_Installation.md | 14 +++++++------- package-lock.json | 4 ++-- package.json | 2 +- public/build/entrypoints.json | 4 ++-- public/build/manifest.json | 4 ++-- public/build/report.html | 4 ++-- src/Controller/DefaultController.php | 6 +++--- src/DependencyInjection/Configuration.php | 4 ++-- ...iExtension.php => PimcoreStudioUiExtension.php} | 6 +++--- ...benchUiBundle.php => PimcoreStudioUiBundle.php} | 4 ++-- templates/default/index.html.twig | 4 ++-- tests/Unit.suite.dist.yml | 2 +- tests/Unit/DefaultTest.php | 2 +- webpack.config.js | 4 ++-- 22 files changed, 50 insertions(+), 50 deletions(-) rename src/DependencyInjection/{PimcoreWorkbenchUiExtension.php => PimcoreStudioUiExtension.php} (85%) rename src/{PimcoreWorkbenchUiBundle.php => PimcoreStudioUiBundle.php} (80%) diff --git a/.github/ci/files/config/bundles.php b/.github/ci/files/config/bundles.php index 36dfd6f0a..37e891136 100644 --- a/.github/ci/files/config/bundles.php +++ b/.github/ci/files/config/bundles.php @@ -1,5 +1,5 @@ ['all' => true], + 'Pimcore\\Bundle\\StudioUiBundle\\PimcoreStudioUiBundle' => ['all' => true], ]; diff --git a/.github/ci/files/config/services.yaml b/.github/ci/files/config/services.yaml index 3657af6b4..cb2873926 100644 --- a/.github/ci/files/config/services.yaml +++ b/.github/ci/files/config/services.yaml @@ -10,14 +10,14 @@ services: # # INSTALLER # - Pimcore\Bundle\WorkbenchUiBundle\Installer: + Pimcore\Bundle\StudioUiBundle\Installer: public: true arguments: - $bundle: "@=service('kernel').getBundle('PimcoreWorkbenchUiBundle')" + $bundle: "@=service('kernel').getBundle('PimcoreStudioUiBundle')" # controllers are imported separately to make sure they're public # and have a tag that allows actions to type-hint services - Pimcore\Bundle\WorkbenchUiBundle\Controller\: + Pimcore\Bundle\StudioUiBundle\Controller\: resource: '../src/Controller' public: true - tags: [ 'controller.service_arguments' ] \ No newline at end of file + tags: [ 'controller.service_arguments' ] diff --git a/README.md b/README.md index fdedf2edd..89d376321 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Workbench Ui +# Studio Ui todo ## Features in a Nutshell diff --git a/assets/js/components/example/example.stories.tsx b/assets/js/components/example/example.stories.tsx index 18725de2f..28a3e4c47 100644 --- a/assets/js/components/example/example.stories.tsx +++ b/assets/js/components/example/example.stories.tsx @@ -4,7 +4,7 @@ import { Meta } from '@storybook/react'; import { Example as ExampleComponent } from './example'; export default { - title: 'Pimcore workbench/Example', + title: 'Pimcore studio/Example', component: ExampleComponent, parameters: { layout: 'centered' diff --git a/codeception.dist.yml b/codeception.dist.yml index 23c1775b0..6c7e77929 100644 --- a/codeception.dist.yml +++ b/codeception.dist.yml @@ -1,4 +1,4 @@ -namespace: Pimcore\Bundle\WorkbenchUiBundle\Tests +namespace: Pimcore\Bundle\StudioUiBundle\Tests bootstrap: _bootstrap.php settings: @@ -21,4 +21,4 @@ coverage: - src/DependencyInjection/* - src/Repository/* - src/Installer.php - - src/PimcoreWorkbenchUiBundle.php \ No newline at end of file + - src/PimcoreStudioUiBundle.php diff --git a/composer.json b/composer.json index 55fb5e75e..b94e9bbd5 100644 --- a/composer.json +++ b/composer.json @@ -1,8 +1,8 @@ { - "name": "pimcore/workbench-ui-bundle", + "name": "pimcore/studio-ui-bundle", "license": "Pimcore Enterprise License (PEL)", "type": "pimcore-bundle", - "description": "Pimcore Workbench Ui Bundle", + "description": "Pimcore Studio Ui Bundle", "config": { "discard-changes": true, "sort-packages": true, @@ -36,19 +36,19 @@ }, "autoload": { "psr-4": { - "Pimcore\\Bundle\\WorkbenchUiBundle\\": "src/", + "Pimcore\\Bundle\\StudioUiBundle\\": "src/", "Pimcore\\": "core-extension/Pimcore/" } }, "autoload-dev": { "psr-4": { - "Pimcore\\Bundle\\WorkbenchUiBundle\\Tests\\": "tests" + "Pimcore\\Bundle\\StudioUiBundle\\Tests\\": "tests" } }, "extra": { "pimcore": { "bundles": [ - "Pimcore\\Bundle\\WorkbenchUiBundle\\PimcoreWorkbenchUiBundle" + "Pimcore\\Bundle\\StudioUiBundle\\PimcoreStudioUiBundle" ] } } diff --git a/config/pimcore/routing.yaml b/config/pimcore/routing.yaml index f668f003e..7dc08311c 100644 --- a/config/pimcore/routing.yaml +++ b/config/pimcore/routing.yaml @@ -1,5 +1,5 @@ -pimcore_workbench_ui: - resource: "@PimcoreWorkbenchUiBundle/src/Controller/" +pimcore_studio_ui: + resource: "@PimcoreStudioUiBundle/src/Controller/" type: annotation prefix: / diff --git a/config/services.yaml b/config/services.yaml index 0aa879a5a..677c5fd4b 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -6,13 +6,13 @@ services: # controllers are imported separately to make sure they're public # and have a tag that allows actions to type-hint services - Pimcore\Bundle\WorkbenchUiBundle\Controller\: + Pimcore\Bundle\StudioUiBundle\Controller\: resource: '../src/Controller' public: true tags: ['controller.service_arguments'] # add more services, or override services that need manual wiring -# Pimcore\Bundle\WorkbenchUiBundle\ExampleClass: +# Pimcore\Bundle\StudioUiBundle\ExampleClass: # arguments: # - "@service_id" # - "plain_value" diff --git a/doc/01_Installation.md b/doc/01_Installation.md index 6f9d84e95..4ba1a8efc 100644 --- a/doc/01_Installation.md +++ b/doc/01_Installation.md @@ -1,4 +1,4 @@ -# Installation of the Workbench Ui Bundle +# Installation of the Studio Ui Bundle :::info @@ -8,21 +8,21 @@ ## Bundle Installation -To install the Workbench Ui Bundle, follow the three steps below: +To install the Studio Ui Bundle, follow the three steps below: 1) Install the required dependencies: ```bash -composer require pimcore/workbench-ui-bundle +composer require pimcore/studio-ui-bundle ``` 2) Make sure the bundle is enabled in the `config/bundles.php` file. The following lines should be added: ```php -use Pimcore\Bundle\WorkbenchUiBundle\PimcoreWorkbenchUiBundle; +use Pimcore\Bundle\StudioUiBundle\PimcoreStudioUiBundle; // ... return [ // ... - WorkbenchUiBundle::class => ['all' => true], + StudioUiBundle::class => ['all' => true], // ... ]; ``` @@ -30,5 +30,5 @@ return [ 3) Install the bundle: ```bash -bin/console pimcore:bundle:install PimcoreWorkbenchUiBundle -``` \ No newline at end of file +bin/console pimcore:bundle:install PimcoreStudioUiBundle +``` diff --git a/package-lock.json b/package-lock.json index ef1c25362..4052d27f8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,10 +1,10 @@ { - "name": "pimcore-workbench-ui-bundle", + "name": "pimcore-studio-ui-bundle", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "pimcore-workbench-ui-bundle", + "name": "pimcore-studio-ui-bundle", "license": "PEL", "dependencies": { "@reduxjs/toolkit": "^2.0.1", diff --git a/package.json b/package.json index 4a8eb5f82..9ad30e334 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "pimcore-workbench-ui-bundle", + "name": "pimcore-studio-ui-bundle", "scripts": { "dev-server": "encore dev-server --port 3030", "dev": "encore dev", diff --git a/public/build/entrypoints.json b/public/build/entrypoints.json index 41a08d95d..c27c14542 100644 --- a/public/build/entrypoints.json +++ b/public/build/entrypoints.json @@ -2,8 +2,8 @@ "entrypoints": { "main": { "js": [ - "/bundles/pimcoreworkbenchui/build/472.6d9d9b99.js", - "/bundles/pimcoreworkbenchui/build/main.8fe6115e.js" + "/bundles/pimcorestudioui/build/472.6d9d9b99.js", + "/bundles/pimcorestudioui/build/main.8fe6115e.js" ] } } diff --git a/public/build/manifest.json b/public/build/manifest.json index b866fddd5..72fdf3b4a 100644 --- a/public/build/manifest.json +++ b/public/build/manifest.json @@ -1,4 +1,4 @@ { - "bundles/pimcoreworkbenchui/build/main.js": "/bundles/pimcoreworkbenchui/build/main.8fe6115e.js", - "bundles/pimcoreworkbenchui/build/472.6d9d9b99.js": "/bundles/pimcoreworkbenchui/build/472.6d9d9b99.js" + "bundles/pimcorestudioui/build/main.js": "/bundles/pimcorestudioui/build/main.8fe6115e.js", + "bundles/pimcorestudioui/build/472.6d9d9b99.js": "/bundles/pimcorestudioui/build/472.6d9d9b99.js" } \ No newline at end of file diff --git a/public/build/report.html b/public/build/report.html index 2974055d7..ce2988816 100644 --- a/public/build/report.html +++ b/public/build/report.html @@ -3,7 +3,7 @@ - pimcore-workbench-ui-bundle [24 Jan 2024 at 09:55] + pimcore-studio-ui-bundle [24 Jan 2024 at 10:09] - \ No newline at end of file + diff --git a/src/Controller/DefaultController.php b/src/Controller/DefaultController.php index 2845a461d..ba7fb0c54 100644 --- a/src/Controller/DefaultController.php +++ b/src/Controller/DefaultController.php @@ -11,7 +11,7 @@ * @license http://www.pimcore.org/license PCL */ -namespace Pimcore\Bundle\WorkbenchUiBundle\Controller; +namespace Pimcore\Bundle\StudioUiBundle\Controller; use Pimcore\Controller\FrontendController; use Symfony\Component\HttpFoundation\Request; @@ -21,10 +21,10 @@ final class DefaultController extends FrontendController { /** - * @Route("/admin/workbench") + * @Route("/admin/studio") */ public function indexAction(Request $request): Response { - return $this->render('@PimcoreWorkbenchUi/default/index.html.twig'); + return $this->render('@PimcoreStudioUi/default/index.html.twig'); } } diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php index 46ef48abf..a290f8595 100644 --- a/src/DependencyInjection/Configuration.php +++ b/src/DependencyInjection/Configuration.php @@ -10,7 +10,7 @@ * @license http://www.pimcore.org/license PCL */ -namespace Pimcore\Bundle\WorkbenchUiBundle\DependencyInjection; +namespace Pimcore\Bundle\StudioUiBundle\DependencyInjection; use Symfony\Component\Config\Definition\Builder\TreeBuilder; use Symfony\Component\Config\Definition\ConfigurationInterface; @@ -27,7 +27,7 @@ class Configuration implements ConfigurationInterface */ public function getConfigTreeBuilder(): TreeBuilder { - $treeBuilder = new TreeBuilder('pimcore_workbench_ui'); + $treeBuilder = new TreeBuilder('pimcore_studio_ui'); // Here you should define the parameters that are allowed to // configure your bundle. See the documentation linked above for diff --git a/src/DependencyInjection/PimcoreWorkbenchUiExtension.php b/src/DependencyInjection/PimcoreStudioUiExtension.php similarity index 85% rename from src/DependencyInjection/PimcoreWorkbenchUiExtension.php rename to src/DependencyInjection/PimcoreStudioUiExtension.php index ae5e8a6f2..06d09929d 100644 --- a/src/DependencyInjection/PimcoreWorkbenchUiExtension.php +++ b/src/DependencyInjection/PimcoreStudioUiExtension.php @@ -10,7 +10,7 @@ * @license http://www.pimcore.org/license PCL */ -namespace Pimcore\Bundle\WorkbenchUiBundle\DependencyInjection; +namespace Pimcore\Bundle\StudioUiBundle\DependencyInjection; use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; @@ -23,7 +23,7 @@ * * @link http://symfony.com/doc/current/cookbook/bundles/extension.html */ -class PimcoreWorkbenchUiExtension extends Extension implements PrependExtensionInterface +class PimcoreStudioUiExtension extends Extension implements PrependExtensionInterface { /** * {@inheritdoc} @@ -40,7 +40,7 @@ public function load(array $configs, ContainerBuilder $container): void public function prepend(ContainerBuilder $container) { $builds = [ - 'pimcoreWorkbenchUi' => realpath(__DIR__ . '/../../public/build'), + 'pimcoreStudioUi' => realpath(__DIR__ . '/../../public/build'), ]; $container->prependExtensionConfig('webpack_encore', [ diff --git a/src/PimcoreWorkbenchUiBundle.php b/src/PimcoreStudioUiBundle.php similarity index 80% rename from src/PimcoreWorkbenchUiBundle.php rename to src/PimcoreStudioUiBundle.php index 064cbf20f..d22b93da1 100644 --- a/src/PimcoreWorkbenchUiBundle.php +++ b/src/PimcoreStudioUiBundle.php @@ -12,11 +12,11 @@ * @license http://www.pimcore.org/license PCL */ -namespace Pimcore\Bundle\WorkbenchUiBundle; +namespace Pimcore\Bundle\StudioUiBundle; use Pimcore\Extension\Bundle\AbstractPimcoreBundle; -class PimcoreWorkbenchUiBundle extends AbstractPimcoreBundle +class PimcoreStudioUiBundle extends AbstractPimcoreBundle { public function getPath(): string { diff --git a/templates/default/index.html.twig b/templates/default/index.html.twig index 14909b56b..719058b6b 100644 --- a/templates/default/index.html.twig +++ b/templates/default/index.html.twig @@ -3,12 +3,12 @@ - {{ encore_entry_link_tags('main', null, 'pimcoreWorkbenchUi') }} + {{ encore_entry_link_tags('main', null, 'pimcoreStudioUi') }}
- {{ encore_entry_script_tags('main', null, 'pimcoreWorkbenchUi') }} + {{ encore_entry_script_tags('main', null, 'pimcoreStudioUi') }} diff --git a/tests/Unit.suite.dist.yml b/tests/Unit.suite.dist.yml index 3e0ac8723..4a969809b 100644 --- a/tests/Unit.suite.dist.yml +++ b/tests/Unit.suite.dist.yml @@ -1 +1 @@ -suite_namespace: Pimcore\Bundle\WorkbenchUiBundle\Tests \ No newline at end of file +suite_namespace: Pimcore\Bundle\StudioUiBundle\Tests diff --git a/tests/Unit/DefaultTest.php b/tests/Unit/DefaultTest.php index d8bc20b73..27ddd4983 100644 --- a/tests/Unit/DefaultTest.php +++ b/tests/Unit/DefaultTest.php @@ -11,7 +11,7 @@ * @license http://www.pimcore.org/license PCL */ -namespace Pimcore\Bundle\WorkbenchUiBundle\Tests\Unit; +namespace Pimcore\Bundle\StudioUiBundle\Tests\Unit; use Codeception\Test\Unit; diff --git a/webpack.config.js b/webpack.config.js index 2892e7972..77ebbfe91 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -13,7 +13,7 @@ Encore // directory where compiled assets will be stored .setOutputPath(path.resolve(__dirname, 'public', 'build')) // public path used by the web server to access the output path - .setPublicPath('/bundles/pimcoreworkbenchui/build') + .setPublicPath('/bundles/pimcorestudioui/build') /* * ENTRY CONFIG @@ -92,7 +92,7 @@ Encore if (!Encore.isDevServer()) { // only needed for CDN's or sub-directory deploy Encore - .setManifestKeyPrefix('bundles/pimcoreworkbenchui/build') + .setManifestKeyPrefix('bundles/pimcorestudioui/build') .addPlugin(new BundleAnalyzerPlugin({ analyzerMode: 'static', openAnalyzer: false })) ;