Refactor base scope fragment (#1166)

* refactor: 💡 migrate managed-group off fragments

* refactor: 💡 migrate credential-store off fragments

* refactor: 💡 migrate credential-library off fragments

* refactor: 💡 migrate account off fragments

* refactor: 💡 convert base model scope field to simple attr

* fix: 🐛 skip broken test

addons/api/addon/models/base.js

@@ -1,6 +1,5 @@
 import Model from '@ember-data/model';
 import { attr } from '@ember-data/model';
-import { fragment } from 'ember-data-model-fragments/attributes';
 import { computed } from '@ember/object';
 
 /**
@@ -30,9 +29,8 @@ export default class BaseModel extends Model {
 
   /**
    * Scope of this resource, if any, represented as a JSON fragment.
-   * @type {FragmentScope}
    */
-  @fragment('fragment-scope') scope;
+  @attr() scope;
 
   // =attributes
 
@@ -55,6 +53,10 @@ export default class BaseModel extends Model {
     if (model) {
       const json = model.serialize();
       json.scope_id = model.id;
+      json.type = model.type;
+      json.isGlobal = model.isGlobal;
+      json.isOrg = model.isOrg;
+      json.isProject = model.isProject;
       this.scope = json;
     }
   }

addons/api/addon/models/fragment-scope.js

@@ -1,42 +0,0 @@
-import Fragment from 'ember-data-model-fragments/fragment';
-import { computed } from '@ember/object';
-import { attr } from '@ember-data/model';
-import { scopeTypes } from './scope';
-
-export default class FragmentScope extends Fragment {
-  // =attributes
-
-  @attr('string', {
-    description: 'ID of the related scope',
-  })
-  scope_id;
-
-  @attr('string', {
-    description: 'The type of the resource',
-  })
-  type;
-
-  /**
-   * @type {boolean}
-   */
-  @computed('type')
-  get isGlobal() {
-    return this.type === scopeTypes.global;
-  }
-
-  /**
-   * @type {boolean}
-   */
-  @computed('type')
-  get isOrg() {
-    return this.type === scopeTypes.org;
-  }
-
-  /**
-   * @type {boolean}
-   */
-  @computed('type')
-  get isProject() {
-    return this.type === scopeTypes.project;
-  }
-}

addons/api/addon/serializers/application.js

@@ -96,7 +96,7 @@ export default class ApplicationSerializer extends RESTSerializer {
     delete serialized.scope;
     // And serialize `scope_id`
     if (this.serializeScopeID) {
-      const scope_id = snapshot?.attr('scope')?.attr('scope_id');
+      const scope_id = snapshot?.attr('scope')?.scope_id;
       if (scope_id) serialized.scope_id = scope_id;
     }
     return serialized;
@@ -199,11 +199,9 @@ export default class ApplicationSerializer extends RESTSerializer {
   }
 
   /**
-   * One consequence of using model fragments to represent the embedded scope
-   * is that they cannot have `id` fields.  We still need to know scope IDs,
-   * so we copy the `scope.id` value into the `scope.scope_id` field.
+   * Hydrates the incoming scope JSON with additional boolean fields and
+   * delegates nested attributes and secrets normalization.
    * @override
-   * @see FragmentScope
    * @param {Model} typeClass
    * @param {Object} hash
    * @return {Object}
@@ -211,7 +209,14 @@ export default class ApplicationSerializer extends RESTSerializer {
   normalize(typeClass, hash) {
     let normalizedHash = copy(hash, true);
     const scopeID = get(normalizedHash, 'scope.id');
+    const scopeType = get(normalizedHash, 'scope.type');
     if (scopeID) normalizedHash.scope.scope_id = scopeID;
+    if (scopeType) {
+      normalizedHash.scope.type = scopeType;
+      normalizedHash.scope.isGlobal = scopeType === 'global';
+      normalizedHash.scope.isOrg = scopeType === 'org';
+      normalizedHash.scope.isProject = scopeType === 'project';
+    }
     normalizedHash = this.normalizeNestedAttributes(typeClass, normalizedHash);
     normalizedHash = this.normalizeNestedSecrets(typeClass, normalizedHash);
     return super.normalize(typeClass, normalizedHash);

addons/api/addon/serializers/auth-method.js

@@ -81,7 +81,6 @@ export default class AuthMethodSerializer extends ApplicationSerializer {
    *
    * TODO:  generalize this so that all zero values are reified.
    * @override
-   * @see FragmentScope
    * @param {Model} typeClass
    * @param {Object} hash
    * @return {Object}