Skip to content

fix/CDCTOOLBOX-465: Fix mergeDataflows #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iamGaspar wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix/CDCTOOLBOX-465: Fix mergeDataflows #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
276510f
fix/CDCTOOLBOX-465: Fix mergeDataflows
iamGaspar Feb 18, 2025
2de543f
fix/CDCTOOLBOX-465: Fix cypress tests
iamGaspar Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cypress/e2e/dataTest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const emailExampleFile = 'email-templates.zip'
const smsExampleFile = 'sms-templates.zip'
const importEmailsFileHeaderText = 'Import email templates'
const importSmsFileHeaderText = 'Import SMS templates'
const importEmailTemplatesErrorMessage = `Invalid ApiKey parameterInvalid ApiKey parameter`
const importEmailTemplatesErrorMessage = `Invalid ApiKey parameterInvalid APIKey identified. Invalid ApiKey parameter`
const smsTemplatesIconName = 'SMS Templates'
const smsTemplatesExportErrorMessage = 'Error getting SMS templates'
const smsTemplatesExportErrorMessageDetail = 'Error getting SMS templatesThere was an error when getting the SMS templates or you do not have the required permissions to call it.'
Expand Down
4 changes: 2 additions & 2 deletions cypress/e2e/importAccounts.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ describe('Import Account - Configuration Tree test suite', () => {
cy.clearAllLocalStorage()
cy.clearAllSessionStorage()
})
it('Should write on the search input and check the amount of checkboxes', () => {
it.only('Should write on the search input and check the amount of checkboxes', () => {
cy.get('#importAccountsCard').get('ui5-tree').should('have.length', 20)
cy.get('#schemaInput').shadow().find('input').type('data.loyalty.rewardPoints').type('{enter}')
cy.get('#schemaInput').shadow().find('input').type('data.loyalty.rewardPoints{enter}')
cy.get('#importAccountsCard').get('ui5-tree-item-custom').should('have.length', 3)
})
})
Expand Down
3 changes: 3 additions & 0 deletions src/services/copyConfig/dataflow/dataflow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,9 @@ class Dataflow {
for (const resp of dataflows) {
if (response.length === 0) {
response.push(resp)
if (!response[0].result) {
response[0].result = []
}
} else if (resp.result) {
response[0].result.push(...resp.result)
response[0].resultCount += resp.resultCount
Expand Down