AccessorID
Scope
Description
- {{/block-slot}}
- {{#block-slot name='row'}}
-
+
+
+
{{truncate item.AccessorID 8 false}}
@@ -24,6 +24,6 @@
{{item.Description}}
- {{/block-slot}}
- {{/tabular-collection}}
+
+
{{/if}}
\ No newline at end of file
diff --git a/ui-v2/app/components/token-list.js b/ui-v2/app/components/token-list/index.js
similarity index 100%
rename from ui-v2/app/components/token-list.js
rename to ui-v2/app/components/token-list/index.js
diff --git a/ui-v2/app/components/token-source/README.mdx b/ui-v2/app/components/token-source/README.mdx
new file mode 100644
index 0000000000..80aaab3b79
--- /dev/null
+++ b/ui-v2/app/components/token-source/README.mdx
@@ -0,0 +1,32 @@
+## TokenSource
+
+```handlebars
+
+
+
+
+
+
+
+
+
+ {{/let}}
+
\ No newline at end of file
diff --git a/ui-v2/app/components/token-source/index.js b/ui-v2/app/components/token-source/index.js
new file mode 100644
index 0000000000..0c0dee2507
--- /dev/null
+++ b/ui-v2/app/components/token-source/index.js
@@ -0,0 +1,36 @@
+import Component from '@ember/component';
+
+import chart from './chart.xstate';
+export default Component.extend({
+ onchange: function() {},
+ init: function() {
+ this._super(...arguments);
+ this.chart = chart;
+ },
+ actions: {
+ isSecret: function() {
+ return this.type === 'secret';
+ },
+ change: function(e) {
+ e.data.toJSON = function() {
+ return {
+ AccessorID: this.AccessorID,
+ // TODO: In the past we've always ignored the SecretID returned
+ // from the server and used what the user typed in instead, now
+ // as we don't know the SecretID when we use SSO we use the SecretID
+ // in the response
+ SecretID: this.SecretID,
+ Namespace: this.Namespace,
+ ...{
+ AuthMethod: typeof this.AuthMethod !== 'undefined' ? this.AuthMethod : undefined,
+ // TODO: We should be able to only set namespaces if they are enabled
+ // but we might be testing for nspaces everywhere
+ // Namespace: typeof this.Namespace !== 'undefined' ? this.Namespace : undefined
+ },
+ };
+ };
+ // FIXME: We should probably put the component into idle state
+ this.onchange(e);
+ },
+ },
+});
diff --git a/ui-v2/app/templates/components/tomography-graph.hbs b/ui-v2/app/components/tomography-graph/index.hbs
similarity index 100%
rename from ui-v2/app/templates/components/tomography-graph.hbs
rename to ui-v2/app/components/tomography-graph/index.hbs
diff --git a/ui-v2/app/components/tomography-graph.js b/ui-v2/app/components/tomography-graph/index.js
similarity index 100%
rename from ui-v2/app/components/tomography-graph.js
rename to ui-v2/app/components/tomography-graph/index.js
diff --git a/ui-v2/app/controllers/application.js b/ui-v2/app/controllers/application.js
new file mode 100644
index 0000000000..47349bcca5
--- /dev/null
+++ b/ui-v2/app/controllers/application.js
@@ -0,0 +1,72 @@
+import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
+import { getOwner } from '@ember/application';
+import { get } from '@ember/object';
+import transitionable from 'consul-ui/utils/routing/transitionable';
+
+export default Controller.extend({
+ router: service('router'),
+ http: service('repository/type/event-source'),
+ dataSource: service('data-source/service'),
+ client: service('client/http'),
+ store: service('store'),
+ feedback: service('feedback'),
+ actions: {
+ // TODO: We currently do this in the controller instead of the router
+ // as the nspace and dc variables aren't available directly on the Route
+ // look to see if we can move this up there so we can empty the Controller
+ // out again
+ reauthorize: function(e) {
+ // TODO: For the moment e isn't a real event
+ // it has data which is potentially the token
+ // and type which is the logout/authorize/use action
+ // used for the feedback service.
+ this.feedback.execute(
+ () => {
+ // TODO: Centralize this elsewhere
+ this.client.abort();
+ this.http.resetCache();
+ this.dataSource.resetCache();
+ this.store.init();
+
+ const params = {};
+ if (e.data) {
+ const token = e.data;
+ // TODO: Do I actually need to check to see if nspaces are enabled here?
+ if (typeof this.nspace !== 'undefined') {
+ const nspace = get(token, 'Namespace') || this.nspace.Name;
+ // you potentially have a new namespace
+ // if you do redirect to it
+ if (nspace !== this.nspace.Name) {
+ params.nspace = `~${nspace}`;
+ }
+ }
+ }
+ const routeName = this.router.currentRoute.name;
+ const route = getOwner(this).lookup(`route:${routeName}`);
+ const router = this.router;
+ // Refresh the application route
+ return getOwner(this)
+ .lookup('route:application')
+ .refresh()
+ .promise.then(() => {
+ // We use transitionable here as refresh doesn't work if you are on an error page
+ // which is highly likely to happen here (403s)
+ if (routeName !== router.currentRouteName || typeof params.nspace !== 'undefined') {
+ return route.transitionTo(
+ ...transitionable(router.currentRoute, params, getOwner(this))
+ );
+ } else {
+ return route.refresh();
+ }
+ });
+ },
+ e.type,
+ function(type, e) {
+ return type;
+ },
+ {}
+ );
+ },
+ },
+});
diff --git a/ui-v2/app/controllers/dc/intentions/edit.js b/ui-v2/app/controllers/dc/intentions/edit.js
index 8e1e72ea8a..8d7b8afb0a 100644
--- a/ui-v2/app/controllers/dc/intentions/edit.js
+++ b/ui-v2/app/controllers/dc/intentions/edit.js
@@ -1,100 +1,8 @@
import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
-import { get, set } from '@ember/object';
export default Controller.extend({
- dom: service('dom'),
- builder: service('form'),
- init: function() {
- this._super(...arguments);
- this.form = this.builder.form('intention');
- },
- setProperties: function(model) {
- let source = model.services.findBy('Name', model.item.SourceName);
-
- if (!source) {
- source = { Name: model.item.SourceName };
- model.services = [source].concat(model.services);
- }
- let destination = model.services.findBy('Name', model.item.DestinationName);
- if (!destination) {
- destination = { Name: model.item.DestinationName };
- model.services = [destination].concat(model.services);
- }
-
- let sourceNS = model.nspaces.findBy('Name', model.item.SourceNS);
- if (!sourceNS) {
- sourceNS = { Name: model.item.SourceNS };
- model.nspaces = [sourceNS].concat(model.nspaces);
- }
- let destinationNS = model.nspaces.findBy('Name', model.item.DestinationNS);
- if (!destinationNS) {
- destinationNS = { Name: model.item.DestinationNS };
- model.nspaces = [destinationNS].concat(model.nspaces);
- }
- this._super({
- ...model,
- ...{
- item: this.form.setData(model.item).getData(),
- SourceName: source,
- DestinationName: destination,
- SourceNS: sourceNS,
- DestinationNS: destinationNS,
- },
- });
- },
actions: {
- createNewLabel: function(template, term) {
- return template.replace(/{{term}}/g, term);
- },
- isUnique: function(term) {
- return !this.services.findBy('Name', term);
- },
- change: function(e, value, item) {
- const event = this.dom.normalizeEvent(e, value);
- const form = this.form;
- const target = event.target;
-
- let name, selected, match;
- switch (target.name) {
- case 'SourceName':
- case 'DestinationName':
- case 'SourceNS':
- case 'DestinationNS':
- name = selected = target.value;
- // Names can be selected Service EmberObjects or typed in strings
- // if its not a string, use the `Name` from the Service EmberObject
- if (typeof name !== 'string') {
- name = get(target.value, 'Name');
- }
- // mutate the value with the string name
- // which will be handled by the form
- target.value = name;
- // these are 'non-form' variables so not on `item`
- // these variables also exist in the template so we know
- // the current selection
- // basically the difference between
- // `item.DestinationName` and just `DestinationName`
- // see if the name is already in the list
- match = this.services.filterBy('Name', name);
- if (match.length === 0) {
- // if its not make a new 'fake' Service that doesn't exist yet
- // and add it to the possible services to make an intention between
- selected = { Name: name };
- switch (target.name) {
- case 'SourceName':
- case 'DestinationName':
- set(this, 'services', [selected].concat(this.services.toArray()));
- break;
- case 'SourceNS':
- case 'DestinationNS':
- set(this, 'nspaces', [selected].concat(this.nspaces.toArray()));
- break;
- }
- }
- set(this, target.name, selected);
- break;
- }
- form.handleEvent(event);
+ route: function() {
+ this.send(...arguments);
},
},
});
diff --git a/ui-v2/app/controllers/dc/intentions/index.js b/ui-v2/app/controllers/dc/intentions/index.js
index 422345d862..3dee58bf06 100644
--- a/ui-v2/app/controllers/dc/intentions/index.js
+++ b/ui-v2/app/controllers/dc/intentions/index.js
@@ -13,7 +13,7 @@ const createCounter = function(prop) {
const countAction = createCounter('Action');
export default Controller.extend(WithSearching, WithFiltering, WithEventSource, {
queryParams: {
- action: {
+ currentFilter: {
as: 'action',
},
s: {
@@ -44,7 +44,12 @@ export default Controller.extend(WithSearching, WithFiltering, WithEventSource,
};
});
}),
- filter: function(item, { s = '', action = '' }) {
- return action === '' || get(item, 'Action') === action;
+ filter: function(item, { s = '', currentFilter = '' }) {
+ return currentFilter === '' || get(item, 'Action') === currentFilter;
+ },
+ actions: {
+ route: function() {
+ this.send(...arguments);
+ },
},
});
diff --git a/ui-v2/app/controllers/dc/nodes/show.js b/ui-v2/app/controllers/dc/nodes/show.js
index 4858939a26..0190caba7d 100644
--- a/ui-v2/app/controllers/dc/nodes/show.js
+++ b/ui-v2/app/controllers/dc/nodes/show.js
@@ -1,26 +1,13 @@
import Controller from '@ember/controller';
import { inject as service } from '@ember/service';
-import { get, set, computed } from '@ember/object';
+import { get } from '@ember/object';
import { alias } from '@ember/object/computed';
-import WithSearching from 'consul-ui/mixins/with-searching';
import WithEventSource, { listen } from 'consul-ui/mixins/with-event-source';
-export default Controller.extend(WithEventSource, WithSearching, {
+export default Controller.extend(WithEventSource, {
dom: service('dom'),
notify: service('flashMessages'),
items: alias('item.Services'),
- queryParams: {
- s: {
- as: 'filter',
- replace: true,
- },
- },
- init: function() {
- this.searchParams = {
- nodeservice: 's',
- };
- this._super(...arguments);
- },
item: listen('item').catch(function(e) {
if (e.target.readyState === 1) {
// OPEN
@@ -36,33 +23,7 @@ export default Controller.extend(WithEventSource, WithSearching, {
}
}
}),
- searchable: computed('items', function() {
- return get(this, 'searchables.nodeservice')
- .add(this.items)
- .search(get(this, this.searchParams.nodeservice));
- }),
- setProperties: function() {
- this._super(...arguments);
- // the default selected tab depends on whether you have any healthchecks or not
- // so check the length here.
- // This method is called immediately after `Route::setupController`, and done here rather than there
- // as this is a variable used purely for view level things, if the view was different we might not
- // need this variable
- set(this, 'selectedTab', get(this, 'item.Checks.length') > 0 ? 'health-checks' : 'services');
- },
actions: {
- change: function(e) {
- set(this, 'selectedTab', e.target.value);
- // Ensure tabular-collections sizing is recalculated
- // now it is visible in the DOM
- this.dom
- .components('.tab-section input[type="radio"]:checked + div table')
- .forEach(function(item) {
- if (typeof item.didAppear === 'function') {
- item.didAppear();
- }
- });
- },
sortChecksByImportance: function(a, b) {
const statusA = get(a, 'Status');
const statusB = get(b, 'Status');
diff --git a/ui-v2/app/controllers/dc/nodes/show/services.js b/ui-v2/app/controllers/dc/nodes/show/services.js
new file mode 100644
index 0000000000..a07b299297
--- /dev/null
+++ b/ui-v2/app/controllers/dc/nodes/show/services.js
@@ -0,0 +1,27 @@
+import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
+import { get, computed } from '@ember/object';
+import { alias } from '@ember/object/computed';
+import WithSearching from 'consul-ui/mixins/with-searching';
+
+export default Controller.extend(WithSearching, {
+ dom: service('dom'),
+ items: alias('item.Services'),
+ queryParams: {
+ s: {
+ as: 'filter',
+ replace: true,
+ },
+ },
+ init: function() {
+ this.searchParams = {
+ nodeservice: 's',
+ };
+ this._super(...arguments);
+ },
+ searchable: computed('items', function() {
+ return get(this, 'searchables.nodeservice')
+ .add(this.items)
+ .search(get(this, this.searchParams.nodeservice));
+ }),
+});
diff --git a/ui-v2/app/controllers/dc/nspaces/index.js b/ui-v2/app/controllers/dc/nspaces/index.js
index c357c37066..0f1ecbfee1 100644
--- a/ui-v2/app/controllers/dc/nspaces/index.js
+++ b/ui-v2/app/controllers/dc/nspaces/index.js
@@ -18,6 +18,6 @@ export default Controller.extend(WithEventSource, WithSearching, {
searchable: computed('items.[]', function() {
return get(this, 'searchables.nspace')
.add(this.items)
- .search(this.terms);
+ .search(get(this, this.searchParams.nspace));
}),
});
diff --git a/ui-v2/app/controllers/dc/services/index.js b/ui-v2/app/controllers/dc/services/index.js
index 58c92d465c..4f3a1185c4 100644
--- a/ui-v2/app/controllers/dc/services/index.js
+++ b/ui-v2/app/controllers/dc/services/index.js
@@ -1,32 +1,10 @@
import Controller from '@ember/controller';
import { get, computed } from '@ember/object';
-import { htmlSafe } from '@ember/string';
import WithEventSource from 'consul-ui/mixins/with-event-source';
import WithSearching from 'consul-ui/mixins/with-searching';
-const max = function(arr, prop) {
- return arr.reduce(function(prev, item) {
- return Math.max(prev, get(item, prop));
- }, 0);
-};
-const chunk = function(str, size) {
- const num = Math.ceil(str.length / size);
- const chunks = new Array(num);
- for (let i = 0, o = 0; i < num; ++i, o += size) {
- chunks[i] = str.substr(o, size);
- }
- return chunks;
-};
-const width = function(num) {
- const str = num.toString();
- const len = str.length;
- const commas = chunk(str, 3).length - 1;
- return commas * 4 + len * 10;
-};
-const widthDeclaration = function(num) {
- return htmlSafe(`width: ${num}px`);
-};
export default Controller.extend(WithEventSource, WithSearching, {
queryParams: {
+ sortBy: 'sort',
s: {
as: 'filter',
},
@@ -37,44 +15,32 @@ export default Controller.extend(WithEventSource, WithSearching, {
};
this._super(...arguments);
},
- searchable: computed('items.[]', function() {
+ searchable: computed('services.[]', function() {
return get(this, 'searchables.service')
- .add(this.items)
+ .add(this.services)
.search(this.terms);
}),
- maxWidth: computed('{maxPassing,maxWarning,maxCritical}', function() {
- const PADDING = 32 * 3 + 13;
- return ['maxPassing', 'maxWarning', 'maxCritical'].reduce((prev, item) => {
- return prev + width(get(this, item));
- }, PADDING);
+ services: computed('items.[]', function() {
+ return this.items.filter(function(item) {
+ return item.Kind !== 'connect-proxy';
+ });
}),
- totalWidth: computed('maxWidth', function() {
- return widthDeclaration(this.maxWidth);
- }),
- remainingWidth: computed('maxWidth', function() {
- // maxWidth is the maximum width of the healthchecks column
- // there are currently 2 other columns so divide it by 2 and
- // take that off 50% (100% / number of fluid columns)
- // also we added a Type column which we've currently fixed to 100px
- // so again divide that by 2 and take it off each fluid column
- return htmlSafe(`width: calc(50% - ${Math.round(this.maxWidth / 2)}px)`);
- }),
- maxPassing: computed('items.[]', function() {
- return max(this.items, 'ChecksPassing');
- }),
- maxWarning: computed('items.[]', function() {
- return max(this.items, 'ChecksWarning');
- }),
- maxCritical: computed('items.[]', function() {
- return max(this.items, 'ChecksCritical');
- }),
- passingWidth: computed('maxPassing', function() {
- return widthDeclaration(width(this.maxPassing));
- }),
- warningWidth: computed('maxWarning', function() {
- return widthDeclaration(width(this.maxWarning));
- }),
- criticalWidth: computed('maxCritical', function() {
- return widthDeclaration(width(this.maxCritical));
+ proxies: computed('items.[]', function() {
+ const proxies = {};
+ this.items
+ .filter(function(item) {
+ return item.Kind === 'connect-proxy';
+ })
+ .forEach(item => {
+ // Iterating to cover the usecase of a proxy being
+ // used by more than one service
+ if (item.ProxyFor) {
+ item.ProxyFor.forEach(service => {
+ proxies[service] = true;
+ });
+ }
+ });
+
+ return proxies;
}),
});
diff --git a/ui-v2/app/controllers/dc/services/instance.js b/ui-v2/app/controllers/dc/services/instance.js
index b8780a1e9b..072478d0fb 100644
--- a/ui-v2/app/controllers/dc/services/instance.js
+++ b/ui-v2/app/controllers/dc/services/instance.js
@@ -1,17 +1,10 @@
import Controller from '@ember/controller';
-import { get, set } from '@ember/object';
+import { get } from '@ember/object';
import { inject as service } from '@ember/service';
import WithEventSource, { listen } from 'consul-ui/mixins/with-event-source';
export default Controller.extend(WithEventSource, {
notify: service('flashMessages'),
- setProperties: function() {
- this._super(...arguments);
- // This method is called immediately after `Route::setupController`, and done here rather than there
- // as this is a variable used purely for view level things, if the view was different we might not
- // need this variable
- set(this, 'selectedTab', 'service-checks');
- },
item: listen('item').catch(function(e) {
if (e.target.readyState === 1) {
// OPEN
@@ -29,9 +22,4 @@ export default Controller.extend(WithEventSource, {
}
}
}),
- actions: {
- change: function(e) {
- set(this, 'selectedTab', e.target.value);
- },
- },
});
diff --git a/ui-v2/app/controllers/dc/services/show.js b/ui-v2/app/controllers/dc/services/show.js
index 86684593dd..161619206d 100644
--- a/ui-v2/app/controllers/dc/services/show.js
+++ b/ui-v2/app/controllers/dc/services/show.js
@@ -1,27 +1,10 @@
import Controller from '@ember/controller';
-import { get, set, computed } from '@ember/object';
-import { alias } from '@ember/object/computed';
+import { get } from '@ember/object';
import { inject as service } from '@ember/service';
-import WithSearching from 'consul-ui/mixins/with-searching';
import WithEventSource, { listen } from 'consul-ui/mixins/with-event-source';
-export default Controller.extend(WithEventSource, WithSearching, {
+export default Controller.extend(WithEventSource, {
dom: service('dom'),
notify: service('flashMessages'),
- items: alias('item.Nodes'),
- init: function() {
- this.searchParams = {
- serviceInstance: 's',
- };
- this._super(...arguments);
- },
- setProperties: function() {
- this._super(...arguments);
- // This method is called immediately after `Route::setupController`, and done here rather than there
- // as this is a variable used purely for view level things, if the view was different we might not
- // need this variable
-
- set(this, 'selectedTab', 'instances');
- },
item: listen('item').catch(function(e) {
if (e.target.readyState === 1) {
// OPEN
@@ -35,23 +18,4 @@ export default Controller.extend(WithEventSource, WithSearching, {
}
}
}),
- searchable: computed('items', function() {
- return get(this, 'searchables.serviceInstance')
- .add(this.items)
- .search(get(this, this.searchParams.serviceInstance));
- }),
- actions: {
- change: function(e) {
- set(this, 'selectedTab', e.target.value);
- // Ensure tabular-collections sizing is recalculated
- // now it is visible in the DOM
- this.dom
- .components('.tab-section input[type="radio"]:checked + div table')
- .forEach(function(item) {
- if (typeof item.didAppear === 'function') {
- item.didAppear();
- }
- });
- },
- },
});
diff --git a/ui-v2/app/controllers/dc/services/show/instances.js b/ui-v2/app/controllers/dc/services/show/instances.js
new file mode 100644
index 0000000000..4a916b5128
--- /dev/null
+++ b/ui-v2/app/controllers/dc/services/show/instances.js
@@ -0,0 +1,35 @@
+import Controller from '@ember/controller';
+import { get, computed } from '@ember/object';
+import { alias } from '@ember/object/computed';
+import { inject as service } from '@ember/service';
+import WithSearching from 'consul-ui/mixins/with-searching';
+
+export default Controller.extend(WithSearching, {
+ dom: service('dom'),
+ items: alias('item.Nodes'),
+ queryParams: {
+ s: {
+ as: 'filter',
+ replace: true,
+ },
+ },
+ init: function() {
+ this.searchParams = {
+ serviceInstance: 's',
+ };
+ this._super(...arguments);
+ },
+ searchable: computed('items', function() {
+ return get(this, 'searchables.serviceInstance')
+ .add(this.items)
+ .search(get(this, this.searchParams.serviceInstance));
+ }),
+ keyedProxies: computed('proxies.[]', function() {
+ const proxies = {};
+ this.proxies.forEach(item => {
+ proxies[item.ServiceProxy.DestinationServiceID] = true;
+ });
+
+ return proxies;
+ }),
+});
diff --git a/ui-v2/app/controllers/dc/services/show/intentions.js b/ui-v2/app/controllers/dc/services/show/intentions.js
new file mode 100644
index 0000000000..89173ddd50
--- /dev/null
+++ b/ui-v2/app/controllers/dc/services/show/intentions.js
@@ -0,0 +1,28 @@
+import Controller from '@ember/controller';
+import { get, computed } from '@ember/object';
+import WithSearching from 'consul-ui/mixins/with-searching';
+
+export default Controller.extend(WithSearching, {
+ queryParams: {
+ s: {
+ as: 'filter',
+ replace: true,
+ },
+ },
+ init: function() {
+ this.searchParams = {
+ intention: 's',
+ };
+ this._super(...arguments);
+ },
+ searchable: computed('intentions', function() {
+ return get(this, 'searchables.intention')
+ .add(this.intentions)
+ .search(get(this, this.searchParams.intention));
+ }),
+ actions: {
+ route: function() {
+ this.send(...arguments);
+ },
+ },
+});
diff --git a/ui-v2/app/helpers/css-var.js b/ui-v2/app/helpers/css-var.js
deleted file mode 100644
index 480abba38f..0000000000
--- a/ui-v2/app/helpers/css-var.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import { helper } from '@ember/component/helper';
-// TODO: Look at ember-inline-svg
-const cssVars = {
- '--decor-border-100': '1px solid',
- '--decor-border-200': '2px solid',
- '--decor-radius-300': '3px',
- '--white': '#FFF',
- '--gray-500': '#6f7682',
- '--kubernetes-color-svg': `url('data:image/svg+xml;charset=UTF-8,
{{#if (not loading)}}
{{outlet}}
{{else}}
- {{#hashicorp-consul id="wrapper" permissions=permissions dcs=dcs dc=dc nspaces=nspaces nspace=nspace}}
- {{#app-view class="loading show"}}
- {{#block-slot name='content'}}
- {{partial 'consul-loading'}}
- {{/block-slot}}
- {{/app-view}}
- {{/hashicorp-consul}}
+
+
+
+
+{{/if}}
+
{{/if}}
diff --git a/ui-v2/app/templates/components/acl-filter.hbs b/ui-v2/app/templates/components/acl-filter.hbs
deleted file mode 100644
index 898a407509..0000000000
--- a/ui-v2/app/templates/components/acl-filter.hbs
+++ /dev/null
@@ -1,4 +0,0 @@
-{{!}}
diff --git a/ui-v2/app/templates/components/app-view.hbs b/ui-v2/app/templates/components/app-view.hbs
deleted file mode 100644
index 97df3dbde6..0000000000
--- a/ui-v2/app/templates/components/app-view.hbs
+++ /dev/null
@@ -1,52 +0,0 @@
-{{yield}}
-{{#if (not loading)}}
-
-{{#each flashMessages.queue as |flash|}}
- {{#flash-message flash=flash as |component flash|}}
- {{! flashes automatically ucfirst the type }}
-
-
-
- {{component.flashType}}!
-
- {{#yield-slot name='notification' params=(block-params (lowercase component.flashType) (lowercase flash.action) flash.item )}}{{yield}}{{/yield-slot}}
-
- {{/flash-message}}
-{{/each}}
-
-
- {{#if authorized}}
- {{#yield-slot name='actions'}}{{yield}}{{/yield-slot}}
- {{/if}}
-
-
-
- {{#if authorized}}
-
- {{#yield-slot name='breadcrumbs'}}{{yield}}{{/yield-slot}}
-
- {{/if}}
- {{#yield-slot name='header'}}{{yield}}{{/yield-slot}}
-
-
-{{/if}}
-
-{{#if loading}}
- {{partial 'consul-loading'}}
-{{else}}
- {{#if (not enabled) }}
- {{#yield-slot name='disabled'}}{{yield}}{{/yield-slot}}
- {{else if (not authorized)}}
- {{#yield-slot name='authorization'}}{{yield}}{{/yield-slot}}
- {{else}}
- {{#yield-slot name='content'}}{{yield}}{{/yield-slot}}
- {{/if}}
-{{/if}}
-
diff --git a/ui-v2/app/templates/components/catalog-filter.hbs b/ui-v2/app/templates/components/catalog-filter.hbs
deleted file mode 100644
index d8484e89c2..0000000000
--- a/ui-v2/app/templates/components/catalog-filter.hbs
+++ /dev/null
@@ -1,9 +0,0 @@
-{{!}}
diff --git a/ui-v2/app/templates/components/changeable-set.hbs b/ui-v2/app/templates/components/changeable-set.hbs
deleted file mode 100644
index 8406915e9c..0000000000
--- a/ui-v2/app/templates/components/changeable-set.hbs
+++ /dev/null
@@ -1,6 +0,0 @@
-{{yield}}
-{{#if (gt items.length 0)}}
- {{#yield-slot name='set' params=(block-params items)}}{{yield}}{{/yield-slot}}
-{{else}}
- {{#yield-slot name='empty'}}{{yield}}{{/yield-slot}}
-{{/if}}
\ No newline at end of file
diff --git a/ui-v2/app/templates/components/child-selector.hbs b/ui-v2/app/templates/components/child-selector.hbs
deleted file mode 100644
index 00f4fea020..0000000000
--- a/ui-v2/app/templates/components/child-selector.hbs
+++ /dev/null
@@ -1,21 +0,0 @@
-{{yield}}
- {{#yield-slot name='create'}}{{yield}}{{/yield-slot}}
-
- {{#yield-slot name='label'}}{{yield}}{{/yield-slot}}
- {{#power-select
- onopen=(action 'open')
- search=(action 'search')
- options=options
- loadingMessage="Loading..."
- searchMessage="No possible options"
- searchPlaceholder=placeholder
- onchange=(action 'change' 'items[]' items) as |item|
- }}
- {{#yield-slot name='option' params=(block-params item)}}{{yield}}{{/yield-slot}}
- {{/power-select}}
-
-{{#if (gt items.length 0)}}
- {{#yield-slot name='set'}}{{yield}}{{/yield-slot}}
-{{else}}
-
-{{/if}}
\ No newline at end of file
diff --git a/ui-v2/app/templates/components/code-editor.hbs b/ui-v2/app/templates/components/code-editor.hbs
deleted file mode 100644
index dd6b9ae5e9..0000000000
--- a/ui-v2/app/templates/components/code-editor.hbs
+++ /dev/null
@@ -1,18 +0,0 @@
-{{ivy-codemirror
- value=value
- name=name
- class=class
- options=options
- valueUpdated=(action onkeyup)
-}}
-{{yield}}
- Copied {{name}}!
-
- {{/block-slot}}
- {{#block-slot name='error' as |transition|}}
-
- Sorry, something went wrong!
-
- {{/block-slot}}
-{{/feedback-dialog}}
diff --git a/ui-v2/app/templates/components/copy-button.hbs b/ui-v2/app/templates/components/copy-button.hbs
deleted file mode 100644
index 25b6ca9274..0000000000
--- a/ui-v2/app/templates/components/copy-button.hbs
+++ /dev/null
@@ -1,2 +0,0 @@
-{{! this overriding template makes sure you can add button:empty's }}
-{{~yield~}}
diff --git a/ui-v2/app/templates/components/feedback-dialog.hbs b/ui-v2/app/templates/components/feedback-dialog.hbs
deleted file mode 100644
index 2044e02463..0000000000
--- a/ui-v2/app/templates/components/feedback-dialog.hbs
+++ /dev/null
@@ -1,9 +0,0 @@
-{{yield}}
-{{#if (eq state 'success') }}
- {{#yield-slot name='success' params=(block-params transition)}}{{yield}}{{/yield-slot}}
-{{else if (eq state 'error') }}
- {{#yield-slot name='error' params=(block-params transition)}}{{yield}}{{/yield-slot}}
-{{/if}}
-{{#if (or permanent (eq state 'ready')) }}
- {{#yield-slot name='action' params=(block-params success error)}}{{yield}}{{message}}{{/yield-slot}}
-{{/if}}
\ No newline at end of file
diff --git a/ui-v2/app/templates/components/healthcheck-info.hbs b/ui-v2/app/templates/components/healthcheck-info.hbs
deleted file mode 100644
index 982d4c2c86..0000000000
--- a/ui-v2/app/templates/components/healthcheck-info.hbs
+++ /dev/null
@@ -1,9 +0,0 @@
-{{#if (and (lt passing 1) (lt warning 1) (lt critical 1) )}}
- 0
-{{else}}
-
- {{healthcheck-status width=passingWidth name='passing' value=passing}}
- {{healthcheck-status width=warningWidth name='warning' value=warning}}
- {{healthcheck-status width=criticalWidth name='critical' value=critical}}
-
-{{/if}}
diff --git a/ui-v2/app/templates/components/healthcheck-output.hbs b/ui-v2/app/templates/components/healthcheck-output.hbs
deleted file mode 100644
index 3a434fbd23..0000000000
--- a/ui-v2/app/templates/components/healthcheck-output.hbs
+++ /dev/null
@@ -1,8 +0,0 @@
-{{! TODO: this component and its parent should be moved to a single component }}
-{{yield}}
-
-
- {{#yield-slot name='header'}}{{yield}}{{/yield-slot}}
-
- {{#yield-slot name='content'}}{{yield}}{{/yield-slot}}
-
\ No newline at end of file
diff --git a/ui-v2/app/templates/components/intention-filter.hbs b/ui-v2/app/templates/components/intention-filter.hbs
deleted file mode 100644
index 2a8c0ecd03..0000000000
--- a/ui-v2/app/templates/components/intention-filter.hbs
+++ /dev/null
@@ -1,4 +0,0 @@
-{{!}}
\ No newline at end of file
diff --git a/ui-v2/app/templates/components/list-collection.hbs b/ui-v2/app/templates/components/list-collection.hbs
deleted file mode 100644
index 9bc42e3b66..0000000000
--- a/ui-v2/app/templates/components/list-collection.hbs
+++ /dev/null
@@ -1,6 +0,0 @@
-{{#ember-native-scrollable tagName='ul' content-size=_contentSize scroll-left=_scrollLeft scroll-top=_scrollTop scrollChange=(action "scrollChange") clientSizeChange=(action "clientSizeChange")}}
- {{yield cell.item cell.index }}
- {{~/each~}}
-{{/ember-native-scrollable}}
\ No newline at end of file
diff --git a/ui-v2/app/templates/components/phrase-editor.hbs b/ui-v2/app/templates/components/phrase-editor.hbs
deleted file mode 100644
index d0e8d5e74e..0000000000
--- a/ui-v2/app/templates/components/phrase-editor.hbs
+++ /dev/null
@@ -1,11 +0,0 @@
-
- {{#each value as |item index|}}
-
- Remove {{item}}
-
- {{/each}}
-
-
- Search
-
\ No newline at end of file
diff --git a/ui-v2/app/templates/components/policy-selector.hbs b/ui-v2/app/templates/components/policy-selector.hbs
deleted file mode 100644
index d5318f025e..0000000000
--- a/ui-v2/app/templates/components/policy-selector.hbs
+++ /dev/null
@@ -1,89 +0,0 @@
-{{#child-selector repo=repo dc=dc nspace=nspace type="policy" placeholder="Search for policy" items=items}}
- {{yield}}
- {{#block-slot name='label'}}
- Apply an existing policy
- {{/block-slot}}
- {{#block-slot name='create'}}
- {{#yield-slot name='trigger'}}
- {{yield}}
- {{else}}
-
- Create new policy
-
- {{!TODO: potentially call trigger something else}}
- {{!the modal has to go here so that if you provide a slot to trigger it doesn't get rendered}}
- {{#modal-dialog data-test-policy-form onopen=(action 'open') name="new-policy-toggle"}}
- {{#block-slot name='header'}}
- New Policy
- {{/block-slot}}
- {{#block-slot name='body'}}
- {{policy-form form=form dc=dc allowServiceIdentity=allowServiceIdentity}}
- {{/block-slot}}
- {{#block-slot name='actions' as |close|}}
-
- {{#if item.isSaving }}
-
- {{/if}}
- Create and apply
-
- Cancel
- {{/block-slot}}
- {{/modal-dialog}}
- {{/yield-slot}}
- {{/block-slot}}
- {{#block-slot name='option' as |option|}}
- {{option.Name}}
- {{/block-slot}}
- {{#block-slot name='set'}}
- {{#tabular-details
- data-test-policies
- onchange=(action 'loadItem')
- items=(sort-by 'CreateTime:desc' 'Name:asc' items) as |item index|
- }}
- {{#block-slot name='header'}}
- Name
- Datacenters
- {{/block-slot}}
- {{#block-slot name='row'}}
-
-{{#if item.ID }}
- {{item.Name}}
-{{else}}
- {{item.Name}}
-{{/if}}
-
-
- {{if (not item.isSaving) (join ', ' (policy/datacenters item)) 'Saving...'}}
-
- {{/block-slot}}
- {{#block-slot name='details'}}
-
- Rules (HCL Format)
- {{#if (eq item.template '')}}
- {{code-editor syntax='hcl' readonly=true value=item.Rules}}
- {{else}}
- {{#code-editor syntax='hcl' readonly=true}}
- {{~component 'service-identity' name=item.Name~}}
- {{/code-editor}}
- {{/if}}
-
-
- {{#confirmation-dialog message='Are you sure you want to remove this policy from this token?'}}
- {{#block-slot name='action' as |confirm|}}
-
Remove
- {{/block-slot}}
- {{#block-slot name='dialog' as |execute cancel message|}}
-
- {{message}}
-
-
-
Confirm remove
-
Cancel
- {{/block-slot}}
- {{/confirmation-dialog}}
-
- {{#yield-slot name='trigger'}}
- {{yield}}
- {{/yield-slot}}
-
- {{/toggle-button}}
-
-
- {{#each submenus as |sub|}}
-
- {{/each}}
- {{#yield-slot name='header'}}
-
- {{yield}}
-
- {{else}}
- {{/yield-slot}}
-
- {{#yield-slot name='menu' params=(block-params (concat 'popover-menu-' guid '-') send keypressClick) }}
- {{yield}}
- {{/yield-slot}}
-
-
-
- {{#yield-slot name='mini-stat'}}{{yield}}{{/yield-slot}}
- {{#yield-slot name='header'}}{{yield}}{{/yield-slot}}
- {{#yield-slot name='icon'}}{{yield}}{{/yield-slot}}
-
- {{#yield-slot name='body'}}{{yield}}{{/yield-slot}}
-
diff --git a/ui-v2/app/templates/components/tab-nav.hbs b/ui-v2/app/templates/components/tab-nav.hbs
deleted file mode 100644
index 70c098f23d..0000000000
--- a/ui-v2/app/templates/components/tab-nav.hbs
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/ui-v2/app/templates/components/tabular-collection.hbs b/ui-v2/app/templates/components/tabular-collection.hbs
deleted file mode 100644
index 29186a1e7c..0000000000
--- a/ui-v2/app/templates/components/tabular-collection.hbs
+++ /dev/null
@@ -1,27 +0,0 @@
-{{yield}}
-{{#if hasCaption}}
- {{#yield-slot name='caption'}}{{yield}}{{/yield-slot}}
-{{/if}}
-
-
- {{#yield-slot name='header'}}{{yield}}{{/yield-slot}}
-{{#if hasActions }}
- Actions
-{{/if}}
-
-
- {{#ember-native-scrollable tagName='tbody' content-size=_contentSize scroll-left=_scrollLeft scroll-top=_scrollTop scrollChange=(action 'scrollChange') clientSizeChange=(action "clientSizeChange")}}
-
- {{#yield-slot name='row'}}{{yield cell.item index}}{{/yield-slot}}
-{{#if hasActions }}
-
- {{#yield-slot name='actions' params=(block-params (concat cell.index) (action 'change') checked)}}
- {{yield cell.item index}}
- {{/yield-slot}}
-
-{{/if}}
-
-{{~/each~}}
- {{/ember-native-scrollable}}
\ No newline at end of file
diff --git a/ui-v2/app/templates/components/tag-list.hbs b/ui-v2/app/templates/components/tag-list.hbs
deleted file mode 100644
index c51ea2a418..0000000000
--- a/ui-v2/app/templates/components/tag-list.hbs
+++ /dev/null
@@ -1,8 +0,0 @@
-{{#if (gt items.length 0)}}
- Tags
-
- {{#each items as |item|}}
- {{item}}
- {{/each}}
-
-{{/if}}
diff --git a/ui-v2/app/templates/components/toggle-button.hbs b/ui-v2/app/templates/components/toggle-button.hbs
deleted file mode 100644
index 5ed4861532..0000000000
--- a/ui-v2/app/templates/components/toggle-button.hbs
+++ /dev/null
@@ -1,4 +0,0 @@
-
- {{yield (action 'click')}}
-
\ No newline at end of file
diff --git a/ui-v2/app/templates/dc.hbs b/ui-v2/app/templates/dc.hbs
index e4c245a452..c24cd68950 100644
--- a/ui-v2/app/templates/dc.hbs
+++ b/ui-v2/app/templates/dc.hbs
@@ -1,3 +1 @@
-{{#hashicorp-consul id="wrapper" permissions=permissions dcs=dcs dc=dc nspaces=nspaces nspace=nspace}}
- {{outlet}}
-{{/hashicorp-consul}}
+{{outlet}}
diff --git a/ui-v2/app/templates/dc/acls/-authorization.hbs b/ui-v2/app/templates/dc/acls/-authorization.hbs
index f2ca918e50..8617be5769 100644
--- a/ui-v2/app/templates/dc/acls/-authorization.hbs
+++ b/ui-v2/app/templates/dc/acls/-authorization.hbs
@@ -1,13 +1,21 @@
-
- The Access Control List (ACL) system, which controls permissions for this UI, is enabled for this cluster. Your token ID will be saved locally and persist through visits.
-
-
+
+
+ You are not authorized
+
+
+ Error 403
+
+
+
+ You must be granted permissions to view this data. Login or ask your administrator if you think you should have access.
+
+
+
+
+ Read the documentation
+
+
+ Follow the guide
+
+
+
diff --git a/ui-v2/app/templates/dc/acls/-disabled.hbs b/ui-v2/app/templates/dc/acls/-disabled.hbs
index 4a8d1ffb9a..bd54f7fc40 100644
--- a/ui-v2/app/templates/dc/acls/-disabled.hbs
+++ b/ui-v2/app/templates/dc/acls/-disabled.hbs
@@ -1,6 +1,18 @@
-
- ACLs are disabled in this Consul cluster. This is the default behavior, as you have to explicitly enable them.
-
-
- Learn more in the ACL documentation
-
+
+
+ Welcome to ACLs
+
+
+
+ ACLs are not enabled. We strongly encourage the use of ACLs in production environments for the best security practices.
+
+
+
+
+ Read the documentation
+
+
+ Follow the guide
+
+
+
diff --git a/ui-v2/app/templates/dc/acls/-form.hbs b/ui-v2/app/templates/dc/acls/-form.hbs
index d58944d0e5..df995189ea 100644
--- a/ui-v2/app/templates/dc/acls/-form.hbs
+++ b/ui-v2/app/templates/dc/acls/-form.hbs
@@ -2,7 +2,7 @@
Name
- {{input value=item.Name name='name' autofocus='autofocus'}}
+
{{#each types as |type|}}
@@ -14,12 +14,12 @@
Policy (HCL Format)
- {{code-editor class=(if item.error.Rules 'error') name='Rules' value=item.Rules syntax="hcl" onkeyup=(action 'change' 'Rules')}}
+
{{#if create }}
ID
- {{ input value=item.ID }}
+ We'll generate a UUID if this field is left empty.
{{/if}}
@@ -31,14 +31,14 @@
{{/if}}
Cancel
{{# if (and (not create) (not-eq item.ID 'anonymous')) }}
- {{#confirmation-dialog message='Are you sure you want to delete this ACL token?'}}
- {{#block-slot name='action' as |confirm|}}
+
+
Delete
- {{/block-slot}}
- {{#block-slot name='dialog' as |execute cancel message|}}
- {{delete-confirmation message=message execute=execute cancel=cancel}}
- {{/block-slot}}
- {{/confirmation-dialog}}
+
+
+
+
{{/if}}
diff --git a/ui-v2/app/templates/dc/acls/-nav.hbs b/ui-v2/app/templates/dc/acls/-nav.hbs
index 9d794f4443..982fa9d352 100644
--- a/ui-v2/app/templates/dc/acls/-nav.hbs
+++ b/ui-v2/app/templates/dc/acls/-nav.hbs
@@ -1,19 +1 @@
-{{tab-nav
- items=(array
- (hash
- label='Tokens'
- href=(href-to 'dc.acls.tokens')
- selected=(is-href 'dc.acls.tokens')
- )
- (hash
- label='Roles'
- href=(href-to 'dc.acls.roles')
- selected=(is-href 'dc.acls.roles')
- )
- (hash
- label='Policies'
- href=(href-to 'dc.acls.policies')
- selected=(is-href 'dc.acls.policies')
- )
- )
-}}
+
+
{{partial 'dc/acls/notifications'}}
- {{/block-slot}}
- {{#block-slot name='breadcrumbs'}}
+
+
All Tokens
- {{/block-slot}}
- {{#block-slot name='header'}}
+
+
{{#if item.Name }}
{{item.Name}}
@@ -15,42 +15,28 @@
New token
{{/if}}
- {{/block-slot}}
- {{#block-slot name='actions'}}
+
+
{{#if (not create) }}
- {{#feedback-dialog type='inline'}}
- {{#block-slot name='action' as |success error|}}
- {{#copy-button success=(action success) error=(action error) clipboardText=item.ID title='copy token ID to clipboard'}}
- Copy token ID
- {{/copy-button}}
- {{/block-slot}}
- {{#block-slot name='success' as |transition|}}
-
- Copied token ID!
-
- {{/block-slot}}
- {{#block-slot name='error' as |transition|}}
-
- Sorry, something went wrong!
-
- {{/block-slot}}
- {{/feedback-dialog}}
+
+ Copy token ID
+
Clone token
- {{#confirmation-dialog message='Are you sure you want to use this ACL token?'}}
- {{#block-slot name='action' as |confirm|}}
+
+
Use token
- {{/block-slot}}
- {{#block-slot name='dialog' as |execute cancel message|}}
+
+
{{message}}
Confirm Use
Cancel
- {{/block-slot}}
- {{/confirmation-dialog}}
+
+
{{/if}}
- {{/block-slot}}
- {{#block-slot name='content'}}
+
+
{{ partial 'dc/acls/form'}}
- {{/block-slot}}
-{{/app-view}}
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/ui-v2/app/templates/dc/acls/index.hbs b/ui-v2/app/templates/dc/acls/index.hbs
index 88c50c2e55..46a7620546 100644
--- a/ui-v2/app/templates/dc/acls/index.hbs
+++ b/ui-v2/app/templates/dc/acls/index.hbs
@@ -1,32 +1,30 @@
-{{#app-view class="acl list" loading=isLoading}}
- {{#block-slot name='notification' as |status type|}}
+
+
{{partial 'dc/acls/notifications'}}
- {{/block-slot}}
- {{#block-slot name='header'}}
+
+
ACL Tokens {{format-number items.length}} total
+
Create
- {{/block-slot}}
- {{#block-slot name='toolbar'}}
+
+
{{#if (gt items.length 0) }}
- {{acl-filter searchable=searchable filters=typeFilters search=filters.s type=filters.type onchange=(action 'filter')}}
+
+
+
+
+
+
Name
Type
- {{/block-slot}}
- {{#block-slot name='row'}}
+
+
{{item.Name}}
@@ -37,18 +35,13 @@
{{item.Type}}
{{/if}}
- {{/block-slot}}
- {{#block-slot name='actions' as |index change checked|}}
- {{#popover-menu
- expanded=(if (eq checked index) true false)
- onchange=(action change index)
- keyboardAccess=false
- submenus=(array 'logout' 'use' 'delete')
- }}
- {{#block-slot name='trigger'}}
+
+
+
+
More
- {{/block-slot}}
- {{#block-slot name='menu' as |confirm send keypressClick|}}
+
+
Edit
@@ -129,16 +122,16 @@
{{/if}}
- {{/block-slot}}
- {{/popover-menu}}
- {{/block-slot}}
- {{/tabular-collection}}
- {{/block-slot}}
- {{#block-slot name='empty'}}
+
+
+
+
+
+
There are no ACLs.
- {{/block-slot}}
- {{/changeable-set}}
- {{/block-slot}}
-{{/app-view}}
\ No newline at end of file
+
+
+
+
\ No newline at end of file
diff --git a/ui-v2/app/templates/dc/acls/policies/-form.hbs b/ui-v2/app/templates/dc/acls/policies/-form.hbs
index 7df38ed76b..0ab52245d4 100644
--- a/ui-v2/app/templates/dc/acls/policies/-form.hbs
+++ b/ui-v2/app/templates/dc/acls/policies/-form.hbs
@@ -1,10 +1,10 @@
diff --git a/ui-v2/app/templates/dc/acls/policies/-view.hbs b/ui-v2/app/templates/dc/acls/policies/-view.hbs
index dc5859cb50..19464f922b 100644
--- a/ui-v2/app/templates/dc/acls/policies/-view.hbs
+++ b/ui-v2/app/templates/dc/acls/policies/-view.hbs
@@ -9,4 +9,4 @@
{{item.Description}}
-{{token-list caption="Applied to the following tokens:" items=items}}
+
+
{{partial 'dc/acls/policies/notifications'}}
- {{/block-slot}}
- {{#block-slot name='disabled'}}
+
+
{{partial 'dc/acls/disabled'}}
- {{/block-slot}}
- {{#block-slot name='authorization'}}
+
+
{{partial 'dc/acls/authorization'}}
- {{/block-slot}}
- {{#block-slot name='breadcrumbs'}}
+
+
All Policies
- {{/block-slot}}
- {{#block-slot name='header'}}
+
+
{{#if isAuthorized }}
{{#if create }}
@@ -38,12 +43,12 @@
Access Controls
{{/if}}
- {{/block-slot}}
- {{#block-slot name='content'}}
+
+
{{#if (eq (policy/typeof item) 'policy-management')}}
{{ partial 'dc/acls/policies/view'}}
{{else}}
{{ partial 'dc/acls/policies/form'}}
{{/if}}
- {{/block-slot}}
-{{/app-view}}
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/ui-v2/app/templates/dc/acls/policies/index.hbs b/ui-v2/app/templates/dc/acls/policies/index.hbs
index 3641d0f76e..10e85407ce 100644
--- a/ui-v2/app/templates/dc/acls/policies/index.hbs
+++ b/ui-v2/app/templates/dc/acls/policies/index.hbs
@@ -3,44 +3,49 @@
{{else}}
{{title 'Access Controls'}}
{{/if}}
-{{#app-view class=(concat 'policy ' (if (not isAuthorized) 'edit' 'list')) loading=isLoading authorized=isAuthorized enabled=isEnabled}}
- {{#block-slot name='notification' as |status type|}}
+
+
{{partial 'dc/acls/policies/notifications'}}
- {{/block-slot}}
- {{#block-slot name='header'}}
+
+
Access Controls
- {{#if isAuthorized }}
- {{partial 'dc/acls/nav'}}
- {{/if}}
- {{/block-slot}}
- {{#block-slot name='disabled'}}
+
+
+{{#if isAuthorized }}
+ {{partial 'dc/acls/nav'}}
+{{/if}}
+
+
{{partial 'dc/acls/disabled'}}
- {{/block-slot}}
- {{#block-slot name='authorization'}}
+
+
{{partial 'dc/acls/authorization'}}
- {{/block-slot}}
- {{#block-slot name='actions'}}
+
+
Create
- {{/block-slot}}
- {{#block-slot name='content'}}
+
+
{{#if (gt items.length 0) }}
{{/if}}
- {{#changeable-set dispatcher=searchable}}
- {{#block-slot name='set' as |filtered|}}
- {{#tabular-collection
- items=(sort-by 'CreateIndex:desc' 'Name:asc' filtered) as |item index|
- }}
- {{#block-slot name='header'}}
+
+
+
+
Name
Datacenters
Description
- {{/block-slot}}
- {{#block-slot name='row'}}
+
+
{{item.Name}}
@@ -50,13 +55,13 @@
{{item.Description}}
- {{/block-slot}}
- {{#block-slot name='actions' as |index change checked|}}
- {{#popover-menu expanded=(if (eq checked index) true false) onchange=(action change index) keyboardAccess=false}}
- {{#block-slot name='trigger'}}
+
+
+
+
More
- {{/block-slot}}
- {{#block-slot name='menu' as |confirm send keypressClick|}}
+
+
{{#if (eq (policy/typeof item) 'policy-management')}}
View
@@ -90,16 +95,16 @@
{{/if}}
- {{/block-slot}}
- {{/popover-menu}}
- {{/block-slot}}
- {{/tabular-collection}}
- {{/block-slot}}
- {{#block-slot name='empty'}}
+
+
+
+
+
+
There are no Policies.
- {{/block-slot}}
- {{/changeable-set}}
- {{/block-slot}}
-{{/app-view}}
\ No newline at end of file
+
+
+
+
\ No newline at end of file
diff --git a/ui-v2/app/templates/dc/acls/roles/-form.hbs b/ui-v2/app/templates/dc/acls/roles/-form.hbs
index ee29bdb169..092fcda217 100644
--- a/ui-v2/app/templates/dc/acls/roles/-form.hbs
+++ b/ui-v2/app/templates/dc/acls/roles/-form.hbs
@@ -1,11 +1,11 @@
diff --git a/ui-v2/app/templates/dc/acls/roles/edit.hbs b/ui-v2/app/templates/dc/acls/roles/edit.hbs
index 090553d9cc..964084d0d8 100644
--- a/ui-v2/app/templates/dc/acls/roles/edit.hbs
+++ b/ui-v2/app/templates/dc/acls/roles/edit.hbs
@@ -7,22 +7,27 @@
{{else}}
{{title 'Access Controls'}}
{{/if}}
-{{#app-view class=(concat 'role ' (if (or isAuthorized isEnabled) 'edit' 'list')) loading=isLoading authorized=isAuthorized enabled=isEnabled}}
- {{#block-slot name='notification' as |status type|}}
+
+
{{partial 'dc/acls/roles/notifications'}}
- {{/block-slot}}
- {{#block-slot name='disabled'}}
+
+
{{partial 'dc/acls/disabled'}}
- {{/block-slot}}
- {{#block-slot name='authorization'}}
+
+
{{partial 'dc/acls/authorization'}}
- {{/block-slot}}
- {{#block-slot name='breadcrumbs'}}
+
+
All Roles
- {{/block-slot}}
- {{#block-slot name='header'}}
+
+
{{#if isAuthorized }}
{{#if create }}
@@ -34,8 +39,8 @@
Access Controls
{{/if}}
- {{/block-slot}}
- {{#block-slot name='content'}}
+
+
{{ partial 'dc/acls/roles/form'}}
- {{/block-slot}}
-{{/app-view}}
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/ui-v2/app/templates/dc/acls/roles/index.hbs b/ui-v2/app/templates/dc/acls/roles/index.hbs
index b4cf6ed390..b809f33f14 100644
--- a/ui-v2/app/templates/dc/acls/roles/index.hbs
+++ b/ui-v2/app/templates/dc/acls/roles/index.hbs
@@ -3,44 +3,49 @@
{{else}}
{{title 'Access Controls'}}
{{/if}}
-{{#app-view class=(concat 'role ' (if (not isAuthorized) 'edit' 'list')) loading=isLoading authorized=isAuthorized enabled=isEnabled}}
- {{#block-slot name='notification' as |status type|}}
+
+
{{partial 'dc/acls/roles/notifications'}}
- {{/block-slot}}
- {{#block-slot name='header'}}
+
+
Access Controls
- {{#if isAuthorized }}
- {{partial 'dc/acls/nav'}}
- {{/if}}
- {{/block-slot}}
- {{#block-slot name='disabled'}}
+
+
+{{#if isAuthorized }}
+ {{partial 'dc/acls/nav'}}
+{{/if}}
+
+
{{partial 'dc/acls/disabled'}}
- {{/block-slot}}
- {{#block-slot name='authorization'}}
+
+
{{partial 'dc/acls/authorization'}}
- {{/block-slot}}
- {{#block-slot name='actions'}}
+
+
Create
- {{/block-slot}}
- {{#block-slot name='content'}}
+
+
{{#if (gt items.length 0) }}
{{/if}}
- {{#changeable-set dispatcher=searchable}}
- {{#block-slot name='set' as |filtered|}}
- {{#tabular-collection
- items=(sort-by 'CreateIndex:desc' 'Name:asc' filtered) as |item index|
- }}
- {{#block-slot name='header'}}
+
+
+
+
Name
Description
Policies
- {{/block-slot}}
- {{#block-slot name='row'}}
+
+
{{item.Name}}
@@ -52,13 +57,13 @@
{{item.Name}}
{{/each}}
- {{/block-slot}}
- {{#block-slot name='actions' as |index change checked|}}
- {{#popover-menu expanded=(if (eq checked index) true false) onchange=(action change index) keyboardAccess=false}}
- {{#block-slot name='trigger'}}
+
+
+
+
More
- {{/block-slot}}
- {{#block-slot name='menu' as |confirm send keypressClick|}}
+
+
Edit
@@ -85,16 +90,16 @@
- {{/block-slot}}
- {{/popover-menu}}
- {{/block-slot}}
- {{/tabular-collection}}
- {{/block-slot}}
- {{#block-slot name='empty'}}
+
+
+
+
+
+
There are no Roles.
- {{/block-slot}}
- {{/changeable-set}}
- {{/block-slot}}
-{{/app-view}}
\ No newline at end of file
+
+
+
+
\ No newline at end of file
diff --git a/ui-v2/app/templates/dc/acls/tokens/-fieldsets-legacy.hbs b/ui-v2/app/templates/dc/acls/tokens/-fieldsets-legacy.hbs
index 213f8d1133..a96aac9cdb 100644
--- a/ui-v2/app/templates/dc/acls/tokens/-fieldsets-legacy.hbs
+++ b/ui-v2/app/templates/dc/acls/tokens/-fieldsets-legacy.hbs
@@ -1,7 +1,7 @@
Name
- {{input value=item.Description name='name' autofocus='autofocus'}}
+
{{#if false}}
@@ -15,12 +15,12 @@
{{/if}}
Rules (HCL Format)
- {{code-editor class=(if item.error.Rules 'error') name='Rules' syntax='hcl' value=item.Rules onkeyup=(action 'change' 'Rules')}}
+
{{#if create }}
ID
- {{ input value=item.ID }}
+ We'll generate a UUID if this field is left empty.
{{/if}}
diff --git a/ui-v2/app/templates/dc/acls/tokens/-fieldsets.hbs b/ui-v2/app/templates/dc/acls/tokens/-fieldsets.hbs
index f7e50db434..048a2d3fd9 100644
--- a/ui-v2/app/templates/dc/acls/tokens/-fieldsets.hbs
+++ b/ui-v2/app/templates/dc/acls/tokens/-fieldsets.hbs
@@ -1,12 +1,11 @@
{{#if create }}
-
diff --git a/ui-v2/app/templates/dc/acls/tokens/-notifications.hbs b/ui-v2/app/templates/dc/acls/tokens/-notifications.hbs
index 5c98ecf4bf..c5770bf1e3 100644
--- a/ui-v2/app/templates/dc/acls/tokens/-notifications.hbs
+++ b/ui-v2/app/templates/dc/acls/tokens/-notifications.hbs
@@ -16,24 +16,12 @@
{{else}}
There was an error deleting the token.
{{/if}}
-{{ else if (eq type 'logout')}}
- {{#if (eq status 'success') }}
- You are now logged out.
- {{else}}
- There was an error logging out.
- {{/if}}
{{ else if (eq type 'clone')}}
{{#if (eq status 'success') }}
The token has been cloned as {{truncate subject.AccessorID 8 false}}
{{else}}
There was an error cloning the token.
{{/if}}
-{{ else if (eq type 'authorize')}}
- {{#if (eq status 'success') }}
- You are now logged in.
- {{else}}
- There was an error, please check your SecretID/Token
- {{/if}}
{{ else if (eq type 'use')}}
{{#if (eq status 'success') }}
You are now using the new ACL token
diff --git a/ui-v2/app/templates/dc/acls/tokens/edit.hbs b/ui-v2/app/templates/dc/acls/tokens/edit.hbs
index ea4d80b26b..86cd683681 100644
--- a/ui-v2/app/templates/dc/acls/tokens/edit.hbs
+++ b/ui-v2/app/templates/dc/acls/tokens/edit.hbs
@@ -7,22 +7,27 @@
{{else}}
{{title 'Access Controls'}}
{{/if}}
-{{#app-view class=(concat 'token ' (if (or isAuthorized isEnabled) 'edit' 'list')) loading=isLoading authorized=isAuthorized enabled=isEnabled}}
- {{#block-slot name='notification' as |status type|}}
+
+
{{partial 'dc/acls/tokens/notifications'}}
- {{/block-slot}}
- {{#block-slot name='disabled'}}
+
+
{{partial 'dc/acls/disabled'}}
- {{/block-slot}}
- {{#block-slot name='authorization'}}
+
+
{{partial 'dc/acls/authorization'}}
- {{/block-slot}}
- {{#block-slot name='breadcrumbs'}}
+
+
All Tokens
- {{/block-slot}}
- {{#block-slot name='header'}}
+
+
{{#if isAuthorized }}
{{#if create }}
@@ -34,29 +39,29 @@
Access Controls
{{/if}}
- {{/block-slot}}
- {{#block-slot name='actions'}}
+
+
{{#if (not create)}}
{{#if (not-eq item.AccessorID token.AccessorID)}}
- {{#confirmation-dialog message='Are you sure you want to use this ACL token?'}}
- {{#block-slot name='action' as |confirm|}}
+
+
Use
- {{/block-slot}}
- {{#block-slot name='dialog' as |execute cancel message|}}
+
+
{{message}}
Confirm Use
Cancel
- {{/block-slot}}
- {{/confirmation-dialog}}
+
+
{{/if}}
{{#if (not (token/is-legacy item))}}
Duplicate
{{/if}}
{{/if}}
- {{/block-slot}}
- {{#block-slot name='content'}}
+
+
{{#if (token/is-legacy item)}}
Update. We have upgraded our ACL system by allowing you to create reusable policies which you can then apply to tokens. Don't worry, even though this token was written in the old style, it is still valid. However, we do recommend upgrading your old tokens to the new style. Learn how in our documentation .
{{/if}}
@@ -65,11 +70,11 @@
AccessorID
- {{copy-button-feedback title="Copy AccessorID to the clipboard" copy=item.AccessorID name="AccessorID"}} {{item.AccessorID}}
+
Token
- {{copy-button-feedback title="Copy SecretID to the clipboard" copy=item.SecretID name="Token"}} {{#secret-button}}{{item.SecretID}}{{/secret-button}}
+ {{item.SecretID}}
{{#if (and (not (token/is-legacy item)) (not create))}}
Scope
@@ -81,5 +86,5 @@
+
\ No newline at end of file
diff --git a/ui-v2/app/templates/dc/acls/tokens/index.hbs b/ui-v2/app/templates/dc/acls/tokens/index.hbs
index 72f57861c5..b520806074 100644
--- a/ui-v2/app/templates/dc/acls/tokens/index.hbs
+++ b/ui-v2/app/templates/dc/acls/tokens/index.hbs
@@ -3,51 +3,56 @@
{{else}}
{{title 'Access Controls'}}
{{/if}}
-{{#app-view class=(concat 'token ' (if (and isEnabled (not isAuthorized)) 'edit' 'list')) loading=isLoading authorized=isAuthorized enabled=isEnabled}}
- {{#block-slot name='notification' as |status type subject|}}
+
By adding roles to this namespaces, you will apply them to all tokens created within this namespace.
- {{role-selector dc=dc nspace='default' items=item.ACLs.RoleDefaults}}
+
- You can expose individual HTTP paths like /metrics through Envoy for external services like Prometheus.
-
-{{#tabular-collection
- data-test-exposedpaths
- class="exposedpaths"
- items=item.Proxy.Expose.Paths as |path index|
-}}
- {{#block-slot name='header'}}
-
- Consul returned an error.
- You may have visited a URL that is loading an unknown resource, so you can try going back to the root or try re-submitting your ACL Token/SecretID by going back to ACLs.documentation
-
-