Got product attribute / product attribute preset deployments working

Author: mattbrailsford

Directory.Packages.props

@@ -12,6 +12,6 @@
   <ItemGroup>
     <PackageVersion Include="Umbraco.Commerce.Cms.Startup" Version="[16.0.0-rc1, 16.999.999)" />
     <PackageVersion Include="Umbraco.Commerce.Persistence.Sqlite" Version="[16.0.0-rc1, 16.999.999)" />
-    <PackageVersion Include="Umbraco.Deploy.Infrastructure" Version="[16.0.0-rc2, 16.999.999)" />
+    <PackageVersion Include="Umbraco.Deploy.Infrastructure" Version="[16.0.0-rc3, 16.999.999)" />
   </ItemGroup>
 </Project>

src/Umbraco.Commerce.Deploy/Composing/UmbracoCommerceDeployComponent.cs

@@ -59,31 +59,11 @@ private void InitializeIntegratedEntities()
             new DeployRegisteredEntityTypeDetailOptions
             {
                 SupportsQueueForTransfer = true,
-                //SupportsQueueForTransferOfDescendents = true,
+                // SupportsQueueForTransferOfDescendents = false,
                 SupportsRestore = true,
                 PermittedToRestore = true,
                 SupportsPartialRestore = true,
                 SupportsImportExport = true,
-            },
-            (string id, bool descendants, IServiceProvider provider, out UdiRange? range) =>
-            {
-                // Root folder
-                if (int.TryParse(id, out var numericId) && numericId == Cms.Constants.Trees.Stores.Ids[Cms.Constants.Trees.Stores.NodeType.ProductAttributes])
-                {
-                    range = new UdiRange(Udi.Create(UmbracoCommerceConstants.UdiEntityType.ProductAttribute), Constants.DeploySelector.DescendantsOfThis);
-                    return true;
-                }
-
-                // Single entity
-                if (Guid.TryParse(id, out Guid guidId))
-                {
-                    range = new UdiRange(Udi.Create(UmbracoCommerceConstants.UdiEntityType.ProductAttribute, guidId));
-                    return true;
-                }
-
-                // Out of range
-                range = null;
-                return false;
             });
 
         transferEntityService.RegisterTransferEntityType(
@@ -96,26 +76,6 @@ private void InitializeIntegratedEntities()
                 PermittedToRestore = true,
                 SupportsPartialRestore = true,
                 SupportsImportExport = true,
-            },
-            (string id, bool descendants, IServiceProvider provider, out UdiRange? range) =>
-            {
-                // Root folder
-                if (int.TryParse(id, out var numericId) && numericId == Cms.Constants.Trees.Stores.Ids[Cms.Constants.Trees.Stores.NodeType.ProductAttributePresets])
-                {
-                    range = new UdiRange(Udi.Create(UmbracoCommerceConstants.UdiEntityType.ProductAttributePreset), Constants.DeploySelector.DescendantsOfThis);
-                    return true;
-                }
-
-                // Single entity
-                if (Guid.TryParse(id, out Guid guidId))
-                {
-                    range = new UdiRange(Udi.Create(UmbracoCommerceConstants.UdiEntityType.ProductAttributePreset, guidId));
-                    return true;
-                }
-
-                // Out of range
-                range = null;
-                return false;
             });
     }
 

src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceEntityServiceConnectorBase.cs

@@ -91,6 +91,15 @@ public override async Task<NamedUdiRange> GetRangeAsync(
                 throw new ArgumentException("Invalid identifier.", nameof(sid));
             }
 
+            // See if the sid is a Store ID, if so, it's a root UDI
+            StoreReadOnly? store = await _umbracoCommerceApi.GetStoreAsync(result);
+            if (store != null)
+            {
+                EnsureOpenSelector(selector);
+                return new NamedUdiRange(Udi.Create(UdiEntityType), OpenUdiName, selector);
+            }
+
+            // If it's not a store ID, then is must be an entity ID
             TEntity? entity = await GetEntityAsync(result, cancellationToken).ConfigureAwait(false);
 
             if (entity == null)

src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceProductAttributePresetServiceConnector.cs

@@ -28,7 +28,7 @@ public class UmbracoCommerceProductAttributePresetServiceConnector : UmbracoComm
             "descendants"
         };
 
-        protected override string OpenUdiName => "All global:: Product Attribute Presets";
+        protected override string OpenUdiName => "All Umbraco Commerce Product Attribute Presets";
 
         public override string UdiEntityType => UmbracoCommerceConstants.UdiEntityType.ProductAttributePreset;
 

src/Umbraco.Commerce.Deploy/wwwroot/umbraco-commerce-deploy.js

@@ -1,5 +1,23 @@
 export const onInit = async (host, extensionRegistry) => {
   extensionRegistry.registerMany([
+    {
+      type: 'localization',
+      alias: 'Uc.Deploy.Localization.En',
+      weight: -100,
+      name: 'English',
+      meta: {
+        culture: 'en',
+        localizations: {
+          // Entity types
+          deploy_entityTypes: {
+            "uc:product-attribute": "Umbraco Commerce Product Attribute",
+            "uc:product-attributes": "Umbraco Commerce Product Attributes",
+            "uc:product-attribute-preset": "Umbraco Commerce Product Attribute Preset",
+            "uc:product-attribute-presets": "Umbraco Commerce Product Attribute Presets"
+          }
+        }
+      },
+    },
     {
       type: "deployEntityActionRegistrar",
       actionAlias: "Deploy.EntityAction.Queue",
@@ -11,6 +29,17 @@ export const onInit = async (host, extensionRegistry) => {
         "uc:product-attribute-preset",
         "uc:product-attribute-presets"
       ],
-    }
+    },
+    {
+      type: "deployEntityTypeMapping",
+      alias: "Uc.Deploy.EntityTypeMapping",
+      name: "Umbraco Commerce Deploy Entity Type Mapping",
+      entityTypes: {
+        "uc:product-attribute": "umbraco-commerce-product-attribute",
+        "uc:product-attributes": "umbraco-commerce-product-attribute",
+        "uc:product-attribute-preset": "umbraco-commerce-product-attribute-preset",
+        "uc:product-attribute-presets": "umbraco-commerce-product-attribute-preset"
+      },
+    },
   ]);
 };

src/Umbraco.Commerce.Deploy/wwwroot/umbraco-package.json

@@ -1,7 +1,7 @@
 {
   "id": "Umbraco.Commerce.Deploy",
   "name": "Umbraco Commerce Deploy",
-  "version": "16.0.0--rc1.preview.5.g222ad58",
+  "version": "16.0.0--rc1.preview.6.gdc53613",
   "allowTelemetry": true,
   "extensions": [
     {