habsi/authentik
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

web: improve truncation of strings

Browse Source 
Signed-off-by: Jens Langhammer <jens@goauthentik.io>
This commit is contained in:
Jens Langhammer
2023-02-13 10:38:48 +01:00
parent 19d2fcb542
commit be42e5562d
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
web/src/admin/admin-overview/cards/RecentEventsCard.ts
View File

@ -2,6 +2,7 @@ import "@goauthentik/admin/events/EventInfo";
import { ActionToLabel } from "@goauthentik/admin/events/utils"; import { ActionToLabel } from "@goauthentik/admin/events/utils";
import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { EventWithContext } from "@goauthentik/common/events"; import { EventWithContext } from "@goauthentik/common/events";
import { truncate } from "@goauthentik/common/utils";
import "@goauthentik/elements/Tabs"; import "@goauthentik/elements/Tabs";
import "@goauthentik/elements/buttons/Dropdown"; import "@goauthentik/elements/buttons/Dropdown";
import "@goauthentik/elements/buttons/ModalButton"; import "@goauthentik/elements/buttons/ModalButton";
@ -78,7 +79,7 @@ export class RecentEventsCard extends Table<Event> {
item.user?.username item.user?.username
? html`<div> ? html`<div>
<a href="#/identity/users/${item.user.pk}" <a href="#/identity/users/${item.user.pk}"
>${item.user?.username.substring(0, 15)}</a >${truncate(item.user?.username, 15)}</a
> >
</div> </div>
${item.user.on_behalf_of ${item.user.on_behalf_of

8
web/src/common/utils.ts
View File

@ -29,12 +29,8 @@ export function convertToTitle(text: string): string {
}); });
} }
export function truncate(input?: string, max = 10): string { export function truncate(string: string, length = 10): string {
input = input || ""; return string.length > length ? `${string.substring(0, length)}...` : string;
const array = input.trim().split(" ");
const ellipsis = array.length > max ? "..." : "";
return array.slice(0, max).join(" ") + ellipsis;
} }
export function camelToSnake(key: string): string { export function camelToSnake(key: string): string {

4
web/src/user/LibraryApplication.ts
View File

@ -126,7 +126,9 @@ export class LibraryApplication extends AKElement {
<small>${this.application.metaPublisher}</small> <small>${this.application.metaPublisher}</small>
</div> </div>
</div> </div>
<div class="pf-c-card__body">${truncate(this.application.metaDescription, 35)}</div> <div class="pf-c-card__body">
${truncate(this.application.metaDescription || "", 35)}
</div>
</div>`; </div>`;
} }
} }