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

chore: remove server side previews #1759

Merged
merged 1 commit into from
Nov 13, 2023
Merged

chore: remove server side previews #1759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion demo/src/app/basic/new-server-side/new-server-side.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<ng-template #preview>
<table datatable [dtOptions]="dtOptions" class="row-border hover"></table>
<blockquote>
<p>No preview as we do not have a server that can serve the queries.</p>
</blockquote>
</ng-template>
<app-base-demo [pageTitle]="pageTitle" [mdIntro]="mdIntro" [mdHTML]="mdHTML" [mdTS]="mdTS" [template]="preview">
</app-base-demo>
19 changes: 3 additions & 16 deletions demo/src/app/basic/new-server-side/new-server-side.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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);
});
});
56 changes: 9 additions & 47 deletions demo/src/app/basic/new-server-side/new-server-side.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<DataTablesResponse>(
'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'
}]
};
}
}

24 changes: 3 additions & 21 deletions demo/src/app/basic/server-side-angular-way.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,7 @@
<ng-template #preview>
<table datatable [dtOptions]="dtOptions" class="row-border hover">
<thead>
<tr>
<th>ID</th>
<th>First name</th>
<th>Last name</th>
</tr>
</thead>
<tbody *ngIf="persons?.length != 0">
<tr *ngFor="let person of persons">
<td>{{ person.id }}</td>
<td>{{ person.firstName }}</td>
<td>{{ person.lastName }}</td>
</tr>
</tbody>
<tbody *ngIf="persons?.length == 0">
<tr>
<td colspan="3" class="no-data-available">No data!</td>
</tr>
</tbody>
</table>
<blockquote>
<p>No preview as we do not have a server that can serve the queries.</p>
</blockquote>
</ng-template>
<app-base-demo [pageTitle]="pageTitle" [mdIntro]="mdIntro" [mdHTML]="mdHTML" [mdTS]="mdTS" [template]="preview"
[deprecated]="true">
Expand Down
14 changes: 0 additions & 14 deletions demo/src/app/basic/server-side-angular-way.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<ServerSideAngularWayComponent>, component: ServerSideAngularWayComponent = null;
Expand Down Expand Up @@ -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);
});

});
35 changes: 2 additions & 33 deletions demo/src/app/basic/server-side-angular-way.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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<DataTablesResponse>(
'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' }]
};
}
}