Skip to content
This repository was archived by the owner on Feb 2, 2025. It is now read-only.

Commit 0a66237

Browse files
shanmukhatejashanmukhateja
authored
Merge pull request #1759 from l-lin/chore/remove_server_side_preview
2 parents 1c9407b + 8007ded commit 0a66237

File tree

6 files changed

+20
-132
lines changed

6 files changed

+20
-132
lines changed

‎demo/src/app/basic/new-server-side/new-server-side.component.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<ng-template #preview>
2-
<table datatable [dtOptions]="dtOptions" class="row-border hover"></table>
2+
<blockquote>
3+
<p>No preview as we do not have a server that can serve the queries.</p>
4+
</blockquote>
35
</ng-template>
46
<app-base-demo [pageTitle]="pageTitle" [mdIntro]="mdIntro" [mdHTML]="mdHTML" [mdTS]="mdTS" [template]="preview">
57
</app-base-demo>

‎demo/src/app/basic/new-server-side/new-server-side.component.spec.ts‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { HttpClientModule } from '@angular/common/http';
22
import { SecurityContext, NO_ERRORS_SCHEMA } from '@angular/core';
33
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
4-
import { By } from '@angular/platform-browser';
54
import { RouterTestingModule } from '@angular/router/testing';
65
import { DataTableDirective, DataTablesModule } from 'angular-datatables';
76
import { AppRoutingModule } from 'app/app.routing';
@@ -40,25 +39,13 @@ describe('NewServerSideComponent', () => {
4039
fixture.detectChanges(); // initial binding
4140
});
4241

43-
it('should create', () => {
44-
expect(component).toBeTruthy();
42+
it('should create the app', () => {
43+
const app = fixture.debugElement.componentInstance;
44+
expect(app).toBeTruthy();
4545
});
4646

47-
4847
it('should have title "Server-side processing"', waitForAsync(() => {
4948
const app = fixture.debugElement.componentInstance as NewServerSideComponent;
5049
expect(app.pageTitle).toBe('Server-side processing');
5150
}));
52-
53-
it('should have table populated via AJAX', async () => {
54-
const app = fixture.debugElement.componentInstance as NewServerSideComponent;
55-
await fixture.whenStable();
56-
expect(app.dtOptions.columns).toBeDefined();
57-
const query = fixture.debugElement.query(By.directive(DataTableDirective));
58-
const dir = query.injector.get(DataTableDirective);
59-
expect(dir).toBeTruthy();
60-
const instance = await dir.dtInstance;
61-
fixture.detectChanges();
62-
expect(instance.rows().length).toBeGreaterThan(0);
63-
});
6451
});

‎demo/src/app/basic/new-server-side/new-server-side.component.ts‎

Lines changed: 9 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,15 @@
1-
import { HttpClient } from '@angular/common/http';
2-
import { Component, OnInit } from '@angular/core';
3-
import { DataTablesResponse } from 'app/datatables-response.model';
1+
import { Component } from "@angular/core";
42

53
@Component({
6-
selector: 'app-new-server-side',
7-
templateUrl: './new-server-side.component.html',
8-
styleUrls: ['./new-server-side.component.css']
4+
selector: "app-new-server-side",
5+
templateUrl: "./new-server-side.component.html",
6+
styleUrls: ["./new-server-side.component.css"],
97
})
10-
export class NewServerSideComponent implements OnInit {
11-
12-
constructor(
13-
private http: HttpClient
14-
) { }
15-
16-
pageTitle = 'Server-side processing';
17-
mdIntro = 'assets/docs/basic/new-server-side/intro.md';
18-
mdHTML = 'assets/docs/basic/new-server-side/source-html.md';
19-
mdTS = 'assets/docs/basic/new-server-side/source-ts.md';
8+
export class NewServerSideComponent {
9+
pageTitle = "Server-side processing";
10+
mdIntro = "assets/docs/basic/new-server-side/intro.md";
11+
mdHTML = "assets/docs/basic/new-server-side/source-html.md";
12+
mdTS = "assets/docs/basic/new-server-side/source-ts.md";
2013

2114
dtOptions: DataTables.Settings = {};
22-
23-
ngOnInit(): void {
24-
const that = this;
25-
this.dtOptions = {
26-
serverSide: true,
27-
ajax: (dataTablesParameters: any, callback) => {
28-
that.http
29-
.post<DataTablesResponse>(
30-
'https://xtlncifojk.eu07.qoddiapp.com/',
31-
dataTablesParameters, {}
32-
).subscribe(resp => {
33-
callback({
34-
recordsTotal: resp.recordsTotal,
35-
recordsFiltered: resp.recordsFiltered,
36-
data: resp.data
37-
});
38-
});
39-
},
40-
columns: [{
41-
title: 'ID',
42-
data: 'id'
43-
}, {
44-
title: 'First name',
45-
data: 'firstName'
46-
}, {
47-
title: 'Last name',
48-
data: 'lastName'
49-
}]
50-
};
51-
}
5215
}
53-

‎demo/src/app/basic/server-side-angular-way.component.html‎

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,7 @@
11
<ng-template #preview>
2-
<table datatable [dtOptions]="dtOptions" class="row-border hover">
3-
<thead>
4-
<tr>
5-
<th>ID</th>
6-
<th>First name</th>
7-
<th>Last name</th>
8-
</tr>
9-
</thead>
10-
<tbody *ngIf="persons?.length != 0">
11-
<tr *ngFor="let person of persons">
12-
<td>{{ person.id }}</td>
13-
<td>{{ person.firstName }}</td>
14-
<td>{{ person.lastName }}</td>
15-
</tr>
16-
</tbody>
17-
<tbody *ngIf="persons?.length == 0">
18-
<tr>
19-
<td colspan="3" class="no-data-available">No data!</td>
20-
</tr>
21-
</tbody>
22-
</table>
2+
<blockquote>
3+
<p>No preview as we do not have a server that can serve the queries.</p>
4+
</blockquote>
235
</ng-template>
246
<app-base-demo [pageTitle]="pageTitle" [mdIntro]="mdIntro" [mdHTML]="mdHTML" [mdTS]="mdTS" [template]="preview"
257
[deprecated]="true">

‎demo/src/app/basic/server-side-angular-way.component.spec.ts‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { MarkdownModule } from 'ngx-markdown';
77
import { BaseDemoComponent } from '../base-demo/base-demo.component';
88
import { ServerSideAngularWayComponent } from './server-side-angular-way.component';
99
import { AppRoutingModule } from '../app.routing';
10-
import { By } from '@angular/platform-browser';
1110

1211

1312
let fixture: ComponentFixture<ServerSideAngularWayComponent>, component: ServerSideAngularWayComponent = null;
@@ -48,17 +47,4 @@ describe('ServerSideAngularWayComponent', () => {
4847
const app = fixture.debugElement.componentInstance as ServerSideAngularWayComponent;
4948
expect(app.pageTitle).toBe('Server side the Angular way');
5049
}));
51-
52-
it('should have table populated via AJAX', async () => {
53-
const app = fixture.debugElement.componentInstance as ServerSideAngularWayComponent;
54-
await fixture.whenStable();
55-
expect(app.dtOptions.columns).toBeDefined();
56-
const query = fixture.debugElement.query(By.directive(DataTableDirective));
57-
const dir = query.injector.get(DataTableDirective);
58-
expect(dir).toBeTruthy();
59-
const instance = await dir.dtInstance;
60-
fixture.detectChanges();
61-
expect(instance.rows().length).toBeGreaterThan(0);
62-
});
63-
6450
});

‎demo/src/app/basic/server-side-angular-way.component.ts‎

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
import { Component, OnInit } from '@angular/core';
2-
import { HttpClient } from '@angular/common/http';
1+
import { Component } from '@angular/core';
32
import { Person } from '../person';
4-
import { DataTablesResponse } from 'app/datatables-response.model';
53

64
@Component({
75
selector: 'app-server-side-angular-way',
86
templateUrl: 'server-side-angular-way.component.html',
97
styleUrls: ['server-side-angular-way.component.css']
108
})
11-
export class ServerSideAngularWayComponent implements OnInit {
9+
export class ServerSideAngularWayComponent {
1210

1311
pageTitle = 'Server side the Angular way';
1412
mdIntro = 'assets/docs/basic/server-side-angular-way/intro.md';
@@ -17,33 +15,4 @@ export class ServerSideAngularWayComponent implements OnInit {
1715

1816
dtOptions: DataTables.Settings = {};
1917
persons: Person[];
20-
21-
constructor(private http: HttpClient) {}
22-
23-
ngOnInit(): void {
24-
const that = this;
25-
26-
this.dtOptions = {
27-
pagingType: 'full_numbers',
28-
pageLength: 2,
29-
serverSide: true,
30-
processing: true,
31-
ajax: (dataTablesParameters: any, callback) => {
32-
that.http
33-
.post<DataTablesResponse>(
34-
'https://xtlncifojk.eu07.qoddiapp.com/',
35-
dataTablesParameters, {}
36-
).subscribe(resp => {
37-
that.persons = resp.data;
38-
39-
callback({
40-
recordsTotal: resp.recordsTotal,
41-
recordsFiltered: resp.recordsFiltered,
42-
data: []
43-
});
44-
});
45-
},
46-
columns: [{ data: 'id' }, { data: 'firstName' }, { data: 'lastName' }]
47-
};
48-
}
4918
}

0 commit comments

Comments
 (0)