diff --git a/package.json b/package.json index 57d8443825..af3e59848d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,8 @@ { "dependencies": { "jquery": "^2.2.0", - "semantic-ui-css": "^2.2.0" + "semantic-ui-css": "^2.2.0", + "sortablejs": "^1.4.2" }, "devDependencies": { "gulp": "^3.9.0", diff --git a/src/Sylius/Behat/Context/Ui/Admin/ManagingTaxonsContext.php b/src/Sylius/Behat/Context/Ui/Admin/ManagingTaxonsContext.php index 571bae5a55..b922279386 100644 --- a/src/Sylius/Behat/Context/Ui/Admin/ManagingTaxonsContext.php +++ b/src/Sylius/Behat/Context/Ui/Admin/ManagingTaxonsContext.php @@ -496,7 +496,7 @@ final class ManagingTaxonsContext implements Context $this->createPage->getFirstLeafName(), $taxon->getName(), sprintf( - 'Expected %s as a first taxon, leaf but got %s.', + 'Expected %s as a first taxon, but got %s.', $taxon->getName(), $this->createPage->getFirstLeafName() ) diff --git a/src/Sylius/Behat/Page/Admin/Taxon/CreatePage.php b/src/Sylius/Behat/Page/Admin/Taxon/CreatePage.php index 07fe85984c..9fcfbb1e27 100644 --- a/src/Sylius/Behat/Page/Admin/Taxon/CreatePage.php +++ b/src/Sylius/Behat/Page/Admin/Taxon/CreatePage.php @@ -141,10 +141,6 @@ class CreatePage extends BaseCreatePage implements CreatePageInterface */ public function getFirstLeafName(TaxonInterface $parentTaxon = null) { - $this->getDocument()->waitFor(5, function () { - return; - }); - return $this->getLeafs($parentTaxon)[0]->getText(); } @@ -177,10 +173,13 @@ class CreatePage extends BaseCreatePage implements CreatePageInterface $leafs = $this->getLeafs(); foreach ($leafs as $leaf) { if ($leaf->getText() === $taxon->getName()) { - $moveButton = $leaf->getParent()->find('css', sprintf('.%s', $direction)); + $leaf = $leaf->getParent(); + $menuButton = $leaf->find('css', '.wrench'); + $menuButton->click(); + $moveButton = $leaf->find('css', sprintf('.%s', $direction)); $moveButton->click(); - $moveButton->waitFor(5, function () use ($moveButton) { - return !$moveButton->hasClass('loading'); + $moveButton->waitFor(5, function () use ($taxon) { + return $this->getFirstLeafName() === $taxon->getName(); }); return; diff --git a/src/Sylius/Bundle/AdminBundle/Gulpfile.js b/src/Sylius/Bundle/AdminBundle/Gulpfile.js index e265763cdc..6064ab7c8d 100644 --- a/src/Sylius/Bundle/AdminBundle/Gulpfile.js +++ b/src/Sylius/Bundle/AdminBundle/Gulpfile.js @@ -17,6 +17,8 @@ var paths = { admin: { js: [ '../../../../node_modules/jquery/dist/jquery.min.js', + '../../../../node_modules/sortablejs/Sortable.js', + '../../../../node_modules/sortablejs/jquery.binding.js', '../../../../node_modules/semantic-ui-css/semantic.min.js', '../PromotionBundle/Resources/public/js/sylius-promotion.js', '../ShippingBundle/Resources/public/js/**', diff --git a/src/Sylius/Bundle/AdminBundle/Resources/private/js/delete-resource-action.js b/src/Sylius/Bundle/AdminBundle/Resources/private/js/delete-resource-action.js new file mode 100644 index 0000000000..e55e61a33c --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/private/js/delete-resource-action.js @@ -0,0 +1,31 @@ +(function ($) { + 'use strict'; + + $(document).ready(function() { + + $('.sylius-delete-resource').api({ + method: 'delete', + debug: true, + onSuccess: function (response) { + var redirectUrl = $(this).data('success-redirect-url'); + + if (redirectUrl) { + location.replace(redirectUrl); + + return; + } + + throw 'You need to define data-success-redirect-url on "' + $(this).attr('class') +'"'; + }, + onFailure: function (response) { + var message = $(this).parent().parent().popup({ + inline: true, + content: response.error.message, + on: 'manual' + }); + message.popup('show'); + setTimeout(function() { message.popup('hide'); }, 3000); + } + }); + }); +})( jQuery ); diff --git a/src/Sylius/Bundle/AdminBundle/Resources/private/js/move-taxon.js b/src/Sylius/Bundle/AdminBundle/Resources/private/js/move-taxon.js index 8c9395b982..429c07beda 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/private/js/move-taxon.js +++ b/src/Sylius/Bundle/AdminBundle/Resources/private/js/move-taxon.js @@ -2,8 +2,37 @@ 'use strict'; $(document).ready(function() { + $('.sylius-sortable-list').sortable({ + onEnd: function (event) { + $(this).api({ + throttle: 500, + method: 'PUT', + action: 'move taxon', + urlData: { + id: $(event.item).data('id') + }, + on: 'now', + beforeSend: function (settings) { + settings.data = { + position: event.newIndex + }; + + return settings; + }, + onSuccess: function (response) { + $(event.item).find('.sylius-taxon-move-up').data('position', event.newIndex); + $(event.item).find('.sylius-taxon-move-down').data('position', event.newIndex); + }, + onFailure: function (response) { + throw 'Something went wrong with api call.'; + } + }); + } + }); + $('.sylius-taxon-move-up').api({ method: 'PUT', + on: 'click', beforeSend: function (settings) { settings.data = { position: $(this).data('position') - 1 @@ -18,6 +47,7 @@ $('.sylius-taxon-move-down').api({ method: 'PUT', + on: 'click', beforeSend: function (settings) { settings.data = { position: $(this).data('position') + 1 diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Partial/_treeWithButtons.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Partial/_treeWithButtons.html.twig index 459cc7d676..4bdceadb8a 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Partial/_treeWithButtons.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Partial/_treeWithButtons.html.twig @@ -6,26 +6,40 @@ {% import _self as tree %} {% for taxon in taxons if taxon.id != null %} -
+
{{ taxon.name }} -
-
- {{ buttons.create(path('sylius_admin_taxon_create_for_parent', { 'id': taxon.id }), 'sylius.ui.add'|trans) }} - {{ buttons.edit(path('sylius_admin_taxon_update', { 'id': taxon.id })) }} - {{ buttons.delete(path('sylius_admin_taxon_delete', { 'id': taxon.id }), 'sylius.ui.delete'|trans) }} -
- -
-
- +
+ +
+ + + {{ 'sylius.ui.add'|trans }} + + + + {{ 'sylius.ui.edit'|trans }} + +
+ + {{ 'sylius.ui.move_up'|trans }} +
+
+ + {{ 'sylius.ui.move_down'|trans }} +
+
+ + {{ 'sylius.ui.delete'|trans }} +
+
-
+
{{ tree.render(taxon.children) }}
@@ -35,7 +49,7 @@ {{ buttons.create(path('sylius_admin_taxon_create')) }}
-
+
{{ tree.render(taxons) }}