luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Change with-namespace-ids mixin to a base class

Browse source 
This is a merge of 5d9fce5.
This commit is contained in:
Michael Lange 2020-06-11 22:19:08 -07:00 committed by Buck Doyle
parent c56726abd1
commit 16ed5451d2
3 changed files with 22 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ui/app/adapters/job.js
View file

@ -1,8 +1,7 @@
import Watchable from './watchable';
import WatchableNamespaceIDs from './watchable-namespace-ids';
import addToPath from 'nomad-ui/utils/add-to-path';
import WithNamespaceIDs from 'nomad-ui/mixins/with-namespace-ids';
export default Watchable.extend(WithNamespaceIDs, {
export default WatchableNamespaceIDs.extend({
relationshipFallbackLinks: Object.freeze({
summary: '/summary',
}),

5
ui/app/adapters/volume.js
View file

@ -1,7 +1,6 @@
import Watchable from './watchable';
import WithNamespaceIDs from 'nomad-ui/mixins/with-namespace-ids';
import WatchableNamespaceIDs from './watchable-namespace-ids';
export default Watchable.extend(WithNamespaceIDs, {
export default WatchableNamespaceIDs.extend({
queryParamsToAttrs: Object.freeze({
type: 'type',
plugin_id: 'plugin.id',

37
ui/app/mixins/with-namespace-ids.js → ui/app/adapters/watchable-namespace-ids.js
View file

@ -1,57 +1,56 @@
import { inject as service } from '@ember/service';
import Mixin from '@ember/object/mixin';
import Watchable from './watchable';
// eslint-disable-next-line ember/no-new-mixins
export default Mixin.create({
system: service(),
export default class WatchableNamespaceIDs extends Watchable {
@service system;
findAll() {
const namespace = this.get('system.activeNamespace');
return this._super(...arguments).then(data => {
return super.findAll(...arguments).then(data => {
data.forEach(record => {
record.Namespace = namespace ? namespace.get('id') : 'default';
});
return data;
});
},
}
findRecord(store, type, id, snapshot) {
const [, namespace] = JSON.parse(id);
const namespaceQuery = namespace && namespace !== 'default' ? { namespace } : {};
return this._super(store, type, id, snapshot, namespaceQuery);
},
return super.findRecord(store, type, id, snapshot, namespaceQuery);
}
urlForFindAll() {
const url = this._super(...arguments);
const url = super.urlForFindAll(...arguments);
const namespace = this.get('system.activeNamespace.id');
return associateNamespace(url, namespace);
},
}
urlForQuery() {
const url = this._super(...arguments);
const url = super.urlForQuery(...arguments);
const namespace = this.get('system.activeNamespace.id');
return associateNamespace(url, namespace);
},
}
urlForFindRecord(id, type, hash) {
const [name, namespace] = JSON.parse(id);
let url = this._super(name, type, hash);
let url = super.urlForFindRecord(name, type, hash);
return associateNamespace(url, namespace);
},
}
urlForUpdateRecord(id, type, hash) {
const [name, namespace] = JSON.parse(id);
let url = this._super(name, type, hash);
let url = super.urlForUpdateRecord(name, type, hash);
return associateNamespace(url, namespace);
},
}
xhrKey(url, method, options = {}) {
const plainKey = this._super(...arguments);
const plainKey = super.xhrKey(...arguments);
const namespace = options.data && options.data.namespace;
return associateNamespace(plainKey, namespace);
},
});
}
}
function associateNamespace(url, namespace) {
if (namespace && namespace !== 'default') {