web/admin: re-name service connection to integration

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
Jens Langhammer 2021-07-31 13:48:26 +02:00
parent 55a5300bd2
commit 8bb57a1283
4 changed files with 58 additions and 22 deletions

View File

@ -1247,6 +1247,7 @@ msgstr "Each provider has a different issuer, based on the application slug."
#: src/pages/flows/FlowListPage.ts #: src/pages/flows/FlowListPage.ts
#: src/pages/groups/GroupListPage.ts #: src/pages/groups/GroupListPage.ts
#: src/pages/outposts/OutpostListPage.ts #: src/pages/outposts/OutpostListPage.ts
#: src/pages/outposts/OutpostListPage.ts
#: src/pages/outposts/ServiceConnectionListPage.ts #: src/pages/outposts/ServiceConnectionListPage.ts
#: src/pages/policies/PolicyListPage.ts #: src/pages/policies/PolicyListPage.ts
#: src/pages/property-mappings/PropertyMappingListPage.ts #: src/pages/property-mappings/PropertyMappingListPage.ts
@ -1930,6 +1931,11 @@ msgstr "Include User claims from scopes in the id_token, for applications that d
msgid "Include claims in id_token" msgid "Include claims in id_token"
msgstr "Include claims in id_token" msgstr "Include claims in id_token"
#: src/pages/outposts/OutpostForm.ts
#: src/pages/outposts/OutpostListPage.ts
msgid "Integration"
msgstr "Integration"
#: src/pages/stages/authenticator_duo/AuthenticatorDuoStageForm.ts #: src/pages/stages/authenticator_duo/AuthenticatorDuoStageForm.ts
msgid "Integration key" msgid "Integration key"
msgstr "Integration key" msgstr "Integration key"
@ -2473,6 +2479,11 @@ msgstr "No additional data available."
msgid "No form found" msgid "No form found"
msgstr "No form found" msgstr "No form found"
#: src/pages/outposts/OutpostListPage.ts
#: src/pages/outposts/OutpostListPage.ts
msgid "No integration active"
msgstr "No integration active"
#: src/elements/events/ObjectChangelog.ts #: src/elements/events/ObjectChangelog.ts
#: src/elements/events/UserEvents.ts #: src/elements/events/UserEvents.ts
msgid "No matching events could be found." msgid "No matching events could be found."
@ -3295,9 +3306,13 @@ msgstr "Select which transports should be used to notify the user. If none are s
msgid "Selected policies are executed when the stage is submitted to validate the data." msgid "Selected policies are executed when the stage is submitted to validate the data."
msgstr "Selected policies are executed when the stage is submitted to validate the data." msgstr "Selected policies are executed when the stage is submitted to validate the data."
#:
#~ msgid "Selecting a service-connection enables the management of the outpost by authentik."
#~ msgstr "Selecting a service-connection enables the management of the outpost by authentik."
#: src/pages/outposts/OutpostForm.ts #: src/pages/outposts/OutpostForm.ts
msgid "Selecting a service-connection enables the management of the outpost by authentik." msgid "Selecting an integration enables the management of the outpost by authentik."
msgstr "Selecting a service-connection enables the management of the outpost by authentik." msgstr "Selecting an integration enables the management of the outpost by authentik."
#: src/pages/stages/password/PasswordStageForm.ts #: src/pages/stages/password/PasswordStageForm.ts
msgid "Selection of backends to test the password against." msgid "Selection of backends to test the password against."
@ -3348,10 +3363,10 @@ msgstr "Service Connections"
msgid "Service Provider Binding" msgid "Service Provider Binding"
msgstr "Service Provider Binding" msgstr "Service Provider Binding"
#: src/pages/outposts/OutpostForm.ts #:
#: src/pages/outposts/OutpostListPage.ts #:
msgid "Service connection" #~ msgid "Service connection"
msgstr "Service connection" #~ msgstr "Service connection"
#: src/elements/user/SessionList.ts #: src/elements/user/SessionList.ts
msgid "Session" msgid "Session"
@ -4242,9 +4257,9 @@ msgstr "Unhealthy outposts"
msgid "Unknown" msgid "Unknown"
msgstr "Unknown" msgstr "Unknown"
#: src/pages/outposts/OutpostListPage.ts #:
msgid "Unmanaged" #~ msgid "Unmanaged"
msgstr "Unmanaged" #~ msgstr "Unmanaged"
#: src/pages/admin-overview/charts/LDAPSyncStatusChart.ts #: src/pages/admin-overview/charts/LDAPSyncStatusChart.ts
msgid "Unsynced sources" msgid "Unsynced sources"
@ -4264,6 +4279,7 @@ msgstr "Up-to-date!"
#: src/pages/flows/FlowListPage.ts #: src/pages/flows/FlowListPage.ts
#: src/pages/groups/GroupListPage.ts #: src/pages/groups/GroupListPage.ts
#: src/pages/outposts/OutpostListPage.ts #: src/pages/outposts/OutpostListPage.ts
#: src/pages/outposts/OutpostListPage.ts
#: src/pages/outposts/ServiceConnectionListPage.ts #: src/pages/outposts/ServiceConnectionListPage.ts
#: src/pages/policies/BoundPoliciesList.ts #: src/pages/policies/BoundPoliciesList.ts
#: src/pages/policies/BoundPoliciesList.ts #: src/pages/policies/BoundPoliciesList.ts
@ -4341,6 +4357,7 @@ msgstr "Update OAuth Source"
msgid "Update OAuth2 Provider" msgid "Update OAuth2 Provider"
msgstr "Update OAuth2 Provider" msgstr "Update OAuth2 Provider"
#: src/pages/outposts/OutpostListPage.ts
#: src/pages/outposts/OutpostListPage.ts #: src/pages/outposts/OutpostListPage.ts
msgid "Update Outpost" msgid "Update Outpost"
msgstr "Update Outpost" msgstr "Update Outpost"

View File

@ -1239,6 +1239,7 @@ msgstr ""
#: src/pages/flows/FlowListPage.ts #: src/pages/flows/FlowListPage.ts
#: src/pages/groups/GroupListPage.ts #: src/pages/groups/GroupListPage.ts
#: src/pages/outposts/OutpostListPage.ts #: src/pages/outposts/OutpostListPage.ts
#: src/pages/outposts/OutpostListPage.ts
#: src/pages/outposts/ServiceConnectionListPage.ts #: src/pages/outposts/ServiceConnectionListPage.ts
#: src/pages/policies/PolicyListPage.ts #: src/pages/policies/PolicyListPage.ts
#: src/pages/property-mappings/PropertyMappingListPage.ts #: src/pages/property-mappings/PropertyMappingListPage.ts
@ -1922,6 +1923,11 @@ msgstr ""
msgid "Include claims in id_token" msgid "Include claims in id_token"
msgstr "" msgstr ""
#: src/pages/outposts/OutpostForm.ts
#: src/pages/outposts/OutpostListPage.ts
msgid "Integration"
msgstr ""
#: src/pages/stages/authenticator_duo/AuthenticatorDuoStageForm.ts #: src/pages/stages/authenticator_duo/AuthenticatorDuoStageForm.ts
msgid "Integration key" msgid "Integration key"
msgstr "" msgstr ""
@ -2465,6 +2471,11 @@ msgstr ""
msgid "No form found" msgid "No form found"
msgstr "" msgstr ""
#: src/pages/outposts/OutpostListPage.ts
#: src/pages/outposts/OutpostListPage.ts
msgid "No integration active"
msgstr ""
#: src/elements/events/ObjectChangelog.ts #: src/elements/events/ObjectChangelog.ts
#: src/elements/events/UserEvents.ts #: src/elements/events/UserEvents.ts
msgid "No matching events could be found." msgid "No matching events could be found."
@ -3287,8 +3298,12 @@ msgstr ""
msgid "Selected policies are executed when the stage is submitted to validate the data." msgid "Selected policies are executed when the stage is submitted to validate the data."
msgstr "" msgstr ""
#:
#~ msgid "Selecting a service-connection enables the management of the outpost by authentik."
#~ msgstr ""
#: src/pages/outposts/OutpostForm.ts #: src/pages/outposts/OutpostForm.ts
msgid "Selecting a service-connection enables the management of the outpost by authentik." msgid "Selecting an integration enables the management of the outpost by authentik."
msgstr "" msgstr ""
#: src/pages/stages/password/PasswordStageForm.ts #: src/pages/stages/password/PasswordStageForm.ts
@ -3340,10 +3355,10 @@ msgstr ""
msgid "Service Provider Binding" msgid "Service Provider Binding"
msgstr "" msgstr ""
#: src/pages/outposts/OutpostForm.ts #:
#: src/pages/outposts/OutpostListPage.ts #:
msgid "Service connection" #~ msgid "Service connection"
msgstr "" #~ msgstr ""
#: src/elements/user/SessionList.ts #: src/elements/user/SessionList.ts
msgid "Session" msgid "Session"
@ -4227,9 +4242,9 @@ msgstr ""
msgid "Unknown" msgid "Unknown"
msgstr "" msgstr ""
#: src/pages/outposts/OutpostListPage.ts #:
msgid "Unmanaged" #~ msgid "Unmanaged"
msgstr "" #~ msgstr ""
#: src/pages/admin-overview/charts/LDAPSyncStatusChart.ts #: src/pages/admin-overview/charts/LDAPSyncStatusChart.ts
msgid "Unsynced sources" msgid "Unsynced sources"
@ -4249,6 +4264,7 @@ msgstr ""
#: src/pages/flows/FlowListPage.ts #: src/pages/flows/FlowListPage.ts
#: src/pages/groups/GroupListPage.ts #: src/pages/groups/GroupListPage.ts
#: src/pages/outposts/OutpostListPage.ts #: src/pages/outposts/OutpostListPage.ts
#: src/pages/outposts/OutpostListPage.ts
#: src/pages/outposts/ServiceConnectionListPage.ts #: src/pages/outposts/ServiceConnectionListPage.ts
#: src/pages/policies/BoundPoliciesList.ts #: src/pages/policies/BoundPoliciesList.ts
#: src/pages/policies/BoundPoliciesList.ts #: src/pages/policies/BoundPoliciesList.ts
@ -4326,6 +4342,7 @@ msgstr ""
msgid "Update OAuth2 Provider" msgid "Update OAuth2 Provider"
msgstr "" msgstr ""
#: src/pages/outposts/OutpostListPage.ts
#: src/pages/outposts/OutpostListPage.ts #: src/pages/outposts/OutpostListPage.ts
msgid "Update Outpost" msgid "Update Outpost"
msgstr "" msgstr ""

View File

@ -94,7 +94,7 @@ export class OutpostForm extends ModelForm<Outpost, string> {
</select> </select>
</ak-form-element-horizontal> </ak-form-element-horizontal>
<ak-form-element-horizontal <ak-form-element-horizontal
label=${t`Service connection`} label=${t`Integration`}
name="serviceConnection"> name="serviceConnection">
<select class="pf-c-form-control"> <select class="pf-c-form-control">
<option value="" ?selected=${this.instance?.serviceConnection === undefined}>---------</option> <option value="" ?selected=${this.instance?.serviceConnection === undefined}>---------</option>
@ -112,7 +112,9 @@ export class OutpostForm extends ModelForm<Outpost, string> {
}); });
}), html`<option>${t`Loading...`}</option>`)} }), html`<option>${t`Loading...`}</option>`)}
</select> </select>
<p class="pf-c-form__helper-text">${t`Selecting a service-connection enables the management of the outpost by authentik.`}</p> <p class="pf-c-form__helper-text">
${t`Selecting an integration enables the management of the outpost by authentik.`}
</p>
<p class="pf-c-form__helper-text"> <p class="pf-c-form__helper-text">
See <a target="_blank" href="https://goauthentik.io/docs/outposts/outposts">documentation</a>. See <a target="_blank" href="https://goauthentik.io/docs/outposts/outposts">documentation</a>.
</p> </p>

View File

@ -43,7 +43,7 @@ export class OutpostListPage extends TablePage<Outpost> {
return [ return [
new TableColumn(t`Name`, "name"), new TableColumn(t`Name`, "name"),
new TableColumn(t`Providers`), new TableColumn(t`Providers`),
new TableColumn(t`Service connection`, "service_connection__name"), new TableColumn(t`Integration`, "service_connection__name"),
new TableColumn(t`Health and Version`), new TableColumn(t`Health and Version`),
new TableColumn(""), new TableColumn(""),
]; ];
@ -61,7 +61,7 @@ export class OutpostListPage extends TablePage<Outpost> {
html`<ul>${item.providersObj?.map((p) => { html`<ul>${item.providersObj?.map((p) => {
return html`<li><a href="#/core/providers/${p.pk}">${p.name}</a></li>`; return html`<li><a href="#/core/providers/${p.pk}">${p.name}</a></li>`;
})}</ul>`, })}</ul>`,
html`${item.serviceConnectionObj?.name || t`Unmanaged`}`, html`${item.serviceConnectionObj?.name || t`No integration active`}`,
html`<ak-outpost-health outpostId=${ifDefined(item.pk)}></ak-outpost-health>`, html`<ak-outpost-health outpostId=${ifDefined(item.pk)}></ak-outpost-health>`,
html` html`
<ak-forms-modal> <ak-forms-modal>
@ -108,7 +108,7 @@ export class OutpostListPage extends TablePage<Outpost> {
html`<ul>${item.providersObj?.map((p) => { html`<ul>${item.providersObj?.map((p) => {
return html`<li><a href="#/core/providers/${p.pk}">${p.name}</a></li>`; return html`<li><a href="#/core/providers/${p.pk}">${p.name}</a></li>`;
})}</ul>`, })}</ul>`,
html`-`, html`${item.serviceConnectionObj?.name || t`No integration active`}`,
html`<ak-outpost-health ?showVersion=${false} outpostId=${ifDefined(item.pk)}></ak-outpost-health>`, html`<ak-outpost-health ?showVersion=${false} outpostId=${ifDefined(item.pk)}></ak-outpost-health>`,
html`<ak-forms-modal> html`<ak-forms-modal>
<span slot="submit"> <span slot="submit">