Improve "Search with AQL" page

NUM-Forschungsdatenplattform · Nov 7, 2024 · 3df3bea · 3df3bea
1 parent f1166d6
commit 3df3bea
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 20 deletions.
diff --git a/src/app/modules/search-with-aql/components/search-aql/search.component.html b/src/app/modules/search-with-aql/components/search-aql/search.component.html
@@ -48,30 +48,14 @@ <h2>{{ 'BUILD_QUERY' | translate }}</h2>
         <num-editor-determine-hits
           [isButtonDisabled]="!isValidForExecution || isExecutionLoading"
           [content]="determineHitsContent"
-          (clicked)="determineHits()"
+          (clicked)="getData()"
         ></num-editor-determine-hits>
       </mat-card-content>
     </mat-card>
   </section>
 
   <section role="region" fxLayout="column" fxFlex="100%">
-    <h2>{{ 'SEARCH_WITH_AQL.QUERY_DATA' | translate }}</h2>
-    <num-button
-      icon="play"
-      class="num-margin-b-60"
-      (singleClick)="getData()"
-      data-test="manager-data-explorer__retrieval-button"
-      >{{ 'BUTTON.GET_DATA' | translate }}</num-button
-    >
-
-    <div
-      *ngIf="resultSet && !isDataSetLoading"
-      fxFlex
-      fxLayout="row"
-      fxLayoutGap="10px"
-      fxLayoutAlign="start center"
-      class="num-margin-b-40"
-    ></div>
+    <h2 *ngIf="resultSet && !isDataSetLoading">{{ 'SEARCH_WITH_AQL.QUERY_DATA' | translate }}</h2>
 
     <ng-container *ngIf="!isDataSetLoading; else loading">
       <num-result-table

diff --git a/src/app/modules/search-with-aql/components/search-aql/search.component.ts b/src/app/modules/search-with-aql/components/search-aql/search.component.ts
@@ -33,6 +33,7 @@ export class SearchComponent extends AqlEditorCeatorComponent implements OnDestr
   }
 
   getData(): void {
+    this.determineHits()
     this.isDataSetLoading = true
     this.queryService.setQuery(this.aqlQuery)
     this.subscriptions.add(
@@ -42,6 +43,7 @@ export class SearchComponent extends AqlEditorCeatorComponent implements OnDestr
           this.isDataSetLoading = false
         },
         error: () => {
+          this.resultSet = null
           this.isDataSetLoading = false
           this.toastMessageService.openToast(RESULT_SET_LOADING_ERROR)
         },

diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
@@ -150,7 +150,7 @@
   },
   "SEARCH_WITH_AQL": {
     "BUILD_QUERY_CONTENT": "Erstellen Sie eine Abfrage im Abfrage-Builder. Danach können Sie die Abfrage im untenstehenden Editor bearbeiten.",
-    "QUERY_DATA": "Daten abrufen"
+    "QUERY_DATA": "Ergebnisse"
   },
   "CONTENT_EDITOR": {
     "SAVE_NAVIGATION_SUCCESS": "Die Navigationselemente wurden erfolgreich veröffentlicht.",

diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
@@ -150,7 +150,7 @@
   },
   "SEARCH_WITH_AQL": {
     "BUILD_QUERY_CONTENT": "Create a query in the Builder. Afterwards you can edit the query in the editor below.",
-    "QUERY_DATA": "Retrieve data"
+    "QUERY_DATA": "Results"
   },
   "CONTENT_EDITOR": {
     "SAVE_NAVIGATION_SUCCESS": "The navigations items were successfully published.",