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

web/admin: replace user selections with ak-search-select

Browse source 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

#4157
This commit is contained in:
Jens Langhammer 2022-12-29 11:00:57 +01:00
parent 6d86067cea
commit e02b99bfbc
No known key found for this signature in database
6 changed files with 177 additions and 127 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
web/src/admin/applications/ApplicationCheckAccessForm.ts
View file

@ -1,18 +1,23 @@
import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { PFColor } from "@goauthentik/elements/Label"; import { PFColor } from "@goauthentik/elements/Label";
import "@goauthentik/elements/SearchSelect";
import { Form } from "@goauthentik/elements/forms/Form"; import { Form } from "@goauthentik/elements/forms/Form";
import "@goauthentik/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { UserOption } from "@goauthentik/elements/user/utils";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
import { CSSResult, TemplateResult, html } from "lit"; import { CSSResult, TemplateResult, html } from "lit";
import { customElement, property } from "lit/decorators.js"; import { customElement, property } from "lit/decorators.js";
import { until } from "lit/directives/until.js";
import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css";
import { Application, CoreApi, PolicyTestResult } from "@goauthentik/api"; import {
Application,
CoreApi,
CoreUsersListRequest,
PolicyTestResult,
User,
} from "@goauthentik/api";
@customElement("ak-application-check-access-form") @customElement("ak-application-check-access-form")
export class ApplicationCheckAccessForm extends Form<{ forUser: number }> { export class ApplicationCheckAccessForm extends Form<{ forUser: number }> {
@ -114,25 +119,31 @@ export class ApplicationCheckAccessForm extends Form<{ forUser: number }> {
renderForm(): TemplateResult { renderForm(): TemplateResult {
return html`<form class="pf-c-form pf-m-horizontal"> return html`<form class="pf-c-form pf-m-horizontal">
<ak-form-element-horizontal label=${t`User`} ?required=${true} name="forUser"> <ak-form-element-horizontal label=${t`User`} ?required=${true} name="forUser">
<select class="pf-c-form-control"> <ak-search-select
${until( .fetchObjects=${async (query?: string): Promise<User[]> => {
new CoreApi(DEFAULT_CONFIG) const args: CoreUsersListRequest = {
.coreUsersList({
ordering: "username", ordering: "username",
}) };
.then((users) => { if (query !== undefined) {
return users.results.map((user) => { args.search = query;
return html`<option }
?selected=${user.pk.toString() === this.request?.toString()} const users = await new CoreApi(DEFAULT_CONFIG).coreUsersList(args);
value=${user.pk} return users.results;
}}
.renderElement=${(user: User): string => {
return user.username;
}}
.renderDescription=${(user: User): TemplateResult => {
return html`${user.name}`;
}}
.value=${(user: User | undefined): number | undefined => {
return user?.pk;
}}
.selected=${(user: User): boolean => {
return user.pk.toString() === this.request?.toString();
}}
> >
${UserOption(user)} </ak-search-select>
</option>`;
});
}),
html`<option>${t`Loading...`}</option>`,
)}
</select>
</ak-form-element-horizontal> </ak-form-element-horizontal>
${this.result ? this.renderResult() : html``} ${this.result ? this.renderResult() : html``}
</form>`; </form>`;

54
web/src/admin/policies/PolicyBindingForm.ts
View file

@ -3,7 +3,6 @@ import { first, groupBy } from "@goauthentik/common/utils";
import "@goauthentik/elements/SearchSelect"; import "@goauthentik/elements/SearchSelect";
import "@goauthentik/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
import { UserOption } from "@goauthentik/elements/user/utils";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
@ -21,6 +20,7 @@ import {
CoreGroupsListRequest, CoreGroupsListRequest,
CoreUsersListRequest, CoreUsersListRequest,
Group, Group,
PoliciesAllListRequest,
PoliciesApi, PoliciesApi,
Policy, Policy,
PolicyBinding, PolicyBinding,
@ -181,28 +181,40 @@ export class PolicyBindingForm extends ModelForm<PolicyBinding, string> {
name="policy" name="policy"
?hidden=${this.policyGroupUser !== target.policy} ?hidden=${this.policyGroupUser !== target.policy}
> >
<select class="pf-c-form-control"> <ak-search-select
<option value="" ?selected=${this.instance?.policy === undefined}> .groupBy=${(items: Policy[]) => {
--------- return groupBy(items, (policy) => policy.verboseNamePlural);
</option> }}
${until( .fetchObjects=${async (query?: string): Promise<Policy[]> => {
new PoliciesApi(DEFAULT_CONFIG) const args: PoliciesAllListRequest = {
.policiesAllList({
ordering: "name", ordering: "name",
}) };
.then((policies) => { if (query !== undefined) {
return this.groupPolicies(policies.results); args.search = query;
}), }
html`<option>${t`Loading...`}</option>`, const policies = await new PoliciesApi(
)} DEFAULT_CONFIG,
</select> ).policiesAllList(args);
return policies.results;
}}
.renderElement=${(policy: Policy): string => {
return policy.name;
}}
.value=${(policy: Policy | undefined): string | undefined => {
return policy?.pk;
}}
.selected=${(policy: Policy): boolean => {
return policy.pk === this.instance?.policy;
}}
?blankable=${true}
>
</ak-search-select>
</ak-form-element-horizontal> </ak-form-element-horizontal>
<ak-form-element-horizontal <ak-form-element-horizontal
label=${t`Group`} label=${t`Group`}
name="group" name="group"
?hidden=${this.policyGroupUser !== target.group} ?hidden=${this.policyGroupUser !== target.group}
> >
<!-- @ts-ignore -->
<ak-search-select <ak-search-select
.fetchObjects=${async (query?: string): Promise<Group[]> => { .fetchObjects=${async (query?: string): Promise<Group[]> => {
const args: CoreGroupsListRequest = { const args: CoreGroupsListRequest = {
@ -220,7 +232,7 @@ export class PolicyBindingForm extends ModelForm<PolicyBinding, string> {
return group.name; return group.name;
}} }}
.value=${(group: Group | undefined): string | undefined => { .value=${(group: Group | undefined): string | undefined => {
return group ? group.pk : undefined; return group?.pk;
}} }}
.selected=${(group: Group): boolean => { .selected=${(group: Group): boolean => {
return group.pk === this.instance?.group; return group.pk === this.instance?.group;
@ -239,7 +251,6 @@ export class PolicyBindingForm extends ModelForm<PolicyBinding, string> {
name="user" name="user"
?hidden=${this.policyGroupUser !== target.user} ?hidden=${this.policyGroupUser !== target.user}
> >
<!-- @ts-ignore -->
<ak-search-select <ak-search-select
.fetchObjects=${async (query?: string): Promise<User[]> => { .fetchObjects=${async (query?: string): Promise<User[]> => {
const args: CoreUsersListRequest = { const args: CoreUsersListRequest = {
@ -252,10 +263,13 @@ export class PolicyBindingForm extends ModelForm<PolicyBinding, string> {
return users.results; return users.results;
}} }}
.renderElement=${(user: User): string => { .renderElement=${(user: User): string => {
return UserOption(user); return user.username;
}}
.renderDescription=${(user: User): TemplateResult => {
return html`${user.name}`;
}} }}
.value=${(user: User | undefined): number | undefined => { .value=${(user: User | undefined): number | undefined => {
return user ? user.pk : undefined; return user?.pk;
}} }}
.selected=${(user: User): boolean => { .selected=${(user: User): boolean => {
return user.pk === this.instance?.user; return user.pk === this.instance?.user;

46
web/src/admin/policies/PolicyTestForm.ts
View file

@ -2,25 +2,26 @@ import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { first } from "@goauthentik/common/utils"; import { first } from "@goauthentik/common/utils";
import "@goauthentik/elements/CodeMirror"; import "@goauthentik/elements/CodeMirror";
import { PFColor } from "@goauthentik/elements/Label"; import { PFColor } from "@goauthentik/elements/Label";
import "@goauthentik/elements/SearchSelect";
import { Form } from "@goauthentik/elements/forms/Form"; import { Form } from "@goauthentik/elements/forms/Form";
import "@goauthentik/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { UserOption } from "@goauthentik/elements/user/utils";
import YAML from "yaml"; import YAML from "yaml";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
import { CSSResult, TemplateResult, html } from "lit"; import { CSSResult, TemplateResult, html } from "lit";
import { customElement, property, state } from "lit/decorators.js"; import { customElement, property, state } from "lit/decorators.js";
import { until } from "lit/directives/until.js";
import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css"; import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList/description-list.css";
import { import {
CoreApi, CoreApi,
CoreUsersListRequest,
PoliciesApi, PoliciesApi,
Policy, Policy,
PolicyTestRequest, PolicyTestRequest,
PolicyTestResult, PolicyTestResult,
User,
} from "@goauthentik/api"; } from "@goauthentik/api";
@customElement("ak-policy-test-form") @customElement("ak-policy-test-form")
@ -119,26 +120,31 @@ export class PolicyTestForm extends Form<PolicyTestRequest> {
renderForm(): TemplateResult { renderForm(): TemplateResult {
return html`<form class="pf-c-form pf-m-horizontal"> return html`<form class="pf-c-form pf-m-horizontal">
<ak-form-element-horizontal label=${t`User`} ?required=${true} name="user"> <ak-form-element-horizontal label=${t`User`} ?required=${true} name="user">
<select class="pf-c-form-control"> <ak-search-select
${until( .fetchObjects=${async (query?: string): Promise<User[]> => {
new CoreApi(DEFAULT_CONFIG) const args: CoreUsersListRequest = {
.coreUsersList({
ordering: "username", ordering: "username",
}) };
.then((users) => { if (query !== undefined) {
return users.results.map((user) => { args.search = query;
return html`<option }
?selected=${this.request?.user.toString() === const users = await new CoreApi(DEFAULT_CONFIG).coreUsersList(args);
user.pk.toString()} return users.results;
value=${user.pk} }}
.renderElement=${(user: User): string => {
return user.username;
}}
.renderDescription=${(user: User): TemplateResult => {
return html`${user.name}`;
}}
.value=${(user: User | undefined): number | undefined => {
return user?.pk;
}}
.selected=${(user: User): boolean => {
return this.request?.user.toString() === user.pk.toString();
}}
> >
${UserOption(user)} </ak-search-select>
</option>`;
});
}),
html`<option>${t`Loading...`}</option>`,
)}
</select>
</ak-form-element-horizontal> </ak-form-element-horizontal>
<ak-form-element-horizontal label=${t`Context`} name="context"> <ak-form-element-horizontal label=${t`Context`} name="context">
<ak-codemirror <ak-codemirror

46
web/src/admin/property-mappings/PropertyMappingTestForm.ts
View file

@ -1,9 +1,9 @@
import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { first } from "@goauthentik/common/utils"; import { first } from "@goauthentik/common/utils";
import "@goauthentik/elements/CodeMirror"; import "@goauthentik/elements/CodeMirror";
import "@goauthentik/elements/SearchSelect";
import { Form } from "@goauthentik/elements/forms/Form"; import { Form } from "@goauthentik/elements/forms/Form";
import "@goauthentik/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { UserOption } from "@goauthentik/elements/user/utils";
import YAML from "yaml"; import YAML from "yaml";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
@ -11,14 +11,15 @@ import { t } from "@lingui/macro";
import { TemplateResult, html } from "lit"; import { TemplateResult, html } from "lit";
import { customElement, property } from "lit/decorators.js"; import { customElement, property } from "lit/decorators.js";
import { ifDefined } from "lit/directives/if-defined.js"; import { ifDefined } from "lit/directives/if-defined.js";
import { until } from "lit/directives/until.js";
import { import {
CoreApi, CoreApi,
CoreUsersListRequest,
PolicyTestRequest, PolicyTestRequest,
PropertyMapping, PropertyMapping,
PropertyMappingTestResult, PropertyMappingTestResult,
PropertymappingsApi, PropertymappingsApi,
User,
} from "@goauthentik/api"; } from "@goauthentik/api";
@customElement("ak-property-mapping-test-form") @customElement("ak-property-mapping-test-form")
@ -67,26 +68,31 @@ export class PolicyTestForm extends Form<PolicyTestRequest> {
renderForm(): TemplateResult { renderForm(): TemplateResult {
return html`<form class="pf-c-form pf-m-horizontal"> return html`<form class="pf-c-form pf-m-horizontal">
<ak-form-element-horizontal label=${t`User`} ?required=${true} name="user"> <ak-form-element-horizontal label=${t`User`} ?required=${true} name="user">
<select class="pf-c-form-control"> <ak-search-select
${until( .fetchObjects=${async (query?: string): Promise<User[]> => {
new CoreApi(DEFAULT_CONFIG) const args: CoreUsersListRequest = {
.coreUsersList({
ordering: "username", ordering: "username",
}) };
.then((users) => { if (query !== undefined) {
return users.results.map((user) => { args.search = query;
return html`<option }
?selected=${this.request?.user.toString() === const users = await new CoreApi(DEFAULT_CONFIG).coreUsersList(args);
user.pk.toString()} return users.results;
value=${user.pk} }}
.renderElement=${(user: User): string => {
return user.username;
}}
.renderDescription=${(user: User): TemplateResult => {
return html`${user.name}`;
}}
.value=${(user: User | undefined): number | undefined => {
return user?.pk;
}}
.selected=${(user: User): boolean => {
return this.request?.user.toString() === user.pk.toString();
}}
> >
${UserOption(user)} </ak-search-select>
</option>`;
});
}),
html`<option>${t`Loading...`}</option>`,
)}
</select>
</ak-form-element-horizontal> </ak-form-element-horizontal>
<ak-form-element-horizontal label=${t`Context`} name="context"> <ak-form-element-horizontal label=${t`Context`} name="context">
<ak-codemirror mode="yaml" value=${YAML.stringify(first(this.request?.context, {}))} <ak-codemirror mode="yaml" value=${YAML.stringify(first(this.request?.context, {}))}

42
web/src/admin/stages/authenticator_duo/DuoDeviceImportForm.ts
View file

@ -1,24 +1,25 @@
import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { MessageLevel } from "@goauthentik/common/messages"; import { MessageLevel } from "@goauthentik/common/messages";
import "@goauthentik/elements/Divider"; import "@goauthentik/elements/Divider";
import "@goauthentik/elements/SearchSelect";
import "@goauthentik/elements/buttons/ActionButton"; import "@goauthentik/elements/buttons/ActionButton";
import "@goauthentik/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { ModalForm } from "@goauthentik/elements/forms/ModalForm"; import { ModalForm } from "@goauthentik/elements/forms/ModalForm";
import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
import { showMessage } from "@goauthentik/elements/messages/MessageContainer"; import { showMessage } from "@goauthentik/elements/messages/MessageContainer";
import { UserOption } from "@goauthentik/elements/user/utils";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
import { TemplateResult, html } from "lit"; import { TemplateResult, html } from "lit";
import { customElement } from "lit/decorators.js"; import { customElement } from "lit/decorators.js";
import { until } from "lit/directives/until.js";
import { import {
AuthenticatorDuoStage, AuthenticatorDuoStage,
AuthenticatorDuoStageManualDeviceImportRequest, AuthenticatorDuoStageManualDeviceImportRequest,
CoreApi, CoreApi,
CoreUsersListRequest,
StagesApi, StagesApi,
User,
} from "@goauthentik/api"; } from "@goauthentik/api";
@customElement("ak-stage-authenticator-duo-device-import-form") @customElement("ak-stage-authenticator-duo-device-import-form")
@ -50,22 +51,29 @@ export class DuoDeviceImportForm extends ModelForm<AuthenticatorDuoStage, string
renderFormManual(): TemplateResult { renderFormManual(): TemplateResult {
return html`<ak-form-element-horizontal label=${t`User`} ?required=${true} name="username"> return html`<ak-form-element-horizontal label=${t`User`} ?required=${true} name="username">
<select class="pf-c-form-control"> <ak-search-select
${until( .fetchObjects=${async (query?: string): Promise<User[]> => {
new CoreApi(DEFAULT_CONFIG) const args: CoreUsersListRequest = {
.coreUsersList({
ordering: "username", ordering: "username",
}) };
.then((users) => { if (query !== undefined) {
return users.results.map((user) => { args.search = query;
return html`<option value=${user.username}> }
${UserOption(user)} const users = await new CoreApi(DEFAULT_CONFIG).coreUsersList(args);
</option>`; return users.results;
}); }}
}), .renderElement=${(user: User): string => {
html`<option>${t`Loading...`}</option>`, return user.username;
)} }}
</select> .renderDescription=${(user: User): TemplateResult => {
return html`${user.name}`;
}}
.value=${(user: User | undefined): string | undefined => {
return user?.username;
}}
>
</ak-search-select>
<p class="pf-c-form__helper-text"> <p class="pf-c-form__helper-text">
${t`The user in authentik this device will be assigned to.`} ${t`The user in authentik this device will be assigned to.`}
</p> </p>

45
web/src/admin/tokens/TokenForm.ts
View file

@ -1,17 +1,16 @@
import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { dateTimeLocal, first } from "@goauthentik/common/utils"; import { dateTimeLocal, first } from "@goauthentik/common/utils";
import "@goauthentik/elements/SearchSelect";
import "@goauthentik/elements/forms/FormGroup"; import "@goauthentik/elements/forms/FormGroup";
import "@goauthentik/elements/forms/HorizontalFormElement"; import "@goauthentik/elements/forms/HorizontalFormElement";
import { ModelForm } from "@goauthentik/elements/forms/ModelForm"; import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
import { UserOption } from "@goauthentik/elements/user/utils";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
import { TemplateResult, html } from "lit"; import { TemplateResult, html } from "lit";
import { customElement } from "lit/decorators.js"; import { customElement } from "lit/decorators.js";
import { until } from "lit/directives/until.js";
import { CoreApi, IntentEnum, Token } from "@goauthentik/api"; import { CoreApi, CoreUsersListRequest, IntentEnum, Token, User } from "@goauthentik/api";
@customElement("ak-token-form") @customElement("ak-token-form")
export class TokenForm extends ModelForm<Token, string> { export class TokenForm extends ModelForm<Token, string> {
@ -56,25 +55,31 @@ export class TokenForm extends ModelForm<Token, string> {
</p> </p>
</ak-form-element-horizontal> </ak-form-element-horizontal>
<ak-form-element-horizontal label=${t`User`} ?required=${true} name="user"> <ak-form-element-horizontal label=${t`User`} ?required=${true} name="user">
<select class="pf-c-form-control"> <ak-search-select
${until( .fetchObjects=${async (query?: string): Promise<User[]> => {
new CoreApi(DEFAULT_CONFIG) const args: CoreUsersListRequest = {
.coreUsersList({
ordering: "username", ordering: "username",
}) };
.then((users) => { if (query !== undefined) {
return users.results.map((user) => { args.search = query;
return html`<option }
value=${user.pk} const users = await new CoreApi(DEFAULT_CONFIG).coreUsersList(args);
?selected=${this.instance?.user === user.pk} return users.results;
}}
.renderElement=${(user: User): string => {
return user.username;
}}
.renderDescription=${(user: User): TemplateResult => {
return html`${user.name}`;
}}
.value=${(user: User | undefined): number | undefined => {
return user?.pk;
}}
.selected=${(user: User): boolean => {
return this.instance?.user === user.pk;
}}
> >
${UserOption(user)} </ak-search-select>
</option>`;
});
}),
html`<option>${t`Loading...`}</option>`,
)}
</select>
</ak-form-element-horizontal> </ak-form-element-horizontal>
<ak-form-element-horizontal label=${t`Intent`} ?required=${true} name="intent"> <ak-form-element-horizontal label=${t`Intent`} ?required=${true} name="intent">
<select class="pf-c-form-control"> <select class="pf-c-form-control">