Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FEATURE: Make taxonomies sortable #70

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

FEATURE: Make taxonomies sortable #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 62 additions & 7 deletions Classes/Controller/ModuleController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,12 +274,6 @@ public function vocabularyAction(NodeInterface $vocabulary)
$this->view->assign('vocabulary', $vocabulary);
$this->view->assign('defaultVocabulary', $this->getNodeInDefaultDimensions($vocabulary));
$taxonomies = $this->fetchChildTaxonomies($vocabulary);
usort($taxonomies, function (array $taxonomyA, array $taxonomyB) {
return strcmp(
$taxonomyA['node']->getProperty('title') ?: '',
$taxonomyB['node']->getProperty('title') ?: ''
);
});
$this->view->assign('taxonomies', $taxonomies);
}

Expand Down Expand Up @@ -501,7 +495,7 @@ public function updateTaxonomyAction(NodeInterface $taxonomy, array $properties)
public function deleteTaxonomyAction(NodeInterface $taxonomy)
{
if ($taxonomy->isAutoCreated()) {
throw new \Exception('cannot delete autocrated taxonomies');
throw new \Exception('cannot delete autocreated taxonomies');
}

$flowQuery = new FlowQuery([$taxonomy]);
Expand All @@ -518,5 +512,66 @@ public function deleteTaxonomyAction(NodeInterface $taxonomy)
$this->redirect('vocabulary', null, null, ['vocabulary' => $vocabulary]);
}

/**
* Move taxonomy up
*
* @param NodeInterface $taxonomy
* @return void
*/
public function moveUpTaxonomyAction(NodeInterface $taxonomy)
{
$this->persistenceManager->allowObject($taxonomy);

$flowQuery = new FlowQuery([$taxonomy]);
$nextSiblingNode = $flowQuery->prev()->get(0);
$taxonomy->moveBefore($nextSiblingNode);
$this->persistenceManager->persistAll();

foreach ($taxonomy->getOtherNodeVariants() as $otherNodeVariant) {
$otherNodeVariant->setIndex($taxonomy->getIndex());
}
$this->persistenceManager->persistAll();

$this->addFlashMessage(
sprintf('Moved up taxonomy %s', $taxonomy->getPath())
);

$vocabulary = $flowQuery
->closest('[instanceof ' . $this->taxonomyService->getVocabularyNodeType() . ']')
->get(0);

$this->redirect('vocabulary', null, null, ['vocabulary' => $vocabulary]);
}

/**
* Move taxonomy down
*
* @param NodeInterface $taxonomy
* @return void
*/
public function moveDownTaxonomyAction(NodeInterface $taxonomy)
{
$this->persistenceManager->allowObject($taxonomy);

$flowQuery = new FlowQuery([$taxonomy]);
$nextSiblingNode = $flowQuery->next()->get(0);
$taxonomy->moveAfter($nextSiblingNode);
$this->persistenceManager->persistAll();

foreach ($taxonomy->getOtherNodeVariants() as $otherNodeVariant) {
$otherNodeVariant->setIndex($taxonomy->getIndex());
}
$this->persistenceManager->persistAll();

$this->addFlashMessage(
sprintf('Moved down taxonomy %s', $taxonomy->getPath())
);

$vocabulary = $flowQuery
->closest('[instanceof ' . $this->taxonomyService->getVocabularyNodeType() . ']')
->get(0);

$this->redirect('vocabulary', null, null, ['vocabulary' => $vocabulary]);
}

}
2 changes: 1 addition & 1 deletion Configuration/Policy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ privilegeTargets:
'Sitegeist.Taxonomy:Module.ManageVocabularyActions':
matcher: 'method(Sitegeist\Taxonomy\Controller\ModuleController->(newVocabulary|createVocabulary|editVocabulary|updateVocabulary|deleteVocabulary)Action())'
'Sitegeist.Taxonomy:Module.ManageTaxonomyActions':
matcher: 'method(Sitegeist\Taxonomy\Controller\ModuleController->(newTaxonomy|createTaxonomy|editTaxonomy|updateTaxonomy|deleteTaxonomy)Action())'
matcher: 'method(Sitegeist\Taxonomy\Controller\ModuleController->(newTaxonomy|createTaxonomy|editTaxonomy|updateTaxonomy|deleteTaxonomy|moveUpTaxonomy|moveDownTaxonomy)Action())'
'Sitegeist.Taxonomy:SecondaryInspector.Tree':
matcher: 'method(Sitegeist\Taxonomy\Controller\SecondaryInspectorController->treeAction())'

Expand Down
26 changes: 24 additions & 2 deletions Resources/Private/Fusion/Backend/Views/Taxonomy.List.fusion
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ prototype(Sitegeist.Taxonomy:Views.Module.Taxonomy.List) < prototype(Neos.Fusion
</thead>
<tbody>
<Neos.Fusion:Loop items={taxonomies} itemName="taxon">
<Sitegeist.Taxonomy:Views.Module.Taxonomy.List.Item taxon={taxon}/>
<Sitegeist.Taxonomy:Views.Module.Taxonomy.List.Item taxon={taxon} isFirst={iterator.isFirst} isLast={iterator.isLast}/>
</Neos.Fusion:Loop>
</tbody>
</table>
Expand Down Expand Up @@ -72,6 +72,8 @@ prototype(Sitegeist.Taxonomy:Views.Module.Taxonomy.List) < prototype(Neos.Fusion

prototype(Sitegeist.Taxonomy:Views.Module.Taxonomy.List.Item) < prototype(Neos.Fusion:Component) {
taxon = null
isFirst = false
isLast = false

renderer = afx`
<tr>
Expand All @@ -94,6 +96,26 @@ prototype(Sitegeist.Taxonomy:Views.Module.Taxonomy.List.Item) < prototype(Neos.F

<Neos.Fusion:Fragment @if={Security.hasAccess("Sitegeist.Taxonomy:Module.ManageTaxonomyActions")}>

<Neos.Fusion:Link.Action
@if={!props.isFirst}
href.action="moveUpTaxonomy"
href.arguments.taxonomy={props.taxon.node.contextPath}
title={props.i8n.id('taxon.moveUp')}
class="neos-button neos-button-primary"
>
<i class="fas fa-arrow-up"></i>
</Neos.Fusion:Link.Action>
<span @if={props.isFirst} class="neos-button neos-disabled" style="width: 46px;"></span>
<Neos.Fusion:Link.Action
@if={!props.isLast}
href.action="moveDownTaxonomy"
href.arguments.taxonomy={props.taxon.node.contextPath}
title={props.i8n.id('taxon.moveDown')}
class="neos-button neos-button-primary"
>
<i class="fas fa-arrow-down"></i>
</Neos.Fusion:Link.Action>
<span @if={props.isLast} class="neos-button neos-disabled" style="width: 46px;"></span>
<Neos.Fusion:Link.Action
href.action="newTaxonomy"
href.arguments.parent={props.taxon.node.contextPath}
Expand Down Expand Up @@ -149,7 +171,7 @@ prototype(Sitegeist.Taxonomy:Views.Module.Taxonomy.List.Item) < prototype(Neos.F
</tr>

<Neos.Fusion:Loop items={props.taxon.children} itemName="child">
<Sitegeist.Taxonomy:Views.Module.Taxonomy.List.Item taxon={child}/>
<Sitegeist.Taxonomy:Views.Module.Taxonomy.List.Item taxon={child} isFirst={iterator.isFirst} isLast={iterator.isLast}/>
</Neos.Fusion:Loop>

`
Expand Down