trustchain-oc1-orchestral
/
authentik
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

web: fix pagination not working correctly sometimes, fix pagination not showing when changing pages

This commit is contained in:
Jens Langhammer 2021-02-04 10:08:57 +01:00
parent 178417fe67
commit 9ca9e67ffa
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/api/Providers.ts
View File

@ -16,7 +16,7 @@ export class Provider {
} }
static get(id: number): Promise<Provider> { static get(id: number): Promise<Provider> {
return DefaultClient.fetch<Provider>(["providers", "all", id]); return DefaultClient.fetch<Provider>(["providers", "all", id.toString()]);
} }
static list(filter?: QueryArguments): Promise<PBResponse<Provider>> { static list(filter?: QueryArguments): Promise<PBResponse<Provider>> {

7
web/src/elements/table/Table.ts
View File

@ -117,7 +117,6 @@ export abstract class Table<T> extends LitElement {
return; return;
} }
this.isLoading = true; this.isLoading = true;
this.data = undefined;
this.apiEndpoint(this.page).then((r) => { this.apiEndpoint(this.page).then((r) => {
this.data = r; this.data = r;
this.page = r.pagination.current; this.page = r.pagination.current;
@ -225,7 +224,7 @@ export abstract class Table<T> extends LitElement {
<ak-table-pagination <ak-table-pagination
class="pf-c-toolbar__item pf-m-pagination" class="pf-c-toolbar__item pf-m-pagination"
.pages=${this.data?.pagination} .pages=${this.data?.pagination}
.pageChangeHandler=${(page: number) => {this.page = page; }}> .pageChangeHandler=${(page: number) => { this.page = page; this.fetch(); }}>
</ak-table-pagination> </ak-table-pagination>
</div> </div>
</div> </div>
@ -236,13 +235,13 @@ export abstract class Table<T> extends LitElement {
${this.columns().map((col) => col.render(this))} ${this.columns().map((col) => col.render(this))}
</tr> </tr>
</thead> </thead>
${this.data ? this.renderRows() : this.renderLoading()} ${(this.isLoading || !this.data) ? this.renderLoading() : this.renderRows()}
</table> </table>
<div class="pf-c-pagination pf-m-bottom"> <div class="pf-c-pagination pf-m-bottom">
<ak-table-pagination <ak-table-pagination
class="pf-c-toolbar__item pf-m-pagination" class="pf-c-toolbar__item pf-m-pagination"
.pages=${this.data?.pagination} .pages=${this.data?.pagination}
.pageChangeHandler=${(page: number) => { this.page = page; }}> .pageChangeHandler=${(page: number) => { this.page = page; this.fetch(); }}>
</ak-table-pagination> </ak-table-pagination>
</div>`; </div>`;
} }

9
web/src/elements/table/TablePagination.ts
View File

@ -1,6 +1,7 @@
import { CSSResult, customElement, html, LitElement, property, TemplateResult } from "lit-element"; import { CSSResult, customElement, html, LitElement, property, TemplateResult } from "lit-element";
import { COMMON_STYLES } from "../../common/styles"; import { COMMON_STYLES } from "../../common/styles";
import { PBPagination } from "../../api/Client"; import { PBPagination } from "../../api/Client";
import { gettext } from "django";
@customElement("ak-table-pagination") @customElement("ak-table-pagination")
export class TablePagination extends LitElement { export class TablePagination extends LitElement {
@ -32,8 +33,8 @@ export class TablePagination extends LitElement {
<button <button
class="pf-c-button pf-m-plain" class="pf-c-button pf-m-plain"
@click=${() => { this.pageChangeHandler(this.pages?.previous || 0); }} @click=${() => { this.pageChangeHandler(this.pages?.previous || 0); }}
?disabled="${(this.pages?.previous || 0) > 0}" ?disabled="${(this.pages?.previous || 0) < 1}"
aria-label="{% trans 'Go to previous page' %}" aria-label="${gettext("Go to previous page")}"
> >
<i class="fas fa-angle-left" aria-hidden="true"></i> <i class="fas fa-angle-left" aria-hidden="true"></i>
</button> </button>
@ -42,8 +43,8 @@ export class TablePagination extends LitElement {
<button <button
class="pf-c-button pf-m-plain" class="pf-c-button pf-m-plain"
@click=${() => { this.pageChangeHandler(this.pages?.next || 0); }} @click=${() => { this.pageChangeHandler(this.pages?.next || 0); }}
?disabled="${(this.pages?.next || 0) > 0}" ?disabled="${(this.pages?.next || 0) < 0}"
aria-label="{% trans 'Go to next page' %}" aria-label="${gettext("Go to next page")}"
> >
<i class="fas fa-angle-right" aria-hidden="true"></i> <i class="fas fa-angle-right" aria-hidden="true"></i>
</button> </button>