14.1.0: fix property value extractor does not work; add a toggle to include tax to price (#13)

* move product feeds menu to the bottom of store settings menu

* Remove appsettings-schemas

* Fix property value extractor dropdown does not work

* Remove more schema.json

* add a toggle in the settings to add tax into the feed price; fix exception in multi media picker value extractor

* bump version number

* Remove dependency on commerce rc

Author: umbracotrd

.gitignore

@@ -477,3 +477,5 @@ $RECYCLE.BIN/
 **/wwwroot/**
 src/**/packages.lock.json
 tests/**/packages.lock.json
+**/appsettings-schema.**
+**/umbraco-package-schema.json

Directory.Packages.props

@@ -20,7 +20,7 @@
     <PackageVersion Include="Umbraco.Cms" Version="[14.0.0, 15)" />
     <PackageVersion Include="Umbraco.Cms.Web.Website" Version="[14.0.0, 15)" />
     <PackageVersion Include="Umbraco.Cms.Web.BackOffice" Version="[14.0.0, 15)" />
-    <PackageVersion Include="Umbraco.Commerce" Version="[14.0.0-rc3, 15)" />
+    <PackageVersion Include="Umbraco.Commerce" Version="[14.0.0, 15)" />
     <PackageVersion Include="coverlet.collector" Version="6.0.0" />
     <PackageVersion Include="xunit" Version="2.6.6" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6" />

README.md

@@ -13,6 +13,7 @@ With the Umbraco.Commerce.ProductFeeds installed you will be able to configure p
 
 
 ## Migrate from v13 and v0.5.5 to v14
+- Migrate directly to v14.1.0 instead of v14.0.0. There's a bug that prevents you from changing property value extractor in the feed settings.
 - Due to the change in schema of Product Document Type and Product Child Variant Types, you will need to manually edit your feed settings. Please go the the feed settings and find the [obsolete] properties and migrate them to the newer one
 ![image](https://github.com/user-attachments/assets/36d48973-11dc-49f2-b744-432152458419)
 

src/Umbraco.Commerce.ProductFeeds.Client/frontend/openapi-ts.config.ts

@@ -4,7 +4,7 @@ export default defineConfig({
     client: '@hey-api/client-axios',
     // client: '@hey-api/client-fetch',
     // client: 'legacy/fetch',
-    input: 'http://localhost:43252/umbraco/swagger/ucproductfeeds/swagger.json',
+    input: 'http://localhost:44321/umbraco/swagger/ucproductfeeds/swagger.json',
     output: {
         path: 'src/generated/apis',
         lint: 'eslint',

src/Umbraco.Commerce.ProductFeeds.Client/frontend/src/generated/apis/types.gen.ts

@@ -33,6 +33,7 @@ export type ProductFeedSettingReadModel = {
     productChildVariantTypeIds: Array<(string)>;
     feedRelativePath: string;
     propertyNameMappings: Array<(PropertyAndNodeMapItem)>;
+    includeTaxInPrice: boolean;
 };
 
 export type ProductFeedSettingWriteModel = {
@@ -54,6 +55,7 @@ export type ProductFeedSettingWriteModel = {
     propertyNameMappings: Array<(PropertyAndNodeMapItem)>;
     productChildVariantTypeIds: Array<(string)>;
     productDocumentTypeIds: Array<(string)>;
+    includeTaxInPrice: boolean;
 };
 
 export type ProductFeedType = 'GoogleMerchantCenter';

src/Umbraco.Commerce.ProductFeeds.Client/frontend/src/lang/en.ts

@@ -23,6 +23,9 @@ export default {
         'propProductRootIdLabel': 'Product Root',
         'propProductRootIdDescription': 'Select the root for products. Only products under this root will be included in the feed.',
 
+        'propIncludeTaxInPriceLabel': 'Include Tax In Price',
+        'propIncludeTaxInPriceDescription': 'For countries like US and Canada, you need to show price without tax, for most other countries, you should show price with tax.',
+
         'propPropNodeMappingLabel': 'Product Property And Feed Node Mapping',
         'propPropNodeMappingDescription': 'Map between product property alias and the feed node under \\<item\\>.',
 

src/Umbraco.Commerce.ProductFeeds.Client/frontend/src/uc-menu-manifest.ts

@@ -11,5 +11,5 @@ export const storeMenuManifests: UcManifestStoreMenuItem = {
         entityType: listingWorkspaceManifest.meta.entityType,
         icon: 'icon-rss',
     },
-    weight: 9999,
+    weight: -1000,
 };

src/Umbraco.Commerce.ProductFeeds.Client/frontend/src/workspaces/details/components/ucpf-property-node-mapper.ts

@@ -128,8 +128,8 @@ export class UcpfPropNodeMapper extends UmbLitElement {
                         selected: mapItem.valueExtractorName === extractor.value,
                     };
                 })}
-                        .title=${mapItem.valueExtractorName ?? ''}
-                        @change = ${(e: CustomEvent) => this.#onMapItemChange(e, mapItem.uiId)}>
+                        @change=${(e: CustomEvent) => this.#onMapItemChange(e, mapItem.uiId)}
+                        title=${mapItem.valueExtractorName ?? ''}>
                     </uui-select>
                     <uui-button
                         @click=${() => this.#onRemoveItemClick(mapItem.uiId)}

src/Umbraco.Commerce.ProductFeeds.Client/frontend/src/workspaces/details/views/details.element.ts

@@ -1,5 +1,5 @@
 import type { UmbWorkspaceViewElement } from '@umbraco-cms/backoffice/extension-registry';
-import type { UUIEvent, UUIInputElement, UUISelectElement } from '@umbraco-cms/backoffice/external/uui';
+import type { UUIBooleanInputElement, UUIEvent, UUIInputElement, UUISelectElement } from '@umbraco-cms/backoffice/external/uui';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import {
     customElement,
@@ -89,6 +89,16 @@ export class UcpfDetailsWorkspaceViewElement
         }
     }
 
+    #onCheckboxChange(evt: UUIEvent) {
+        const checkboxEl = evt.target as UUIBooleanInputElement;
+        if (checkboxEl) {
+            this.#workspaceContext?.setModel({
+                ...this._model!,
+                [checkboxEl.name]: checkboxEl.checked,
+            });
+        }
+    }
+
     #onSelectElementChange(evt: UUIEvent) {
         const selectEl = evt.target as UUISelectElement;
         if (selectEl) {
@@ -103,15 +113,15 @@ export class UcpfDetailsWorkspaceViewElement
         const selections = event.target.selection ?? [];
         this.#workspaceContext?.setModel({
             ...this._model!,
-            productRootId: selections.join(','),
+            productRootId: selections.join(',') || undefined,
         });
 
         // this.#validateForm(); // TODO Dinh
     }
 
     #onProductDocumentTypeIdsChange(event: Event) {
         const element = event.target as UmbInputDocumentTypeElement;
-        if (element.value) {
+        if (element) {
             this.#workspaceContext?.setModel({
                 ...this._model!,
                 productDocumentTypeIds: element.selection,
@@ -121,7 +131,7 @@ export class UcpfDetailsWorkspaceViewElement
 
     #onProductChildVariantTypeIdsChange(event: Event) {
         const element = event.target as UmbInputDocumentTypeElement;
-        if (element.value) {
+        if (element) {
             this.#workspaceContext?.setModel({
                 ...this._model!,
                 productChildVariantTypeIds: element.selection,
@@ -133,7 +143,7 @@ export class UcpfDetailsWorkspaceViewElement
         return () => {
             this.#workspaceContext?.setModel({
                 ...this._model!,
-                [propName]: '',
+                [propName]: undefined,
             });
         };
     }
@@ -212,6 +222,7 @@ export class UcpfDetailsWorkspaceViewElement
                             name='productDocumentTypeIds'
                             slot='editor'
                             @change=${this.#onProductDocumentTypeIdsChange}
+                            ?documentTypesOnly=${true}
                             .selection=${this._model?.productDocumentTypeIds ?? []}
                         ></umb-input-document-type>
                     </umb-property-layout>
@@ -259,19 +270,30 @@ export class UcpfDetailsWorkspaceViewElement
                         ${this._model?.productRootId && html`<uui-button class='ucpf-clearPropButton' slot='editor' look='secondary' @click=${this.#onClearInputClick('productRootId')} label=${this.localize.term('general_remove')}></uui-button>`}
                     </umb-property-layout>
 
+                    <umb-property-layout
+                        label=${this.localize.term('ucProductFeeds_propIncludeTaxInPriceLabel')}
+                        description=${this.localize.term('ucProductFeeds_propIncludeTaxInPriceDescription')}
+                    >
+                        <uui-toggle
+                            slot="editor"
+                            label=""
+                            name="includeTaxInPrice"
+                            @change=${this.#onCheckboxChange}
+                            ?checked=${!!this._model?.includeTaxInPrice}
+                        ></uui-toggle>
+                    </umb-property-layout>
+
                     <umb-property-layout
                         label=${this.localize.term('ucProductFeeds_propPropNodeMappingLabel')}
                         description=${this.localize.term('ucProductFeeds_propPropNodeMappingDescription')}
                         ?mandatory=${true}
                     >
-
                         <ucpf-property-node-mapper
                             slot='editor'
                             .mapItems=${this._model?.propertyNameMappings ?? []}
                             .propertyValueExtractorOptions=${this._propertyValueExtractorOptions}
                             @change=${this.#onPropNodeMapperChange}
                         ></ucpf-property-node-mapper>
-
                     </umb-property-layout>
                 </uc-stack>
             </uui-box>

src/Umbraco.Commerce.ProductFeeds.Client/frontend/src/workspaces/list/collections/views/table.element.ts

@@ -66,7 +66,6 @@ export class UcpfListCollectionViewTableElement extends UmbLitElement {
         this.observe(
             this.#collectionContext.items,
             (collectionItems) => {
-                console.log('collectionItems', collectionItems);
                 this.#createTableItems(collectionItems);
             },
             'umbCollectionItemsObserver',