Skip to content

Commit 7e8e234

Browse files
committed
TASK: Fix NodeType name and deactivate ampping and indexing of _ fields
1 parent de974a2 commit 7e8e234

File tree

3 files changed

+40
-7
lines changed

3 files changed

+40
-7
lines changed

Configuration/NodeTypes.Override.Document.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,8 @@
3939
'neos_hidden_in_index':
4040
search:
4141
indexing: '${node.hiddenInIndex}'
42+
43+
# deliberately don't map or index this
44+
'_hiddenInIndex':
45+
search:
46+
indexing: false

Configuration/NodeTypes.Override.Node.yaml

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
'neos_Neos:Node': &node
1+
'Neos.Neos:Node': &node
22
search:
33
fulltext:
44
enable: true
@@ -34,11 +34,6 @@
3434
type: integer
3535
indexing: '${node.index}'
3636

37-
'neos_removed':
38-
search:
39-
elasticSearchMapping: '' # deliberately don't map or index this
40-
indexing: ''
41-
4237
# we index the node type INCLUDING ALL SUPERTYPES
4338
'neos_type_and_supertypes':
4439
search:
@@ -67,4 +62,36 @@
6762
format: 'date_time_no_millis'
6863
indexing: '${(node.creationDateTime ? Date.format(node.creationDateTime, "Y-m-d\TH:i:sP") : null)}'
6964

65+
# deliberately don't map or index this
66+
'_removed':
67+
search:
68+
indexing: false
69+
'_creationDateTime':
70+
search:
71+
indexing: false
72+
'_lastModificationDateTime':
73+
search:
74+
indexing: false
75+
'_lastPublicationDateTime':
76+
search:
77+
indexing: false
78+
'_hiddenBeforeDateTime':
79+
search:
80+
indexing: false
81+
'_hiddenAfterDateTime':
82+
search:
83+
indexing: false
84+
'_path':
85+
search:
86+
indexing: false
87+
'_nodeType':
88+
search:
89+
indexing: false
90+
'_name':
91+
search:
92+
indexing: false
93+
'_hidden':
94+
search:
95+
indexing: false
96+
7097
'unstructured': *node

Tests/Functional/Eel/ElasticSearchQueryTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,9 @@ public function fullTextSearchReturnsTheDocumentNode(): void
138138
/** @var ElasticSearchQueryResult $result */
139139
$result = $this->getQueryBuilder()
140140
->fulltext('circum*')
141+
->log($this->getLogMessagePrefix(__METHOD__))
141142
->execute();
142-
$this->assertEquals(1, $result->count());
143+
static::assertEquals(1, $result->count());
143144

144145
/** @var NodeInterface $node */
145146
$node = $result->current();

0 commit comments

Comments
 (0)