Add default field "has children" to field specific search

Author: tkleinke

core/src/basic-index-configuration.ts

@@ -24,6 +24,7 @@ export const basicIndexConfiguration: Map<IndexDefinition> = {
     'id:match': { path: 'resource.id', pathArray: ['resource', 'id'], type: 'match' },
     'isRecordedIn:contain': { path: 'resource.relations.isRecordedIn', pathArray: ['resource', 'relations', 'isRecordedIn'], type: 'contain' },
     'isChildOf:contain': { path: 'resource.relations.isChildOf', pathArray: ['resource', 'relations', 'isChildOf'], type: 'contain', recursivelySearchable: true },
+    'isChildOf:contained': { path: 'resource.relations.isChildOf', pathArray: ['resource', 'relations', 'isChildOf'], type: 'contained' },
     'isChildOf:exist': { path: 'resource.relations.isChildOf', pathArray: ['resource', 'relations', 'isChildOf'], type: 'exist' },
     'isPresentIn:contain': { path: 'resource.relations.isPresentIn', pathArray: ['resource', 'relations', 'isPresentIn'], type: 'contain' },
     'missingRelationTargetIds:contain': { path: 'warnings.missingRelationTargets.targetIds', pathArray: ['warnings', 'missingRelationTargets', 'targetIds'], type: 'contain' }

desktop/src/app/components/resources/searchbar/resources-search-constraints.component.ts

@@ -41,43 +41,49 @@ export class ResourcesSearchConstraintsComponent extends SearchConstraintsCompon
 
     public getFieldLabel(field: Field): string {
 
-        if (field.name === 'geometry') {
-            return this.i18n({
-                id: 'resources.searchBar.constraints.geometry',
-                value: 'Geometrie'
-            });
-        } else if (field.name === 'isDepictedIn') {
-            return this.i18n({
-                id: 'resources.searchBar.constraints.linkedImages',
-                value: 'Verknüpfte Bilder'
-            });
-        } else if (field.name === 'isSameAs') {
-            return this.i18n({
-                id: 'resources.searchBar.constraints.isSameAs',
-                value: 'Verknüpfte identische Ressourcen'
-            });
-        } else if (field.name === 'isInstanceOf') {
-            return this.i18n({
-                id: 'resources.searchBar.constraints.isInstanceOf',
-                value: 'Verknüpfte Typen'
-            });
-        } else if (field.name === 'hasInstance') {
-            return this.i18n({
-                id: 'resources.searchBar.constraints.hasInstance',
-                value: 'Verknüpfte Funde'
-            });
-        } else if (field.name === 'isStoragePlaceOf') {
-            return this.i18n({
-                id: 'resources.searchBar.constraints.isStoragePlaceOf',
-                value: 'Verknüpfte Objekte'
-            });
-        } else if (field.name === 'isStoredIn') {
-            return this.i18n({
-                id: 'resources.searchBar.constraints.isStoredIn',
-                value: 'Verknüpfter Aufbewahrungsort'
-            });
-        } else {
-            return super.getFieldLabel(field);
+        switch (field.name) {
+            case 'isChildOf':
+                return this.i18n({
+                    id: 'resources.searchBar.constraints.hasChildren',
+                    value: 'Untergeordnete Ressourcen'
+                });
+            case 'geometry':
+                return this.i18n({
+                    id: 'resources.searchBar.constraints.geometry',
+                    value: 'Geometrie'
+                });
+            case 'isDepictedIn':
+                return this.i18n({
+                    id: 'resources.searchBar.constraints.linkedImages',
+                    value: 'Verknüpfte Bilder'
+                });
+            case 'isSameAs':
+                return this.i18n({
+                    id: 'resources.searchBar.constraints.isSameAs',
+                    value: 'Verknüpfte identische Ressourcen'
+                });
+            case 'isInstanceOf':
+                return this.i18n({
+                    id: 'resources.searchBar.constraints.isInstanceOf',
+                    value: 'Verknüpfte Typen'
+                });
+            case 'hasInstance':
+                return this.i18n({
+                    id: 'resources.searchBar.constraints.hasInstance',
+                    value: 'Verknüpfte Funde'
+                });
+            case 'isStoragePlaceOf':
+                return this.i18n({
+                    id: 'resources.searchBar.constraints.isStoragePlaceOf',
+                    value: 'Verknüpfte Objekte'
+                });
+            case 'isStoredIn':
+                return this.i18n({
+                    id: 'resources.searchBar.constraints.isStoredIn',
+                    value: 'Verknüpfter Aufbewahrungsort'
+                });
+            default:
+                return super.getFieldLabel(field);
         }
     }
 
@@ -86,6 +92,12 @@ export class ResourcesSearchConstraintsComponent extends SearchConstraintsCompon
 
         this.defaultFields = [];
 
+        this.defaultFields.push({
+            name: 'isChildOf',
+            inputType: 'default',
+            constraintIndexed: true
+        });
+
         if (!this.viewFacade.isInTypesManagement()) {
             this.defaultFields.push({
                 name: 'geometry',

desktop/src/app/components/widgets/search-constraints.component.ts

@@ -2,7 +2,7 @@ import { Component, Input, OnChanges, Renderer2 } from '@angular/core';
 import { I18n } from '@ngx-translate/i18n-polyfill';
 import { aFilter, clone, is, on } from 'tsfun';
 import { CategoryForm, ConstraintIndex, Datastore, Field, ProjectConfiguration, Valuelist,
-    ValuelistUtil, Labels } from 'idai-field-core';
+    ValuelistUtil, Labels, IndexType } from 'idai-field-core';
 import { SearchBarComponent } from './search-bar.component';
 
 
@@ -493,11 +493,13 @@ export abstract class SearchConstraintsComponent implements OnChanges {
     }
 
 
-    private getIndexType(field: Field, searchTerm: string) {
+    private getIndexType(field: Field, searchTerm: string): IndexType {
 
-        return this.isExistIndexSearch(searchTerm, this.getSearchInputType(field))
-            ? 'exist'
-            : ConstraintIndex.getIndexType(field);
+        return field.name === 'isChildOf'
+            ? 'contained'
+            : this.isExistIndexSearch(searchTerm, this.getSearchInputType(field))
+                ? 'exist'
+                : ConstraintIndex.getIndexType(field);
     }