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.

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

Correctly display dirty and deleted nodes in flat lists #11

Merged
merged 28 commits into from Apr 1, 2019

Conversation

Projects
None yet
3 participants
@danielkestler
Copy link
Contributor

commented Oct 12, 2018

bildschirmfoto 2018-10-12 um 12 33 31

danielkestler added some commits Sep 10, 2018

Add isPaginated setting to control pagination / loading button, add s…
…tyles to give the flat nav the Neos tree look
Merge pull request #1 from psmb/master
Add Neos 4 compatibility, smaller improvements (#10)
@@ -62,7 +62,7 @@ public function queryAction($preset, $nodeContextPath, $page = 1)
];
$nodes = \Neos\Eel\Utility::evaluateEelExpression($expression, $this->eelEvaluator, $contextVariables, $this->defaultContextConfiguration);
$nodeInfoHelper = new NodeInfoHelper();
$result = $nodeInfoHelper->renderNodes($nodes, $this->getControllerContext(), true);
$result = $nodeInfoHelper->renderNodes($nodes, $this->getControllerContext(), false);

This comment has been minimized.

Copy link
@dimaip

dimaip Oct 12, 2018

Member

Why is this necessary? It will make things A LOT slower...

This comment has been minimized.

Copy link
@danielkestler

danielkestler Oct 12, 2018

Author Contributor

Without it, we don't know if the node is deleted ... I don't know why it is returned anyway if deleted, there must be some bug in the Eel.

This comment has been minimized.

Copy link
@dimaip

dimaip Oct 12, 2018

Member

Could please look into it? Would rather fix that bug than making everything much slower.

This comment has been minimized.

Copy link
@danielkestler

danielkestler Oct 12, 2018

Author Contributor

Okay, I will have another look ;-)

@danielkestler

This comment has been minimized.

Copy link
Contributor Author

commented Oct 12, 2018

Do you like it more this way?

@danielkestler

This comment has been minimized.

Copy link
Contributor Author

commented Oct 12, 2018

The latest commit also displays hidden nodes correctly, see screenshot:
bildschirmfoto 2018-10-12 um 16 36 03

@danielkestler

This comment has been minimized.

Copy link
Contributor Author

commented Oct 15, 2018

Now includes a bugfix for "delayed" showing of isHidden-state of nodes and also displays hiddenBefore and hiddenAfter states correctly, see screenshot:

bildschirmfoto 2018-10-15 um 10 28 19

@dimaip

This comment has been minimized.

Copy link
Member

commented Oct 15, 2018

Sorry, but I still don't understand why it's necessary to filter out removed nodes. Shouldn't they not be returned in the first place?

@danielkestler

This comment has been minimized.

Copy link
Contributor Author

commented Oct 15, 2018

Yes, of course, but they are. I don't know where the bug occurs ...

But it makes sense to display the deleted, but not yet published nodes in the tree. See this PR in Neos.Ui: neos/neos-ui#1929

@dimaip

This comment has been minimized.

Copy link
Member

commented Oct 15, 2018

Ah, ok, I see.

dimaip and others added some commits Nov 2, 2018

Merge pull request #13 from psmb/nodetype-select
FEATURE: allow to select nodetype

dimaip and others added some commits Dec 10, 2018

Update Resources/Private/FlatNav/src/makeFlatNavContainer.js
Co-Authored-By: DrillSergeant <peter@familierauber.ch>
@dimaip

This comment has been minimized.

Copy link
Member

commented Mar 27, 2019

Oups, this PR flew out of my mind completely! Could you please rebase & rebuild and I'd merge?

Merge branch 'master' into upstream
# Conflicts:
#	Resources/Private/FlatNav/src/FlatNav.js
#	Resources/Public/JavaScript/FlatNav/Plugin.js
#	Resources/Public/JavaScript/FlatNav/Plugin.js.map
@danielkestler

This comment has been minimized.

Copy link
Contributor Author

commented Mar 28, 2019

I hope I did it right ;-) Changes are merged.

@dimaip

dimaip approved these changes Apr 1, 2019

Copy link
Member

left a comment

By reading, looks good

@dimaip dimaip merged commit 81ec7f1 into psmb:master Apr 1, 2019

const isDirty = this.props.publishableNodes.filter(i => (
$get('contextPath', i) === contextPath ||
$get('documentContextPath', i) === contextPath
)).count() > 0;

This comment has been minimized.

Copy link
@pmaas

pmaas Apr 1, 2019

Contributor

This should be length instead of count(), right?

This comment has been minimized.

Copy link
@dimaip

dimaip Apr 1, 2019

Member

yes, since we stopped using immutable, i.e. 2.x+

This comment has been minimized.

Copy link
@pmaas

pmaas Apr 2, 2019

Contributor

Fixed it here: #20

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.