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

package/dist/api/product-import.controller.d.ts

@@ -1,11 +1,11 @@
 /// <reference types="Multer" />
 import { LanguageCode, RequestContext } from '@vendure/core';
 import { Response } from 'express';
-import { PluginInitOptions } from '../types';
+import { PluginInitOptions, UpdatingStrategy } from '../types';
 import { ProductImportService } from '../services/product-import.service';
 export declare class ProductImportController {
     private options;
     private service;
     constructor(options: PluginInitOptions, service: ProductImportService);
-    updateProducts(ctx: RequestContext, file: Express.Multer.File, updateProductSlug: "true" | "false" | undefined, mainLanguage: LanguageCode, res: Response): Promise<Response<any, Record<string, any>>>;
+    updateProducts(ctx: RequestContext, file: Express.Multer.File, updateProductSlug: "true" | "false" | undefined, mainLanguage: LanguageCode, updatingStrategy: UpdatingStrategy, res: Response): Promise<Response<any, Record<string, any>>>;
 }

package/dist/api/product-import.controller.js

@@ -26,7 +26,7 @@ let ProductImportController = class ProductImportController {
         this.service = service;
     }
     async updateProducts(ctx, file, updateProductSlug = this.options.importOptions.defaultOptions
-        ?.updateProductSlug || 'true', mainLanguage, res) {
+        ?.updateProductSlug || 'true', mainLanguage, updatingStrategy, res) {
         if (!file) {
             return res.status(400).send('No file uploaded');
         }
@@ -34,7 +34,7 @@ let ProductImportController = class ProductImportController {
             return res.status(400).send('No mainLanguage provided');
         }
         try {
-            this.service.processFile(ctx, file, updateProductSlug === 'true', mainLanguage);
+            this.service.processFile(ctx, file, updateProductSlug === 'true', mainLanguage, updatingStrategy);
             return res.status(200).send('File uploaded successfully');
         }
         catch (error) {
@@ -49,9 +49,10 @@ __decorate([
     __param(1, (0, common_1.UploadedFile)()),
     __param(2, (0, common_1.Body)('updateProductSlug')),
     __param(3, (0, common_1.Body)('mainLanguage')),
-    __param(4, (0, common_1.Res)()),
+    __param(4, (0, common_1.Body)('updatingStrategy')),
+    __param(5, (0, common_1.Res)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [core_1.RequestContext, Object, String, String, Object]),
+    __metadata("design:paramtypes", [core_1.RequestContext, Object, String, String, String, Object]),
     __metadata("design:returntype", Promise)
 ], ProductImportController.prototype, "updateProducts", null);
 ProductImportController = __decorate([

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.d.ts

@@ -3,7 +3,7 @@ import { ConfigService, ChannelService, FacetService, FacetValueService, TaxCate
 import { Stream } from 'stream';
 import { Observable } from 'rxjs';
 import { ExtendedFastImporterService } from '../../services/extended-fast-importer.service';
-import { ParsedProductWithId } from '../../types';
+import { ParsedProductWithId, UpdatingStrategy } from '../../types';
 import { ImportParser } from './import-parser';
 import { ExtendedAssetImporter } from './asset-importer';
 export declare class ProductImporter {
@@ -26,7 +26,7 @@ export declare class ProductImporter {
     private customFieldTypes;
     private allAssets;
     constructor(connection: TransactionalConnection, configService: ConfigService, importParser: ImportParser, assetImporter: ExtendedAssetImporter, fastImporter: ExtendedFastImporterService, translatableSaver: TranslatableSaver, productService: ProductService, channelService: ChannelService, facetService: FacetService, facetValueService: FacetValueService, taxCategoryService: TaxCategoryService, assetService: AssetService, optionGroupService: ProductOptionGroupService);
-    parseAndImport(input: string | Stream, ctx: RequestContext, updateProductSlug: boolean | undefined, mainLanguage: LanguageCode): Observable<ImportProgress>;
+    parseAndImport(input: string | Stream, ctx: RequestContext, updateProductSlug: boolean | undefined, mainLanguage: LanguageCode, updatingStrategy: UpdatingStrategy): Observable<ImportProgress>;
     private extractProductIdsFromCSV;
     private preprocessCsv;
     private streamToString;
@@ -34,7 +34,7 @@ export declare class ProductImporter {
     setMissingAssetHashes(ctx: RequestContext): Promise<void>;
     private doParseAndImport;
     private getRequestContext;
-    importProducts(ctx: RequestContext, rows: ParsedProductWithId[], onProgress: OnProgressFn): Promise<string[]>;
+    importProducts(ctx: RequestContext, rows: ParsedProductWithId[], updatingStrategy: UpdatingStrategy, onProgress: OnProgressFn): Promise<string[]>;
     private getFacetValueIds;
     private processCustomFieldValues;
     /**

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

@@ -56,9 +56,9 @@ let ProductImporter = class ProductImporter {
         this.assetService = assetService;
         this.optionGroupService = optionGroupService;
     }
-    parseAndImport(input, ctx, updateProductSlug = true, mainLanguage) {
+    parseAndImport(input, ctx, updateProductSlug = true, mainLanguage, updatingStrategy) {
         return new rxjs_1.Observable((subscriber) => {
-            const p = this.doParseAndImport(input, updateProductSlug, mainLanguage, ctx, (progress) => {
+            const p = this.doParseAndImport(input, updateProductSlug, mainLanguage, updatingStrategy, ctx, (progress) => {
                 subscriber.next(progress);
             }).then((value) => {
                 subscriber.next({ ...value, currentProduct: 'Complete' });
@@ -169,7 +169,7 @@ let ProductImporter = class ProductImporter {
         }
         this.allAssets = assets;
     }
-    async doParseAndImport(input, updateProductSlug, mainLanguage, reqCtx, onProgress) {
+    async doParseAndImport(input, updateProductSlug, mainLanguage, updatingStrategy, reqCtx, onProgress) {
         const ctx = await this.getRequestContext(reqCtx, mainLanguage);
         await this.setMissingAssetHashes(ctx);
         let csvContent;
@@ -194,7 +194,7 @@ let ProductImporter = class ProductImporter {
         });
         if (parsed && parsed.results.length) {
             try {
-                const importErrors = await this.importProducts(ctx, parsed.results, (progess) => {
+                const importErrors = await this.importProducts(ctx, parsed.results, updatingStrategy, (progess) => {
                     onProgress({
                         ...progess,
                         processed: parsed.processed,
@@ -236,7 +236,7 @@ let ProductImporter = class ProductImporter {
             throw new core_1.InternalServerError('No RequestContext provided');
         }
     }
-    async importProducts(ctx, rows, onProgress) {
+    async importProducts(ctx, rows, updatingStrategy, onProgress) {
         let errors = [];
         let imported = 0;
         const languageCode = ctx.languageCode;
@@ -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, 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;
@@ -6,10 +6,11 @@ export declare class ExtendedFastImporterService {
     private stockMovementService;
     private translatableSaver;
     private requestContextService;
+    private entityHydrator;
     private defaultChannel;
     private importCtx;
     /** @internal */
-    constructor(connection: TransactionalConnection, channelService: ChannelService, stockMovementService: StockMovementService, translatableSaver: TranslatableSaver, requestContextService: RequestContextService);
+    constructor(connection: TransactionalConnection, channelService: ChannelService, stockMovementService: StockMovementService, translatableSaver: TranslatableSaver, requestContextService: RequestContextService, entityHydrator: EntityHydrator);
     /**
      * @description
      * This should be called prior to any of the import methods, as it establishes the
@@ -22,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

@@ -21,15 +21,17 @@ let ExtendedFastImporterService = class ExtendedFastImporterService {
     stockMovementService;
     translatableSaver;
     requestContextService;
+    entityHydrator;
     defaultChannel;
     importCtx;
     /** @internal */
-    constructor(connection, channelService, stockMovementService, translatableSaver, requestContextService) {
+    constructor(connection, channelService, stockMovementService, translatableSaver, requestContextService, entityHydrator) {
         this.connection = connection;
         this.channelService = channelService;
         this.stockMovementService = stockMovementService;
         this.translatableSaver = translatableSaver;
         this.requestContextService = requestContextService;
+        this.entityHydrator = entityHydrator;
     }
     /**
      * @description
@@ -59,7 +61,11 @@ let ExtendedFastImporterService = class ExtendedFastImporterService {
             entityType: core_1.Product,
             translationType: core_1.ProductTranslation,
             beforeSave: async (p) => {
-                p.channels = (0, unique_1.unique)([this.defaultChannel, this.importCtx.channel], 'id');
+                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 };
                 }
@@ -80,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
@@ -197,8 +217,9 @@ let ExtendedFastImporterService = class ExtendedFastImporterService {
                 input: { ...input, id: facetExists.id },
                 entityType: core_1.Facet,
                 translationType: core_1.FacetTranslation,
-                beforeSave: (facet) => {
-                    facet.channels = (0, unique_1.unique)([this.defaultChannel, this.importCtx.channel], 'id');
+                beforeSave: async (facet) => {
+                    await this.entityHydrator.hydrate(this.importCtx, facet, { relations: ['channels'] });
+                    facet.channels = (0, unique_1.unique)([...facet.channels, this.defaultChannel, this.importCtx.channel], 'id');
                 },
             });
             return facet.id;
@@ -208,7 +229,7 @@ let ExtendedFastImporterService = class ExtendedFastImporterService {
             input,
             entityType: core_1.Facet,
             translationType: core_1.FacetTranslation,
-            beforeSave: (facet) => {
+            beforeSave: async (facet) => {
                 facet.channels = (0, unique_1.unique)([this.defaultChannel, this.importCtx.channel], 'id');
             },
         });
@@ -228,9 +249,10 @@ let ExtendedFastImporterService = class ExtendedFastImporterService {
                 input: { ...input, id: facetValueExists.id },
                 entityType: core_1.FacetValue,
                 translationType: core_1.FacetValueTranslation,
-                beforeSave: (facetValue) => {
+                beforeSave: async (facetValue) => {
+                    await this.entityHydrator.hydrate(this.importCtx, facetValue, { relations: ['channels'] });
                     facetValue.facet = { id: input.facetId };
-                    facetValue.channels = (0, unique_1.unique)([this.defaultChannel, this.importCtx.channel], 'id');
+                    facetValue.channels = (0, unique_1.unique)([...facetValue.channels, this.defaultChannel, this.importCtx.channel], 'id');
                 },
             });
             return updatedFacetValue.id;
@@ -240,7 +262,7 @@ let ExtendedFastImporterService = class ExtendedFastImporterService {
             input,
             entityType: core_1.FacetValue,
             translationType: core_1.FacetValueTranslation,
-            beforeSave: (facetValue) => {
+            beforeSave: async (facetValue) => {
                 facetValue.facet = { id: input.facetId };
                 facetValue.channels = (0, unique_1.unique)([this.defaultChannel, this.importCtx.channel], 'id');
             },
@@ -299,11 +321,15 @@ let ExtendedFastImporterService = class ExtendedFastImporterService {
             entityType: core_1.ProductVariant,
             translationType: core_1.ProductVariantTranslation,
             beforeSave: async (variant) => {
-                variant.channels = (0, unique_1.unique)([this.defaultChannel, this.importCtx.channel], 'id');
+                await this.entityHydrator.hydrate(this.importCtx, variant, { relations: ['channels'] });
+                variant.channels = (0, unique_1.unique)([...variant.channels, this.defaultChannel, this.importCtx.channel], 'id');
                 const { optionIds } = input;
                 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) {
@@ -331,15 +357,32 @@ let ExtendedFastImporterService = class ExtendedFastImporterService {
         await this.stockMovementService.adjustProductVariantStock(this.importCtx, updatedVariant.id, input.stockOnHand ?? 0);
         const assignedChannelIds = (0, unique_1.unique)([this.defaultChannel, this.importCtx.channel], 'id').map((c) => c.id);
         for (const channelId of assignedChannelIds) {
-            const variantPrice = new core_1.ProductVariantPrice({
-                price: input.price,
-                channelId,
-                currencyCode: this.defaultChannel.defaultCurrencyCode,
-            });
-            variantPrice.variant = updatedVariant;
-            await this.connection
+            const allPrices = await this.connection
                 .getRepository(this.importCtx, core_1.ProductVariantPrice)
-                .update({ id: updatedVariant.id }, variantPrice);
+                .find({
+                where: {
+                    variant: { id: updatedVariant.id },
+                },
+            });
+            let existingVariantPrice = allPrices.find((p) => (0, core_1.idsAreEqual)(p.channelId, channelId) &&
+                p.currencyCode === this.importCtx.channel.defaultCurrencyCode);
+            if (!existingVariantPrice) {
+                const variantPrice = new core_1.ProductVariantPrice({
+                    price: input.price,
+                    channelId,
+                    currencyCode: this.importCtx.channel.defaultCurrencyCode,
+                });
+                variantPrice.variant = updatedVariant;
+                await this.connection.rawConnection
+                    .getRepository(core_1.ProductVariantPrice)
+                    .save(variantPrice, { reload: false });
+            }
+            else {
+                existingVariantPrice.price = input.price;
+                await this.connection.rawConnection
+                    .getRepository(core_1.ProductVariantPrice)
+                    .save(existingVariantPrice, { reload: false });
+            }
         }
         return updatedVariant.id;
     }
@@ -392,11 +435,11 @@ let ExtendedFastImporterService = class ExtendedFastImporterService {
             const variantPrice = new core_1.ProductVariantPrice({
                 price: input.price,
                 channelId,
-                currencyCode: this.defaultChannel.defaultCurrencyCode,
+                currencyCode: this.importCtx.channel.defaultCurrencyCode,
             });
             variantPrice.variant = createdVariant;
-            await this.connection
-                .getRepository(this.importCtx, core_1.ProductVariantPrice)
+            await this.connection.rawConnection
+                .getRepository(core_1.ProductVariantPrice)
                 .save(variantPrice, { reload: false });
         }
         return createdVariant.id;
@@ -413,6 +456,7 @@ ExtendedFastImporterService = __decorate([
         core_1.ChannelService,
         core_1.StockMovementService,
         core_1.TranslatableSaver,
-        core_1.RequestContextService])
+        core_1.RequestContextService,
+        core_1.EntityHydrator])
 ], ExtendedFastImporterService);
 exports.ExtendedFastImporterService = ExtendedFastImporterService;

package/dist/services/product-import.service.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="Multer" />
 import { OnModuleInit } from '@nestjs/common';
 import { RequestContext, JobQueueService, SerializedRequestContext, SearchService, LanguageCode } from '@vendure/core';
-import { PluginInitOptions } from '../types';
+import { PluginInitOptions, UpdatingStrategy } from '../types';
 import { ProductImporter } from '../providers/import-providers/product-importer';
 export declare class ProductImportService implements OnModuleInit {
     private options;
@@ -11,11 +11,12 @@ export declare class ProductImportService implements OnModuleInit {
     private productImportQueue;
     constructor(options: PluginInitOptions, jobQueueService: JobQueueService, productImporter: ProductImporter, searchService: SearchService);
     onModuleInit(): Promise<void>;
-    processFile(ctx: RequestContext, file: Express.Multer.File, updateProductSlug: boolean, mainLanguage: LanguageCode): Promise<import("@vendure/core/dist/job-queue/subscribable-job").SubscribableJob<{
+    processFile(ctx: RequestContext, file: Express.Multer.File, updateProductSlug: boolean, mainLanguage: LanguageCode, updatingStrategy: UpdatingStrategy): Promise<import("@vendure/core/dist/job-queue/subscribable-job").SubscribableJob<{
         ctx: SerializedRequestContext;
         fileContent: string;
         updateProductSlug: boolean;
         mainLanguage: LanguageCode;
+        updatingStrategy: UpdatingStrategy;
     }>>;
     private triggerProductImport;
 }

package/dist/services/product-import.service.js

@@ -39,7 +39,7 @@ let ProductImportService = class ProductImportService {
                 let jobResult;
                 return new Promise((resolve, reject) => {
                     this.productImporter
-                        .parseAndImport(job.data.fileContent, ctx, job.data.updateProductSlug, job.data.mainLanguage)
+                        .parseAndImport(job.data.fileContent, ctx, job.data.updateProductSlug, job.data.mainLanguage, job.data.updatingStrategy)
                         .subscribe({
                         next: (result) => {
                             const processedCount = result.processed;
@@ -60,16 +60,17 @@ let ProductImportService = class ProductImportService {
             },
         });
     }
-    async processFile(ctx, file, updateProductSlug, mainLanguage) {
+    async processFile(ctx, file, updateProductSlug, mainLanguage, updatingStrategy) {
         const fileContent = file.buffer.toString('utf-8');
-        return this.triggerProductImport(ctx, fileContent, updateProductSlug, mainLanguage);
+        return this.triggerProductImport(ctx, fileContent, updateProductSlug, mainLanguage, updatingStrategy);
     }
-    triggerProductImport(ctx, fileContent, updateProductSlug, mainLanguage) {
+    triggerProductImport(ctx, fileContent, updateProductSlug, mainLanguage, updatingStrategy) {
         return this.productImportQueue.add({
             ctx: ctx.serialize(),
             fileContent,
             updateProductSlug,
             mainLanguage,
+            updatingStrategy,
         });
     }
 };

package/dist/types.d.ts

@@ -37,4 +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 = 'replace' | 'merge';
 export {};

package/dist/ui/components/export-dialog.component.html

@@ -13,7 +13,7 @@
 
 <div class="input-row" style="margin-top: 16px">
   <label style="margin-bottom: 8px; display: inline-block">{{
-    'product-export.dialog.customFieldsLabel' | translate
+    'product-export.dialog.availableExportFieldsLabel' | translate
   }}</label>
   <div *ngFor="let field of availableExportFields">
     <input

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

@@ -3,6 +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 = 'replace' | 'merge';
 type ImportOptions = {
     updateProductSlug?: string;
 };
@@ -26,6 +27,7 @@ export declare class ProductImportComponent implements OnInit {
     updateProductSlug: boolean;
     selectedMainLanguage: LanguageCode | undefined;
     availableLanguages: LanguageCode[];
+    updatingStrategy: UpdatingStrategy;
     fileUploadElement: ElementRef<HTMLInputElement>;
     config: PluginInitOptions;
     appConfig: AdminUiConfig;

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

@@ -25,7 +25,11 @@
         </div>
       </vdr-form-field>
     </div>
-    <div class="form-grid" *ngIf="selectedFile">
+    <div
+      class="form-grid"
+      *ngIf="selectedFile"
+      style="margin-top: 24px; border-top: 1px solid #cdcdcd"
+    >
       <div
         class="input-row"
         style="margin-top: 16px"
@@ -44,7 +48,7 @@
       </div>
 
       <div class="input-row" style="margin-top: 16px">
-        <div>Välj huvudspråk för filen:</div>
+        <div>{{ 'product-import.card.select-main-language' | translate }}</div>
         <div *ngFor="let lang of availableLanguages">
           <label>
             <input
@@ -58,6 +62,49 @@
             {{ lang }}
           </label>
         </div>
+        <div
+          style="
+            margin-top: 8px;
+            padding-top: 8px;
+            font-style: italic;
+            font-size: 12px;
+            line-height: 1.4;
+          "
+        >
+          <clr-icon shape="info-circle" size="16" class="is-info"></clr-icon>
+          {{ 'product-import.card.main-language-info' | translate }}
+        </div>
+      </div>
+
+      <div class="input-row" style="margin-top: 16px">
+        <div>{{ 'product-import.card.updating-strategy' | translate }}</div>
+        <div>
+          <label>
+            <input
+              type="radio"
+              name="updatingStrategy"
+              value="merge"
+              [(ngModel)]="updatingStrategy"
+              style="width: fit-content"
+            />
+            {{ 'product-import.card.merge' | translate }}
+          </label>
+        </div>
+        <div>
+          <label>
+            <input
+              type="radio"
+              name="updatingStrategy"
+              value="replace"
+              [(ngModel)]="updatingStrategy"
+              style="width: fit-content"
+            />
+            {{ '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>
     </div>
   </vdr-card>

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

@@ -26,6 +26,7 @@ let ProductImportComponent = class ProductImportComponent {
     updateProductSlug = true;
     selectedMainLanguage;
     availableLanguages = [];
+    updatingStrategy = 'merge';
     fileUploadElement;
     config;
     appConfig;
@@ -90,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'];
@@ -121,6 +123,15 @@ let ProductImportComponent = class ProductImportComponent {
                         lines.splice(index, 1);
                     }
                 });
+                // Check if number of columns for each line is consistent and the same as headers
+                const headerLength = this.splitLines(lines[0]).length;
+                const inconsistentLines = lines.filter((line) => this.splitLines(line).length !== headerLength);
+                if (inconsistentLines.length > 0) {
+                    console.log('Inconsistent number of columns in the CSV file.');
+                    this.notificationService.error(this.translate.instant('product-import.notifications.inconsistent-columns'));
+                    resolve({ isValid: false });
+                    return;
+                }
                 if (lines.length > 0) {
                     const header = this.splitLines(lines[0]).map((col) => col.trim());
                     console.log('CSV Header:', header);
@@ -282,11 +293,12 @@ let ProductImportComponent = class ProductImportComponent {
         });
     }
     async uploadFile() {
-        if (this.selectedFile && this.selectedMainLanguage) {
+        if (this.selectedFile && this.selectedMainLanguage && this.updatingStrategy) {
             const formData = new FormData();
             formData.append('file', this.selectedFile);
             formData.append('updateProductSlug', this.updateProductSlug.toString());
             formData.append('mainLanguage', this.selectedMainLanguage);
+            formData.append('updatingStrategy', this.updatingStrategy);
             try {
                 const res = await fetch(`${this.serverPath}/product-import/upload`, {
                     method: 'POST',

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

@@ -7,6 +7,8 @@ import { endsWith, startsWith, size, uniq } from 'lodash'
 import { AdminUiConfig } from '@vendure/common/lib/shared-types'
 import { Channel, LanguageCode } from '@vendure/core'
 
+type UpdatingStrategy = 'replace' | 'merge'
+
 type ImportOptions = {
   updateProductSlug?: string
 }
@@ -34,6 +36,7 @@ export class ProductImportComponent implements OnInit {
   updateProductSlug = true
   selectedMainLanguage: LanguageCode | undefined
   availableLanguages: LanguageCode[] = []
+  updatingStrategy: UpdatingStrategy = 'merge'
 
   @ViewChild('fileUpload', { static: false }) fileUploadElement: ElementRef<HTMLInputElement>
 
@@ -114,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> {
@@ -151,6 +155,22 @@ export class ProductImportComponent implements OnInit {
             lines.splice(index, 1)
           }
         })
+
+        // Check if number of columns for each line is consistent and the same as headers
+        const headerLength = this.splitLines(lines[0]).length
+        const inconsistentLines = lines.filter(
+          (line) => this.splitLines(line).length !== headerLength,
+        )
+
+        if (inconsistentLines.length > 0) {
+          console.log('Inconsistent number of columns in the CSV file.')
+          this.notificationService.error(
+            this.translate.instant('product-import.notifications.inconsistent-columns'),
+          )
+          resolve({ isValid: false })
+          return
+        }
+
         if (lines.length > 0) {
           const header = this.splitLines(lines[0]).map((col) => col.trim())
           console.log('CSV Header:', header)
@@ -398,11 +418,12 @@ export class ProductImportComponent implements OnInit {
   }
 
   async uploadFile(): Promise<void> {
-    if (this.selectedFile && this.selectedMainLanguage) {
+    if (this.selectedFile && this.selectedMainLanguage && this.updatingStrategy) {
       const formData = new FormData()
       formData.append('file', this.selectedFile)
       formData.append('updateProductSlug', this.updateProductSlug.toString())
       formData.append('mainLanguage', this.selectedMainLanguage)
+      formData.append('updatingStrategy', this.updatingStrategy)
 
       try {
         const res = await fetch(`${this.serverPath}/product-import/upload`, {

package/dist/ui/translations/en.json

@@ -6,7 +6,13 @@
       "description": "Choose a CSV file to import products from",
       "button-select": "Select file",
       "button-upload": "Upload file",
-      "update-product-slugs": "Update product slugs based on name"
+      "update-product-slugs": "Update product slugs based on name",
+      "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."
     },
     "notifications": {
       "invalid-file-type": "Invalid file type. Please upload a CSV file.",
@@ -23,7 +29,8 @@
       "missing-languages": "Your CSV file contains languages that are not available in the system. Please add the languages to the system or remove the languages that are not used and try again.",
       "mismatched-option-values": "Some product variants are missing product options. Please fill in all options: ",
       "missing-main-language-name": "Main language is missing for name. Please add the main language and try again.",
-      "missing-translation-values": "Some fields are missing translations for the main language that exist in other languages. These will not be imported: "
+      "missing-translation-values": "Some fields are missing translations for the main language that exist in other languages. These will not be imported: ",
+      "inconsistent-columns": "The columns in the file are inconsistent. Please ensure all rows have the same number of columns."
     }
   },
   "product-export": {
@@ -38,7 +45,8 @@
       "exportAssetsAsOptions": {
         "url": "URL",
         "json": "JSON"
-      }
+      },
+      "availableExportFieldsLabel": "Fields to export"
     }
   }
 }

package/dist/ui/translations/sv.json

@@ -6,7 +6,13 @@
       "description": "Välj en CSV-fil att importera produkter från",
       "button-select": "Välj fil",
       "button-upload": "Ladda upp fil",
-      "update-product-slugs": "Uppdatera produkt-sluggar utifrån namn"
+      "update-product-slugs": "Uppdatera produkt-sluggar utifrån namn",
+      "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."
     },
     "notifications": {
       "invalid-file-type": "Felaktig filtyp. Vänligen ladda upp en CSV-fil.",
@@ -23,7 +29,8 @@
       "missing-languages": "Din CSV-fil innehåller språk som inte är tillgängliga i den här kanalen. Vänligen lägg till språken i kanalen eller ta bort de språk som inte används och försök igen.",
       "mismatched-option-values": "Antalet produktalternativ för vissa produktvarianter är felaktigt: ",
       "missing-main-language-name": "Huvudspråket saknas för namn. Vänligen lägg till huvudspråket och försök igen.",
-      "missing-translation-values": "Det saknas översättningar för vissa fält för huvudspråket som existerar i andra språk. Dessa kommer inte importeras: "
+      "missing-translation-values": "Det saknas översättningar för vissa fält för huvudspråket som existerar i andra språk. Dessa kommer inte importeras: ",
+      "inconsistent-columns": "Kolumnerna i filen är inkonsekventa. Vänligen kontrollera att alla rader har samma antal kolumner."
     }
   },
   "product-export": {
@@ -38,7 +45,8 @@
       "exportAssetsAsOptions": {
         "url": "URL",
         "json": "JSON"
-      }
+      },
+      "availableExportFieldsLabel": "Fält att exportera"
     }
   }
 }

package/package.json

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