Suggestions from PR
This commit is contained in:
1 parent
bd8b9d738f
commit
101e6653d4
4 files changed
+20
-15
No files matched your search
@@ -1,5 +1,6 @@
|
|||||||
import factory from '../generated/factories/managed-groups';
|
import factory from '../generated/factories/managed-groups';
|
||||||
import permissions from '../helpers/permissions';
|
import permissions from '../helpers/permissions';
|
||||||
|
import { trait } from 'ember-cli-mirage';
|
||||||
|
|
||||||
const types = ['password', 'OIDC'];
|
const types = ['password', 'OIDC'];
|
||||||
|
|
||||||
@@ -14,4 +15,21 @@ export default factory.extend({
|
|||||||
'update',
|
'update',
|
||||||
'delete',
|
'delete',
|
||||||
],
|
],
|
||||||
|
|
||||||
|
authorized_collection_actions: () => {
|
||||||
|
return {
|
||||||
|
accounts: ['create', 'list'],
|
||||||
|
};
|
||||||
|
},
|
||||||
|
/**
|
||||||
|
* Generates some users for the same scope and assigns them to the group
|
||||||
|
* as members.
|
||||||
|
*/
|
||||||
|
withMembers: trait({
|
||||||
|
afterCreate(group, server) {
|
||||||
|
const scope = group.scope;
|
||||||
|
const members = server.createList('user', 2, { scope });
|
||||||
|
group.update({ members });
|
||||||
|
},
|
||||||
|
}),
|
||||||
});
|
});
|
||||||
@@ -11,7 +11,7 @@ export default Factory.extend({
|
|||||||
created_time: () => date.recent(),
|
created_time: () => date.recent(),
|
||||||
updated_time: () => date.recent(),
|
updated_time: () => date.recent(),
|
||||||
version: () => datatype.number(),
|
version: () => datatype.number(),
|
||||||
type: Math.random() < 0.5 ? 'password' : 'OIDC',
|
type: 'OIDC',
|
||||||
auth_method_id: () => datatype.number(),
|
auth_method_id: () => datatype.number(),
|
||||||
member_ids: () => datatype.array(),
|
member_ids: () => datatype.array(),
|
||||||
});
|
});
|
||||||
@@ -44,12 +44,7 @@ export default function (server) {
|
|||||||
server.createList('role', 1, { scope: globalScope }, 'withPrincipals');
|
server.createList('role', 1, { scope: globalScope }, 'withPrincipals');
|
||||||
server.createList('role', 5, { scope: orgScope }, 'withPrincipals');
|
server.createList('role', 5, { scope: orgScope }, 'withPrincipals');
|
||||||
|
|
||||||
server.createList(
|
server.createList('managed-group', 2, { scope: globalScope }, 'withMembers');
|
||||||
'managed-group',
|
|
||||||
2,
|
|
||||||
{ scope: globalScope },
|
|
||||||
'withAccountsAndUsers'
|
|
||||||
);
|
|
||||||
|
|
||||||
// Other resources
|
// Other resources
|
||||||
server.schema.scopes.where({ type: 'project' }).models.forEach((scope) => {
|
server.schema.scopes.where({ type: 'project' }).models.forEach((scope) => {
|
||||||
|
|||||||
@@ -2,12 +2,4 @@ import ApplicationSerializer from './application';
|
|||||||
|
|
||||||
export default ApplicationSerializer.extend({
|
export default ApplicationSerializer.extend({
|
||||||
modelName: 'managed-groups',
|
modelName: 'managed-groups',
|
||||||
|
|
||||||
_hashForModel() {
|
|
||||||
const json = ApplicationSerializer.prototype._hashForModel.apply(
|
|
||||||
this,
|
|
||||||
arguments
|
|
||||||
);
|
|
||||||
return json;
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
Reference in new issue
Block a user