web/admin: bugfix: dual select initialization revision

web/src/admin/applications/wizard/methods/oauth/ak-application-wizard-authentication-by-oauth.ts

@@ -1,23 +1,23 @@
 import "@goauthentik/admin/applications/wizard/ak-wizard-title";
 import "@goauthentik/admin/common/ak-crypto-certificate-search";
 import "@goauthentik/admin/common/ak-flow-search/ak-branded-flow-search";
-import {
-    makeOAuth2PropertyMappingsSelector,
-    oauth2PropertyMappingsProvider,
-} from "@goauthentik/admin/providers/oauth2/OAuth2PropertyMappings.js";
 import {
     clientTypeOptions,
     issuerModeOptions,
     redirectUriHelp,
     subjectModeOptions,
 } from "@goauthentik/admin/providers/oauth2/OAuth2ProviderForm";
+import {
+    propertyMappingsProvider,
+    propertyMappingsSelector,
+} from "@goauthentik/admin/providers/oauth2/OAuth2ProviderFormHelpers.js";
 import {
     IRedirectURIInput,
     akOAuthRedirectURIInput,
 } from "@goauthentik/admin/providers/oauth2/OAuth2ProviderRedirectURI";
 import {
-    makeSourceSelector,
     oauth2SourcesProvider,
+    oauth2SourcesSelector,
 } from "@goauthentik/admin/providers/oauth2/OAuth2Sources.js";
 import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
 import { ascii_letters, digits, first, randomString } from "@goauthentik/common/utils";
@@ -252,10 +252,8 @@ export class ApplicationWizardAuthenticationByOauth extends BaseProviderPanel {
                             .errorMessages=${errors?.propertyMappings ?? []}
                         >
                             <ak-dual-select-dynamic-selected
-                                .provider=${oauth2PropertyMappingsProvider}
-                                .selector=${makeOAuth2PropertyMappingsSelector(
-                                    provider?.propertyMappings,
-                                )}
+                                .provider=${propertyMappingsProvider}
+                                .selector=${propertyMappingsSelector(provider?.propertyMappings)}
                                 available-label=${msg("Available Scopes")}
                                 selected-label=${msg("Selected Scopes")}
                             ></ak-dual-select-dynamic-selected>
@@ -309,7 +307,7 @@ export class ApplicationWizardAuthenticationByOauth extends BaseProviderPanel {
                         >
                             <ak-dual-select-dynamic-selected
                                 .provider=${oauth2SourcesProvider}
-                                .selector=${makeSourceSelector(provider?.jwksSources)}
+                                .selector=${oauth2SourcesSelector(provider?.jwksSources)}
                                 available-label=${msg("Available Sources")}
                                 selected-label=${msg("Selected Sources")}
                             ></ak-dual-select-dynamic-selected>

web/src/admin/applications/wizard/methods/proxy/AuthenticationByProxyPage.ts

@@ -1,12 +1,12 @@
 import "@goauthentik/admin/applications/wizard/ak-wizard-title";
 import {
-    makeSourceSelector,
     oauth2SourcesProvider,
+    oauth2SourcesSelector,
 } from "@goauthentik/admin/providers/oauth2/OAuth2Sources.js";
 import {
-    makeProxyPropertyMappingsSelector,
-    proxyPropertyMappingsProvider,
-} from "@goauthentik/admin/providers/proxy/ProxyProviderPropertyMappings.js";
+    propertyMappingsProvider,
+    propertyMappingsSelector,
+} from "@goauthentik/admin/providers/proxy/ProxyProviderFormHelpers.js";
 import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
 import { first } from "@goauthentik/common/utils";
 import "@goauthentik/components/ak-switch-input";
@@ -147,8 +147,8 @@ export class AkTypeProxyApplicationWizardPage extends BaseProviderPanel {
                             name="propertyMappings"
                         >
                             <ak-dual-select-dynamic-selected
-                                .provider=${proxyPropertyMappingsProvider}
-                                .selector=${makeProxyPropertyMappingsSelector(
+                                .provider=${propertyMappingsProvider}
+                                .selector=${propertyMappingsSelector(
                                     this.instance?.propertyMappings,
                                 )}
                                 available-label="${msg("Available Scopes")}"
@@ -248,7 +248,7 @@ export class AkTypeProxyApplicationWizardPage extends BaseProviderPanel {
                         >
                             <ak-dual-select-dynamic-selected
                                 .provider=${oauth2SourcesProvider}
-                                .selector=${makeSourceSelector(this.instance?.jwksSources)}
+                                .selector=${oauth2SourcesSelector(this.instance?.jwksSources)}
                                 available-label=${msg("Available Sources")}
                                 selected-label=${msg("Selected Sources")}
                             ></ak-dual-select-dynamic-selected>

web/src/admin/applications/wizard/methods/rac/ak-application-wizard-authentication-for-rac.ts

@@ -1,9 +1,9 @@
 import "@goauthentik/admin/applications/wizard/ak-wizard-title";
 import "@goauthentik/admin/common/ak-flow-search/ak-flow-search";
 import {
-    makeRACPropertyMappingsSelector,
-    racPropertyMappingsProvider,
-} from "@goauthentik/admin/providers/rac/RACPropertyMappings.js";
+    propertyMappingsProvider,
+    propertyMappingsSelector,
+} from "@goauthentik/admin/providers/rac/RACProviderFormHelpers.js";
 import "@goauthentik/components/ak-text-input";
 import "@goauthentik/elements/CodeMirror";
 import "@goauthentik/elements/ak-dual-select/ak-dual-select-dynamic-selected-provider.js";
@@ -70,10 +70,8 @@ export class ApplicationWizardAuthenticationByRAC extends BaseProviderPanel {
                             name="propertyMappings"
                         >
                             <ak-dual-select-dynamic-selected
-                                .provider=${racPropertyMappingsProvider}
-                                .selector=${makeRACPropertyMappingsSelector(
-                                    provider?.propertyMappings,
-                                )}
+                                .provider=${propertyMappingsProvider}
+                                .selector=${propertyMappingsSelector(provider?.propertyMappings)}
                                 available-label="${msg("Available Property Mappings")}"
                                 selected-label="${msg("Selected Property Mappings")}"
                             ></ak-dual-select-dynamic-selected>

web/src/admin/events/RuleForm.ts

@@ -1,7 +1,6 @@
 import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
 import { severityToLabel } from "@goauthentik/common/labels";
 import "@goauthentik/elements/ak-dual-select/ak-dual-select-dynamic-selected-provider.js";
-import { DualSelectPair } from "@goauthentik/elements/ak-dual-select/types";
 import "@goauthentik/elements/forms/HorizontalFormElement";
 import { ModelForm } from "@goauthentik/elements/forms/ModelForm";
 import "@goauthentik/elements/forms/Radio";
@@ -18,32 +17,12 @@ import {
     EventsApi,
     Group,
     NotificationRule,
-    NotificationTransport,
     PaginatedNotificationTransportList,
     SeverityEnum,
 } from "@goauthentik/api";
 
-async function eventTransportsProvider(page = 1, search = "") {
-    const eventTransports = await new EventsApi(DEFAULT_CONFIG).eventsTransportsList({
-        ordering: "name",
-        pageSize: 20,
-        search: search.trim(),
-        page,
-    });
+import { eventTransportsProvider, eventTransportsSelector } from "./RuleFormHelpers.js";
 
-    return {
-        pagination: eventTransports.pagination,
-        options: eventTransports.results.map((transport) => [transport.pk, transport.name]),
-    };
-}
-
-export function makeTransportSelector(instanceTransports: string[] | undefined) {
-    const localTransports = instanceTransports ? new Set(instanceTransports) : undefined;
-
-    return localTransports
-        ? ([pk, _]: DualSelectPair) => localTransports.has(pk)
-        : ([_0, _1, _2, stage]: DualSelectPair<NotificationTransport>) => stage !== undefined;
-}
 @customElement("ak-event-rule-form")
 export class RuleForm extends ModelForm<NotificationRule, string> {
     eventTransports?: PaginatedNotificationTransportList;
@@ -126,7 +105,7 @@ export class RuleForm extends ModelForm<NotificationRule, string> {
             >
                 <ak-dual-select-dynamic-selected
                     .provider=${eventTransportsProvider}
-                    .selector=${makeTransportSelector(this.instance?.transports)}
+                    .selector=${eventTransportsSelector(this.instance?.transports)}
                     available-label="${msg("Available Transports")}"
                     selected-label="${msg("Selected Transports")}"
                 ></ak-dual-select-dynamic-selected>

web/src/admin/events/RuleFormHelpers.ts

@@ -0,0 +1,42 @@
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { DualSelectPair } from "@goauthentik/elements/ak-dual-select/types";
+
+import { EventsApi, NotificationTransport } from "@goauthentik/api";
+
+const transportToSelect = (transport: NotificationTransport) => [transport.pk, transport.name];
+
+export async function eventTransportsProvider(page = 1, search = "") {
+    const eventTransports = await new EventsApi(DEFAULT_CONFIG).eventsTransportsList({
+        ordering: "name",
+        pageSize: 20,
+        search: search.trim(),
+        page,
+    });
+
+    return {
+        pagination: eventTransports.pagination,
+        options: eventTransports.results.map(transportToSelect),
+    };
+}
+
+export function eventTransportsSelector(instanceTransports: string[] | undefined) {
+    if (!instanceTransports) {
+        return async (transports: DualSelectPair<NotificationTransport>[]) =>
+            transports.filter(
+                ([_0, _1, _2, stage]: DualSelectPair<NotificationTransport>) => stage !== undefined,
+            );
+    }
+
+    return async () => {
+        const transportsApi = new EventsApi(DEFAULT_CONFIG);
+        const transports = await Promise.allSettled(
+            instanceTransports.map((instanceId) =>
+                transportsApi.eventsTransportsRetrieve({ uuid: instanceId }),
+            ),
+        );
+        return transports
+            .filter((s) => s.status === "fulfilled")
+            .map((s) => s.value)
+            .map(transportToSelect);
+    };
+}

web/src/admin/providers/google_workspace/GoogleWorkspaceProviderForm.ts

@@ -1,8 +1,8 @@
 import { BaseProviderForm } from "@goauthentik/admin/providers/BaseProviderForm";
 import {
-    googleWorkspacePropertyMappingsProvider,
-    makeGoogleWorkspacePropertyMappingsSelector,
-} from "@goauthentik/admin/providers/google_workspace/GoogleWorkspaceProviderPropertyMappings";
+    propertyMappingsProvider,
+    propertyMappingsSelector,
+} from "@goauthentik/admin/providers/google_workspace/GoogleWorkspaceProviderFormHelpers.js";
 import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
 import { first } from "@goauthentik/common/utils";
 import "@goauthentik/elements/CodeMirror";
@@ -224,8 +224,8 @@ export class GoogleWorkspaceProviderFormPage extends BaseProviderForm<GoogleWork
                         name="propertyMappings"
                     >
                         <ak-dual-select-dynamic-selected
-                            .provider=${googleWorkspacePropertyMappingsProvider}
-                            .selector=${makeGoogleWorkspacePropertyMappingsSelector(
+                            .provider=${propertyMappingsProvider}
+                            .selector=${propertyMappingsSelector(
                                 this.instance?.propertyMappings,
                                 "goauthentik.io/providers/google_workspace/user",
                             )}
@@ -241,8 +241,8 @@ export class GoogleWorkspaceProviderFormPage extends BaseProviderForm<GoogleWork
                         name="propertyMappingsGroup"
                     >
                         <ak-dual-select-dynamic-selected
-                            .provider=${googleWorkspacePropertyMappingsProvider}
-                            .selector=${makeGoogleWorkspacePropertyMappingsSelector(
+                            .provider=${propertyMappingsProvider}
+                            .selector=${propertyMappingsSelector(
                                 this.instance?.propertyMappingsGroup,
                                 "goauthentik.io/providers/google_workspace/group",
                             )}

web/src/admin/providers/google_workspace/GoogleWorkspaceProviderFormHelpers.ts

@@ -0,0 +1,48 @@
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { DualSelectPair } from "@goauthentik/elements/ak-dual-select/types.js";
+
+import { GoogleWorkspaceProviderMapping, PropertymappingsApi } from "@goauthentik/api";
+
+const mappingToSelect = (m: GoogleWorkspaceProviderMapping) => [m.pk, m.name, m.name, m];
+
+export async function propertyMappingsProvider(page = 1, search = "") {
+    const propertyMappings = await new PropertymappingsApi(
+        DEFAULT_CONFIG,
+    ).propertymappingsProviderGoogleWorkspaceList({
+        ordering: "managed",
+        pageSize: 20,
+        search: search.trim(),
+        page,
+    });
+    return {
+        pagination: propertyMappings.pagination,
+        options: propertyMappings.results.map(mappingToSelect),
+    };
+}
+
+export function propertyMappingsSelector(
+    instanceMappings: string[] | undefined,
+    defaultSelection: string,
+) {
+    if (!instanceMappings) {
+        return async (mappings: DualSelectPair<GoogleWorkspaceProviderMapping>[]) =>
+            mappings.filter(
+                ([_0, _1, _2, mapping]: DualSelectPair<GoogleWorkspaceProviderMapping>) =>
+                    mapping?.managed === defaultSelection,
+            );
+    }
+
+    return async () => {
+        const pm = new PropertymappingsApi(DEFAULT_CONFIG);
+        const mappings = await Promise.allSettled(
+            instanceMappings.map((instanceId) =>
+                pm.propertymappingsProviderGoogleWorkspaceRetrieve({ pmUuid: instanceId }),
+            ),
+        );
+
+        return mappings
+            .filter((s) => s.status === "fulfilled")
+            .map((s) => s.value)
+            .map(mappingToSelect);
+    };
+}

web/src/admin/providers/ldap/LDAPProviderFormHelpers.ts

@@ -0,0 +1,46 @@
+import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
+import { DualSelectPair } from "@goauthentik/elements/ak-dual-select/types.js";
+
+import { LDAPSourcePropertyMapping, PropertymappingsApi } from "@goauthentik/api";
+
+const mappingToSelect = (m: LDAPSourcePropertyMapping) => [m.pk, m.name, m.name, m];
+
+export async function propertyMappingsProvider(page = 1, search = "") {
+    const propertyMappings = await new PropertymappingsApi(
+        DEFAULT_CONFIG,
+    ).propertymappingsSourceLdapList({
+        ordering: "managed",
+        pageSize: 20,
+        search: search.trim(),
+        page,
+    });
+    return {
+        pagination: propertyMappings.pagination,
+        options: propertyMappings.results.map(mappingToSelect),
+    };
+}
+
+export function propertyMappingsSelector(instanceMappings?: string[]) {
+    if (!instanceMappings) {
+        return async (transports: DualSelectPair<LDAPSourcePropertyMapping>[]) =>
+            transports.filter(
+                ([_0, _1, _2, mapping]: DualSelectPair<LDAPSourcePropertyMapping>) =>
+                    mapping?.managed?.startsWith("goauthentik.io/sources/ldap/default") ||
+                    mapping?.managed?.startsWith("goauthentik.io/sources/ldap/ms"),
+            );
+    }
+
+    return async () => {
+        const pm = new PropertymappingsApi(DEFAULT_CONFIG);
+        const mappings = await Promise.allSettled(
+            instanceMappings.map((instanceId) =>
+                pm.propertymappingsSourceLdapRetrieve({ pmUuid: instanceId }),
+            ),
+        );
+
+        return mappings
+            .filter((s) => s.status === "fulfilled")
+            .map((s) => s.value)
+            .map(mappingToSelect);
+    };
+}