Skip to content

Commit

Permalink
Merge branch 'main' into dev
Browse files Browse the repository at this point in the history
* main:
  web: bump @patternfly/elements from 2.4.0 to 3.0.0 in /web (#9089)
  web: bump ts-pattern from 5.0.8 to 5.1.0 in /web (#9090)
  website: bump the docusaurus group in /website with 9 updates (#9087)
  web/admin: allow custom sorting for bound* tables (#9080)
  • Loading branch information
kensternberg-authentik committed Apr 1, 2024
2 parents 7123b2c + d7d3207 commit 5d4c380
Show file tree
Hide file tree
Showing 7 changed files with 404 additions and 715 deletions.
1 change: 1 addition & 0 deletions authentik/flows/api/bindings.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,4 @@ class FlowStageBindingViewSet(UsedByMixin, ModelViewSet):
filterset_fields = "__all__"
search_fields = ["stage__name"]
ordering = ["order"]
ordering_fields = ["order", "stage__name"]
66 changes: 18 additions & 48 deletions web/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@lit/localize": "^0.12.1",
"@lit/reactive-element": "^2.0.4",
"@open-wc/lit-helpers": "^0.7.0",
"@patternfly/elements": "^2.4.0",
"@patternfly/elements": "^3.0.0",
"@patternfly/patternfly": "^4.224.2",
"@sentry/browser": "^7.109.0",
"@webcomponents/webcomponentsjs": "^2.8.0",
Expand All @@ -63,7 +63,7 @@
"rapidoc": "^9.3.4",
"showdown": "^2.1.0",
"style-mod": "^4.1.2",
"ts-pattern": "^5.0.6",
"ts-pattern": "^5.1.0",
"webcomponent-qr-code": "^1.2.0",
"yaml": "^2.4.1"
},
Expand Down
8 changes: 5 additions & 3 deletions web/src/admin/flows/BoundStagesList.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,24 @@ export class BoundStagesList extends Table<FlowStageBinding> {
checkbox = true;
clearOnRefresh = true;

order = "order";

@property()
target?: string;

async apiEndpoint(page: number): Promise<PaginatedResponse<FlowStageBinding>> {
return new FlowsApi(DEFAULT_CONFIG).flowsBindingsList({
target: this.target || "",
ordering: "order",
ordering: this.order,
page: page,
pageSize: (await uiConfig()).pagination.perPage,
});
}

columns(): TableColumn[] {
return [
new TableColumn(msg("Order")),
new TableColumn(msg("Name")),
new TableColumn(msg("Order"), "order"),
new TableColumn(msg("Name"), "stage__name"),
new TableColumn(msg("Type")),
new TableColumn(msg("Actions")),
];
Expand Down
4 changes: 3 additions & 1 deletion web/src/admin/policies/BoundPoliciesList.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@ export class BoundPoliciesList extends Table<PolicyBinding> {
checkbox = true;
clearOnRefresh = true;

order = "order";

async apiEndpoint(page: number): Promise<PaginatedResponse<PolicyBinding>> {
return new PoliciesApi(DEFAULT_CONFIG).policiesBindingsList({
target: this.target || "",
ordering: "order",
ordering: this.order,
page: page,
pageSize: (await uiConfig()).pagination.perPage,
});
Expand Down
Loading

0 comments on commit 5d4c380

Please sign in to comment.