diff --git a/demo/src/app/basic/new-server-side/new-server-side.component.html b/demo/src/app/basic/new-server-side/new-server-side.component.html index 8ad7b16f..04d7e560 100644 --- a/demo/src/app/basic/new-server-side/new-server-side.component.html +++ b/demo/src/app/basic/new-server-side/new-server-side.component.html @@ -1,5 +1,7 @@ -
+
+

No preview as we do not have a server that can serve the queries.

+
diff --git a/demo/src/app/basic/new-server-side/new-server-side.component.spec.ts b/demo/src/app/basic/new-server-side/new-server-side.component.spec.ts index 3add0825..a3b2e2a9 100644 --- a/demo/src/app/basic/new-server-side/new-server-side.component.spec.ts +++ b/demo/src/app/basic/new-server-side/new-server-side.component.spec.ts @@ -1,7 +1,6 @@ import { HttpClientModule } from '@angular/common/http'; import { SecurityContext, NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; import { DataTableDirective, DataTablesModule } from 'angular-datatables'; import { AppRoutingModule } from 'app/app.routing'; @@ -40,25 +39,13 @@ describe('NewServerSideComponent', () => { fixture.detectChanges(); // initial binding }); - it('should create', () => { - expect(component).toBeTruthy(); + it('should create the app', () => { + const app = fixture.debugElement.componentInstance; + expect(app).toBeTruthy(); }); - it('should have title "Server-side processing"', waitForAsync(() => { const app = fixture.debugElement.componentInstance as NewServerSideComponent; expect(app.pageTitle).toBe('Server-side processing'); })); - - it('should have table populated via AJAX', async () => { - const app = fixture.debugElement.componentInstance as NewServerSideComponent; - await fixture.whenStable(); - expect(app.dtOptions.columns).toBeDefined(); - const query = fixture.debugElement.query(By.directive(DataTableDirective)); - const dir = query.injector.get(DataTableDirective); - expect(dir).toBeTruthy(); - const instance = await dir.dtInstance; - fixture.detectChanges(); - expect(instance.rows().length).toBeGreaterThan(0); - }); }); diff --git a/demo/src/app/basic/new-server-side/new-server-side.component.ts b/demo/src/app/basic/new-server-side/new-server-side.component.ts index e474fd21..0216082c 100644 --- a/demo/src/app/basic/new-server-side/new-server-side.component.ts +++ b/demo/src/app/basic/new-server-side/new-server-side.component.ts @@ -1,53 +1,15 @@ -import { HttpClient } from '@angular/common/http'; -import { Component, OnInit } from '@angular/core'; -import { DataTablesResponse } from 'app/datatables-response.model'; +import { Component } from "@angular/core"; @Component({ - selector: 'app-new-server-side', - templateUrl: './new-server-side.component.html', - styleUrls: ['./new-server-side.component.css'] + selector: "app-new-server-side", + templateUrl: "./new-server-side.component.html", + styleUrls: ["./new-server-side.component.css"], }) -export class NewServerSideComponent implements OnInit { - - constructor( - private http: HttpClient - ) { } - - pageTitle = 'Server-side processing'; - mdIntro = 'assets/docs/basic/new-server-side/intro.md'; - mdHTML = 'assets/docs/basic/new-server-side/source-html.md'; - mdTS = 'assets/docs/basic/new-server-side/source-ts.md'; +export class NewServerSideComponent { + pageTitle = "Server-side processing"; + mdIntro = "assets/docs/basic/new-server-side/intro.md"; + mdHTML = "assets/docs/basic/new-server-side/source-html.md"; + mdTS = "assets/docs/basic/new-server-side/source-ts.md"; dtOptions: DataTables.Settings = {}; - - ngOnInit(): void { - const that = this; - this.dtOptions = { - serverSide: true, - ajax: (dataTablesParameters: any, callback) => { - that.http - .post( - 'https://xtlncifojk.eu07.qoddiapp.com/', - dataTablesParameters, {} - ).subscribe(resp => { - callback({ - recordsTotal: resp.recordsTotal, - recordsFiltered: resp.recordsFiltered, - data: resp.data - }); - }); - }, - columns: [{ - title: 'ID', - data: 'id' - }, { - title: 'First name', - data: 'firstName' - }, { - title: 'Last name', - data: 'lastName' - }] - }; - } } - diff --git a/demo/src/app/basic/server-side-angular-way.component.html b/demo/src/app/basic/server-side-angular-way.component.html index 60ee4737..fc42d39e 100644 --- a/demo/src/app/basic/server-side-angular-way.component.html +++ b/demo/src/app/basic/server-side-angular-way.component.html @@ -1,25 +1,7 @@ - - - - - - - - - - - - - - - - - - - - -
IDFirst nameLast name
{{ person.id }}{{ person.firstName }}{{ person.lastName }}
No data!
+
+

No preview as we do not have a server that can serve the queries.

+
diff --git a/demo/src/app/basic/server-side-angular-way.component.spec.ts b/demo/src/app/basic/server-side-angular-way.component.spec.ts index 8eb7dcc6..b065d406 100644 --- a/demo/src/app/basic/server-side-angular-way.component.spec.ts +++ b/demo/src/app/basic/server-side-angular-way.component.spec.ts @@ -7,7 +7,6 @@ import { MarkdownModule } from 'ngx-markdown'; import { BaseDemoComponent } from '../base-demo/base-demo.component'; import { ServerSideAngularWayComponent } from './server-side-angular-way.component'; import { AppRoutingModule } from '../app.routing'; -import { By } from '@angular/platform-browser'; let fixture: ComponentFixture, component: ServerSideAngularWayComponent = null; @@ -48,17 +47,4 @@ describe('ServerSideAngularWayComponent', () => { const app = fixture.debugElement.componentInstance as ServerSideAngularWayComponent; expect(app.pageTitle).toBe('Server side the Angular way'); })); - - it('should have table populated via AJAX', async () => { - const app = fixture.debugElement.componentInstance as ServerSideAngularWayComponent; - await fixture.whenStable(); - expect(app.dtOptions.columns).toBeDefined(); - const query = fixture.debugElement.query(By.directive(DataTableDirective)); - const dir = query.injector.get(DataTableDirective); - expect(dir).toBeTruthy(); - const instance = await dir.dtInstance; - fixture.detectChanges(); - expect(instance.rows().length).toBeGreaterThan(0); - }); - }); diff --git a/demo/src/app/basic/server-side-angular-way.component.ts b/demo/src/app/basic/server-side-angular-way.component.ts index 2963e237..b918935b 100644 --- a/demo/src/app/basic/server-side-angular-way.component.ts +++ b/demo/src/app/basic/server-side-angular-way.component.ts @@ -1,14 +1,12 @@ -import { Component, OnInit } from '@angular/core'; -import { HttpClient } from '@angular/common/http'; +import { Component } from '@angular/core'; import { Person } from '../person'; -import { DataTablesResponse } from 'app/datatables-response.model'; @Component({ selector: 'app-server-side-angular-way', templateUrl: 'server-side-angular-way.component.html', styleUrls: ['server-side-angular-way.component.css'] }) -export class ServerSideAngularWayComponent implements OnInit { +export class ServerSideAngularWayComponent { pageTitle = 'Server side the Angular way'; mdIntro = 'assets/docs/basic/server-side-angular-way/intro.md'; @@ -17,33 +15,4 @@ export class ServerSideAngularWayComponent implements OnInit { dtOptions: DataTables.Settings = {}; persons: Person[]; - - constructor(private http: HttpClient) {} - - ngOnInit(): void { - const that = this; - - this.dtOptions = { - pagingType: 'full_numbers', - pageLength: 2, - serverSide: true, - processing: true, - ajax: (dataTablesParameters: any, callback) => { - that.http - .post( - 'https://xtlncifojk.eu07.qoddiapp.com/', - dataTablesParameters, {} - ).subscribe(resp => { - that.persons = resp.data; - - callback({ - recordsTotal: resp.recordsTotal, - recordsFiltered: resp.recordsFiltered, - data: [] - }); - }); - }, - columns: [{ data: 'id' }, { data: 'firstName' }, { data: 'lastName' }] - }; - } }