Merge pull request #426 from medizininformatik-initiative/new-pagination-search

New pagination search

Author: Shayan1375

cypress/e2e/CohortSearch/cohort-search.feature

@@ -6,22 +6,21 @@ Feature: Cohort Search
     And I set the language to German
 
   Scenario Outline: Search for Criterium "<criterium>"
-    And the table should have 50 rows
+    And the table should have 20 rows
     And the button "<button1>" should be disabled
     And the button "<button2>" should be disabled
     When I type "<criterium>" in the search input field
     Then I should see a row containing "<criterium>"
     When I clear the search input field
-    Then the table should have 50 rows
+    Then the table should have 20 rows
 
     Examples: Search Criteria
-        | criterium                       | button1                          | button2                    |
-        | Aktuelles chronologisches Alter | Zur Kohortenselektion hinzufügen | Kohortenselektion anzeigen |
-        | Diabetes | Zur Kohortenselektion hinzufügen | Kohortenselektion anzeigen |
-
+      | criterium                       | button1                          | button2                    |
+      | Aktuelles chronologisches Alter | Zur Kohortenselektion hinzufügen | Kohortenselektion anzeigen |
+      | Diabetes                        | Zur Kohortenselektion hinzufügen | Kohortenselektion anzeigen |
 
   Scenario Outline: Select Cohort elements
-    Given  I type "<criterium>" in the search input field
+    Given I type "<criterium>" in the search input field
     Then I select the checkbox in the row containing "<criterium>"
     And I click on the button "<button1>"
     Then the button "<button2>" should be enabled
@@ -30,5 +29,5 @@ Feature: Cohort Search
     Then I am on the "Feasibility Editor" page
 
     Examples: Selection Criteria
-        | criterium                       | button1                          | button2                    |
-        | Aktuelles chronologisches Alter| Zur Kohortenselektion hinzufügen | Kohortenselektion anzeigen |
+      | criterium                       | button1                          | button2                    |
+      | Aktuelles chronologisches Alter | Zur Kohortenselektion hinzufügen | Kohortenselektion anzeigen |

package-lock.json

@@ -55,6 +55,7 @@
     "monaco-editor": "0.29.1",
     "ng-lint-staged": "^12.0.3",
     "ngx-filesaver": "^15.0.0",
+    "ngx-infinite-scroll": "^15.0.0",
     "ngx-webstorage-service": "^4.1.0",
     "rxjs": "~7.8.0",
     "ts-jest": "^27.1.1",

package.json

@@ -1,8 +1,11 @@
+import { RouterModule, Routes } from '@angular/router';
+
+import { BasePaths } from './app-paths';
+import { CriteriaSearchDataResolverService } from './service/Resolver/CriteriaSearchDataResolver.service';
+import { CriteriaSearchFilterResolverService } from './service/Resolver/CriteriaSearchFilterResolver.service';
 import { DataProtectionComponent } from './site/data-protection/data-protection.component';
 import { NgModule } from '@angular/core';
 import { RoleGuard } from './core/auth/guards/role.guard';
-import { RouterModule, Routes } from '@angular/router';
-import { BasePaths } from './app-paths';
 
 export const routes: Routes = [
   {
@@ -42,6 +45,10 @@ export const routes: Routes = [
   },
   {
     path: BasePaths.feasibilityQuery,
+    resolve: {
+      preLoadCriteriaData: CriteriaSearchDataResolverService,
+      preLoadCriteriaFilter: CriteriaSearchFilterResolverService,
+    },
     canLoad: [RoleGuard],
     data: {
       navId: BasePaths.feasibilityQuery,

src/app/app-routing.module.ts

@@ -1,4 +1,4 @@
-import { BuildDetailsData } from 'src/app/model/Interface/ActuatorInfoIData/BuildData/BuildDetailsData';
+import { BuildDetailsData } from 'src/app/model/Interface/ActuatorInfoData/BuildData/BuildDetailsData';
 
 export class BuildDetails {
   private artifact: string;

src/app/model/Actuator/Information/Build/BuildInformation.ts

@@ -1,6 +1,5 @@
-import { BuildDetailsData } from '../../Interface/ActuatorInfoIData/BuildData/BuildDetailsData';
-import { BuildInformationData } from '../../Interface/ActuatorInfoIData/BuildInformationData';
 import { BuildDetails } from './Build/BuildInformation';
+import { BuildInformationData } from '../../Interface/ActuatorInfoData/BuildInformationData';
 import { GitInformation } from './Git/GitInformation';
 import { TerminologyInformation } from './Terminology/TerminologyInformation';
 

src/app/model/Actuator/Information/BuildInformation.ts

@@ -1,4 +1,4 @@
-import { GitBranchData } from 'src/app/model/Interface/ActuatorInfoIData/GitData/GitBranchData';
+import { GitBranchData } from 'src/app/model/Interface/ActuatorInfoData/GitData/GitBranchData';
 
 export class GitBranchInformation {
   private name: string;

src/app/model/Actuator/Information/Git/GitBranchInformation.ts

@@ -1,4 +1,4 @@
-import { GitBuildData } from '../../../Interface/ActuatorInfoIData/GitData/GitBuildData';
+import { GitBuildData } from '../../../Interface/ActuatorInfoData/GitData/GitBuildData';
 
 export class GitBuildInformation {
   private version: string;

src/app/model/Actuator/Information/Git/GitBuildInformation.ts

@@ -1,4 +1,4 @@
-import { GitCommitIdData } from 'src/app/model/Interface/ActuatorInfoIData/GitData/GitCommitIdData';
+import { GitCommitIdData } from 'src/app/model/Interface/ActuatorInfoData/GitData/GitCommitIdData';
 
 export class GitCommitIdInformation {
   private full: string;

src/app/model/Actuator/Information/Git/GitCommitIdInformation.ts

@@ -1,4 +1,4 @@
-import { GitCommitData } from 'src/app/model/Interface/ActuatorInfoIData/GitData/GitCommitData';
+import { GitCommitData } from 'src/app/model/Interface/ActuatorInfoData/GitData/GitCommitData';
 import { GitCommitIdInformation } from './GitCommitIdInformation';
 
 export class GitCommitInformation {