diff --git a/cypress/e2e/dataTest.js b/cypress/e2e/dataTest.js index c762a7c2..fbe066d1 100644 --- a/cypress/e2e/dataTest.js +++ b/cypress/e2e/dataTest.js @@ -1425,6 +1425,19 @@ const mockedGetCommunicationTopicsExpectedResponse = { }, }, } +const mockedGetCommunicationSettingsSearchExpectedResponse = { + callId: '015f04e745e9798c81026b182es73504', + context: '{}', + errorCode: 0, + errorDetails: '', + apiVersion: 2, + statusCode: 200, + statusReason: 'OK', + time: '2026-06-25T17:08:14.119Z', + results: [], + objectsCount: 0, + totalCount: 0, +} const mockedSetCommunicationResponse = { callId: 'f88bef4a500440a2914e17c0c1177276', @@ -2407,4 +2420,5 @@ export { mockedVersionControlGetListBranches, mockedVersionControlGetListBranches2, mockedVersionControlGetCommitsEmptyResponse, + mockedGetCommunicationSettingsSearchExpectedResponse, } diff --git a/cypress/e2e/importAccounts.cy.js b/cypress/e2e/importAccounts.cy.js index 64bd790c..c2cc3214 100644 --- a/cypress/e2e/importAccounts.cy.js +++ b/cypress/e2e/importAccounts.cy.js @@ -1,5 +1,4 @@ import * as utils from './utils' -import * as dataTest from './dataTest' describe('Import Account - Configuration Tree test suite', () => { context('Configuration Tree ', () => { diff --git a/cypress/e2e/prettifyCode.cy.js b/cypress/e2e/prettifyCode.cy.js index a7ca2c97..c0476379 100644 --- a/cypress/e2e/prettifyCode.cy.js +++ b/cypress/e2e/prettifyCode.cy.js @@ -14,6 +14,9 @@ describe('UI Builder - Prettify Code', () => { context('Single Screen - No javascript on the screenSet', () => { beforeEach(() => { cy.visit(`/#/99999999/4_AAAAAAAAAAAAAAAAAAAAAA/user-interfacing/screen-sets-app/web/uiBuilder?screenSetId=${liteRegistration}`) + cy.get('#automated-usage-tracking-tool-dialog-warning-close-button').click() + cy.get('#automated-usage-tracking-tool-dialog-warning-close-button').should('not.be.visible') + utils.getScreenSets(datatest.mockedPrettierGetScreenSetResponse) }) afterEach(() => { @@ -30,6 +33,8 @@ describe('UI Builder - Prettify Code', () => { context('Single Screen - View Success PopUp', () => { beforeEach(() => { cy.visit(`/#/99999999/4_AAAAAAAAAAAAAAAAAAAAAA/user-interfacing/screen-sets-app/web/uiBuilder?screenSetId=${linkAccounts}`) + cy.get('#automated-usage-tracking-tool-dialog-warning-close-button').click() + cy.get('#automated-usage-tracking-tool-dialog-warning-close-button').should('not.be.visible') utils.getScreenSets(datatest.mockedPrettierGetScreenSetResponse) }) afterEach(() => { @@ -46,6 +51,8 @@ describe('UI Builder - Prettify Code', () => { context('Single Screen - View Error PopUp', () => { beforeEach(() => { cy.visit(`/#/99999999/4_AAAAAAAAAAAAAAAAAAAAAA/user-interfacing/screen-sets-app/web/uiBuilder?screenSetId=${organizationRegistration}`) + cy.get('#automated-usage-tracking-tool-dialog-warning-close-button').click() + cy.get('#automated-usage-tracking-tool-dialog-warning-close-button').should('not.be.visible') utils.getScreenSets(datatest.mockedPrettierGetScreenSetResponse) }) afterEach(() => { @@ -64,6 +71,8 @@ describe('UI Builder - Prettify Code', () => { context('All Screens - Success Prettier', () => { beforeEach(() => { cy.visit(`/#/99999999/4_AAAAAAAAAAAAAAAAAAAAAA/user-interfacing/screen-sets-app/web`) + cy.get('#automated-usage-tracking-tool-dialog-warning-close-button').click() + cy.get('#automated-usage-tracking-tool-dialog-warning-close-button').should('not.be.visible') utils.getScreenSets(datatest.mockGetAllSuccessScreenSets) }) @@ -83,6 +92,8 @@ describe('UI Builder - Prettify Code', () => { context('All Screens - No Javascript on any screen', () => { beforeEach(() => { cy.visit(`/#/99999999/4_AAAAAAAAAAAAAAAAAAAAAA/user-interfacing/screen-sets-app/web`) + cy.get('#automated-usage-tracking-tool-dialog-warning-close-button').click() + cy.get('#automated-usage-tracking-tool-dialog-warning-close-button').should('not.be.visible') utils.removeJavascript(datatest.mockGetAllSuccessScreenSets) utils.getScreenSets(datatest.mockGetAllSuccessScreenSets) }) @@ -99,6 +110,8 @@ describe('UI Builder - Prettify Code', () => { context('All Screens - Javascript error on a single screenSet', () => { beforeEach(() => { cy.visit(`/#/99999999/4_AAAAAAAAAAAAAAAAAAAAAA/user-interfacing/screen-sets-app/web`) + cy.get('#automated-usage-tracking-tool-dialog-warning-close-button').click() + cy.get('#automated-usage-tracking-tool-dialog-warning-close-button').should('not.be.visible') utils.getScreenSets(datatest.mockGetAllSuccessScreenSets) utils.addErrorOnJavascript(datatest.mockGetAllSuccessScreenSets, liteRegistration) }) diff --git a/cypress/e2e/utils.js b/cypress/e2e/utils.js index 0f8a7471..aa96a25b 100644 --- a/cypress/e2e/utils.js +++ b/cypress/e2e/utils.js @@ -26,6 +26,7 @@ import { mockedGetWebhookExpectedResponse, mockedSearchDataflowsResponse, mockedUserSitesResponse, + mockedGetCommunicationSettingsSearchExpectedResponse, policiesPopoverText, siteConfigResponse, targetSitePopoverText, @@ -47,9 +48,13 @@ export function startUp(pageName) { cy.clearAllCookies() cy.clearAllLocalStorage() cy.clearAllSessionStorage() + cy.get('#automated-usage-tracking-tool-dialog-warning-close-button').click() + cy.get('#automated-usage-tracking-tool-dialog-warning-close-button').should('not.be.visible') + + cy.contains(pageName).click() - cy.contains(pageName).realClick() cy.reload() + cy.get('#automated-usage-tracking-tool-dialog-warning-close-button').click() } export function getImportAccountsInformation() { cy.get('#importAccountsTitle').should('contain.text', importData) @@ -169,6 +174,7 @@ export function mockGetConfigurationRequests() { cy.intercept('POST', 'accounts.getConsentsStatements', { body: mockedGetConsentStatementExpectedResponse }).as('getConsentsStatements') cy.intercept('POST', 'accounts.communication.getChannels', { body: mockedGetCommunicationChannelsExpectedResponse }).as('communication.getChannels') cy.intercept('POST', 'accounts.communication.getTopicSettings', { body: mockedGetCommunicationTopicsExpectedResponse }).as('communication.getTopicSettings') + cy.intercept('POST', 'accounts.communications.settings.search', { body: mockedGetCommunicationSettingsSearchExpectedResponse }).as('communication.getComminicationSettingsSearch') cy.intercept('POST', 'accounts.webhooks.getAll', { body: mockedGetWebhookExpectedResponse }).as('webhooks.getAll') cy.intercept('POST', 'accounts.extensions.list', { body: mockedGetExtensionExpectedResponse }).as('extensions.list') cy.intercept('POST', 'accounts.extensions.create', { body: mockedCreateExtensionExpectedResponse }).as('extensions.create') diff --git a/package-lock.json b/package-lock.json index dae78768..2dda695e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,16 +1,17 @@ { "name": "sap-customer-data-cloud-toolkit", - "version": "1.11.3", + "version": "1.11.4", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "1.11.3", + "name": "sap-customer-data-cloud-toolkit", + "version": "1.11.4", "dependencies": { "@babel/runtime": "^7.27.0", "@octokit/rest": "^21.0.2", "@reduxjs/toolkit": "^1.8.6", - "@sap_oss/automated-usage-tracking-tool": "^1.0.0", + "@sap_oss/automated-usage-tracking-tool": "^1.2.5", "@testing-library/jest-dom": "6.6.3", "@testing-library/react": "^14.0.0", "@testing-library/user-event": "^14.4.3", @@ -42,7 +43,7 @@ "devDependencies": { "@babel/plugin-proposal-class-properties": "^7.18.6", "@babel/plugin-proposal-private-property-in-object": "^7.21.11", - "@bahmutov/cypress-code-coverage": "^2.7.2", + "@bahmutov/cypress-code-coverage": "^2.0.0", "@cypress/browserify-preprocessor": "^3.0.2", "@cypress/code-coverage": "^3.10.0", "@cypress/instrument-cra": "^1.4.0", @@ -4864,13 +4865,39 @@ "dev": true }, "node_modules/@sap_oss/automated-usage-tracking-tool": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@sap_oss/automated-usage-tracking-tool/-/automated-usage-tracking-tool-1.0.1.tgz", - "integrity": "sha512-G035lKI7l0k1ceZ9z/LfTQ+Equejzp9+L8jWsksqr2UT0O4C0b7p7+/mcpAw2GHKLGpZIBvCfT/x09rEE0C/6A==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/@sap_oss/automated-usage-tracking-tool/-/automated-usage-tracking-tool-1.2.5.tgz", + "integrity": "sha512-hVLWUZCFcB4RarKGHbqxAqIkTJnKrdTXDlAbuQv3P0i8JJyR3wcQaKv3O3DAzJ6UcnCp+3doZHD+A+c6ADnM+A==", + "license": "ISC", "dependencies": { - "dotenv": "^16.4.5", + "dotenv": "^17.2.3", "ts-node": "^10.9.2", - "uuid": "^10.0.0" + "uuid": "^14.0.0" + } + }, + "node_modules/@sap_oss/automated-usage-tracking-tool/node_modules/dotenv": { + "version": "17.4.2", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.4.2.tgz", + "integrity": "sha512-nI4U3TottKAcAD9LLud4Cb7b2QztQMUEfHbvhTH09bqXTxnSie8WnjPALV/WMCrJZ6UV/qHJ6L03OqO3LcdYZw==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" + } + }, + "node_modules/@sap_oss/automated-usage-tracking-tool/node_modules/uuid": { + "version": "14.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-14.0.1.tgz", + "integrity": "sha512-6ZxzVpzDXDa3bJWaHilVayA+BH/1zmxCJoVgvmqJnid/gPoKHxUrS/aC/T6LGQtNHT+XHG9fXPJB4d+IrU30Ew==", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "license": "MIT", + "bin": { + "uuid": "dist-node/bin/uuid" } }, "node_modules/@sap-theming/theming-base-content": { @@ -10787,6 +10814,7 @@ "version": "16.5.0", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.5.0.tgz", "integrity": "sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==", + "dev": true, "engines": { "node": ">=12" }, @@ -26952,18 +26980,6 @@ "node": ">= 0.4.0" } }, - "node_modules/uuid": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz", - "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==", - "funding": [ - "https://github.com/sponsors/broofa", - "https://github.com/sponsors/ctavan" - ], - "bin": { - "uuid": "dist/bin/uuid" - } - }, "node_modules/v8-compile-cache-lib": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", @@ -31908,13 +31924,25 @@ "dev": true }, "@sap_oss/automated-usage-tracking-tool": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@sap_oss/automated-usage-tracking-tool/-/automated-usage-tracking-tool-1.0.1.tgz", - "integrity": "sha512-G035lKI7l0k1ceZ9z/LfTQ+Equejzp9+L8jWsksqr2UT0O4C0b7p7+/mcpAw2GHKLGpZIBvCfT/x09rEE0C/6A==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/@sap_oss/automated-usage-tracking-tool/-/automated-usage-tracking-tool-1.2.5.tgz", + "integrity": "sha512-hVLWUZCFcB4RarKGHbqxAqIkTJnKrdTXDlAbuQv3P0i8JJyR3wcQaKv3O3DAzJ6UcnCp+3doZHD+A+c6ADnM+A==", "requires": { - "dotenv": "^16.4.5", + "dotenv": "^17.2.3", "ts-node": "^10.9.2", - "uuid": "^10.0.0" + "uuid": "^14.0.0" + }, + "dependencies": { + "dotenv": { + "version": "17.4.2", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.4.2.tgz", + "integrity": "sha512-nI4U3TottKAcAD9LLud4Cb7b2QztQMUEfHbvhTH09bqXTxnSie8WnjPALV/WMCrJZ6UV/qHJ6L03OqO3LcdYZw==" + }, + "uuid": { + "version": "14.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-14.0.1.tgz", + "integrity": "sha512-6ZxzVpzDXDa3bJWaHilVayA+BH/1zmxCJoVgvmqJnid/gPoKHxUrS/aC/T6LGQtNHT+XHG9fXPJB4d+IrU30Ew==" + } } }, "@sap-theming/theming-base-content": { @@ -36497,7 +36525,8 @@ "dotenv": { "version": "16.5.0", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.5.0.tgz", - "integrity": "sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==" + "integrity": "sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==", + "dev": true }, "dotenv-expand": { "version": "5.1.0", @@ -48429,11 +48458,6 @@ "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", "dev": true }, - "uuid": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz", - "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==" - }, "v8-compile-cache-lib": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", diff --git a/package.json b/package.json index 06e72364..3c8468f0 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,12 @@ { "name": "sap-customer-data-cloud-toolkit", - "version": "1.11.3", + "version": "1.11.4", "private": false, "dependencies": { - "@octokit/rest": "^21.0.2", "@babel/runtime": "^7.27.0", + "@octokit/rest": "^21.0.2", "@reduxjs/toolkit": "^1.8.6", - "@sap_oss/automated-usage-tracking-tool": "^1.0.0", + "@sap_oss/automated-usage-tracking-tool": "^1.2.5", "@testing-library/jest-dom": "6.6.3", "@testing-library/react": "^14.0.0", "@testing-library/user-event": "^14.4.3", @@ -54,7 +54,7 @@ }, "jest": { "transformIgnorePatterns": [ - "node_modules/(?!(@ui5|lit-html|@babel|axios|@octokit|universal-user-agent|before-after-hook)).*\\.js$" + "node_modules/(?!(@ui5|lit-html|@babel|axios|@octokit|universal-user-agent|before-after-hook|uuid|@sap_oss)).*\\.js$" ], "moduleNameMapper": { "\\.(css)$": "identity-obj-proxy" @@ -113,8 +113,8 @@ "nyc": "^15.1.0", "prettier": "3.0.0", "react-scripts": "5.0.1", + "redux-thunk": "^2.4.2", "release-it": "^19.0.2", - "start-server-and-test": "^2.0.0", - "redux-thunk": "^2.4.2" + "start-server-and-test": "^2.0.0" } }