+ {{#each @issuer.formFieldGroups as |fieldGroup|}}
+ {{#each-in fieldGroup as |group fields|}}
+
+ {{#if (not-eq group "default")}}
+
+ {{group}}
+
+ {{/if}}
+ {{#each fields as |attr|}}
+ {{#if (eq attr.options.displayType "masked")}}
+
+
+
+ {{else if (eq attr.name "keyId")}}
+
+ {{get @issuer attr.name}}
+
+ {{else}}
+
+ {{/if}}
+ {{/each}}
+
+ {{/each-in}}
+ {{/each}}
+
+
\ No newline at end of file
diff --git a/ui/lib/pki/addon/routes/issuers/index.js b/ui/lib/pki/addon/routes/issuers/index.js
index 5211ecc3f3d62..d895f8f374bc0 100644
--- a/ui/lib/pki/addon/routes/issuers/index.js
+++ b/ui/lib/pki/addon/routes/issuers/index.js
@@ -1,7 +1,7 @@
import Route from '@ember/routing/route';
import { inject as service } from '@ember/service';
-export default class PkiIssuersIndexRoute extends Route {
+export default class PkiIssuersListRoute extends Route {
@service store;
@service secretMountPath;
@service pathHelp;
@@ -12,8 +12,6 @@ export default class PkiIssuersIndexRoute extends Route {
}
model() {
- // the pathHelp service is needed for adding openAPI to the model
- this.pathHelp.getNewModel('pki/issuer', 'pki');
return this.store
.query('pki/issuer', { backend: this.secretMountPath.currentPath })
.then((issuersModel) => {
diff --git a/ui/lib/pki/addon/routes/issuers/issuer/details.js b/ui/lib/pki/addon/routes/issuers/issuer/details.js
index db8ba0c3ce9e6..ef04cad3fd38d 100644
--- a/ui/lib/pki/addon/routes/issuers/issuer/details.js
+++ b/ui/lib/pki/addon/routes/issuers/issuer/details.js
@@ -1,3 +1,9 @@
-import Route from '@ember/routing/route';
+import PkiIssuerIndexRoute from './index';
-export default class PkiIssuerDetailsRoute extends Route {}
+export default class PkiIssuerDetailsRoute extends PkiIssuerIndexRoute {
+ // Details route gets issuer data from PkiIssuerIndexRoute
+ setupController(controller, resolvedModel) {
+ super.setupController(controller, resolvedModel);
+ controller.breadcrumbs.push({ label: resolvedModel.id });
+ }
+}
diff --git a/ui/lib/pki/addon/routes/issuers/issuer/index.js b/ui/lib/pki/addon/routes/issuers/issuer/index.js
new file mode 100644
index 0000000000000..e0548c91de2e2
--- /dev/null
+++ b/ui/lib/pki/addon/routes/issuers/issuer/index.js
@@ -0,0 +1,22 @@
+import PkiIssuersListRoute from '../index';
+
+// Single issuer index route extends issuers list route
+export default class PkiIssuerIndexRoute extends PkiIssuersListRoute {
+ model() {
+ const { issuer_ref } = this.paramsFor('issuers/issuer');
+ return this.store.queryRecord('pki/issuer', {
+ backend: this.secretMountPath.currentPath,
+ id: issuer_ref,
+ });
+ }
+
+ setupController(controller, resolvedModel) {
+ super.setupController(controller, resolvedModel);
+ const backend = this.secretMountPath.currentPath || 'pki';
+ controller.breadcrumbs = [
+ { label: 'secrets', route: 'secrets', linkExternal: true },
+ { label: backend, route: 'overview' },
+ { label: 'issuers', route: 'issuers.index' },
+ ];
+ }
+}
diff --git a/ui/lib/pki/addon/templates/issuers/index.hbs b/ui/lib/pki/addon/templates/issuers/index.hbs
index 099ed80f4ef0e..378d8099476d6 100644
--- a/ui/lib/pki/addon/templates/issuers/index.hbs
+++ b/ui/lib/pki/addon/templates/issuers/index.hbs
@@ -39,7 +39,11 @@
{{#if this.model.issuersModel.length}}
{{#each this.model.issuersModel as |pkiIssuer|}}
-