From 6df173ce1db086ab2f5ece48bfe5e7379c54cae0 Mon Sep 17 00:00:00 2001 From: mabashian Date: Wed, 22 Jul 2020 13:43:41 -0400 Subject: [PATCH] Update return structure of readInputSources to match what the edit component is expecting. This also required me to make corresponding updates to the detail component so that it matched. --- awx/ui_next/src/api/models/Credentials.js | 6 +++++- .../Credential/CredentialDetail/CredentialDetail.jsx | 4 +++- .../Credential/CredentialDetail/CredentialDetail.test.jsx | 6 +++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/awx/ui_next/src/api/models/Credentials.js b/awx/ui_next/src/api/models/Credentials.js index 1f369e7a77..340a8b47ee 100644 --- a/awx/ui_next/src/api/models/Credentials.js +++ b/awx/ui_next/src/api/models/Credentials.js @@ -41,7 +41,11 @@ class Credentials extends Base { inputSources.concat(data.results) ); } - return Promise.resolve(inputSources.concat(data.results)); + return Promise.resolve({ + data: { + results: inputSources.concat(data.results), + }, + }); } catch (error) { return Promise.reject(error); } diff --git a/awx/ui_next/src/screens/Credential/CredentialDetail/CredentialDetail.jsx b/awx/ui_next/src/screens/Credential/CredentialDetail/CredentialDetail.jsx index b7d14fec9c..5f8066b904 100644 --- a/awx/ui_next/src/screens/Credential/CredentialDetail/CredentialDetail.jsx +++ b/awx/ui_next/src/screens/Credential/CredentialDetail/CredentialDetail.jsx @@ -60,7 +60,9 @@ function CredentialDetail({ i18n, credential }) { { data: { inputs: credentialTypeInputs, managed_by_tower }, }, - loadedInputSources, + { + data: { results: loadedInputSources }, + }, ] = await Promise.all([ CredentialTypesAPI.readDetail(credential_type.id), CredentialsAPI.readInputSources(credentialId), diff --git a/awx/ui_next/src/screens/Credential/CredentialDetail/CredentialDetail.test.jsx b/awx/ui_next/src/screens/Credential/CredentialDetail/CredentialDetail.test.jsx index af401cfbb5..7d99339f2b 100644 --- a/awx/ui_next/src/screens/Credential/CredentialDetail/CredentialDetail.test.jsx +++ b/awx/ui_next/src/screens/Credential/CredentialDetail/CredentialDetail.test.jsx @@ -37,7 +37,11 @@ CredentialTypesAPI.readDetail.mockResolvedValue({ data: mockCredentialType, }); -CredentialsAPI.readInputSources.mockResolvedValue([mockInputSource]); +CredentialsAPI.readInputSources.mockResolvedValue({ + data: { + results: [mockInputSource], + }, +}); function expectDetailToMatch(wrapper, label, value) { const detail = wrapper.find(`Detail[label="${label}"]`);