Merge pull request #19 from adobe/master

Merge latest from origin/master
adobe · Sep 26, 2020 · fae01d1 · fae01d1
2 parents c347883 + 3268980
commit fae01d1
Show file tree

Hide file tree

Showing 49 changed files with 1,428 additions and 1,195 deletions.
diff --git a/STABILIZING.md b/STABILIZING.md
@@ -1,6 +1,6 @@
 # Stabilization Candidates
 
-_Generated on **Tue Sep 22 2020 03:51:36 GMT+0000 (UTC)**_
+_Generated on **Wed Sep 23 2020 19:21:44 GMT+0000 (UTC)**_
 
 
 ### Unknown Status, needs immediate attention

diff --git a/components/datatypes/device.schema.json b/components/datatypes/device.schema.json
@@ -84,6 +84,33 @@
           "meta:enum": {
             "portrait": "Portrait",
             "landscape": "Landscape"
+          },
+          "xdm:isBackgroundPushEnabled": {
+            "title": "Background Push Enabled Flag",
+            "type": "boolean",
+            "description": "For devices like mobile , this tracks the system background push enabled permision status."
+          },
+          "xdm:isLocationEnabled": {
+            "title": "Location Enabled Flag",
+            "type": "boolean",
+            "description": "Indicates whether or not the device has location services enabled."
+          },
+          "xdm:locationPermission": {
+            "title": "Location Permission",
+            "type": "string",
+            "description": "Tracks the device location permision attribute setting.",
+            "enum": [
+              "SYSTEM_LOCATION_DISABLED",
+              "NOT_ALLOWED",
+              "ALWAYS_ALLOWED",
+              "FOREGROUND_ALLOWED",
+              "UNPROMPTED"
+            ]
+          },
+          "xdm:isPushOptIn": {
+            "title": "Push Opt In Flag",
+            "type": "boolean",
+            "description": "Indicates whether or not the device opted-in to receive push notifications."
           }
         }
       }

diff --git a/components/datatypes/placecontext.schema.json b/components/datatypes/placecontext.schema.json
@@ -20,6 +20,11 @@
           "format": "date-time",
           "description": "The local time using RFC3339 with a stated time zone offset such as \"2001-07-04T12:08:56-07:00\". An example formatting pattern is \"yyyy-MM-dd'T'HH:mm:ssXXX\"."
         },
+        "xdm:ianaTimezone": {
+          "title": "Iana Timezone",
+          "type": "string",
+          "description": "Timezone of the device represented as a standard timezone string. https://en.wikipedia.org/wiki/List_of_tz_database_time_zones."
+        },
         "xdm:localTimezoneOffset": {
           "title": "Local time zone offset",
           "type": "integer",

diff --git a/components/datatypes/product.schema.json b/components/datatypes/product.schema.json
@@ -22,7 +22,13 @@
         "xdm:SKU": {
           "title": "SKU",
           "type": "string",
-          "description": "The unique SKU (stock keeping unit) of the product assigned by the vendor."
+          "description": "The unique SKU (stock keeping unit) of the product assigned by the vendor.",
+          "meta:descriptors": [
+            {
+              "@type": "xdm:searchdescriptor",
+              "search:indexed": true
+            }
+          ]
         },
         "xdm:name": {
           "title": "Name",
@@ -32,7 +38,19 @@
         "schema:description": {
           "title": "Description",
           "type": "string",
-          "description": "The localized description of the product."
+          "description": "The localized description of the product.",
+          "meta:status": "deprecated"
+        },
+        "xdm:productDescription": {
+          "title": "Description",
+          "type": "string",
+          "description": "The localized description of the product.",
+          "meta:descriptors": [
+            {
+              "@type": "xdm:searchdescriptor",
+              "search:indexed": true
+            }
+          ]
         },
         "xdm:category": {
           "title": "Category",
@@ -47,7 +65,13 @@
         "xdm:brand": {
           "title": "Brand",
           "type": "string",
-          "description": "The brand of the product."
+          "description": "The brand of the product.",
+          "meta:descriptors": [
+            {
+              "@type": "xdm:searchdescriptor",
+              "search:indexed": true
+            }
+          ]
         },
         "xdm:masterProductID": {
           "title": "Master product identifier",
@@ -73,7 +97,19 @@
         "xdm:fabrication": {
           "title": "Fabrication",
           "type": "string",
-          "description": "Primary material of the product construction."
+          "description": "Primary material of the product construction.",
+          "meta:status": "deprecated"
+        },
+        "xdm:material": {
+          "title": "Material",
+          "type": "string",
+          "description": "Primary material of the product construction.",
+          "meta:descriptors": [
+            {
+              "@type": "xdm:searchdescriptor",
+              "search:indexed": true
+            }
+          ]
         },
         "xdm:gender": {
           "title": "Gender",

diff --git a/components/mixins/shared/external-source-system-audit-details.schema.json b/components/mixins/shared/external-source-system-audit-details.schema.json
@@ -10,13 +10,7 @@
   "title": "External Source System Audit Details Mixin",
   "type": "object",
   "meta:extensible": true,
-  "meta:intendedToExtend": [
-    "https://ns.adobe.com/xdm/context/opportunity",
-    "https://ns.adobe.com/xdm/context/account",
-    "https://ns.adobe.com/xdm/context/opportunity-contactrole",
-    "https://ns.adobe.com/xdm/context/activitylog",
-    "https://ns.adobe.com/xdm/context/profile"
-  ],
+  "meta:intendedToExtend": [],
   "description": "Mixin which defines a set a audit properties for extenal sources.",
   "definitions": {
     "externalSourceSystemAuditDetails": {

diff --git a/components/mixins/shared/identitymap.schema.json b/components/mixins/shared/identitymap.schema.json
@@ -10,12 +10,7 @@
   "title": "IdentityMap",
   "type": "object",
   "meta:extensible": true,
-  "meta:intendedToExtend": [
-    "https://ns.adobe.com/xdm/context/profile",
-    "https://ns.adobe.com/xdm/context/experienceevent",
-    "https://ns.adobe.com/xdm/context/segmentdefinition",
-    "https://ns.adobe.com/experience/audiencemanager/segmentfolder"
-  ],
+  "meta:intendedToExtend": [],
   "description": "Defines a map containing a set of end user identities, keyed on either namespace integration code or the namespace ID of the identity.  The values of the map are an array, meaning that more than one identity of each namespace may be carried.",
   "definitions": {
     "identitymap": {