From 92524d76329b2dff03091deb42ba6a932a99ef02 Mon Sep 17 00:00:00 2001 From: eknee <6667779+eknee@users.noreply.github.com> Date: Thu, 9 Apr 2020 11:43:35 -0500 Subject: [PATCH 1/3] Contains a collection of mixins in logical groupings --profile emails --profile addresses --profile phones --- schemas/context/profile-.txt | 0 schemas/context/profile-addresses.schema.json | 51 +++++++++++++++++ schemas/context/profile-emails.schema.json | 46 +++++++++++++++ schemas/context/profile-phones.schema.json | 56 +++++++++++++++++++ 4 files changed, 153 insertions(+) create mode 100644 schemas/context/profile-.txt create mode 100644 schemas/context/profile-addresses.schema.json create mode 100644 schemas/context/profile-emails.schema.json create mode 100644 schemas/context/profile-phones.schema.json diff --git a/schemas/context/profile-.txt b/schemas/context/profile-.txt new file mode 100644 index 000000000..e69de29bb diff --git a/schemas/context/profile-addresses.schema.json b/schemas/context/profile-addresses.schema.json new file mode 100644 index 000000000..3e7d7259e --- /dev/null +++ b/schemas/context/profile-addresses.schema.json @@ -0,0 +1,51 @@ +{ + "meta:license": [ + "Copyright 2018 Adobe Systems Incorporated. All rights reserved.", + "This work is licensed under a Creative Commons Attribution 4.0 International (CC BY 4.0) license", + "you may not use this file except in compliance with the License. You may obtain a copy", + "of the License at https://creativecommons.org/licenses/by/4.0/" + ], + "$id": "https://ns.adobe.com/xdm/context/profile-addresses", + "$schema": "http://json-schema.org/draft-06/schema#", + "title": "Profile Addresses", + "type": "object", + "meta:extensible": true, + "meta:abstract": true, + "meta:intendedToExtend": ["https://ns.adobe.com/xdm/context/profile"], + "description": "Contains the various addresses a single profile can contain", + "definitions": { + "profile-addresses": { + "properties": { + "xdm:homeAddress": { + "title": "Home Address", + "$ref": "https://ns.adobe.com/xdm/common/address", + "description": "A home postal address." + }, + "xdm:workAddress": { + "title": "Work Address", + "$ref": "https://ns.adobe.com/xdm/common/address", + "description": "A work postal address." + }, + "xdm:shippingAddress": { + "title": "Shipping Address", + "$ref": "https://ns.adobe.com/xdm/common/address", + "description": "A mailing postal address." + }, + "xdm:directMarketingAddress": { + "title": "Direct Marketing Address", + "$ref": "https://ns.adobe.com/xdm/context/directmarketing-address", + "description": "Direct Marketing postal address." + } + } + } + }, + "allOf": [ + { + "$ref": "https://ns.adobe.com/xdm/common/extensible#/definitions/@context" + }, + { + "$ref": "#/definitions/profile-addresses" + } + ], + "meta:status": "experimental" +} diff --git a/schemas/context/profile-emails.schema.json b/schemas/context/profile-emails.schema.json new file mode 100644 index 000000000..15ffaf3b0 --- /dev/null +++ b/schemas/context/profile-emails.schema.json @@ -0,0 +1,46 @@ +{ + "meta:license": [ + "Copyright 2018 Adobe Systems Incorporated. All rights reserved.", + "This work is licensed under a Creative Commons Attribution 4.0 International (CC BY 4.0) license", + "you may not use this file except in compliance with the License. You may obtain a copy", + "of the License at https://creativecommons.org/licenses/by/4.0/" + ], + "$id": "https://ns.adobe.com/xdm/context/profile-emails", + "$schema": "http://json-schema.org/draft-06/schema#", + "title": "Profile Emails", + "type": "object", + "meta:extensible": true, + "meta:abstract": true, + "meta:intendedToExtend": ["https://ns.adobe.com/xdm/context/profile"], + "description": "Contains the various email types a single profile can contain", + "definitions": { + "profile-emails": { + "properties": { + "xdm:personalEmail": { + "title": "Personal Email", + "$ref": "https://ns.adobe.com/xdm/context/emailaddress", + "description": "A personal email address." + }, + "xdm:workEmail": { + "title": "Work Email", + "$ref": "https://ns.adobe.com/xdm/context/emailaddress", + "description": "A work email address." + }, + "xdm:directMarketingEmail": { + "title": "Direct Marketing Email", + "$ref": "https://ns.adobe.com/xdm/context/directmarketing-emailaddress", + "description": "Direct Marketing email address." + } + } + } + }, + "allOf": [ + { + "$ref": "https://ns.adobe.com/xdm/common/extensible#/definitions/@context" + }, + { + "$ref": "#/definitions/profile-emails" + } + ], + "meta:status": "experimental" +} diff --git a/schemas/context/profile-phones.schema.json b/schemas/context/profile-phones.schema.json new file mode 100644 index 000000000..ec81847e8 --- /dev/null +++ b/schemas/context/profile-phones.schema.json @@ -0,0 +1,56 @@ +{ + "meta:license": [ + "Copyright 2018 Adobe Systems Incorporated. All rights reserved.", + "This work is licensed under a Creative Commons Attribution 4.0 International (CC BY 4.0) license", + "you may not use this file except in compliance with the License. You may obtain a copy", + "of the License at https://creativecommons.org/licenses/by/4.0/" + ], + "$id": "https://ns.adobe.com/xdm/context/profile-phones", + "$schema": "http://json-schema.org/draft-06/schema#", + "title": "Profile Addresses", + "type": "object", + "meta:extensible": true, + "meta:abstract": true, + "meta:intendedToExtend": ["https://ns.adobe.com/xdm/context/profile"], + "description": "Contains the various phone numbers a single profile can contain", + "definitions": { + "profile-phones": { + "properties": { + "xdm:homePhone": { + "title": "Home Phone", + "$ref": "https://ns.adobe.com/xdm/context/phonenumber", + "description": "Home phone number." + }, + "xdm:mobilePhone": { + "title": "Mobile Phone", + "$ref": "https://ns.adobe.com/xdm/context/phonenumber", + "description": "Mobile phone number." + }, + "xdm:workPhone": { + "title": "Work Phone", + "$ref": "https://ns.adobe.com/xdm/context/phonenumber", + "description": "Work phone number." + }, + "xdm:faxPhone": { + "title": "Fax Phone", + "$ref": "https://ns.adobe.com/xdm/context/phonenumber", + "description": "Fax phone number." + }, + "xdm:directMarketingPhone": { + "title": "Direct Marketing Phone", + "$ref": "https://ns.adobe.com/xdm/context/directmarketing-phonenumber", + "description": "Direct Marketing phone number." + } + } + } + }, + "allOf": [ + { + "$ref": "https://ns.adobe.com/xdm/common/extensible#/definitions/@context" + }, + { + "$ref": "#/definitions/profile-phones" + } + ], + "meta:status": "experimental" +} From cd5fac9868447992fd6c9d6e0ed20a530ca413d3 Mon Sep 17 00:00:00 2001 From: eknee <6667779+eknee@users.noreply.github.com> Date: Thu, 9 Apr 2020 13:11:14 -0500 Subject: [PATCH 2/3] Samples added for new mixins --- .../context/profile-addresses.example.1.json | 44 +++++++++++++++++++ schemas/context/profile-addresses.schema.json | 7 +-- schemas/context/profile-emails.example.1.json | 16 +++++++ schemas/context/profile-emails.schema.json | 5 --- schemas/context/profile-phones.example.1.json | 22 ++++++++++ schemas/context/profile-phones.schema.json | 5 --- 6 files changed, 83 insertions(+), 16 deletions(-) create mode 100644 schemas/context/profile-addresses.example.1.json create mode 100644 schemas/context/profile-emails.example.1.json create mode 100644 schemas/context/profile-phones.example.1.json diff --git a/schemas/context/profile-addresses.example.1.json b/schemas/context/profile-addresses.example.1.json new file mode 100644 index 000000000..26101f2f6 --- /dev/null +++ b/schemas/context/profile-addresses.example.1.json @@ -0,0 +1,44 @@ +{ + "xdm:homeAddress": { + "@id": "https://data.adobe.io/entities/address/123", + "xdm:primary": false, + "xdm:street1": "345 Park Ave", + "xdm:city": "San Jose", + "xdm:stateProvince": "US-CA", + "xdm:postalCode": "95110", + "xdm:country": "United States", + "xdm:countryCode": "US", + "schema:latitude": 37.3382, + "schema:longitude": 121.8863, + "xdm:status": "active", + "xdm:lastVerifiedDate": "2018-01-02" + }, + "xdm:workAddress": { + "@id": "https://data.adobe.io/entities/address/123", + "xdm:primary": false, + "xdm:street1": "345 Park Ave", + "xdm:city": "San Jose", + "xdm:stateProvince": "US-CA", + "xdm:postalCode": "95110", + "xdm:country": "United States", + "xdm:countryCode": "US", + "schema:latitude": 37.3382, + "schema:longitude": 121.8863, + "xdm:status": "active", + "xdm:lastVerifiedDate": "2018-01-02" + }, + "xdm:shippingAddress": { + "@id": "https://data.adobe.io/entities/address/123", + "xdm:primary": false, + "xdm:street1": "345 Park Ave", + "xdm:city": "San Jose", + "xdm:stateProvince": "US-CA", + "xdm:postalCode": "95110", + "xdm:country": "United States", + "xdm:countryCode": "US", + "schema:latitude": 37.3382, + "schema:longitude": 121.8863, + "xdm:status": "active", + "xdm:lastVerifiedDate": "2018-01-02" + } +} \ No newline at end of file diff --git a/schemas/context/profile-addresses.schema.json b/schemas/context/profile-addresses.schema.json index 3e7d7259e..c1b679522 100644 --- a/schemas/context/profile-addresses.schema.json +++ b/schemas/context/profile-addresses.schema.json @@ -30,12 +30,7 @@ "title": "Shipping Address", "$ref": "https://ns.adobe.com/xdm/common/address", "description": "A mailing postal address." - }, - "xdm:directMarketingAddress": { - "title": "Direct Marketing Address", - "$ref": "https://ns.adobe.com/xdm/context/directmarketing-address", - "description": "Direct Marketing postal address." - } + } } } }, diff --git a/schemas/context/profile-emails.example.1.json b/schemas/context/profile-emails.example.1.json new file mode 100644 index 000000000..82aa1d31e --- /dev/null +++ b/schemas/context/profile-emails.example.1.json @@ -0,0 +1,16 @@ +{ + "xdm:personalEmail": { + "xdm:primary": false, + "xdm:address": "jsmith@xyzinc.com", + "xdm:label": "John Smith", + "xdm:type": "work", + "xdm:status": "active" + }, + "xdm:workEmail": { + "xdm:primary": false, + "xdm:address": "jsmith@xyzinc.com", + "xdm:label": "John Smith", + "xdm:type": "work", + "xdm:status": "active" + } +} \ No newline at end of file diff --git a/schemas/context/profile-emails.schema.json b/schemas/context/profile-emails.schema.json index 15ffaf3b0..d24200d38 100644 --- a/schemas/context/profile-emails.schema.json +++ b/schemas/context/profile-emails.schema.json @@ -25,11 +25,6 @@ "title": "Work Email", "$ref": "https://ns.adobe.com/xdm/context/emailaddress", "description": "A work email address." - }, - "xdm:directMarketingEmail": { - "title": "Direct Marketing Email", - "$ref": "https://ns.adobe.com/xdm/context/directmarketing-emailaddress", - "description": "Direct Marketing email address." } } } diff --git a/schemas/context/profile-phones.example.1.json b/schemas/context/profile-phones.example.1.json new file mode 100644 index 000000000..a517a0c2a --- /dev/null +++ b/schemas/context/profile-phones.example.1.json @@ -0,0 +1,22 @@ +{ + "xdm:homePhone": { + "xdm:primary": true, + "xdm:number": "1-408-888-8888", + "xdm:status": "active" + }, + "xdm:mobilePhone": { + "xdm:primary": true, + "xdm:number": "1-408-888-8888", + "xdm:status": "active" + }, + "xdm:workPhone": { + "xdm:primary": true, + "xdm:number": "1-408-888-8888", + "xdm:status": "active" + }, + "xdm:faxPhone": { + "xdm:primary": true, + "xdm:number": "1-408-888-8888", + "xdm:status": "active" + } +} \ No newline at end of file diff --git a/schemas/context/profile-phones.schema.json b/schemas/context/profile-phones.schema.json index ec81847e8..2e9d84e0e 100644 --- a/schemas/context/profile-phones.schema.json +++ b/schemas/context/profile-phones.schema.json @@ -35,11 +35,6 @@ "title": "Fax Phone", "$ref": "https://ns.adobe.com/xdm/context/phonenumber", "description": "Fax phone number." - }, - "xdm:directMarketingPhone": { - "title": "Direct Marketing Phone", - "$ref": "https://ns.adobe.com/xdm/context/directmarketing-phonenumber", - "description": "Direct Marketing phone number." } } } From a3093a2dbdaf28b61e7eacd0fe78186e892d91e7 Mon Sep 17 00:00:00 2001 From: Prabhakar Muriki <34528438+prabhum2@users.noreply.github.com> Date: Mon, 13 Apr 2020 12:26:03 -0700 Subject: [PATCH 3/3] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 29a087a08..904b25fd8 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "aem_user": "packageUser", "aem_password": "override me securely", "markdown-importer-version": "0.0.4", - "schemas": 266 + "schemas": 269 }, "scripts": { "clean": "rm -rf docs/reference",