+ {{#if (has-block "customTitle")}}
+ {{yield to="customTitle"}}
+ {{else}}
+
+ {{@cardTitle}}
+
+ {{/if}}
{{#if (has-block "action")}}
{{yield to="action"}}
diff --git a/ui/lib/core/addon/helpers/date-format.js b/ui/lib/core/addon/helpers/date-format.js
index 1084c2af99ff..c541a58fb8bd 100644
--- a/ui/lib/core/addon/helpers/date-format.js
+++ b/ui/lib/core/addon/helpers/date-format.js
@@ -43,7 +43,7 @@ function dateFromString(str) {
return null;
}
-export function dateFormat([value, style], { withTimeZone = false }) {
+export function dateFormat([value, style = 'MMM d yyyy, h:mm:ss aa'], { withTimeZone = false }) {
// see format breaking in upgrade to date-fns 2.x https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md#changed-5
let date;
switch (checkType(value)) {
diff --git a/ui/app/helpers/date-from-now.js b/ui/lib/core/addon/helpers/date-from-now.js
similarity index 100%
rename from ui/app/helpers/date-from-now.js
rename to ui/lib/core/addon/helpers/date-from-now.js
diff --git a/ui/lib/core/app/helpers/date-from-now.js b/ui/lib/core/app/helpers/date-from-now.js
new file mode 100644
index 000000000000..64cb81592449
--- /dev/null
+++ b/ui/lib/core/app/helpers/date-from-now.js
@@ -0,0 +1,6 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
+export { default } from 'core/helpers/date-from-now';
diff --git a/ui/lib/kv/addon/components/kv-paths-card.hbs b/ui/lib/kv/addon/components/kv-paths-card.hbs
new file mode 100644
index 000000000000..d7976d92f27c
--- /dev/null
+++ b/ui/lib/kv/addon/components/kv-paths-card.hbs
@@ -0,0 +1,82 @@
+{{!
+ Copyright (c) HashiCorp, Inc.
+ SPDX-License-Identifier: BUSL-1.1
+~}}
+
+
+
+ Paths
+
+ {{#if @isCondensed}}
+
+ The paths to use when referring to this secret in API or CLI.
+
+ {{/if}}
+
+
+ {{#each this.paths as |path|}}
+
+
+
+ {{path.snippet}}
+
+
+ {{/each}}
+
+
+ {{#unless @isCondensed}}
+
+ Commands
+
+
+
+
+ CLI
+
+
+
+ This command retrieves the value from KV secrets engine at the given key name. See our
+
+ documentation
+ for other CLI commands.
+
+
+
+
+ API read secret version
+
+
+ This command obtains data and metadata for the latest version of this secret. In this example, Vault is located at
+ https://127.0.0.1:8200. For other API commands,
+
+ learn more.
+
+
+
+
+ {{/unless}}
+
\ No newline at end of file
diff --git a/ui/lib/kv/addon/components/page/secret/paths.js b/ui/lib/kv/addon/components/kv-paths-card.js
similarity index 67%
rename from ui/lib/kv/addon/components/page/secret/paths.js
rename to ui/lib/kv/addon/components/kv-paths-card.js
index 716c76c3982f..008efa8f2b01 100644
--- a/ui/lib/kv/addon/components/page/secret/paths.js
+++ b/ui/lib/kv/addon/components/kv-paths-card.js
@@ -9,23 +9,21 @@ import { kvMetadataPath, kvDataPath } from 'vault/utils/kv-path';
import { encodePath } from 'vault/utils/path-encoding-helpers';
/**
- * @module KvSecretPaths is used to display copyable secret paths for KV v2 for CLI and API use.
- * This view is permission agnostic because args come from the views mount path and url params.
+ * @module KvPathsCard is used to display copyable secret paths for KV v2 for CLI and API use.
+ * This component is permission agnostic because args come from the views mount path and url params.
*
- *
*
* @param {string} path - kv secret path for building the CLI and API paths
* @param {string} backend - the secret engine mount path, comes from the secretMountPath service defined in the route
- * @param {array} breadcrumbs - Array to generate breadcrumbs, passed to the page header component
- * @param {boolean} [canReadMetadata=true] - if true, displays tab for Version History
+ * @param {boolean} isCondensed - if true a smaller version displays with no commands section or extra explanatory text
*/
-export default class KvSecretPaths extends Component {
+export default class KvPathsCard extends Component {
@service namespace;
get paths() {
@@ -46,11 +44,15 @@ export default class KvSecretPaths extends Component {
snippet: namespace ? `-namespace=${namespace} ${cli}` : cli,
text: 'Use this path when referring to this secret in the CLI.',
},
- {
- label: 'API path for metadata',
- snippet: namespace ? `/v1/${encodePath(namespace)}/${metadata}` : `/v1/${metadata}`,
- text: `Use this path when referring to this secret's metadata in the API and permanent secret deletion.`,
- },
+ ...(this.args.isCondensed
+ ? []
+ : [
+ {
+ label: 'API path for metadata',
+ snippet: namespace ? `/v1/${encodePath(namespace)}/${metadata}` : `/v1/${metadata}`,
+ text: `Use this path when referring to this secret's metadata in the API and permanent secret deletion.`,
+ },
+ ]),
];
}
diff --git a/ui/lib/kv/addon/components/kv-subkeys.hbs b/ui/lib/kv/addon/components/kv-subkeys.hbs
index a36f18be69fa..62451b7368e0 100644
--- a/ui/lib/kv/addon/components/kv-subkeys.hbs
+++ b/ui/lib/kv/addon/components/kv-subkeys.hbs
@@ -3,9 +3,9 @@
SPDX-License-Identifier: BUSL-1.1
~}}
-
+
<:customSubtext>
-
+
{{#if this.showJson}}
These are the subkeys within this secret. All underlying values of leaf keys are not retrieved and are replaced with
null
diff --git a/ui/lib/kv/addon/components/page/secret/overview.hbs b/ui/lib/kv/addon/components/page/secret/overview.hbs
new file mode 100644
index 000000000000..43da56c1aaf9
--- /dev/null
+++ b/ui/lib/kv/addon/components/page/secret/overview.hbs
@@ -0,0 +1,105 @@
+{{!
+ Copyright (c) HashiCorp, Inc.
+ SPDX-License-Identifier: BUSL-1.1
+~}}
+
+
+ <:tabLinks>
+
+ Overview
+
+
+ Secret
+
+
+ Metadata
+
+
+ Paths
+
+ {{#if @canReadMetadata}}
+
+ Version History
+
+ {{/if}}
+
+
+
+{{#if (or @metadata @subkeys)}}
+
+
+ <:customTitle>
+
+ Current version
+ {{#unless this.isActive}}
+
+ {{/unless}}
+
+
+ <:action>
+ {{#if @canUpdateSecret}}
+
+ {{/if}}
+
+ <:content>
+
+ {{or @metadata.currentVersion @subkeys.metadata.version}}
+
+
+
+
+ {{#if this.isActive}}
+ {{#let (or @metadata.createdTime @subkeys.metadata.created_time) as |timestamp|}}
+
+ <:action>
+ {{#if @canReadMetadata}}
+
+ {{/if}}
+
+ <:content>
+
+ {{date-from-now timestamp}}
+
+
+
+ {{/let}}
+ {{/if}}
+
+{{/if}}
+
+
+
+
+
+{{#if @subkeys.subkeys}}
+
+{{/if}}
\ No newline at end of file
diff --git a/ui/lib/kv/addon/components/page/secret/overview.js b/ui/lib/kv/addon/components/page/secret/overview.js
new file mode 100644
index 000000000000..0c41df40dc8e
--- /dev/null
+++ b/ui/lib/kv/addon/components/page/secret/overview.js
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
+import Component from '@glimmer/component';
+import { dateFormat } from 'core/helpers/date-format';
+
+/**
+ * @module KvSecretOverview
+ *
+ *
+ * @param {string} backend - kv secret mount to make network request
+ * @param {array} breadcrumbs - Array to generate breadcrumbs, passed to the page header component
+ * @param {boolean} canReadMetadata - permissions to read metadata
+ * @param {boolean} canUpdateSecret - permissions to create a new version of a secret
+ * @param {model} metadata - Ember data model: 'kv/metadata'
+ * @param {string} path - path to request secret data for selected version
+ * @param {string} secretState - if a secret has been "destroyed", "deleted" or "created" (still active)
+ * @param {object} subkeys - API response from subkeys endpoint, object with "subkeys" and "metadata" keys
+ */
+
+export default class KvSecretOverview extends Component {
+ get isActive() {
+ const state = this.args.secretState;
+ return state !== 'destroyed' && state !== 'deleted';
+ }
+
+ get versionSubtext() {
+ const state = this.args.secretState;
+ if (state === 'destroyed') {
+ return 'The current version of this secret has been permanently deleted and cannot be restored.';
+ }
+ if (state === 'deleted') {
+ const time =
+ this.args.metadata?.currentSecret.deletionTime || this.args.subkeys?.metadata.deletion_time;
+ const date = dateFormat([time], {});
+ return `The current version of this secret was deleted ${date}.`;
+ }
+ return 'The current version of this secret.';
+ }
+}
diff --git a/ui/lib/kv/addon/components/page/secret/paths.hbs b/ui/lib/kv/addon/components/page/secret/paths.hbs
index 0472d30bc20d..f7e7e0c15dcc 100644
--- a/ui/lib/kv/addon/components/page/secret/paths.hbs
+++ b/ui/lib/kv/addon/components/page/secret/paths.hbs
@@ -36,66 +36,4 @@
-
- Paths
-
-
-
- {{#each this.paths as |path|}}
-
-
-
- {{path.snippet}}
-
-
- {{/each}}
-
-
-
- Commands
-
-
-
-
- CLI
-
-
-
- This command retrieves the value from KV secrets engine at the given key name. For other CLI commands,
-
- learn more.
-
-
-
-
-
- API read secret version
-
-
- This command obtains data and metadata for the latest version of this secret. In this example, Vault is located at
- https://127.0.0.1:8200. For other API commands,
-
- learn more.
-
-
-
-