@haus-tech/product-import-export-plugin 2.2.0-dev.1 → 2.2.0-dev.2

package/dist/providers/import-providers/asset-importer.js

@@ -45,12 +45,16 @@ let ExtendedAssetImporter = class ExtendedAssetImporter {
         for (const assetPath of uniqueAssetPaths.values()) {
             const cachedAsset = this.assetMap.get(assetPath.url);
             if (cachedAsset) {
-                if (assetPath.id && cachedAsset.name !== assetPath.name) {
+                if (cachedAsset.name !== assetPath.name && assetPath.name) {
                     this.connection.getRepository(ctx, core_1.Asset).update(cachedAsset.id, {
                         name: assetPath.name,
                     });
+                    this.assetMap.set(assetPath.url, { ...cachedAsset, name: assetPath.name });
+                    assets.push({ ...cachedAsset, name: assetPath.name });
+                }
+                else {
+                    assets.push(cachedAsset);
                 }
-                assets.push(cachedAsset);
             }
             else {
                 try {
@@ -65,6 +69,12 @@ let ExtendedAssetImporter = class ExtendedAssetImporter {
                         },
                     });
                     if (assetFromHash) {
+                        // Check if the asset name has changed
+                        if (assetPath.name && assetFromHash.name !== assetPath.name) {
+                            await this.connection.getRepository(ctx, core_1.Asset).update(assetFromHash.id, {
+                                name: assetPath.name,
+                            });
+                        }
                         this.assetMap.set(assetPath.url, assetFromHash);
                         assets.push(assetFromHash);
                         continue;
@@ -89,6 +99,7 @@ let ExtendedAssetImporter = class ExtendedAssetImporter {
                                 shouldDeleteCreatedAsset = true;
                                 assetToUpdate = { ...assetFromHash, name: assetPath.name || assetFromHash.name };
                             }
+                            console.log('assetFromHash', assetFromHash);
                             if (assetPath.id) {
                                 shouldDeleteCreatedAsset = true;
                                 assetToUpdate = {

package/dist/providers/import-providers/product-importer.js

@@ -294,6 +294,7 @@ let ProductImporter = class ProductImporter {
                         'variants',
                         'variants.facetValues',
                         'assets',
+                        'featuredAsset',
                     ],
                 })
                 : undefined;
@@ -322,10 +323,17 @@ let ProductImporter = class ProductImporter {
                     previousNormalizedName: (0, normalize_string_1.normalizeString)(existingProductName),
                 }
                 : undefined;
+            if (existingProduct && updatingStrategy === 'replace') {
+                await this.fastImporter.removeAllAssetsFromProduct(existingProduct);
+            }
             const productData = {
-                featuredAssetId: productAssets.length ? productAssets[0].id : undefined,
+                featuredAssetId: existingProduct?.featuredAsset
+                    ? undefined
+                    : productAssets.length
+                        ? productAssets[0].id
+                        : undefined,
                 assetIds: productAssets.map((a) => a.id),
-                // facetValueIds: await this.getFacetValueIds(ctx, product.facets, ctx.languageCode),
+                facetValueIds: updatingStrategy === 'replace' ? [] : undefined,
                 translations: await Promise.all(product.translations.map(async (translation) => {
                     return {
                         languageCode: translation.languageCode,
@@ -430,6 +438,7 @@ let ProductImporter = class ProductImporter {
                         sku: variant.sku,
                     },
                     withDeleted: true,
+                    relations: ['facetValues', 'facetValues.facet', 'assets', 'featuredAsset'],
                 });
                 if (existingVariant?.deletedAt) {
                     existingVariant.deletedAt = null;
@@ -441,10 +450,18 @@ let ProductImporter = class ProductImporter {
                         console.error('Error while restoring the variant:', error);
                     }
                 }
+                if (existingVariant && updatingStrategy === 'replace') {
+                    // Remove all assets from the product
+                    await this.fastImporter.removeAllAssetsFromVariant(existingVariant);
+                }
                 const variantData = {
                     productId: createdProductId,
-                    // facetValueIds,
-                    featuredAssetId: variantAssets.length ? variantAssets[0].id : undefined,
+                    facetValueIds: updatingStrategy === 'replace' ? [] : undefined,
+                    featuredAssetId: existingVariant?.featuredAsset
+                        ? undefined
+                        : variantAssets.length
+                            ? variantAssets[0].id
+                            : undefined,
                     assetIds: variantAssets.map((a) => a.id),
                     sku: variant.sku,
                     taxCategoryId: this.getMatchingTaxCategoryId(variant.taxCategory, taxCategories.items),

package/dist/services/extended-fast-importer.service.d.ts

@@ -1,4 +1,4 @@
-import { Channel, ChannelService, EntityHydrator, ID, RequestContextService, StockMovementService, TransactionalConnection, TranslatableSaver } from '@vendure/core';
+import { Channel, ChannelService, EntityHydrator, ID, Product, ProductVariant, RequestContextService, StockMovementService, TransactionalConnection, TranslatableSaver } from '@vendure/core';
 import { CreateFacetInput, CreateFacetValueInput, CreateProductInput, CreateProductOptionGroupInput, CreateProductOptionInput, CreateProductVariantInput } from '@vendure/common/lib/generated-types';
 export declare class ExtendedFastImporterService {
     private connection;
@@ -23,6 +23,8 @@ export declare class ExtendedFastImporterService {
     updateProduct(id: ID, input: CreateProductInput & {
         id: ID;
     }): Promise<ID>;
+    removeAllAssetsFromProduct(product: Product): Promise<void>;
+    removeAllAssetsFromVariant(variant: ProductVariant): Promise<void>;
     createProduct(input: CreateProductInput): Promise<ID>;
     updateProductOptionGroup(input: CreateProductOptionGroupInput & {
         id: ID;

package/dist/services/extended-fast-importer.service.js

@@ -63,6 +63,9 @@ let ExtendedFastImporterService = class ExtendedFastImporterService {
             beforeSave: async (p) => {
                 await this.entityHydrator.hydrate(this.importCtx, p, { relations: ['channels'] });
                 p.channels = (0, unique_1.unique)([...p.channels, this.defaultChannel, this.importCtx.channel], 'id');
+                if (input.facetValueIds) {
+                    p.facetValues = input.facetValueIds.map((id) => ({ id }));
+                }
                 if (input.featuredAssetId) {
                     p.featuredAsset = { id: input.featuredAssetId };
                 }
@@ -83,6 +86,20 @@ let ExtendedFastImporterService = class ExtendedFastImporterService {
         }
         return product.id;
     }
+    async removeAllAssetsFromProduct(product) {
+        this.ensureInitialized();
+        await this.connection
+            .getRepository(this.importCtx, core_1.ProductAsset)
+            .delete({ productId: product.id });
+        product.featuredAsset = undefined;
+    }
+    async removeAllAssetsFromVariant(variant) {
+        this.ensureInitialized();
+        await this.connection
+            .getRepository(this.importCtx, core_1.ProductVariantAsset)
+            .delete({ productVariantId: variant.id });
+        variant.featuredAsset = undefined;
+    }
     async createProduct(input) {
         this.ensureInitialized();
         // https://github.com/vendure-ecommerce/vendure/issues/2053
@@ -310,6 +327,9 @@ let ExtendedFastImporterService = class ExtendedFastImporterService {
                 if (optionIds && optionIds.length) {
                     variant.options = optionIds.map((id) => ({ id }));
                 }
+                if (input.facetValueIds) {
+                    variant.facetValues = input.facetValueIds.map((id) => ({ id }));
+                }
                 variant.product = { id: input.productId };
                 variant.taxCategory = { id: input.taxCategoryId };
                 if (input.featuredAssetId) {

package/dist/types.d.ts

@@ -37,5 +37,5 @@ export type JsonAsset = {
 type ExportFields = Array<ProductFields | VariantFields>;
 type ProductFields = 'productId' | 'name' | 'slug' | 'description' | 'assets' | 'facets' | 'optionGroups';
 type VariantFields = 'sku' | 'optionValues' | 'price' | 'taxCategory' | 'stockOnHand' | 'trackInventory' | 'variantAssets' | 'variantFacets';
-export type UpdatingStrategy = 'overwrite' | 'merge';
+export type UpdatingStrategy = 'replace' | 'merge';
 export {};

package/dist/ui/components/product-import.component.d.ts

@@ -3,7 +3,7 @@ import { NotificationService, LocalStorageService } from '@vendure/admin-ui/core
 import { TranslateService } from '@ngx-translate/core';
 import { AdminUiConfig } from '@vendure/common/lib/shared-types';
 import { Channel, LanguageCode } from '@vendure/core';
-type UpdatingStrategy = 'overwrite' | 'merge';
+type UpdatingStrategy = 'replace' | 'merge';
 type ImportOptions = {
     updateProductSlug?: string;
 };

package/dist/ui/components/product-import.component.html

@@ -83,11 +83,11 @@
             <input
               type="radio"
               name="updatingStrategy"
-              value="overwrite"
+              value="merge"
               [(ngModel)]="updatingStrategy"
               style="width: fit-content"
             />
-            {{ 'product-import.card.overwrite' | translate }}
+            {{ 'product-import.card.merge' | translate }}
           </label>
         </div>
         <div>
@@ -95,11 +95,14 @@
             <input
               type="radio"
               name="updatingStrategy"
-              value="merge"
+              value="replace"
               [(ngModel)]="updatingStrategy"
               style="width: fit-content"
             />
-            {{ 'product-import.card.merge' | translate }}
+            {{ 'product-import.card.overwrite' | translate }}<br />
+            <span *ngIf="updatingStrategy === 'replace'" style="color: red; font-size: 12px">{{
+              'product-import.card.overwrite-warning' | translate
+            }}</span>
           </label>
         </div>
       </div>

package/dist/ui/components/product-import.component.js

@@ -91,6 +91,7 @@ let ProductImportComponent = class ProductImportComponent {
         this.selectedFile = null;
         this.validateFile = null;
         this.selectedMainLanguage = undefined;
+        this.updatingStrategy = 'merge';
     }
     async validateCsvStructure(file) {
         const baseColumns = ['sku'];

package/dist/ui/components/product-import.component.ts

@@ -7,7 +7,7 @@ import { endsWith, startsWith, size, uniq } from 'lodash'
 import { AdminUiConfig } from '@vendure/common/lib/shared-types'
 import { Channel, LanguageCode } from '@vendure/core'
 
-type UpdatingStrategy = 'overwrite' | 'merge'
+type UpdatingStrategy = 'replace' | 'merge'
 
 type ImportOptions = {
   updateProductSlug?: string
@@ -117,6 +117,7 @@ export class ProductImportComponent implements OnInit {
     this.selectedFile = null
     this.validateFile = null
     this.selectedMainLanguage = undefined
+    this.updatingStrategy = 'merge'
   }
 
   async validateCsvStructure(file: File): Promise<ValidateReturnType> {

package/dist/ui/translations/en.json

@@ -10,6 +10,7 @@
       "select-main-language": "Select main language: ",
       "updating-strategy": "Updating strategy for facets and assets: ",
       "overwrite": "Overwrite",
+      "overwrite-warning": "Warning: This will remove existing facets and assets from products and variants.",
       "merge": "Merge",
       "main-language-info": "The main language is used as a fallback when translations are missing. It is recommended to select the language that is used the most in your system. The main language will be used to create products, the other languages will be used to fill in translations."
     },

package/dist/ui/translations/sv.json

@@ -10,6 +10,7 @@
       "select-main-language": "Välj huvudspråk: ",
       "updating-strategy": "Uppdateringsstrategi för etiketter och filer: ",
       "overwrite": "Skriv över",
+      "overwrite-warning": "Varning: Detta kommer ta bort befintliga etiketter och filer från produkter och varianter.",
       "merge": "Sammanfoga",
       "main-language-info": "Huvudspråket används som fallback när översättningar saknas. Det rekommenderas att välja det språk som används mest i din kanal. Huvudspråket kommer användas för att skapa upp produkter, de övriga språken kommer användas för att fylla i översättningar."
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haus-tech/product-import-export-plugin",
-  "version": "2.2.0-dev.1",
+  "version": "2.2.0-dev.2",
   "description": "A Vendure plugin for importing and exporting products using a CSV file",
   "author": "Haus Tech",
   "repository": {