Save product ids only

Author: acoumb

src/Umbraco.Cms.Integrations.Commerce.Shopify/Api/Management/Controllers/GetListByIdsController.cs

@@ -16,11 +16,11 @@ public GetListByIdsController(IOptions<ShopifySettings> shopifySettings, IShopif
         {
         }
 
-        [HttpGet("list-by-ids")]
+        [HttpPost("list-by-ids")]
         [ProducesResponseType(typeof(ResponseDto<ProductsListDto>), StatusCodes.Status200OK)]
         public async Task<IActionResult> GetListByIds([FromBody] RequestDto dto)
         {
-            var result = await ShopifyService.GetProductsByIds(dto.Ids.Select(p => (long.Parse(p))).ToArray());
+            var result = await ShopifyService.GetProductsByIds(dto.Ids.Select(p => p).ToArray());
             return Ok(result);
         }
     }

src/Umbraco.Cms.Integrations.Commerce.Shopify/Client/generated/services.gen.ts

@@ -79,7 +79,7 @@ export class ShopifyService {
      */
     public static getListByIds(data: GetListByIdsData = {}): CancelablePromise<GetListByIdsResponse> {
         return __request(OpenAPI, {
-            method: 'GET',
+            method: 'POST',
             url: '/umbraco/shopify/management/api/v1/list-by-ids',
             body: data.requestBody,
             mediaType: 'application/json',

src/Umbraco.Cms.Integrations.Commerce.Shopify/Client/generated/types.gen.ts

@@ -160,7 +160,7 @@ export type $OpenApiTs = {
         };
     };
     '/umbraco/shopify/management/api/v1/list-by-ids': {
-        get: {
+        post: {
             req: GetListByIdsData;
             res: {
                 /**

src/Umbraco.Cms.Integrations.Commerce.Shopify/Client/src/context/shopify.context.ts

@@ -2,7 +2,7 @@ import { UmbControllerBase } from "@umbraco-cms/backoffice/class-api";
 import { UmbContextToken } from "@umbraco-cms/backoffice/context-api";
 import type { UmbControllerHost } from "@umbraco-cms/backoffice/controller-api";
 import { ShopifyRepository } from "../repository/shopify.repository";
-import { EditorSettingsModel, type OAuthRequestDtoModel } from "@umbraco-integrations/shopify/generated";
+import { EditorSettingsModel, RequestDtoModel, type OAuthRequestDtoModel } from "@umbraco-integrations/shopify/generated";
 import { UmbObjectState } from "@umbraco-cms/backoffice/observable-api";
 
 export class ShopifyContext extends UmbControllerBase{
@@ -44,8 +44,8 @@ export class ShopifyContext extends UmbControllerBase{
         return await this.#repository.getList(pageInfo);
     }
 
-    async getListByIds(){
-        return await this.#repository.getListByIds();
+    async getListByIds(model: RequestDtoModel){
+        return await this.#repository.getListByIds(model);
     }
 
     async getTotalPages(){

src/Umbraco.Cms.Integrations.Commerce.Shopify/Client/src/modal/shopify-products-modal.element.ts

@@ -214,9 +214,9 @@ export default class ShopifyProductsModalElement extends UmbModalBaseElement<Sho
 		});
 	}
 
-    async #loadSelectionItems(){
+    async #loadSelectionItems() {
         this._selection = this.data!.selectedItemIdList;
-        this._addUpToItems = this.data?.config?.maxItems! - this.data?.config?.minItems!;
+        this._addUpToItems = (this.data?.config?.maxItems ? this.data?.config?.maxItems : 0) - (this.data?.config?.minItems ? this.data?.config?.minItems : 0);
     }
 
     #onSelected(event: UmbTableSelectedEvent) {
@@ -273,9 +273,9 @@ export default class ShopifyProductsModalElement extends UmbModalBaseElement<Sho
     }
 
     _onSubmit() {
-        if(this._numberOfSelection > this.data?.config?.maxItems! || this._numberOfSelection < this.data?.config?.minItems!){
+        if (this._addUpToItems != 0 && this._numberOfSelection > this._addUpToItems) {
             this._showError("Please select the amount of items that has been configured in the setting.");
-        }else{
+        } else {
             if(this._numberOfSelection == 0){
                 this._rejectModal();
             }
@@ -319,12 +319,16 @@ export default class ShopifyProductsModalElement extends UmbModalBaseElement<Sho
                     ${this.#renderPagination()}
                 </uui-box>
 
-                <div class="maximum-selection">
-                    <span>
-                        Add up to ${this._addUpToItems} items(s)
-                    </span>
-                </div>
-
+                ${this._addUpToItems > 0
+                    ? html`
+                        <div class="maximum-selection">
+                            <span>
+                                Add up to ${this._addUpToItems} items(s)
+                            </span>
+                        </div>
+                    `
+                    : nothing
+                }
                 <uui-button look="primary"  slot="actions" label="Submit" @click=${this._onSubmit}></uui-button>
                 <uui-button slot="actions" label="Close" @click=${this._rejectModal}></uui-button>
             </umb-body-layout>

src/Umbraco.Cms.Integrations.Commerce.Shopify/Client/src/property-editor/shopify-product-picker-property-editor.element.ts

@@ -6,7 +6,7 @@ import {
 import { SHOPIFY_MODAL_TOKEN } from "../modal/shopify.modal-token";
 import { ConfigDescription, type ShopifyServiceStatus } from "../models/shopify-service.model";
 import { SHOPIFY_CONTEXT_TOKEN } from "../context/shopify.context";
-import type { EditorSettingsModel, ProductDtoModel } from "@umbraco-integrations/shopify/generated";
+import type { EditorSettingsModel, ProductDtoModel, RequestDtoModel } from "@umbraco-integrations/shopify/generated";
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry';
 import type { UmbPropertyEditorConfigCollection } from "@umbraco-cms/backoffice/property-editor";
@@ -16,6 +16,7 @@ const elementName = "shopify-product-picker";
 
 @customElement(elementName)
 export class ShopifyProductPickerPropertyEditor extends UmbLitElement implements UmbPropertyEditorUiElement {
+    #shopifyContext!: typeof SHOPIFY_CONTEXT_TOKEN.TYPE;
     #modalManagerContext?: typeof UMB_MODAL_MANAGER_CONTEXT.TYPE;
     #settingsModel?: EditorSettingsModel;
 
@@ -57,6 +58,7 @@ export class ShopifyProductPickerPropertyEditor extends UmbLitElement implements
         });
         this.consumeContext(SHOPIFY_CONTEXT_TOKEN, (context) => {
             if (!context) return;
+            this.#shopifyContext = context;
             this.observe(context.settingsModel, (settingsModel) => {
                 this.#settingsModel = settingsModel;
             });
@@ -81,8 +83,18 @@ export class ShopifyProductPickerPropertyEditor extends UmbLitElement implements
 
         if (this.value == null || this.value.length == 0) return;
 
-        const dto: Array<ProductDtoModel> = JSON.parse(JSON.stringify(this.value));
-        this.products = dto;
+        await this.#getProducts();
+    }
+
+    async #getProducts() {
+        const model: RequestDtoModel = {
+            ids: JSON.parse(JSON.stringify(this.value))
+        };
+
+        const { data } = await this.#shopifyContext.getListByIds(model);
+        if (!data) return;
+
+        this.products = data.result.products;
     }
 
     private async _openModal() {
@@ -97,8 +109,8 @@ export class ShopifyProductPickerPropertyEditor extends UmbLitElement implements
         const data = await pickerContext?.onSubmit();
         if (!data) return;
 
-        this.value = JSON.stringify(data.productList);
-        this.products = JSON.parse(this.value);
+        this.value = JSON.stringify(data.productList.map(product => product.id));
+        this.products = data.productList;
         this.dispatchEvent(new CustomEvent('property-value-change'));
     }
 
@@ -112,7 +124,7 @@ export class ShopifyProductPickerPropertyEditor extends UmbLitElement implements
     deleteForm(id: number){
         var index = this.products.map(p => p.id).indexOf(id);
         this.products.splice(index, 1);
-        this.value = JSON.stringify(this.products);
+        this.value = JSON.stringify(this.products.map(product => product.id));
         this.dispatchEvent(new CustomEvent('property-value-change'));
     }
 

src/Umbraco.Cms.Integrations.Commerce.Shopify/Client/src/repository/shopify.repository.ts

@@ -1,7 +1,7 @@
 import { UmbControllerBase } from "@umbraco-cms/backoffice/class-api";
 import type { UmbControllerHost } from "@umbraco-cms/backoffice/controller-api";
 import { tryExecuteAndNotify } from "@umbraco-cms/backoffice/resources";
-import { ShopifyService, type OAuthRequestDtoModel } from "@umbraco-integrations/shopify/generated";
+import { ShopifyService, type OAuthRequestDtoModel, RequestDtoModel } from "@umbraco-integrations/shopify/generated";
 
 export class ShopifyRepository extends UmbControllerBase {
     constructor(host: UmbControllerHost) {
@@ -58,8 +58,10 @@ export class ShopifyRepository extends UmbControllerBase {
         return { data };
     }
 
-    async getListByIds(){
-        const { data, error } = await tryExecuteAndNotify(this, ShopifyService.getListByIds());
+    async getListByIds(model: RequestDtoModel) {
+        const { data, error } = await tryExecuteAndNotify(this, ShopifyService.getListByIds({
+            requestBody: model
+        }));
 
         if (error || !data) {
             return { error };

src/Umbraco.Cms.Integrations.Commerce.Shopify/Constants.cs

@@ -18,9 +18,7 @@ public static class Constants
 
         public static class RenderingComponent
         {
-            public const string DefaultV8ViewPath = ViewFolderPath + "/Render/Products.cshtml";
-
-            public const string DefaultV9ViewPath = ViewFolderPath + "/Render/ProductsV9.cshtml";
+            public const string DefaultViewPath = ViewFolderPath + "/Render/Products.cshtml";
         }
 
         public static class ManagementApi

src/Umbraco.Cms.Integrations.Commerce.Shopify/Editors/ShopifyProductPickerValueConverter.cs

@@ -1,4 +1,5 @@
-using Umbraco.Cms.Core.Models.PublishedContent;
+using Newtonsoft.Json;
+using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Integrations.Commerce.Shopify.Models.ViewModels;
 using Umbraco.Cms.Integrations.Commerce.Shopify.Services;
@@ -27,10 +28,7 @@ public override object ConvertSourceToIntermediate(IPublishedElement owner, IPub
         {
             if (source == null) return null;
 
-            return source.ToString()
-                .Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries)
-                .Select(long.Parse)
-                .ToArray();
+            return JsonConvert.DeserializeObject<long[]>(source.ToString());
         }
 
         public override object ConvertIntermediateToObject(IPublishedElement owner, IPublishedPropertyType propertyType,

src/Umbraco.Cms.Integrations.Commerce.Shopify/Helpers/HtmlHelper.cs

@@ -9,7 +9,7 @@ public static class ShopifyHtmlExtensions
     {
         public static IHtmlContent RenderShopifyProductsList(this IHtmlHelper<dynamic> htmlHelper, List<ProductViewModel> vm, string renderingViewPath = "")
         {
-            return htmlHelper.Partial(string.IsNullOrEmpty(renderingViewPath) ? Constants.RenderingComponent.DefaultV9ViewPath : renderingViewPath, vm);
+            return htmlHelper.Partial(string.IsNullOrEmpty(renderingViewPath) ? Constants.RenderingComponent.DefaultViewPath : renderingViewPath, vm);
         }
     }
 }