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

Merge branch 'main' into dev

Browse Source 
* main:
  core: applications api: prefetch related policies (#10273)
  web: restore hasLaunchUrl to client-side criteria for filtering apps (#10291)
This commit is contained in:
Ken Sternberg
2024-06-29 07:46:23 -07:00
parent db059d95a3 136b7dea54
commit fec46dfca5
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
authentik/core/api/applications.py
View File

@ -103,7 +103,7 @@ class ApplicationSerializer(ModelSerializer):
class ApplicationViewSet(UsedByMixin, ModelViewSet): class ApplicationViewSet(UsedByMixin, ModelViewSet):
"""Application Viewset""" """Application Viewset"""
queryset = Application.objects.all().prefetch_related("provider") queryset = Application.objects.all().prefetch_related("provider").prefetch_related("policies")
serializer_class = ApplicationSerializer serializer_class = ApplicationSerializer
search_fields = [ search_fields = [
"name", "name",

17
web/src/user/LibraryPage/ak-library-impl.ts
View File

@ -13,6 +13,7 @@ import styles from "./LibraryPageImpl.css";
import type { Application } from "@goauthentik/api"; import type { Application } from "@goauthentik/api";
import { appHasLaunchUrl } from "./LibraryPageImpl.utils";
import "./ak-library-application-empty-list.js"; import "./ak-library-application-empty-list.js";
import "./ak-library-application-list.js"; import "./ak-library-application-list.js";
import "./ak-library-application-search-empty.js"; import "./ak-library-application-search-empty.js";
@ -136,7 +137,10 @@ export class LibraryPage extends AKElement {
const selected = this.selectedApp?.slug; const selected = this.selectedApp?.slug;
const layout = this.uiConfig.layout as string; const layout = this.uiConfig.layout as string;
const background = this.uiConfig.background; const background = this.uiConfig.background;
const groupedApps = groupBy(this.filteredApps, (app) => app.group || ""); const groupedApps = groupBy(
this.filteredApps.filter(appHasLaunchUrl),
(app) => app.group || "",
);
return html`<ak-library-application-list return html`<ak-library-application-list
layout="${layout}" layout="${layout}"
@ -152,6 +156,10 @@ export class LibraryPage extends AKElement {
></ak-library-application-search>`; ></ak-library-application-search>`;
} }
renderNoAppsFound() {
return html`<ak-library-application-search-empty></ak-library-application-search-empty>`;
}
renderSearchEmpty() { renderSearchEmpty() {
return nothing; return nothing;
} }
@ -162,10 +170,9 @@ export class LibraryPage extends AKElement {
?isadmin=${this.isAdmin} ?isadmin=${this.isAdmin}
></ak-library-application-empty-list>`; ></ak-library-application-empty-list>`;
} }
if (this.filteredApps.length === 0) { return this.filteredApps.some(appHasLaunchUrl) // prettier-ignore
return html`<ak-library-application-search-empty></ak-library-application-search-empty>`; ? this.renderApps()
} : this.renderNoAppsFound();
return this.renderApps();
} }
render() { render() {