Skip to content

Commit

Permalink
AP-83 Rename workbench into studio
Browse files Browse the repository at this point in the history
  • Loading branch information
vin0401 committed Jan 24, 2024
1 parent 974ea10 commit aca55f1
Show file tree
Hide file tree
Showing 22 changed files with 50 additions and 50 deletions.
2 changes: 1 addition & 1 deletion .github/ci/files/config/bundles.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php

return [
'Pimcore\\Bundle\\WorkbenchUiBundle\\PimcoreWorkbenchUiBundle' => ['all' => true],
'Pimcore\\Bundle\\StudioUiBundle\\PimcoreStudioUiBundle' => ['all' => true],
];
8 changes: 4 additions & 4 deletions .github/ci/files/config/services.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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' ]
tags: [ 'controller.service_arguments' ]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Workbench Ui
# Studio Ui
todo

## Features in a Nutshell
Expand Down
2 changes: 1 addition & 1 deletion assets/js/components/example/example.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions codeception.dist.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace: Pimcore\Bundle\WorkbenchUiBundle\Tests
namespace: Pimcore\Bundle\StudioUiBundle\Tests
bootstrap: _bootstrap.php

settings:
Expand All @@ -21,4 +21,4 @@ coverage:
- src/DependencyInjection/*
- src/Repository/*
- src/Installer.php
- src/PimcoreWorkbenchUiBundle.php
- src/PimcoreStudioUiBundle.php
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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"
]
}
}
Expand Down
4 changes: 2 additions & 2 deletions config/pimcore/routing.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pimcore_workbench_ui:
resource: "@PimcoreWorkbenchUiBundle/src/Controller/"
pimcore_studio_ui:
resource: "@PimcoreStudioUiBundle/src/Controller/"
type: annotation
prefix: /

4 changes: 2 additions & 2 deletions config/services.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
14 changes: 7 additions & 7 deletions doc/01_Installation.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Installation of the Workbench Ui Bundle
# Installation of the Studio Ui Bundle

:::info

Expand All @@ -8,27 +8,27 @@

## 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],
// ...
];
```

3) Install the bundle:

```bash
bin/console pimcore:bundle:install PimcoreWorkbenchUiBundle
```
bin/console pimcore:bundle:install PimcoreStudioUiBundle
```
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 2 additions & 2 deletions public/build/entrypoints.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
}
Expand Down
4 changes: 2 additions & 2 deletions public/build/manifest.json
Original file line number Diff line number Diff line change
@@ -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"
}
4 changes: 2 additions & 2 deletions public/build/report.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<title>pimcore-workbench-ui-bundle [24 Jan 2024 at 09:55]</title>
<title>pimcore-studio-ui-bundle [24 Jan 2024 at 10:09]</title>
<link rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAABrVBMVEUAAAD///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////+O1foceMD///+J0/qK1Pr7/v8Xdr/9///W8P4UdL7L7P0Scr2r4Pyj3vwad8D5/f/2/f+55f3E6f34+/2H0/ojfMKpzOd0rNgQcb3F3O/j9f7c8v6g3Pz0/P/w+v/q+P7n9v6T1/uQ1vuE0vqLut/y+v+Z2fvt+f+15Pzv9fuc2/vR7v2V2Pvd6/bg9P7I6/285/2y4/yp3/zp8vk8i8kqgMT7/P31+fyv4vxGkcz6/P6/6P3j7vfS5PNnpNUxhcbO7f7F6v3O4vHK3/DA2u631Ouy0eqXweKJud5wqthfoNMMbLvY8f73+v2dxeR8sNtTmdDx9/zX6PSjyeaCtd1YnNGX2PuQveCGt95Nls42h8dLlM3F4vBtAAAAM3RSTlMAAyOx0/sKBvik8opWGBMOAe3l1snDm2E9LSb06eHcu5JpHbarfHZCN9CBb08zzkdNS0kYaptYAAAFV0lEQVRYw92X51/aYBDHHS2O2qqttVbrqNq9m+TJIAYIShBkWwqIiCgoWvfeq7Z2/s29hyQNyUcR7LveGwVyXy6XH8/9rqxglLfUPLxVduUor3h0rfp2TYvpivk37929TkG037hffoX0+peVtZQc1589rigVUdXS/ABSAyEmGIO/1XfvldSK8vs3OqB6u3m0nxmIrvgB0dj7rr7Y9IbuF68hnfFaiHA/sxqm0wciIG43P60qKv9WXWc1RXGh/mFESFABTSBi0sNAKzqet17eCtOb3kZIDwxEEU0oAIJGYxNBDhBND29e0rtXXbcpuPmED9IhEAAQ/AXEaF8EPmnrrKsv0LvWR3fg5sWDNAFZOgAgaKvZDogHNU9MFwnnYROkc56RD5CjAbQX9Ow4g7upCsvYu55aSI/Nj0H1akgKQEUM94dwK65hYRmFU9MIcH/fqJYOZYcnuJSU/waKDgTOEVaVKhwrTRP5XzgSpAITYzom7UvkhFX5VutmxeNnWDjjswTKTyfgluNDGbUpWissXhF3s7mlSml+czWkg3D0l1nNjGNjz3myOQOa1KM/jOS6ebdbAVTCi4gljHSFrviza7tOgRWcS0MOUX9zdNgag5w7rRqA44Lzw0hr1WqES36dFliSJFlh2rXIae3FFcDDgKdxrUIDePr8jGcSClV1u7A9xeN0ModY/pHMxmR1EzRh8TJiwqsHmKW0l4FCEZI+jHio+JdPPE9qwQtTRxku2D8sIeRL2LnxWSllANCQGOIiqVHAz2ye2JR0DcH+HoxDkaADLjgxjKQ+AwCX/g0+DNgdG0ukYCONAe+dbc2IAc6fwt1ARoDSezNHxV2Cmzwv3O6lDMV55edBGwGK9n1+x2F8EDfAGCxug8MhpsMEcTEAWf3rx2vZhe/LAmtIn/6apE6PN0ULKgywD9mmdxbmFl3OvD5AS5fW5zLbv/YHmcsBTjf/afDz3MaZTVCfAP9z6/Bw6ycv8EUBWJIn9zYcoAWWlW9+OzO3vkTy8H+RANLmdrpOuYWdZYEXpo+TlCJrW5EARb7fF+bWdqf3hhyZI1nWJQHgznErZhbjoEsWqi8dQNoE294aldzFurwSABL2XXMf9+H1VQGke9exw5P/AnA5Pv5ngMul7LOvO922iwACu8WkCwLCafvM4CeWPxfA8lNHcWZSoi8EwMAIciKX2Z4SWCMAa3snCZ/G4EA8D6CMLNFsGQhkkz/gQNEBbPCbWsxGUpYVu3z8IyNAknwJkfPMEhLyrdi5RTyUVACkw4GSFRNWJNEW+fgPGwHD8/JxnRuLabN4CGNRkAE23na2+VmEAUmrYymSGjMAYqH84YUIyzgzs3XC7gNgH36Vcc4zKY9o9fgPBXUAiHHwVboBHGLiX6Zcjp1f2wu4tvzZKo0ecPnDtQYDQvJXaBeNzce45Fp28ZQLrEZVuFqgBwOalArKXnW1UzlnSusQKJqKYNuz4tOnI6sZG4zanpemv+7ySU2jbA9h6uhcgpfy6G2PahirDZ6zvq6zDduMVFTKvzw8wgyEdelwY9in3XkEPs3osJuwRQ4qTkfzifndg9Gfc4pdsu82+tTnHZTBa2EAMrqr2t43pguc8tNm7JQVQ2S0ukj2d22dhXYP0/veWtwKrCkNoNimAN5+Xr/oLrxswKbVJjteWrX7eR63o4j9q0GxnaBdWgGA5VStpanIjQmEhV0/nVt5VOFUvix6awJhPcAaTEShgrG+iGyvb5a0Ndb1YGHFPEwoqAinoaykaID1o1pdPNu7XsnCKQ3R+hwWIIhGvORcJUBYXe3Xa3vq/mF/N9V13ugufMkfXn+KHsRD0B8AAAAASUVORK5CYII=" type="image/x-icon" />

<script>
Expand Down Expand Up @@ -36,4 +36,4 @@
window.defaultSizes = "parsed";
</script>
</body>
</html>
</html>
6 changes: 3 additions & 3 deletions src/Controller/DefaultController.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* @license http://www.pimcore.org/license PCL
*/

namespace Pimcore\Bundle\WorkbenchUiBundle\Controller;
namespace Pimcore\Bundle\StudioUiBundle\Controller;

Check warning on line 14 in src/Controller/DefaultController.php

View workflow job for this annotation

GitHub Actions / Qodana for PHP

Class path doesn't match project structure

Namespace name doesn't match the PSR-0/PSR-4 project structure

use Pimcore\Controller\FrontendController;
use Symfony\Component\HttpFoundation\Request;
Expand All @@ -21,10 +21,10 @@
final class DefaultController extends FrontendController
{
/**
* @Route("/admin/workbench")
* @Route("/admin/studio")
*/
public function indexAction(Request $request): Response

Check notice on line 26 in src/Controller/DefaultController.php

View workflow job for this annotation

GitHub Actions / Qodana for PHP

Unused parameter

Unused parameter 'request'. The parameter's value is not used anywhere.
{
return $this->render('@PimcoreWorkbenchUi/default/index.html.twig');
return $this->render('@PimcoreStudioUi/default/index.html.twig');
}
}
4 changes: 2 additions & 2 deletions src/DependencyInjection/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* @license http://www.pimcore.org/license PCL
*/

namespace Pimcore\Bundle\WorkbenchUiBundle\DependencyInjection;
namespace Pimcore\Bundle\StudioUiBundle\DependencyInjection;

Check warning on line 13 in src/DependencyInjection/PimcoreStudioUiExtension.php

View workflow job for this annotation

GitHub Actions / Qodana for PHP

Class path doesn't match project structure

Namespace name doesn't match the PSR-0/PSR-4 project structure

use Symfony\Component\Config\FileLocator;
use Symfony\Component\DependencyInjection\ContainerBuilder;
Expand All @@ -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}
Expand All @@ -40,7 +40,7 @@ public function load(array $configs, ContainerBuilder $container): void
public function prepend(ContainerBuilder $container)

Check warning on line 40 in src/DependencyInjection/PimcoreStudioUiExtension.php

View workflow job for this annotation

GitHub Actions / Qodana for PHP

Missing return type declaration

Missing function's return type declaration

Check notice on line 40 in src/DependencyInjection/PimcoreStudioUiExtension.php

View workflow job for this annotation

GitHub Actions / Qodana for PHP

Return type hint can be used

\[EA\] ': void' can be declared as return type hint (please use change signature intention to fix this).
{
$builds = [
'pimcoreWorkbenchUi' => realpath(__DIR__ . '/../../public/build'),
'pimcoreStudioUi' => realpath(__DIR__ . '/../../public/build'),

Check warning on line 43 in src/DependencyInjection/PimcoreStudioUiExtension.php

View workflow job for this annotation

GitHub Actions / Qodana for PHP

Phar-incompatible 'realpath(...)' usage

\[EA\] 'dirname(dirname(__DIR__)) . '/public/build'' should be used instead (due to how realpath handles streams).
];

$container->prependExtensionConfig('webpack_encore', [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
* @license http://www.pimcore.org/license PCL
*/

namespace Pimcore\Bundle\WorkbenchUiBundle;
namespace Pimcore\Bundle\StudioUiBundle;

Check warning on line 15 in src/PimcoreStudioUiBundle.php

View workflow job for this annotation

GitHub Actions / Qodana for PHP

Class path doesn't match project structure

Namespace name doesn't match the PSR-0/PSR-4 project structure

use Pimcore\Extension\Bundle\AbstractPimcoreBundle;

class PimcoreWorkbenchUiBundle extends AbstractPimcoreBundle
class PimcoreStudioUiBundle extends AbstractPimcoreBundle
{
public function getPath(): string
{
Expand Down
4 changes: 2 additions & 2 deletions templates/default/index.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<head>
<meta charset="utf-8">

{{ encore_entry_link_tags('main', null, 'pimcoreWorkbenchUi') }}
{{ encore_entry_link_tags('main', null, 'pimcoreStudioUi') }}
</head>

<body>
<div id="app"></div>

{{ encore_entry_script_tags('main', null, 'pimcoreWorkbenchUi') }}
{{ encore_entry_script_tags('main', null, 'pimcoreStudioUi') }}
</body>
</html>
2 changes: 1 addition & 1 deletion tests/Unit.suite.dist.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
suite_namespace: Pimcore\Bundle\WorkbenchUiBundle\Tests
suite_namespace: Pimcore\Bundle\StudioUiBundle\Tests
2 changes: 1 addition & 1 deletion tests/Unit/DefaultTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 }))
;
Expand Down

0 comments on commit aca55f1

Please sign in to comment.