Skip to content
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.

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

Renamed message component names to align with other Adobe SDKs #1202

Merged
merged 2 commits into from
Oct 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .sauce/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ suites:
[
"test/functional/specs/Personalization/C205528.js",
"test/functional/specs/Identity/C6842981.js",
"test/functional/specs/Privacy/IAB/C224677.js",
"test/functional/specs/Privacy/C5594870.js",
"test/functional/specs/Consent/IAB/C224677.js",
"test/functional/specs/Consent/C5594870.js",
"test/functional/specs/LibraryInfo/C2589.js",
]
- name: "Firefox"
Expand All @@ -47,7 +47,7 @@ suites:
src:
- "test/functional/specs/**/*.js"
platformName: "Windows 11"
excludedTestFiles: ["test/functional/specs/Privacy/C5594870.js"]
excludedTestFiles: ["test/functional/specs/Consent/C5594870.js"]
- name: "Chrome"
browserName: "chrome"
headless: true
Expand All @@ -57,7 +57,7 @@ suites:
platformName: "Windows 11"
excludedTestFiles:
[
"test/functional/specs/Privacy/C5594870.js",
"test/functional/specs/Consent/C5594870.js",
"test/functional/specs/Personalization/C7494472.js",
"test/functional/specs/Personalization/C8631576.js",
"test/functional/specs/Personalization/C8631577.js",
Expand Down
10 changes: 5 additions & 5 deletions .sauce/ee-prd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ suites:
[
"test/functional/specs/Personalization/C205528.js",
"test/functional/specs/Identity/C6842981.js",
"test/functional/specs/Privacy/IAB/C224677.js",
"test/functional/specs/Privacy/C5594870.js",
"test/functional/specs/Consent/IAB/C224677.js",
"test/functional/specs/Consent/C5594870.js",
"test/functional/specs/LibraryInfo/C2589.js",
]
- name: "Firefox"
Expand All @@ -54,7 +54,7 @@ suites:
src:
- "test/functional/specs/**/*.js"
platformName: "Windows 11"
excludedTestFiles: ["test/functional/specs/Privacy/C5594870.js"]
excludedTestFiles: ["test/functional/specs/Consent/C5594870.js"]
- name: "Chrome"
browserName: "chrome"
browserVersion: "latest"
Expand All @@ -64,9 +64,9 @@ suites:
excludedTestFiles:
[
"test/functional/specs/Data Collector/C81182.js",
"test/functional/specs/Privacy/C5594870.js",
"test/functional/specs/Consent/C5594870.js",
"test/functional/specs/Personalization/C7494472.js",
"test/functional/specs/Privacy/C1576777.js",
"test/functional/specs/Consent/C1576777.js",
"test/functional/specs/Audiences/C12411.js",
"test/functional/specs/Audiences/C31436.js",
]
10 changes: 5 additions & 5 deletions .sauce/pre-edge-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ suites:
excludedTestFiles:
[
"test/functional/specs/Personalization/C782718.js",
"test/functional/specs/Privacy/C5594870.js",
"test/functional/specs/Consent/C5594870.js",
"test/functional/specs/Personalization/C8631577.js",
]
- name: "Safari"
Expand All @@ -52,8 +52,8 @@ suites:
[
"test/functional/specs/Personalization/C205528.js",
"test/functional/specs/Identity/C6842981.js",
"test/functional/specs/Privacy/IAB/C224677.js",
"test/functional/specs/Privacy/C5594870.js",
"test/functional/specs/Consent/IAB/C224677.js",
"test/functional/specs/Consent/C5594870.js",
"test/functional/specs/LibraryInfo/C2589.js",
]
- name: "Firefox"
Expand All @@ -63,7 +63,7 @@ suites:
src:
- "test/functional/specs/**/*.js"
platformName: "Windows 11"
excludedTestFiles: ["test/functional/specs/Privacy/C5594870.js"]
excludedTestFiles: ["test/functional/specs/Consent/C5594870.js"]
- name: "Chrome"
browserName: "chrome"
headless: true
Expand All @@ -73,7 +73,7 @@ suites:
platformName: "Windows 11"
excludedTestFiles:
[
"test/functional/specs/Privacy/C5594870.js",
"test/functional/specs/Consent/C5594870.js",
"test/functional/specs/Personalization/C7494472.js",
"test/functional/specs/Personalization/C8631576.js",
"test/functional/specs/Personalization/C8631577.js",
Expand Down
10 changes: 5 additions & 5 deletions .sauce/pre-prod-upstreams.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ suites:
excludedTestFiles:
[
"test/functional/specs/Personalization/C782718.js",
"test/functional/specs/Privacy/C5594870.js",
"test/functional/specs/Consent/C5594870.js",
"test/functional/specs/Personalization/C8631577.js",
]
- name: "Safari"
Expand All @@ -52,8 +52,8 @@ suites:
[
"test/functional/specs/Personalization/C205528.js",
"test/functional/specs/Identity/C6842981.js",
"test/functional/specs/Privacy/IAB/C224677.js",
"test/functional/specs/Privacy/C5594870.js",
"test/functional/specs/Consent/IAB/C224677.js",
"test/functional/specs/Consent/C5594870.js",
"test/functional/specs/LibraryInfo/C2589.js",
]
- name: "Firefox"
Expand All @@ -63,7 +63,7 @@ suites:
src:
- "test/functional/specs/**/*.js"
platformName: "Windows 11"
excludedTestFiles: ["test/functional/specs/Privacy/C5594870.js"]
excludedTestFiles: ["test/functional/specs/Consent/C5594870.js"]
- name: "Chrome"
browserName: "chrome"
headless: true
Expand All @@ -73,7 +73,7 @@ suites:
platformName: "Windows 11"
excludedTestFiles:
[
"test/functional/specs/Privacy/C5594870.js",
"test/functional/specs/Consent/C5594870.js",
"test/functional/specs/Personalization/C7494472.js",
"test/functional/specs/Personalization/C8631576.js",
"test/functional/specs/Personalization/C8631577.js",
Expand Down
4 changes: 2 additions & 2 deletions .sauce/prod-chrome.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ suites:
excludedTestFiles:
[
"test/functional/specs/Data Collector/C81182.js",
"test/functional/specs/Privacy/C5594870.js",
"test/functional/specs/Consent/C5594870.js",
"test/functional/specs/Personalization/C7494472.js",
"test/functional/specs/Privacy/C1576777.js",
"test/functional/specs/Consent/C1576777.js",
"test/functional/specs/Audiences/C12411.js",
"test/functional/specs/Audiences/C31436.js",
]
Expand Down
6 changes: 3 additions & 3 deletions .sauce/prod-firefox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ suites:
excludedTestFiles:
[
"test/functional/specs/Data Collector/C81182.js",
"test/functional/specs/Privacy/C2593.js",
"test/functional/specs/Privacy/C5594870.js",
"test/functional/specs/Privacy/C1576777.js",
"test/functional/specs/Consent/C2593.js",
"test/functional/specs/Consent/C5594870.js",
"test/functional/specs/Consent/C1576777.js",
"test/functional/specs/Audiences/C12411.js",
"test/functional/specs/Audiences/C31436.js",
]
Expand Down
8 changes: 4 additions & 4 deletions .sauce/prod-safari.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ suites:
platformName: "macOS 13"
excludedTestFiles:
[
"test/functional/specs/Privacy/C1472435.js",
"test/functional/specs/Consent/C1472435.js",
"test/functional/specs/Data Collector/C81182.js",
"test/functional/specs/Personalization/C205528.js",
"test/functional/specs/Identity/C6842981.js",
"test/functional/specs/Privacy/IAB/C224677.js",
"test/functional/specs/Privacy/C5594870.js",
"test/functional/specs/Consent/IAB/C224677.js",
"test/functional/specs/Consent/C5594870.js",
"test/functional/specs/LibraryInfo/C2589.js",
"test/functional/specs/Privacy/C1576777.js",
"test/functional/specs/Consent/C1576777.js",
"test/functional/specs/Audiences/C12411.js",
"test/functional/specs/Audiences/C31436.js",
"test/functional/specs/Personalization/C8631576.js",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7290,7 +7290,7 @@ module.exports = function (instanceNames) {
governing permissions and limitations under the License.
*/

var createPrivacy = function createPrivacy(_ref) {
var createConsent = function createConsent(_ref) {
var config = _ref.config,
consent = _ref.consent,
sendEdgeNetworkRequest = _ref.sendEdgeNetworkRequest;
Expand All @@ -7316,7 +7316,7 @@ module.exports = function (instanceNames) {
});
};

createPrivacy.namespace = "Privacy";
createConsent.namespace = "Consent";
/*
Copyright 2019 Adobe. All rights reserved.
This file is licensed to you under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -7393,7 +7393,7 @@ module.exports = function (instanceNames) {
*/
// TODO: Figure out how sub-components will be made available/registered

var componentCreators = [createDataCollector, createActivityCollector, createIdentity, createAudiences, createPersonalization, createContext, createPrivacy, createEventMerge, createLibraryInfo];
var componentCreators = [createDataCollector, createActivityCollector, createIdentity, createAudiences, createPersonalization, createContext, createConsent, createEventMerge, createLibraryInfo];
/*
Copyright 2019 Adobe. All rights reserved.
This file is licensed to you under the Apache License, Version 2.0 (the "License");
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -7120,7 +7120,7 @@ module.exports = function (instanceNames) {
governing permissions and limitations under the License.
*/

var createPrivacy = function createPrivacy(_ref) {
var createConsent = function createConsent(_ref) {
var config = _ref.config,
consent = _ref.consent,
sendEdgeNetworkRequest = _ref.sendEdgeNetworkRequest;
Expand All @@ -7146,7 +7146,7 @@ module.exports = function (instanceNames) {
});
};

createPrivacy.namespace = "Privacy";
createConsent.namespace = "Consent";
/*
Copyright 2019 Adobe. All rights reserved.
This file is licensed to you under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -7223,7 +7223,7 @@ module.exports = function (instanceNames) {
*/
// TODO: Figure out how sub-components will be made available/registered

var componentCreators = [createDataCollector, createActivityCollector, createIdentity, createAudiences, createPersonalization, createContext, createPrivacy, createEventMerge, createLibraryInfo];
var componentCreators = [createDataCollector, createActivityCollector, createIdentity, createAudiences, createPersonalization, createContext, createConsent, createEventMerge, createLibraryInfo];
/*
Copyright 2019 Adobe. All rights reserved.
This file is licensed to you under the Apache License, Version 2.0 (the "License");
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -7120,7 +7120,7 @@ module.exports = function (instanceNames) {
governing permissions and limitations under the License.
*/

var createPrivacy = function createPrivacy(_ref) {
var createConsent = function createConsent(_ref) {
var config = _ref.config,
consent = _ref.consent,
sendEdgeNetworkRequest = _ref.sendEdgeNetworkRequest;
Expand All @@ -7146,7 +7146,7 @@ module.exports = function (instanceNames) {
});
};

createPrivacy.namespace = "Privacy";
createConsent.namespace = "Consent";
/*
Copyright 2019 Adobe. All rights reserved.
This file is licensed to you under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -7223,7 +7223,7 @@ module.exports = function (instanceNames) {
*/
// TODO: Figure out how sub-components will be made available/registered

var componentCreators = [createDataCollector, createActivityCollector, createIdentity, createAudiences, createPersonalization, createContext, createPrivacy, createEventMerge, createLibraryInfo];
var componentCreators = [createDataCollector, createActivityCollector, createIdentity, createAudiences, createPersonalization, createContext, createConsent, createEventMerge, createLibraryInfo];
/*
Copyright 2019 Adobe. All rights reserved.
This file is licensed to you under the Apache License, Version 2.0 (the "License");
Expand Down
4 changes: 2 additions & 2 deletions scripts/helpers/runFunctionalTests.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ fs.readFile("dist/alloy.js", "utf8", (readFileErr, alloyData) => {
identity: "Identity",
audiences: "Audiences",
context: "Context",
privacy: "Privacy",
consent: "Consent",
eventMerge: "EventMerge",
libraryInfo: "LibraryInfo",
decisioningEngine: "DecisioningEngine",
rulesEngine: "RulesEngine",
};

// Adjust componentNames using the mapping
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import parseConsentCookie from "./parseConsentCookie.js";
import validateSetConsentOptions from "./validateSetConsentOptions.js";
import configValidators from "./configValidators.js";

const createPrivacy = ({
const createConsent = ({
config,
consent,
sendEdgeNetworkRequest,
Expand Down Expand Up @@ -66,6 +66,6 @@ const createPrivacy = ({
});
};

createPrivacy.namespace = "Privacy";
createPrivacy.configValidators = configValidators;
export default createPrivacy;
createConsent.namespace = "Consent";
createConsent.configValidators = configValidators;
export default createConsent;
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ import createMediaSessionCacheManager from "../StreamingMedia/createMediaSession
import createTrackMediaEvent from "../StreamingMedia/createTrackMediaEvent.js";
import createTrackMediaSession from "../StreamingMedia/createTrackMediaSession.js";
import createMediaResponseHandler from "../StreamingMedia/createMediaResponseHandler.js";
import createLegacyMediaComponent from "./createLegacyMediaComponent.js";
import createMediaAnalyticsBridgeComponent from "./createMediaAnalyticsBridgeComponent.js";
import createMediaHelper from "./createMediaHelper.js";
import createGetInstance from "./createGetInstance.js";
import injectTimestamp from "../Context/injectTimestamp.js";

const createLegacyMediaAnalytics = ({
const createMediaAnalyticsBridge = ({
eventManager,
sendEdgeNetworkRequest,
config,
Expand Down Expand Up @@ -55,7 +55,7 @@ const createLegacyMediaAnalytics = ({
trackMediaEvent,
});

return createLegacyMediaComponent({
return createMediaAnalyticsBridgeComponent({
mediaResponseHandler,
trackMediaSession,
trackMediaEvent,
Expand All @@ -66,6 +66,6 @@ const createLegacyMediaAnalytics = ({
});
};

createLegacyMediaAnalytics.namespace = "Legacy Media Analytics";
createMediaAnalyticsBridge.namespace = "Legacy Media Analytics";

export default createLegacyMediaAnalytics;
export default createMediaAnalyticsBridge;
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import { objectOf, boolean } from "../../utils/validation/index.js";
import createCollect from "../../utils/createCollect.js";
import { mergeDecisionsMeta } from "../../utils/event.js";

const createDecisioningEngine = ({
const createRulesEngine = ({
config,
eventManager,
createNamespacedStorage,
Expand Down Expand Up @@ -134,8 +134,8 @@ const createDecisioningEngine = ({
};
};

createDecisioningEngine.namespace = "DecisioningEngine";
createDecisioningEngine.configValidators = objectOf({
createRulesEngine.namespace = "RulesEngine";
createRulesEngine.configValidators = objectOf({
personalizationStorageEnabled: boolean().default(false),
});
export default createDecisioningEngine;
export default createRulesEngine;
6 changes: 3 additions & 3 deletions src/core/componentCreators.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ governing permissions and limitations under the License.
export { default as activityCollector } from "../components/ActivityCollector/index.js";
export { default as audiences } from "../components/Audiences/index.js";
export { default as context } from "../components/Context/index.js";
export { default as decisioningEngine } from "../components/DecisioningEngine/index.js";
export { default as rulesEngine } from "../components/RulesEngine/index.js";
export { default as eventMerge } from "../components/EventMerge/index.js";
export { default as legacyMediaAnalytics } from "../components/LegacyMediaAnalytics/index.js";
export { default as mediaAnalyticsBridge } from "../components/MediaAnalyticsBridge/index.js";
export { default as personalization } from "../components/Personalization/index.js";
export { default as privacy } from "../components/Privacy/index.js";
export { default as consent } from "../components/Consent/index.js";
export { default as streamingMedia } from "../components/StreamingMedia/index.js";
2 changes: 1 addition & 1 deletion src/core/createLifecycle.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const hookNames = [
"onRequestFailure",
// A user clicked on an element.
"onClick",
// Called by DecisioningEngine when a ruleset is satisfied with a list of
// Called by RulesEngine when a ruleset is satisfied with a list of
// propositions
"onDecision",
];
Expand Down
2 changes: 1 addition & 1 deletion test/integration/customBuildSize.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const components = [
"audiences",
"personalization",
"eventmerge",
"decisioningengine",
"rulesengine",
];

// Run tests for all components
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ OF ANY KIND, either express or implied. See the License for the specific languag
governing permissions and limitations under the License.
*/

import computeConsentHash from "../../../../../src/components/Privacy/computeConsentHash.js";
import computeConsentHash from "../../../../../src/components/Consent/computeConsentHash.js";

describe("computeConsentHash", () => {
it("works", () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import configValidators from "../../../../../src/components/Privacy/configValidators.js";
import configValidators from "../../../../../src/components/Consent/configValidators.js";

describe("defaultConsent", () => {
it("validates defaultConsent=undefined", () => {
Expand Down
Loading
Loading