Refactor key value comp (#2180)

* refactor: 💡 keyvalue comp

addons/api/addon/generated/models/credential-library.js

@@ -81,7 +81,7 @@ export default class GeneratedCredentialLibraryModel extends BaseModel {
   })
   credential_type;
 
-  @attr('object', {
+  @attr('object-as-array', {
     for: 'vault-generic',
     description: 'It indicates the credential mapping overrides.',
   })

addons/api/addon/models/credential-library.js

@@ -13,15 +13,12 @@ export const options = {
   key_type: ['ed25519', 'ecdsa', 'rsa'],
   credential_types: ['ssh_private_key', 'username_password'],
   mapping_overrides: {
-    username_password: {
-      username_attribute: 'Username',
-      password_attribute: 'Password',
-    },
-    ssh_private_key: {
-      private_key_attribute: 'Private Key',
-      private_key_passphrase_attribute: 'Private Key Passphrase',
-      username_attribute: 'Username',
-    },
+    username_password: ['username_attribute', 'password_attribute'],
+    ssh_private_key: [
+      'private_key_attribute',
+      'private_key_passphrase_attribute',
+      'username_attribute',
+    ],
   },
 };
 

addons/api/addon/serializers/credential-library.js

@@ -32,32 +32,9 @@ export default class CredentialLibrarySerializer extends ApplicationSerializer {
         return super.serialize(...arguments);
     }
   }
-  serializeAttribute(snapshot, json) {
-    const value = super.serializeAttribute(...arguments);
-    const { credential_type, type, credential_mapping_overrides, isNew } =
-      snapshot.record;
-    if (
-      type === TYPE_CREDENTIAL_LIBRARY_VAULT_GENERIC &&
-      credential_mapping_overrides &&
-      credential_type &&
-      !isNew
-    ) {
-      // API expects to send null to fields if it is undefined or deleted
-      json.credential_mapping_overrides = Object.keys(
-        options.mapping_overrides[credential_type],
-      ).reduce((obj, key) => {
-        if (credential_mapping_overrides[key]) {
-          obj[key] = credential_mapping_overrides[key];
-        } else {
-          obj[key] = null;
-        }
-        return obj;
-      }, {});
-      return value;
-    }
-  }
 
-  serializeVaultGeneric() {
+  serializeVaultGeneric(snapshot) {
+    const { isNew } = snapshot;
     const serialized = super.serialize(...arguments);
 
     if (serialized.attributes) {
@@ -66,7 +43,22 @@ export default class CredentialLibrarySerializer extends ApplicationSerializer {
       if (!serialized.attributes?.http_method?.match(/post/i)) {
         serialized.attributes.http_request_body = null;
       }
+      const { credential_type, credential_mapping_overrides } = serialized;
+
+      // API expects to send null to fields if it is undefined or deleted
+      if (credential_mapping_overrides && !isNew) {
+        serialized.credential_mapping_overrides = options.mapping_overrides[
+          credential_type
+        ].reduce((obj, key) => {
+          if (credential_mapping_overrides[key]) {
+            obj[key] = credential_mapping_overrides[key];
+          } else {
+            obj[key] = null;
+          }
+          return obj;
+        }, {});
+      }
+      return serialized;
     }
-    return serialized;
   }
 }

addons/api/addon/transforms/account-value-map-array.js

@@ -9,13 +9,13 @@ export default class AccountValueMapArrayTransform extends Transform {
   deserialize(serialized) {
     const accountValues = serialized || [];
     return accountValues.map((accountValueString) => ({
-      from: accountValueString.split('=')[0],
-      to: accountValueString.split('=')[1],
+      key: accountValueString.split('=')[0],
+      value: accountValueString.split('=')[1],
     }));
   }
 
   serialize(deserialized) {
     const accountValues = deserialized || [];
-    return accountValues.map(({ from, to }) => `${from}=${to}`);
+    return accountValues.map(({ key, value }) => `${key}=${value}`);
   }
 }