TASK: Refactor nodeTypes to separate files

Flowpack · May 4, 2020 · 8b6a878 · 8b6a878
1 parent 2f80e3c
commit 8b6a878
Show file tree

Hide file tree

Showing 3 changed files with 118 additions and 119 deletions.
diff --git a/Configuration/NodeTypes.Override.Document.yaml b/Configuration/NodeTypes.Override.Document.yaml
@@ -0,0 +1,48 @@
+'Neos.Neos:Document':
+  search:
+    fulltext:
+      isRoot: true
+  properties:
+    'uriPathSegment':
+      search:
+        elasticSearchMapping:
+          type: keyword
+    title:
+      search:
+        fulltextExtractor: ${Indexing.extractInto('h1', value)}
+    '__fulltextParts':
+      search:
+        elasticSearchMapping:
+          type: object
+          enabled: false
+        indexing: ''
+    '__fulltext':
+      search:
+        indexing: ''
+        elasticSearchMapping:
+          type: object
+          properties:
+            'h1':
+              type: text
+              boost: 20
+            'h2':
+              type: text
+              boost: 12
+            'h3':
+              type: text
+              boost: 10
+            'h4':
+              type: text
+              boost: 5
+            'h5':
+              type: text
+              boost: 3
+            'h6':
+              type: text
+              boost: 2
+            'text':
+              type: text
+              boost: 1
+    '_hiddenInIndex':
+      search:
+        indexing: '${node.hiddenInIndex}'
diff --git a/Configuration/NodeTypes.Override.Node.yaml b/Configuration/NodeTypes.Override.Node.yaml
@@ -0,0 +1,70 @@
+'Neos.Neos:Node': &node
+  search:
+    fulltext:
+      enable: true
+  properties:
+    '__identifier':
+      search:
+        elasticSearchMapping:
+          type: keyword
+        indexing: '${node.identifier}'
+
+    '__workspace':
+      search:
+        elasticSearchMapping:
+          type: keyword
+        indexing: '${node.context.workspace.name}'
+
+    '__path':
+      search:
+        elasticSearchMapping:
+          type: keyword
+        indexing: '${node.path}'
+
+    '__parentPath':
+      search:
+        elasticSearchMapping:
+          type: keyword
+        # we index *all* parent paths as separate tokens to allow for efficient searching without a prefix query
+        indexing: '${Indexing.buildAllPathPrefixes(node.parentPath)}'
+
+    '__sortIndex':
+      search:
+        elasticSearchMapping:
+          type: integer
+        indexing: '${node.index}'
+
+    '_removed':
+      search:
+        elasticSearchMapping: '' # deliberately don't map or index this
+        indexing: ''
+
+    # we index the node type INCLUDING ALL SUPERTYPES
+    '__typeAndSupertypes':
+      search:
+        elasticSearchMapping:
+          type: keyword
+        indexing: '${Indexing.extractNodeTypeNamesAndSupertypes(node.nodeType)}'
+
+    '_lastModificationDateTime':
+      search:
+        elasticSearchMapping:
+          type: date
+          format: 'date_time_no_millis'
+        indexing: '${(node.lastModificationDateTime ? Date.format(node.lastModificationDateTime, "Y-m-d\TH:i:sP") : null)}'
+
+    '_lastPublicationDateTime':
+      search:
+        elasticSearchMapping:
+          type: date
+          format: 'date_time_no_millis'
+        indexing: '${(node.lastPublicationDateTime ? Date.format(node.lastPublicationDateTime, "Y-m-d\TH:i:sP") : null)}'
+
+    '_creationDateTime':
+      search:
+        elasticSearchMapping:
+          type: date
+          format: 'date_time_no_millis'
+        indexing: '${(node.creationDateTime ? Date.format(node.creationDateTime, "Y-m-d\TH:i:sP") : null)}'
+
+'unstructured': *node
diff --git a/Configuration/NodeTypes.yaml b/Configuration/NodeTypes.yaml
@@ -1,74 +1,3 @@
-'Neos.Neos:Node': &node
-  search:
-    fulltext:
-      enable: true
-  properties:
-    '__identifier':
-      search:
-        elasticSearchMapping:
-          type: keyword
-        indexing: '${node.identifier}'
-
-    '__workspace':
-      search:
-        elasticSearchMapping:
-          type: keyword
-        indexing: '${node.context.workspace.name}'
-
-    '__path':
-      search:
-        elasticSearchMapping:
-          type: keyword
-        indexing: '${node.path}'
-
-    '__parentPath':
-      search:
-        elasticSearchMapping:
-          type: keyword
-        # we index *all* parent paths as separate tokens to allow for efficient searching without a prefix query
-        indexing: '${Indexing.buildAllPathPrefixes(node.parentPath)}'
-
-    '__sortIndex':
-      search:
-        elasticSearchMapping:
-          type: integer
-        indexing: '${node.index}'
-
-    '_removed':
-      search:
-        elasticSearchMapping: '' # deliberately don't map or index this
-        indexing: ''
-
-    # we index the node type INCLUDING ALL SUPERTYPES
-    '__typeAndSupertypes':
-      search:
-        elasticSearchMapping:
-          type: keyword
-        indexing: '${Indexing.extractNodeTypeNamesAndSupertypes(node.nodeType)}'
-
-    '_lastModificationDateTime':
-      search:
-        elasticSearchMapping:
-          type: date
-          format: 'date_time_no_millis'
-        indexing: '${(node.lastModificationDateTime ? Date.format(node.lastModificationDateTime, "Y-m-d\TH:i:sP") : null)}'
-
-    '_lastPublicationDateTime':
-      search:
-        elasticSearchMapping:
-          type: date
-          format: 'date_time_no_millis'
-        indexing: '${(node.lastPublicationDateTime ? Date.format(node.lastPublicationDateTime, "Y-m-d\TH:i:sP") : null)}'
-
-    '_creationDateTime':
-      search:
-        elasticSearchMapping:
-          type: date
-          format: 'date_time_no_millis'
-        indexing: '${(node.creationDateTime ? Date.format(node.creationDateTime, "Y-m-d\TH:i:sP") : null)}'
-
-'unstructured': *node
-
 'Neos.Neos:Hidable':
   properties:
     '_hidden':
@@ -92,54 +21,6 @@
         indexing: '${(node.hiddenAfterDateTime ? Date.format(node.hiddenAfterDateTime, "Y-m-d\TH:i:sP") : null)}'
 
 
-'Neos.Neos:Document':
-  search:
-    fulltext:
-      isRoot: true
-  properties:
-    'uriPathSegment':
-      search:
-        elasticSearchMapping:
-          type: keyword
-    title:
-      search:
-        fulltextExtractor: ${Indexing.extractInto('h1', value)}
-    '__fulltextParts':
-      search:
-        elasticSearchMapping:
-          type: object
-          enabled: false
-        indexing: ''
-    '__fulltext':
-      search:
-        indexing: ''
-        elasticSearchMapping:
-          type: object
-          properties:
-            'h1':
-              type: text
-              boost: 20
-            'h2':
-              type: text
-              boost: 12
-            'h3':
-              type: text
-              boost: 10
-            'h4':
-              type: text
-              boost: 5
-            'h5':
-              type: text
-              boost: 3
-            'h6':
-              type: text
-              boost: 2
-            'text':
-              type: text
-              boost: 1
-    '_hiddenInIndex':
-      search:
-        indexing: '${node.hiddenInIndex}'
 
 'Neos.NodeTypes.BaseMixins:TextMixin':
   properties: