diff --git a/web/src/elements/Label.ts b/web/src/elements/Label.ts index 0d836dfce..36c756ac6 100644 --- a/web/src/elements/Label.ts +++ b/web/src/elements/Label.ts @@ -44,7 +44,7 @@ export class Label extends LitElement { diff --git a/web/src/elements/oauth/UserRefreshList.ts b/web/src/elements/oauth/UserRefreshList.ts index 279c01a55..891bfae26 100644 --- a/web/src/elements/oauth/UserRefreshList.ts +++ b/web/src/elements/oauth/UserRefreshList.ts @@ -10,6 +10,7 @@ import { ExpiringBaseGrantModel, Oauth2Api, RefreshTokenModel } from "@goauthent import { AKResponse } from "../../api/Client"; import { DEFAULT_CONFIG } from "../../api/Config"; import { uiConfig } from "../../common/config"; +import { PFColor } from "../Label"; import "../forms/DeleteBulkForm"; import { Table, TableColumn } from "../table/Table"; @@ -85,7 +86,9 @@ export class UserOAuthRefreshList extends Table { row(item: RefreshTokenModel): TemplateResult[] { return [ html` ${item.provider?.name} `, - html`${item.revoked ? t`Yes` : t`No`}`, + html` + ${item.revoked ? t`Yes` : t`No`} + `, html`${item.expires?.toLocaleString()}`, html`${item.scope.join(", ")}`, ]; diff --git a/web/src/pages/applications/ApplicationCheckAccessForm.ts b/web/src/pages/applications/ApplicationCheckAccessForm.ts index b8c0f233b..0f0484ae7 100644 --- a/web/src/pages/applications/ApplicationCheckAccessForm.ts +++ b/web/src/pages/applications/ApplicationCheckAccessForm.ts @@ -7,6 +7,7 @@ import { until } from "lit/directives/until.js"; import { Application, CoreApi, PolicyTestResult } from "@goauthentik/api"; import { DEFAULT_CONFIG } from "../../api/Config"; +import { PFColor } from "../../elements/Label"; import { Form } from "../../elements/forms/Form"; import "../../elements/forms/HorizontalFormElement"; import { UserOption } from "../../elements/user/utils"; @@ -45,9 +46,11 @@ export class ApplicationCheckAccessForm extends Form<{ forUser: number }> { return html`
- ${this.result?.passing ? t`Yes` : t`No`} + + + ${this.result?.passing ? t`Yes` : t`No`} + +
diff --git a/web/src/pages/crypto/CertificateKeyPairListPage.ts b/web/src/pages/crypto/CertificateKeyPairListPage.ts index b676b9f89..844626a4c 100644 --- a/web/src/pages/crypto/CertificateKeyPairListPage.ts +++ b/web/src/pages/crypto/CertificateKeyPairListPage.ts @@ -93,10 +93,10 @@ export class CertificateKeyPairListPage extends TablePage { row(item: CertificateKeyPair): TemplateResult[] { return [ html`${item.name}`, - html` + html` ${item.privateKeyAvailable ? t`Yes` : t`No`} `, - html` new Date() ? PFColor.Green : PFColor.Orange}> + html` new Date() ? PFColor.Green : PFColor.Orange}> ${item.certExpiry?.toLocaleString()} `, html` diff --git a/web/src/pages/groups/GroupListPage.ts b/web/src/pages/groups/GroupListPage.ts index d84984305..b83a59e61 100644 --- a/web/src/pages/groups/GroupListPage.ts +++ b/web/src/pages/groups/GroupListPage.ts @@ -8,6 +8,7 @@ import { CoreApi, Group } from "@goauthentik/api"; import { AKResponse } from "../../api/Client"; import { DEFAULT_CONFIG } from "../../api/Config"; import { uiConfig } from "../../common/config"; +import { PFColor } from "../../elements/Label"; import "../../elements/buttons/SpinnerButton"; import "../../elements/forms/DeleteBulkForm"; import "../../elements/forms/ModalForm"; @@ -80,7 +81,9 @@ export class GroupListPage extends TablePage { html`${item.name}`, html`${item.parentName || t`-`}`, html`${Array.from(item.users || []).length}`, - html`${item.isSuperuser ? t`Yes` : t`No`}`, + html` + ${item.isSuperuser ? t`Yes` : t`No`} + `, html` ${t`Update`} ${t`Update Group`} diff --git a/web/src/pages/groups/MemberSelectModal.ts b/web/src/pages/groups/MemberSelectModal.ts index cb5edff03..b0153bea1 100644 --- a/web/src/pages/groups/MemberSelectModal.ts +++ b/web/src/pages/groups/MemberSelectModal.ts @@ -8,6 +8,7 @@ import { CoreApi, User } from "@goauthentik/api"; import { AKResponse } from "../../api/Client"; import { DEFAULT_CONFIG } from "../../api/Config"; import { uiConfig } from "../../common/config"; +import { PFColor } from "../../elements/Label"; import "../../elements/buttons/SpinnerButton"; import { TableColumn } from "../../elements/table/Table"; import { TableModal } from "../../elements/table/TableModal"; @@ -50,7 +51,9 @@ export class MemberSelectTable extends TableModal {
${item.username}
${item.name} `, - html`${item.isActive ? t`Yes` : t`No`}`, + html` + ${item.isActive ? t`Yes` : t`No`} + `, html`${first(item.lastLogin?.toLocaleString(), t`-`)}`, ]; } diff --git a/web/src/pages/outposts/ServiceConnectionListPage.ts b/web/src/pages/outposts/ServiceConnectionListPage.ts index ba81b1008..7100ea8be 100644 --- a/web/src/pages/outposts/ServiceConnectionListPage.ts +++ b/web/src/pages/outposts/ServiceConnectionListPage.ts @@ -65,7 +65,9 @@ export class OutpostServiceConnectionListPage extends TablePage + ${item.local ? t`Yes` : t`No`} +
`, html`${until( new OutpostsApi(DEFAULT_CONFIG) .outpostsServiceConnectionsAllStateRetrieve({ diff --git a/web/src/pages/policies/BoundPoliciesList.ts b/web/src/pages/policies/BoundPoliciesList.ts index cc0f62f81..df3cf0b4c 100644 --- a/web/src/pages/policies/BoundPoliciesList.ts +++ b/web/src/pages/policies/BoundPoliciesList.ts @@ -10,6 +10,7 @@ import { PoliciesApi, PolicyBinding } from "@goauthentik/api"; import { AKResponse } from "../../api/Client"; import { DEFAULT_CONFIG } from "../../api/Config"; import { uiConfig } from "../../common/config"; +import { PFColor } from "../../elements/Label"; import { PFSize } from "../../elements/Spinner"; import "../../elements/Tabs"; import "../../elements/buttons/Dropdown"; @@ -136,7 +137,9 @@ export class BoundPoliciesList extends Table { row(item: PolicyBinding): TemplateResult[] { return [ html`${this.getPolicyUserGroupRow(item)}`, - html`${item.enabled ? t`Yes` : t`No`}`, + html` + ${item.enabled ? t`Yes` : t`No`} + `, html`${item.order}`, html`${item.timeout}`, html` ${this.getObjectEditButton(item)} diff --git a/web/src/pages/policies/PolicyTestForm.ts b/web/src/pages/policies/PolicyTestForm.ts index 024ed306f..30b9595a3 100644 --- a/web/src/pages/policies/PolicyTestForm.ts +++ b/web/src/pages/policies/PolicyTestForm.ts @@ -16,6 +16,7 @@ import { import { DEFAULT_CONFIG } from "../../api/Config"; import "../../elements/CodeMirror"; +import { PFColor } from "../../elements/Label"; import { Form } from "../../elements/forms/Form"; import "../../elements/forms/HorizontalFormElement"; import { UserOption } from "../../elements/user/utils"; @@ -50,9 +51,11 @@ export class PolicyTestForm extends Form { return html`
- ${this.result?.passing ? t`Yes` : t`No`} + + + ${this.result?.passing ? t`Yes` : t`No`} + +
diff --git a/web/src/pages/providers/proxy/ProxyProviderViewPage.ts b/web/src/pages/providers/proxy/ProxyProviderViewPage.ts index 0c46834ab..aae9c6f68 100644 --- a/web/src/pages/providers/proxy/ProxyProviderViewPage.ts +++ b/web/src/pages/providers/proxy/ProxyProviderViewPage.ts @@ -27,6 +27,7 @@ import MDTraefikStandalone from "../../../../../website/docs/providers/proxy/_tr import { DEFAULT_CONFIG } from "../../../api/Config"; import { EVENT_REFRESH } from "../../../constants"; import "../../../elements/CodeMirror"; +import { PFColor } from "../../../elements/Label"; import "../../../elements/Tabs"; import "../../../elements/buttons/ModalButton"; import "../../../elements/buttons/SpinnerButton"; @@ -172,21 +173,13 @@ export class ProxyProviderViewPage extends LitElement {
- ${this.provider.basicAuthEnabled - ? html` -   ${t`Yes`}` - : html` -   ${t`No`}`} + + ${this.provider.basicAuthEnabled ? t`Yes` : t`No`} +
diff --git a/web/src/pages/tenants/TenantListPage.ts b/web/src/pages/tenants/TenantListPage.ts index bc23b28ec..02dbbb690 100644 --- a/web/src/pages/tenants/TenantListPage.ts +++ b/web/src/pages/tenants/TenantListPage.ts @@ -8,6 +8,7 @@ import { CoreApi, Tenant } from "@goauthentik/api"; import { AKResponse } from "../../api/Client"; import { DEFAULT_CONFIG } from "../../api/Config"; import { uiConfig } from "../../common/config"; +import { PFColor } from "../../elements/Label"; import "../../elements/buttons/SpinnerButton"; import "../../elements/forms/DeleteBulkForm"; import "../../elements/forms/ModalForm"; @@ -77,7 +78,9 @@ export class TenantListPage extends TablePage { row(item: Tenant): TemplateResult[] { return [ html`${item.domain}`, - html`${item._default ? t`Yes` : t`No`}`, + html` + ${item._default ? t`Yes` : t`No`} + `, html` ${t`Update`} ${t`Update Tenant`} diff --git a/web/src/pages/tokens/TokenListPage.ts b/web/src/pages/tokens/TokenListPage.ts index 60efeb6b2..b6950249d 100644 --- a/web/src/pages/tokens/TokenListPage.ts +++ b/web/src/pages/tokens/TokenListPage.ts @@ -8,6 +8,7 @@ import { CoreApi, IntentEnum, Token } from "@goauthentik/api"; import { AKResponse } from "../../api/Client"; import { DEFAULT_CONFIG } from "../../api/Config"; import { uiConfig } from "../../common/config"; +import { PFColor } from "../../elements/Label"; import "../../elements/buttons/Dropdown"; import "../../elements/buttons/TokenCopyButton"; import "../../elements/forms/DeleteBulkForm"; @@ -110,7 +111,9 @@ export class TokenListPage extends TablePage { ${item.managed ? html`${t`Token is managed by authentik.`}` : html``} `, html`${item.userObj?.username}`, - html`${item.expiring ? t`Yes` : t`No`}`, + html` + ${item.expiring ? t`Yes` : t`No`} + `, html`${item.expiring ? item.expires?.toLocaleString() : t`-`}`, html`${IntentToLabel(item.intent || IntentEnum.Api)}`, html` diff --git a/web/src/pages/users/GroupSelectModal.ts b/web/src/pages/users/GroupSelectModal.ts index e7e0127a9..64c53ad36 100644 --- a/web/src/pages/users/GroupSelectModal.ts +++ b/web/src/pages/users/GroupSelectModal.ts @@ -8,6 +8,7 @@ import { CoreApi, Group } from "@goauthentik/api"; import { AKResponse } from "../../api/Client"; import { DEFAULT_CONFIG } from "../../api/Config"; import { uiConfig } from "../../common/config"; +import { PFColor } from "../../elements/Label"; import "../../elements/buttons/SpinnerButton"; import { TableColumn } from "../../elements/table/Table"; import { TableModal } from "../../elements/table/TableModal"; @@ -48,7 +49,9 @@ export class GroupSelectModal extends TableModal { html`
${item.name}
`, - html`${item.isSuperuser ? t`Yes` : t`No`}`, + html` + ${item.isSuperuser ? t`Yes` : t`No`} + `, html`${item.users.length}`, ]; } diff --git a/web/src/pages/users/UserListPage.ts b/web/src/pages/users/UserListPage.ts index 0a2065594..c9779a454 100644 --- a/web/src/pages/users/UserListPage.ts +++ b/web/src/pages/users/UserListPage.ts @@ -11,6 +11,7 @@ import { CoreApi, User } from "@goauthentik/api"; import { AKResponse } from "../../api/Client"; import { DEFAULT_CONFIG, tenant } from "../../api/Config"; import { uiConfig } from "../../common/config"; +import { PFColor } from "../../elements/Label"; import "../../elements/buttons/ActionButton"; import "../../elements/forms/DeleteBulkForm"; import "../../elements/forms/ModalForm"; @@ -110,7 +111,9 @@ export class UserListPage extends TablePage {
${item.username}
${item.name} `, - html`${item.isActive ? t`Yes` : t`No`}`, + html` + ${item.isActive ? t`Yes` : t`No`} + `, html`${first(item.lastLogin?.toLocaleString(), t`-`)}`, html` ${t`Update`} diff --git a/web/src/user/user-settings/tokens/UserTokenList.ts b/web/src/user/user-settings/tokens/UserTokenList.ts index 721924a9a..29ac58d13 100644 --- a/web/src/user/user-settings/tokens/UserTokenList.ts +++ b/web/src/user/user-settings/tokens/UserTokenList.ts @@ -10,6 +10,7 @@ import { CoreApi, IntentEnum, Token } from "@goauthentik/api"; import { AKResponse } from "../../../api/Client"; import { DEFAULT_CONFIG } from "../../../api/Config"; import { uiConfig } from "../../../common/config"; +import { PFColor } from "../../../elements/Label"; import "../../../elements/buttons/Dropdown"; import "../../../elements/buttons/ModalButton"; import "../../../elements/buttons/TokenCopyButton"; @@ -92,7 +93,9 @@ export class UserTokenList extends Table {
- ${item.expiring ? t`Yes` : t`No`} + + ${item.expiring ? t`Yes` : t`No`} +