Prep ember data: relationships (#24712)

* relationships, failing tests * remove old policies test to get tests passing * try adding back in
hashicorp · Jan 8, 2024 · 9088f2b · 9088f2b
1 parent 7ffad66
commit 9088f2b
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/ui/app/models/control-group.js b/ui/app/models/control-group.js
@@ -10,8 +10,8 @@ import lazyCapabilities, { apiPath } from 'vault/macros/lazy-capabilities';
 export default Model.extend({
   approved: attr('boolean'),
   requestPath: attr('string'),
-  requestEntity: belongsTo('identity/entity', { async: false }),
-  authorizations: hasMany('identity/entity', { async: false }),
+  requestEntity: belongsTo('identity/entity', { async: false, inverse: null }),
+  authorizations: hasMany('identity/entity', { async: false, inverse: null }),
 
   authorizePath: lazyCapabilities(apiPath`sys/control-group/authorize`),
   canAuthorize: alias('authorizePath.canUpdate'),

diff --git a/ui/app/models/identity/entity-alias.js b/ui/app/models/identity/entity-alias.js
@@ -14,7 +14,7 @@ export default IdentityModel.extend({
   formFields: computed(function () {
     return ['name', 'mountAccessor'];
   }),
-  entity: belongsTo('identity/entity', { readOnly: true, async: false }),
+  entity: belongsTo('identity/entity', { readOnly: true, async: false, inverse: 'aliases' }),
 
   name: attr('string'),
   canonicalId: attr('string'),

diff --git a/ui/app/models/identity/entity.js b/ui/app/models/identity/entity.js
@@ -34,7 +34,7 @@ export default IdentityModel.extend({
   lastUpdateTime: attr('string', {
     readOnly: true,
   }),
-  aliases: hasMany('identity/entity-alias', { async: false, readOnly: true }),
+  aliases: hasMany('identity/entity-alias', { async: false, readOnly: true, inverse: 'entity' }),
   groupIds: attr({
     readOnly: true,
   }),

diff --git a/ui/app/models/identity/group.js b/ui/app/models/identity/group.js
@@ -77,7 +77,7 @@ export default IdentityModel.extend({
   ),
   policyPath: lazyCapabilities(apiPath`sys/policies`),
   canCreatePolicies: alias('policyPath.canCreate'),
-  alias: belongsTo('identity/group-alias', { async: false, readOnly: true }),
+  alias: belongsTo('identity/group-alias', { async: false, readOnly: true, inverse: 'group' }),
   updatePath: identityCapabilities(),
   canDelete: alias('updatePath.canDelete'),
   canEdit: alias('updatePath.canUpdate'),

diff --git a/ui/app/models/kmip/ca.js b/ui/app/models/kmip/ca.js
@@ -6,7 +6,7 @@
 import Model, { belongsTo, attr } from '@ember-data/model';
 
 export default Model.extend({
-  config: belongsTo('kmip/config', { async: false }),
+  config: belongsTo('kmip/config', { async: false, inverse: 'ca' }),
   caPem: attr('string', {
     label: 'CA PEM',
   }),

diff --git a/ui/app/models/kmip/config.js b/ui/app/models/kmip/config.js
@@ -10,7 +10,7 @@ import fieldToAttrs from 'vault/utils/field-to-attrs';
 
 export default Model.extend({
   useOpenAPI: true,
-  ca: belongsTo('kmip/ca', { async: false }),
+  ca: belongsTo('kmip/ca', { async: false, inverse: 'config' }),
   getHelpUrl(path) {
     return `/v1/${path}/config?help=1`;
   },

diff --git a/ui/app/models/mfa-login-enforcement.js b/ui/app/models/mfa-login-enforcement.js
@@ -37,12 +37,12 @@ const validations = {
 export default class MfaLoginEnforcementModel extends Model {
   @service store;
   @attr('string') name;
-  @hasMany('mfa-method') mfa_methods;
+  @hasMany('mfa-method', { async: true, inverse: null }) mfa_methods;
   @attr('string') namespace_id;
   @attr('array', { defaultValue: () => [] }) auth_method_accessors; // ["auth_approle_17a552c6"]
   @attr('array', { defaultValue: () => [] }) auth_method_types; // ["userpass"]
-  @hasMany('identity/entity') identity_entities;
-  @hasMany('identity/group') identity_groups;
+  @hasMany('identity/entity', { async: true, inverse: null }) identity_entities;
+  @hasMany('identity/group', { async: true, inverse: null }) identity_groups;
 
   get targets() {
     return ArrayProxy.extend(PromiseProxyMixin).create({