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

web/user: only render expand element when required (#6641)

Browse source 
Signed-off-by: Jens Langhammer <jens@goauthentik.io>
This commit is contained in:
Jens L 2023-08-26 23:43:36 +02:00 committed by GitHub
parent dc782498b4
commit 7a90b435cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
web/src/admin/admin-overview/cards/VersionStatusCard.ts
View file

@ -43,11 +43,11 @@ export class VersionStatusCard extends AdminStatusCard<Version> {
renderValue(): TemplateResult {
let text = this.value?.versionCurrent;
let link = "https://goauthentik.io/docs/releases/${this.value?.versionCurrent}";
let link = `https://goauthentik.io/docs/releases/${this.value?.versionCurrent}`;
if (this.value?.buildHash) {
text = this.value.buildHash?.substring(0, 7);
link = "https://github.com/goauthentik/authentik/commit/${this.value.buildHash}";
link = `https://github.com/goauthentik/authentik/commit/${this.value.buildHash}`;
}
return html`<a href=${link} target="_blank"> ${text} </a>`;
return html`<a href=${link} target="_blank">${text}</a>`;
}
}

42
web/src/user/LibraryApplication/index.ts
View file

@ -67,6 +67,13 @@ export class LibraryApplication extends AKElement {
return html`<ak-spinner></ak-spinner>`;
}
const me = rootInterface<UserInterface>()?.me;
let expandable = false;
if (rootInterface()?.uiConfig?.enabledFeatures.applicationEdit && me?.user.isSuperuser) {
expandable = true;
}
if (this.application.metaPublisher !== "" || this.application.metaDescription !== "") {
expandable = true;
}
return html` <div
class="pf-c-card pf-m-hoverable pf-m-compact ${this.selected
? "pf-m-selectable pf-m-selected"
@ -89,22 +96,25 @@ export class LibraryApplication extends AKElement {
>
</div>
<div class="expander"></div>
<ak-expand textOpen=${msg("Less details")} textClosed=${msg("More details")}>
<div class="pf-c-content">
<small>${this.application.metaPublisher}</small>
</div>
${truncateWords(this.application.metaDescription || "", 10)}
${rootInterface()?.uiConfig?.enabledFeatures.applicationEdit && me?.user.isSuperuser
? html`
<a
class="pf-c-button pf-m-control pf-m-small pf-m-block"
href="/if/admin/#/core/applications/${this.application?.slug}"
>
<i class="fas fa-edit"></i>&nbsp;${msg("Edit")}
</a>
`
: html``}
</ak-expand>
${expandable
? html`<ak-expand textOpen=${msg("Less details")} textClosed=${msg("More details")}>
<div class="pf-c-content">
<small>${this.application.metaPublisher}</small>
</div>
${truncateWords(this.application.metaDescription || "", 10)}
${rootInterface()?.uiConfig?.enabledFeatures.applicationEdit &&
me?.user.isSuperuser
? html`
<a
class="pf-c-button pf-m-control pf-m-small pf-m-block"
href="/if/admin/#/core/applications/${this.application?.slug}"
>
<i class="fas fa-edit"></i>&nbsp;${msg("Edit")}
</a>
`
: html``}
</ak-expand>`
: html``}
</div>`;
}
}