Merge branch 'next' into new-forms

web/src/pages/applications/ApplicationViewPage.ts

@@ -19,10 +19,6 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
 @customElement("ak-application-view")
 export class ApplicationViewPage extends LitElement {
-    @property()
-    set args(value: { [key: string]: string }) {
-        this.applicationSlug = value.slug;
-    }
 
     @property()
     set applicationSlug(value: string) {

web/src/pages/crypto/CertificateKeyPairListPage.ts

@@ -13,7 +13,7 @@ import { PAGE_SIZE } from "../../constants";
 import { AdminURLManager } from "../../api/legacy";
 import { DEFAULT_CONFIG } from "../../api/Config";
 
-@customElement("ak-crypto-certificatekeypair-list")
+@customElement("ak-crypto-certificate-list")
 export class CertificateKeyPairListPage extends TablePage<CertificateKeyPair> {
     expandable = true;
 

web/src/pages/events/EventInfoPage.ts

@@ -11,10 +11,6 @@ import "./EventInfo";
 
 @customElement("ak-event-info-page")
 export class EventInfoPage extends LitElement {
-    @property()
-    set args(value: { [key: string]: string }) {
-        this.eventID = value.id;
-    }
 
     @property()
     set eventID(value: string) {

web/src/pages/sources/SourceViewPage.ts

@@ -12,10 +12,6 @@ import "./SAMLSourceViewPage";
 
 @customElement("ak-source-view")
 export class SourceViewPage extends LitElement {
-    @property()
-    set args(value: { [key: string]: string }) {
-        this.sourceSlug = value.slug;
-    }
 
     @property({ type: String })
     set sourceSlug(slug: string) {

web/src/routes.ts

@@ -44,11 +44,11 @@ export const ROUTES: Route[] = [
     }),
     new Route(new RegExp("^/core/applications$"), html`<ak-application-list></ak-application-list>`),
     new Route(new RegExp(`^/core/applications/(?<slug>${SLUG_REGEX})$`)).then((args) => {
-        return html`<ak-application-view .args=${args}></ak-application-view>`;
+        return html`<ak-application-view .applicationSlug=${args.slug}></ak-application-view>`;
     }),
     new Route(new RegExp("^/core/sources$"), html`<ak-source-list></ak-source-list>`),
     new Route(new RegExp(`^/core/sources/(?<slug>${SLUG_REGEX})$`)).then((args) => {
-        return html`<ak-source-view .args=${args}></ak-source-view>`;
+        return html`<ak-source-view .sourceSlug=${args.slug}></ak-source-view>`;
     }),
     new Route(new RegExp("^/core/property-mappings$"), html`<ak-property-mapping-list></ak-property-mapping-list>`),
     new Route(new RegExp("^/core/tokens$"), html`<ak-token-list></ak-token-list>`),
@@ -67,12 +67,12 @@ export const ROUTES: Route[] = [
     }),
     new Route(new RegExp("^/events/log$"), html`<ak-event-list></ak-event-list>`),
     new Route(new RegExp(`^/events/log/(?<id>${UUID_REGEX})$`)).then((args) => {
-        return html`<ak-event-info-page .args=${args}></ak-event-info-page>`;
+        return html`<ak-event-info-page .eventID=${args.id}></ak-event-info-page>`;
     }),
     new Route(new RegExp("^/events/transports$"), html`<ak-event-transport-list></ak-event-transport-list>`),
     new Route(new RegExp("^/events/rules$"), html`<ak-event-rule-list></ak-event-rule-list>`),
     new Route(new RegExp("^/outpost/outposts$"), html`<ak-outpost-list></ak-outpost-list>`),
     new Route(new RegExp("^/outpost/service-connections$"), html`<ak-outpost-service-connection-list></ak-outpost-service-connection-list>`),
-    new Route(new RegExp("^/crypto/certificates$"), html`<ak-crypto-certificatekeypair-list></ak-crypto-certificatekeypair-list>`),
+    new Route(new RegExp("^/crypto/certificates$"), html`<ak-crypto-certificate-list></ak-crypto-certificate-list>`),
     new Route(new RegExp("^/user$"), html`<ak-user-settings></ak-user-settings>`),
 ];