Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

UI access sidebar #4658

Merged
merged 3 commits into from
May 30, 2018
Merged

UI access sidebar #4658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a8a77e
add error template to access so that we can see the sidebar even if y…
meirish May 30, 2018
810d6d6
identity template cleanup
meirish May 30, 2018
3678134
make the token expiry warning friendlier and style it
meirish May 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ui/app/components/token-expire-warning.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import Ember from 'ember';

export default Ember.Component.extend({
classNames: 'token-expire-warning',
auth: Ember.inject.service(),

routing: Ember.inject.service('-routing'),
Expand Down
19 changes: 19 additions & 0 deletions ui/app/styles/components/token-expire-warning.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
.token-expire-warning {
position: absolute;
z-index: 200;
display: flex;
justify-content: center;
box-shadow: $box-shadow-highest;
top: 1rem;
left: 1rem;
right: 1rem;
}
.token-expire-warning .content p {
padding-right: $size-6;
}
.token-expire-warning .message-in-page {
margin: 0;
}
.token-expire-warning .message {
width: 100%;
}
1 change: 1 addition & 0 deletions ui/app/styles/core.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
@import "./components/sidebar";
@import "./components/status-menu";
@import "./components/sub-nav";
@import "./components/token-expire-warning";
@import "./components/tool-tip";
@import "./components/upgrade-overlay";
@import "./components/vault-loading";
2 changes: 1 addition & 1 deletion ui/app/templates/components/identity/item-aliases.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<div class="has-text-grey">
{{item.id}}
</div>
<span class="tag"> {{item.mountType}} </span>
<span class="tag">{{item.mountType}}</span>
<span class="has-text-grey is-size-8">
{{item.mountAccessor}}
</span>
Expand Down
8 changes: 4 additions & 4 deletions ui/app/templates/components/token-expire-warning.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{{#message-in-page type="danger"}}
<div class="content">
<p>
Your auth token expired at {{moment-format auth.tokenExpirationDate 'YYYY-MM-DD HH:mm:ss'}}.
Your auth token expired on {{moment-format auth.tokenExpirationDate 'MMMM Do YYYY, h:mm:ss a'}}. You will need to re-authenticate.
</p>
</div>
<button type="button" class="button" {{action "reauthenticate"}}>
Expand All @@ -14,9 +14,9 @@
{{#message-in-page type="warning"}}
<div class="content">
<p>
We've determined you are inactive, and have stopped auto-renewing your current auth token.
Your token will expire in {{moment-from-now auth.tokenExpirationDate interval=1000 hideSuffix=true}} at
{{moment-format auth.tokenExpirationDate 'YYYY-MM-DD HH:mm:ss'}}
We've stopped auto-renewing your current auth token due to inactivity.
Your token will expire in {{moment-from-now auth.tokenExpirationDate interval=1000 hideSuffix=true}} on
{{moment-format auth.tokenExpirationDate 'MMMM Do YYYY, h:mm:ss a'}}
</p>
<button type="button" class="button" {{action "renewToken"}}>Resume auto-renewal</button>
</div>
Expand Down
25 changes: 25 additions & 0 deletions ui/app/templates/vault/cluster/access/error.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{{#if (eq model.httpStatus 404)}}
{{not-found model=model}}
{{else}}
<header class="page-header">
<div class="level">
<div class="level-left">
<h1 class="title is-3 has-text-grey">
{{#if (eq model.httpStatus 403)}}
Not authorized
{{else}}
Error
{{/if}}
</h1>
</div>
</div>
</header>
<div class="box is-sideless has-background-white-bis has-text-grey has-text-centered">
{{#if model.message}}
<p>{{model.message}}</p>
{{/if}}
{{#each model.errors as |error|}}
<p>{{error}}</p>
{{/each}}
</div>
{{/if}}
2 changes: 1 addition & 1 deletion ui/app/templates/vault/cluster/access/identity/aliases/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<div class="has-text-grey">
{{item.id}}
</div>
<span class="tag"> {{item.mountType}} </span>
<span class="tag">{{item.mountType}}</span>
<span class="has-text-grey is-size-8">
{{item.mountAccessor}}
</span>
Expand Down
7 changes: 2 additions & 5 deletions ui/app/templates/vault/cluster/access/identity/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,8 @@
</div>
</div>
<div class="column is-3 is-hidden-mobile">
{{#if (eq item.identityType "entity")}}
{{#if item.aliases.length}}
{{pluralize item.aliases.length "alias"}}
{{/if}}
{{else}}
{{#if item.aliases.length}}
{{pluralize item.aliases.length "alias"}}
{{/if}}
</div>
<div class="column has-text-right">
Expand Down