web: use generated API Client (#616)
* api: fix types for config API * api: remove broken swagger UI * admin: re-fix system task enum * events: make event optional * events: fix Schema for notification transport test * flows: use APIView for Flow Executor * core: fix schema for Metrics APIs * web: rewrite to use generated API client * web: generate API Client in CI * admin: use x_cord and y_cord to prevent yaml issues * events: fix linting errors * web: don't lint generated code * core: fix fields not being required in TypeSerializer * flows: fix missing permission_classes * web: cleanup * web: fix rendering of graph on Overview page * web: cleanup imports * core: fix missing background image filter * flows: fix flows not advancing properly * stages/*: fix warnings during get_challenge * web: send Flow response as JSON instead of FormData * web: fix styles for horizontal tabs * web: add base chart class and custom chart for application view * root: generate ts client for e2e tests * web: don't attempt to connect to websocket in selenium tests * web: fix UserTokenList not being included in the build * web: fix styling for static token list * web: fix CSRF Token missing * stages/authenticator_static: fix error when disable static tokens * core: fix display issue when updating user info * web: fix Flow executor not showing spinner when redirecting
This commit is contained in:
@ -7,8 +7,10 @@ import "../../elements/buttons/ModalButton";
|
||||
import "../../elements/buttons/Dropdown";
|
||||
import "../../elements/buttons/ActionButton";
|
||||
import { TableColumn } from "../../elements/table/Table";
|
||||
import { User } from "../../api/Users";
|
||||
import { PAGE_SIZE } from "../../constants";
|
||||
import { CoreApi, User } from "../../api";
|
||||
import { DEFAULT_CONFIG } from "../../api/Config";
|
||||
import { AdminURLManager } from "../../api/legacy";
|
||||
|
||||
@customElement("ak-user-list")
|
||||
export class UserListPage extends TablePage<User> {
|
||||
@ -29,10 +31,10 @@ export class UserListPage extends TablePage<User> {
|
||||
order = "username";
|
||||
|
||||
apiEndpoint(page: number): Promise<AKResponse<User>> {
|
||||
return User.list({
|
||||
return new CoreApi(DEFAULT_CONFIG).coreUsersList({
|
||||
ordering: this.order,
|
||||
page: page,
|
||||
page_size: PAGE_SIZE,
|
||||
pageSize: PAGE_SIZE,
|
||||
search: this.search || "",
|
||||
});
|
||||
}
|
||||
@ -52,10 +54,10 @@ export class UserListPage extends TablePage<User> {
|
||||
<div>${item.username}</div>
|
||||
<small>${item.name}</small>
|
||||
</div>`,
|
||||
html`${item.is_active ? "Yes" : "No"}`,
|
||||
html`${new Date(item.last_login * 1000).toLocaleString()}`,
|
||||
html`${item.isActive ? "Yes" : "No"}`,
|
||||
html`${item.lastLogin?.toLocaleString()}`,
|
||||
html`
|
||||
<ak-modal-button href="${User.adminUrl(`${item.pk}/update/`)}">
|
||||
<ak-modal-button href="${AdminURLManager.users(`${item.pk}/update/`)}">
|
||||
<ak-spinner-button slot="trigger" class="pf-m-secondary">
|
||||
${gettext("Edit")}
|
||||
</ak-spinner-button>
|
||||
@ -63,19 +65,19 @@ export class UserListPage extends TablePage<User> {
|
||||
</ak-modal-button>
|
||||
<ak-dropdown class="pf-c-dropdown">
|
||||
<button class="pf-c-dropdown__toggle pf-m-primary" type="button">
|
||||
<span class="pf-c-dropdown__toggle-text">${gettext(item.is_active ? "Disable" : "Enable")}</span>
|
||||
<span class="pf-c-dropdown__toggle-text">${gettext(item.isActive ? "Disable" : "Enable")}</span>
|
||||
<i class="fas fa-caret-down pf-c-dropdown__toggle-icon" aria-hidden="true"></i>
|
||||
</button>
|
||||
<ul class="pf-c-dropdown__menu" hidden>
|
||||
<li>
|
||||
${item.is_active ?
|
||||
html`<ak-modal-button href="${User.adminUrl(`${item.pk}/disable/`)}">
|
||||
${item.isActive ?
|
||||
html`<ak-modal-button href="${AdminURLManager.users(`${item.pk}/disable/`)}">
|
||||
<button slot="trigger" class="pf-c-dropdown__menu-item">
|
||||
${gettext("Disable")}
|
||||
</button>
|
||||
<div slot="modal"></div>
|
||||
</ak-modal-button>`:
|
||||
html`<ak-modal-button href="${User.adminUrl(`${item.pk}/enable/`)}">
|
||||
html`<ak-modal-button href="${AdminURLManager.users(`${item.pk}/enable/`)}">
|
||||
<button slot="trigger" class="pf-c-dropdown__menu-item">
|
||||
${gettext("Enable")}
|
||||
</button>
|
||||
@ -84,7 +86,7 @@ export class UserListPage extends TablePage<User> {
|
||||
</li>
|
||||
<li class="pf-c-divider" role="separator"></li>
|
||||
<li>
|
||||
<ak-modal-button href="${User.adminUrl(`${item.pk}/delete/`)}">
|
||||
<ak-modal-button href="${AdminURLManager.users(`${item.pk}/delete/`)}">
|
||||
<button slot="trigger" class="pf-c-dropdown__menu-item">
|
||||
${gettext("Delete")}
|
||||
</button>
|
||||
@ -93,7 +95,7 @@ export class UserListPage extends TablePage<User> {
|
||||
</li>
|
||||
</ul>
|
||||
</ak-dropdown>
|
||||
<ak-action-button method="GET" url="${User.adminUrl(`${item.pk}/reset/`)}">
|
||||
<ak-action-button method="GET" url="${AdminURLManager.users(`${item.pk}/reset/`)}">
|
||||
${gettext("Reset Password")}
|
||||
</ak-action-button>
|
||||
<a class="pf-c-button pf-m-tertiary" href="${`-/impersonation/${item.pk}/`}">
|
||||
@ -104,7 +106,7 @@ export class UserListPage extends TablePage<User> {
|
||||
|
||||
renderToolbar(): TemplateResult {
|
||||
return html`
|
||||
<ak-modal-button href=${User.adminUrl("create/")}>
|
||||
<ak-modal-button href=${AdminURLManager.users("create/")}>
|
||||
<ak-spinner-button slot="trigger" class="pf-m-primary">
|
||||
${gettext("Create")}
|
||||
</ak-spinner-button>
|
||||
|
||||
Reference in New Issue
Block a user