From 7dc19421961f8e8543e682153c088ecdc806249b Mon Sep 17 00:00:00 2001 From: Sebastian Helzle Date: Mon, 29 Sep 2025 09:21:51 +0200 Subject: [PATCH] BUGFIX: Use correct color for timed visibility icon This fixes a regression introduced with 43efd9c63709ecf87a029d2636b33b0a935d41f3 Resolves: #3997 --- .../Containers/LeftSideBar/NodeTree/Node/index.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/packages/neos-ui/src/Containers/LeftSideBar/NodeTree/Node/index.js b/packages/neos-ui/src/Containers/LeftSideBar/NodeTree/Node/index.js index de15d87d08..b15fd392e8 100644 --- a/packages/neos-ui/src/Containers/LeftSideBar/NodeTree/Node/index.js +++ b/packages/neos-ui/src/Containers/LeftSideBar/NodeTree/Node/index.js @@ -1,16 +1,15 @@ import React, {PureComponent} from 'react'; import PropTypes from 'prop-types'; import {connect} from 'react-redux'; - +import moment from 'moment'; +import hashSum from 'hash-sum'; import flowright from 'lodash.flowright'; + import {Tree, Icon} from '@neos-project/react-ui-components'; import {stripTags, decodeHtml} from '@neos-project/utils-helpers'; - import {actions, selectors} from '@neos-project/neos-ui-redux-store'; import {isNodeCollapsed} from '@neos-project/neos-ui-redux-store/src/CR/Nodes/helpers'; import {neos} from '@neos-project/neos-ui-decorators'; - -import hashSum from 'hash-sum'; import {urlWithParams} from '@neos-project/utils-helpers/src/urlWithParams'; const getContextPath = node => node?.contextPath; @@ -172,7 +171,13 @@ export default class Node extends PureComponent { const hasTimeableNodeVisibility = node?.properties?._hasTimeableNodeVisibility; if (hasTimeableNodeVisibility) { - const circleColor = isDisabled ? 'error' : 'primaryBlue'; + const {enableAfterDateTime, disableAfterDateTime} = node.properties; + + let isCurrentlyHidden = isDisabled + || (enableAfterDateTime && moment(enableAfterDateTime).isAfter(moment())) + || (disableAfterDateTime && moment(disableAfterDateTime).isBefore(moment())); + + const circleColor = isDisabled || isCurrentlyHidden ? 'error' : 'primaryBlue'; return (