feat(expert search): implement default gravsearch as placeholder (#1247)

dasch-swiss · Oct 31, 2023 · 5132f4d · 5132f4d
1 parent f2c5dc9
commit 5132f4d
Show file tree

Hide file tree

Showing 13 changed files with 88 additions and 135 deletions.
diff --git a/apps/dsp-app/src/app/project/list/list-info-form/list-info-form.component.spec.ts b/apps/dsp-app/src/app/project/list/list-info-form/list-info-form.component.spec.ts
@@ -83,7 +83,7 @@ class TestHostCreateListComponent {
 /**
  * test component that mocks StringLiteralInputComponent
  */
-@Component({ selector: 'app-string-literal-input', template: '' })
+@Component({ selector: 'dasch-swiss-app-string-literal', template: '' })
 class MockStringLiteralInputComponent {
     @Input() placeholder = 'Label';
     @Input() language: string;

diff --git a/...p-app/src/app/project/list/list-item-form/edit-list-item/edit-list-item.component.spec.ts b/...p-app/src/app/project/list/list-item-form/edit-list-item/edit-list-item.component.spec.ts
@@ -28,6 +28,7 @@ import { EditListItemComponent } from './edit-list-item.component';
 import { MockProvider } from 'ng-mocks';
 import { AppLoggingService } from '@dasch-swiss/vre/shared/app-logging';
 
+
 /**
  * test host component to simulate parent component for updating an existing child node.
  */
@@ -70,7 +71,7 @@ class TestHostInsertChildNodeComponent {
     constructor() {}
 }
 
-@Component({ selector: 'app-string-literal-input', template: '' })
+@Component({ selector: 'dasch-swiss-app-string-literal', template: '' })
 class MockStringLiteralInputComponent {
     @Input() placeholder = 'Label';
     @Input() language: string;

diff --git a/apps/dsp-app/src/app/project/list/list-item-form/list-item-form.component.spec.ts b/apps/dsp-app/src/app/project/list/list-item-form/list-item-form.component.spec.ts
@@ -40,6 +40,13 @@ import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-servi
 import { MockProvider } from 'ng-mocks';
 import { AppLoggingService } from '@dasch-swiss/vre/shared/app-logging';
 
+
+@Component({
+    selector: 'dasch-swiss-app-progress-indicator',
+    template: '',
+})
+class MockProgressIndicatorComponent {}
+
 /**
  * test host component to simulate parent component.
  */
@@ -84,7 +91,7 @@ class TestHostComponent implements OnInit {
 /**
  * test component that mocks StringLiteralInputComponent
  */
-@Component({ selector: 'app-string-literal-input', template: '' })
+@Component({ selector: 'dasch-swiss-app-string-literal', template: '' })
 class MockStringLiteralInputComponent {
     @Input() placeholder = 'Label';
     @Input() language: string;
@@ -128,6 +135,7 @@ describe('ListItemFormComponent', () => {
                 StringifyStringLiteralPipe,
                 TruncatePipe,
                 MockStringLiteralInputComponent,
+                MockProgressIndicatorComponent,
             ],
             imports: [
                 BrowserAnimationsModule,

diff --git a/apps/dsp-app/src/app/project/ontology/property-form/property-form.component.spec.ts b/apps/dsp-app/src/app/project/ontology/property-form/property-form.component.spec.ts
@@ -233,7 +233,7 @@ class ListHostComponent {
     };
 }
 
-@Component({ selector: 'app-string-literal-input', template: '' })
+@Component({ selector: 'dasch-swiss-app-string-literal', template: '' })
 class MockStringLiteralInputComponent {
     @Input() placeholder = 'Label';
     @Input() language: string;

diff --git a/...sp-app/src/app/project/ontology/resource-class-form/resource-class-form.component.spec.ts b/...sp-app/src/app/project/ontology/resource-class-form/resource-class-form.component.spec.ts
@@ -38,6 +38,7 @@ import { ResourceClassFormComponent } from './resource-class-form.component';
 import { MockProvider } from 'ng-mocks';
 import { AppLoggingService } from '@dasch-swiss/vre/shared/app-logging';
 
+
 /**
  * test host component to simulate parent component.
  */
@@ -46,10 +47,9 @@ import { AppLoggingService } from '@dasch-swiss/vre/shared/app-logging';
 })
 class TestHostResourceClassFormComponent {}
 
-@Component({ selector: 'app-string-literal-input', template: '' })
+@Component({ selector: 'dasch-swiss-app-string-literal', template: '' })
 class MockStringLiteralInputComponent {
     @Input() placeholder = 'Label';
-    @Input() language: string;
     @Input() textarea: boolean;
     @Input() value: StringLiteral[] = [];
     @Input() disabled: boolean;

diff --git a/apps/dsp-app/src/app/project/project-form/project-form.component.spec.ts b/apps/dsp-app/src/app/project/project-form/project-form.component.spec.ts
@@ -29,7 +29,7 @@ import { MockProvider } from 'ng-mocks';
 import { AppLoggingService } from '@dasch-swiss/vre/shared/app-logging';
 import {convertToParamMap} from "@angular/router";
 
-@Component({ selector: 'app-string-literal-input', template: '' })
+@Component({ selector: 'dasch-swiss-app-string-literal', template: '' })
 class MockStringLiteralInputComponent {
     @Input() placeholder = 'Label';
     @Input() language: string;

diff --git a/apps/dsp-app/src/app/project/project.component.spec.ts b/apps/dsp-app/src/app/project/project.component.spec.ts
@@ -50,7 +50,7 @@ class MockOntologyClassesComponent {
 }
 
 @Component({
-    selector: 'app-progress-indicator',
+    selector: 'dasch-swiss-app-progress-indicator',
     template: '',
 })
 class MockProgressIndicatorComponent {}

diff --git a/apps/dsp-app/src/app/user/account/account.component.spec.ts b/apps/dsp-app/src/app/user/account/account.component.spec.ts
@@ -20,6 +20,14 @@ import { StatusComponent } from '@dsp-app/src/app/main/status/status.component';
 import { TestConfig } from '@dsp-app/src/test.config';
 import { PasswordFormComponent } from '../user-form/password-form/password-form.component';
 import { AccountComponent } from './account.component';
+import { Component } from '@angular/core';
+
+@Component({
+    selector: 'dasch-swiss-app-progress-indicator',
+    template: '',
+})
+class MockProgressIndicatorComponent {}
+
 
 describe('AccountComponent', () => {
     let component: AccountComponent;
@@ -32,6 +40,7 @@ describe('AccountComponent', () => {
                 PasswordFormComponent,
                 DialogComponent,
                 StatusComponent,
+                MockProgressIndicatorComponent
             ],
             imports: [
                 BrowserAnimationsModule,

diff --git a/apps/dsp-app/src/app/user/profile/profile.component.spec.ts b/apps/dsp-app/src/app/user/profile/profile.component.spec.ts
@@ -16,14 +16,28 @@ import { DialogComponent } from '@dsp-app/src/app/main/dialog/dialog.component';
 import { StatusComponent } from '@dsp-app/src/app/main/status/status.component';
 import { TestConfig } from '@dsp-app/src/test.config';
 import { ProfileComponent } from './profile.component';
+import { Component } from '@angular/core';
+
+
+@Component({
+    selector: 'dasch-swiss-app-progress-indicator',
+    template: '',
+})
+class MockProgressIndicatorComponent {}
+
 
 describe('ProfileComponent', () => {
     let component: ProfileComponent;
     let fixture: ComponentFixture<ProfileComponent>;
 
     beforeEach(waitForAsync(() => {
         TestBed.configureTestingModule({
-            declarations: [ProfileComponent, DialogComponent, StatusComponent],
+            declarations: [
+                ProfileComponent,
+                DialogComponent,
+                StatusComponent,
+                MockProgressIndicatorComponent
+            ],
             imports: [
                 BrowserAnimationsModule,
                 MatButtonModule,

diff --git a/apps/dsp-app/src/app/user/user.component.spec.ts b/apps/dsp-app/src/app/user/user.component.spec.ts
@@ -37,7 +37,7 @@ import { AppLoggingService } from '@dasch-swiss/vre/shared/app-logging';
  * test component to simulate child component, here progress-indicator from action module.
  */
 @Component({
-    selector: 'app-progress-indicator',
+    selector: 'dasch-swiss-app-progress-indicator',
     template: '',
 })
 class TestProgressIndicatorComponent {}

diff --git a/apps/dsp-app/src/app/workspace/search/expert-search/expert-search.component.html b/apps/dsp-app/src/app/workspace/search/expert-search/expert-search.component.html
@@ -2,7 +2,12 @@
     <form [formGroup]="expertSearchForm" class="expert-search-form app-form-content">
         <mat-form-field class="textarea-field large-field">
             <mat-label>Write your Gravsearch query</mat-label>
-            <textarea matInput [formControlName]="'gravsearchquery'" cdkTextareaAutosize cdkAutosizeMinRows="12"
+            <textarea
+                #textArea
+                matInput
+                [formControlName]="'gravsearchquery'"
+                [placeholder]='defaultGravsearchQuery'
+                cdkTextareaAutosize cdkAutosizeMinRows="12"
                 cdkAutosizeMaxRows="24" class="textarea-field-content">
             </textarea>
             <mat-error *ngIf="expertSearchForm.controls.gravsearchquery.hasError('forbiddenName')">

diff --git a/apps/dsp-app/src/app/workspace/search/expert-search/expert-search.component.spec.ts b/apps/dsp-app/src/app/workspace/search/expert-search/expert-search.component.spec.ts
@@ -107,28 +107,6 @@ describe('ExpertSearchComponent', () => {
         expect(testHostComponent.expertSearch).toBeTruthy();
     });
 
-    it('should init the form with the default query', () => {
-        const textarea = hostCompDe.query(
-            By.css('textarea.textarea-field-content')
-        );
-        const textareaEle = textarea.nativeElement;
-
-        expect(textareaEle.value).toBe(
-            `PREFIX knora-api: <http://api.knora.org/ontology/knora-api/v2#>
-PREFIX incunabula: <http://0.0.0.0:3333/ontology/0803/incunabula/v2#>
-
-CONSTRUCT {
-    ?book knora-api:isMainResource true .
-    ?book incunabula:title ?title .
-
-} WHERE {
-    ?book a incunabula:book .
-    ?book incunabula:title ?title .
-}
-`
-        );
-    });
-
     it('should reset the form', () => {
         const resetBtn = hostCompDe.query(By.css('button.reset'));
         const textarea = hostCompDe.query(
@@ -138,115 +116,33 @@ CONSTRUCT {
         const resetEle = resetBtn.nativeElement;
         const textareaEle = textarea.nativeElement;
 
-        // delete textarea content displayed by default to make a change
-        textareaEle.value = '';
-        expect(textareaEle.value).toBe('');
+        // mock enter some characters into textarea
+        textareaEle.value = 'some text';
 
         resetEle.click();
 
         testHostFixture.detectChanges();
 
         // reset the textarea content
         expect(textareaEle.value).toBe(
-            `PREFIX knora-api: <http://api.knora.org/ontology/knora-api/v2#>
-PREFIX incunabula: <http://0.0.0.0:3333/ontology/0803/incunabula/v2#>
-
-CONSTRUCT {
-    ?book knora-api:isMainResource true .
-    ?book incunabula:title ?title .
-
-} WHERE {
-    ?book a incunabula:book .
-    ?book incunabula:title ?title .
-}
-`
-        );
-    });
-
-    it('should register the query in the params service', () => {
-        const expectedGravsearch = `PREFIX knora-api: <http://api.knora.org/ontology/knora-api/v2#>
-PREFIX incunabula: <http://0.0.0.0:3333/ontology/0803/incunabula/v2#>
-
-CONSTRUCT {
-    ?book knora-api:isMainResource true .
-    ?book incunabula:title ?title .
-
-} WHERE {
-    ?book a incunabula:book .
-    ?book incunabula:title ?title .
-}
-
-             OFFSET 0
-             `;
-        const submitBtn = hostCompDe.query(By.css('button[type="submit"]'));
-        const submitBtnEle = submitBtn.nativeElement;
-
-        submitBtnEle.click();
-        testHostFixture.detectChanges();
-
-        expect(
-            searchParamsServiceSpy.changeSearchParamsMsg
-        ).toHaveBeenCalledTimes(1);
-        expect(gravsearchSearchParams).toBeDefined();
-        expect(gravsearchSearchParams.generateGravsearch(0)).toEqual(
-            expectedGravsearch
+            ''
         );
     });
 
-    it('should emit the Gravsearch query', () => {
-        const expectedGravsearch = `PREFIX knora-api: <http://api.knora.org/ontology/knora-api/v2#>
-PREFIX incunabula: <http://0.0.0.0:3333/ontology/0803/incunabula/v2#>
-
-CONSTRUCT {
-    ?book knora-api:isMainResource true .
-    ?book incunabula:title ?title .
-
-} WHERE {
-    ?book a incunabula:book .
-    ?book incunabula:title ?title .
-}
-
-         OFFSET 0
-         `;
-
-        const submitBtn = hostCompDe.query(By.css('button[type="submit"]'));
-        const submitBtnEle = submitBtn.nativeElement;
-
-        expect(testHostComponent.gravsearchQ).toBeUndefined();
-
-        submitBtnEle.click();
-        testHostFixture.detectChanges();
-
-        expect(testHostComponent.gravsearchQ).toBeDefined();
-        expect(testHostComponent.gravsearchQ.query).toEqual(expectedGravsearch);
-        expect(testHostComponent.gravsearchQ.mode).toEqual('gravsearch');
-    });
-
     it('should not return an invalid query', () => {
+        // if no query is entered
         expect(
             testHostComponent.expertSearch.expertSearchForm.valid
-        ).toBeTruthy();
+        ).toBeFalsy();
 
         const textarea = hostCompDe.query(
             By.css('textarea.textarea-field-content')
         );
         const textareaEle = textarea.nativeElement;
 
-        expect(textareaEle.value).toBe(
-            `PREFIX knora-api: <http://api.knora.org/ontology/knora-api/v2#>
-PREFIX incunabula: <http://0.0.0.0:3333/ontology/0803/incunabula/v2#>
-
-CONSTRUCT {
-    ?book knora-api:isMainResource true .
-    ?book incunabula:title ?title .
-
-} WHERE {
-    ?book a incunabula:book .
-    ?book incunabula:title ?title .
-}
-`
-        );
+        expect(textareaEle.value).toBe('');
 
+        // mock enter a wrong gravsearch query into textarea: "OFFSET 0" is not allowed in the query.
         textareaEle.value = `PREFIX knora-api: <http://api.knora.org/ontology/knora-api/v2#>
 PREFIX incunabula: <http://0.0.0.0:3333/ontology/0803/incunabula/v2#>