@haus-tech/product-import-export-plugin 3.3.2-next.0 → 3.3.2-next.1

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

@@ -20,20 +20,19 @@ const constants_1 = require("../constants");
 const product_importer_1 = require("../providers/import-providers/product-importer");
 const lodash_1 = require("lodash");
 let ProductImportService = class ProductImportService {
-    options;
+    importJobStorageStrategy;
     jobQueueService;
     productImporter;
     searchService;
-    collectionService;
     productService;
     eventBus;
+    loggerCtx = 'ProductImportService';
     productImportQueue;
-    constructor(options, jobQueueService, productImporter, searchService, collectionService, productService, eventBus) {
-        this.options = options;
+    constructor(importJobStorageStrategy, jobQueueService, productImporter, searchService, productService, eventBus) {
+        this.importJobStorageStrategy = importJobStorageStrategy;
         this.jobQueueService = jobQueueService;
         this.productImporter = productImporter;
         this.searchService = searchService;
-        this.collectionService = collectionService;
         this.productService = productService;
         this.eventBus = eventBus;
     }
@@ -41,46 +40,73 @@ let ProductImportService = class ProductImportService {
         this.productImportQueue = await this.jobQueueService.createQueue({
             name: 'product-import',
             process: async (job) => {
-                // Deserialize the RequestContext from the job data
                 const ctx = core_2.RequestContext.deserialize(job.data.ctx);
                 let jobResult;
-                return new Promise((resolve, reject) => {
-                    this.productImporter
-                        .parseAndImport(job.data.fileContent, ctx, job.data.updateProductSlug, job.data.mainLanguage, job.data.updatingStrategy)
-                        .subscribe({
-                        next: (result) => {
-                            const processedCount = result.processed;
-                            const importedCount = result.imported;
-                            const percentage = (importedCount / processedCount) * 100;
-                            job.setProgress(percentage);
-                            jobResult = result;
-                        },
-                        complete: async () => {
-                            // Hack for triggering apply-collection-filters job
-                            const firstProduct = await this.productService.findAll(ctx, {
-                                take: 1,
-                            });
-                            this.eventBus.publish(new core_2.ProductEvent(ctx, firstProduct.items[0], 'updated'));
-                            // Reindex the search index
-                            await this.searchService.reindex(ctx);
-                            resolve((0, lodash_1.omit)(jobResult, 'currentProduct'));
-                        },
-                        error: (err) => {
-                            reject(err);
-                        },
+                try {
+                    const fileContent = await this.importJobStorageStrategy.getImportFileContent(ctx, job.data.storageKey);
+                    return await new Promise((resolve, reject) => {
+                        this.productImporter
+                            .parseAndImport(fileContent, ctx, job.data.updateProductSlug, job.data.mainLanguage, job.data.updatingStrategy)
+                            .subscribe({
+                            next: (result) => {
+                                const processedCount = result.processed || 1;
+                                const importedCount = result.imported || 0;
+                                const percentage = (importedCount / processedCount) * 100;
+                                job.setProgress(percentage);
+                                jobResult = result;
+                            },
+                            complete: () => {
+                                resolve(jobResult ?? { imported: 0, processed: 0, errors: [], currentProduct: '' });
+                            },
+                            error: (err) => {
+                                reject(err);
+                            },
+                        });
+                    }).then(async (result) => {
+                        await this.runPostImportTasks(ctx, result);
+                        return (0, lodash_1.omit)(result, 'currentProduct');
                     });
-                });
+                }
+                finally {
+                    await this.cleanupStoredImportFile(ctx, job.data.storageKey);
+                }
             },
         });
     }
     async processFile(ctx, file, updateProductSlug, mainLanguage, updatingStrategy) {
-        const fileContent = file.buffer.toString('utf-8');
-        return this.triggerProductImport(ctx, fileContent, updateProductSlug, mainLanguage, updatingStrategy);
+        const storageKey = await this.importJobStorageStrategy.storeImportFile(ctx, {
+            originalname: file.originalname,
+            buffer: file.buffer,
+        });
+        return this.triggerProductImport(ctx, storageKey, file.originalname, updateProductSlug, mainLanguage, updatingStrategy);
+    }
+    async cleanupStoredImportFile(ctx, storageKey) {
+        try {
+            await this.importJobStorageStrategy.deleteImportFile(ctx, storageKey);
+        }
+        catch (error) {
+            core_1.Logger.warn(`Failed to cleanup stored import file "${storageKey}": ${error.message}`, this.loggerCtx);
+        }
+    }
+    async runPostImportTasks(ctx, result) {
+        if (result.imported <= 0) {
+            return;
+        }
+        const firstProduct = await this.productService.findAll(ctx, { take: 1 });
+        const firstItem = firstProduct.items[0];
+        if (firstItem) {
+            this.eventBus.publish(new core_2.ProductEvent(ctx, firstItem, 'updated'));
+        }
+        else {
+            core_1.Logger.warn('Skipping ProductEvent publish because no product was found', this.loggerCtx);
+        }
+        await this.searchService.reindex(ctx);
     }
-    triggerProductImport(ctx, fileContent, updateProductSlug, mainLanguage, updatingStrategy) {
+    triggerProductImport(ctx, storageKey, fileName, updateProductSlug, mainLanguage, updatingStrategy) {
         return this.productImportQueue.add({
             ctx: ctx.serialize(),
-            fileContent,
+            storageKey,
+            fileName,
             updateProductSlug,
             mainLanguage,
             updatingStrategy,
@@ -90,11 +116,10 @@ let ProductImportService = class ProductImportService {
 exports.ProductImportService = ProductImportService;
 exports.ProductImportService = ProductImportService = __decorate([
     (0, common_1.Injectable)(),
-    __param(0, (0, common_1.Inject)(constants_1.PRODUCT_IMPORT_EXPORT_PLUGIN_OPTIONS)),
+    __param(0, (0, common_1.Inject)(constants_1.IMPORT_JOB_STORAGE_STRATEGY)),
     __metadata("design:paramtypes", [Object, core_1.JobQueueService,
         product_importer_1.ProductImporter,
         core_1.SearchService,
-        core_1.CollectionService,
         core_1.ProductService,
         core_1.EventBus])
 ], ProductImportService);

package/src/services/product-import.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"product-import.service.js","sourceRoot":"","sources":["../../../../../packages/product-import-export-plugin/src/services/product-import.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"product-import.service.js","sourceRoot":"","sources":["../../../../../packages/product-import-export-plugin/src/services/product-import.service.ts"],"names":[],"mappings":"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"}

package/src/types.d.ts

@@ -2,6 +2,7 @@ import { ID } from '@vendure/core';
 import { ParsedProduct, ParsedProductWithVariants } from './providers/import-providers/import-parser';
 import type { Injector } from '@vendure/core';
 import { ExportStorageStrategy } from './services/export-storage/export-storage-strategy';
+import { ImportJobStorageStrategy } from './services/import-storage/import-job-storage-strategy';
 /**
  * @description
  * The plugin can be configured using the following options:
@@ -18,11 +19,30 @@ type ImportOptions = {
      * will be restored during import. If false, deleted entities will remain deleted.
      */
     restoreSoftDeleted?: boolean;
+    /**
+     * @description
+     * Preferred configuration: provide an import job storage strategy instance directly.
+     */
+    storageStrategy?: ImportJobStorageStrategy;
+    /**
+     * @description
+     * Preferred configuration: provide a factory which can use Vendure's DI via the Injector.
+     */
+    storageStrategyFactory?: (injector: Injector) => ImportJobStorageStrategy | Promise<ImportJobStorageStrategy>;
+    /**
+     * @description
+     * Deprecated. Kept for backward compatibility.
+     * Use `storageStrategy` or `storageStrategyFactory` instead.
+     */
+    importJobStorage?: 'local' | 's3';
 };
 export interface PluginInitOptions {
     importOptions: {
         visibleOptions?: Array<keyof ImportOptions>;
         defaultOptions?: ImportOptions;
+        storageStrategy?: ImportOptions['storageStrategy'];
+        storageStrategyFactory?: ImportOptions['storageStrategyFactory'];
+        importJobStorage?: ImportOptions['importJobStorage'];
     };
     exportOptions: {
         defaultFileName?: string;
@@ -54,7 +74,7 @@ export type JsonAsset = {
     name?: string;
 };
 type ExportFields = Array<ProductFields | VariantFields>;
-type ProductFields = 'productId' | 'name' | 'slug' | 'description' | 'assets' | 'facets' | 'optionGroups';
+type ProductFields = 'name' | 'slug' | 'description' | 'assets' | 'facets' | 'optionGroups';
 type VariantFields = 'sku' | 'optionValues' | 'price' | 'taxCategory' | 'stockOnHand' | 'trackInventory' | 'variantAssets' | 'variantFacets' | 'enabled';
 export type UpdatingStrategy = 'replace' | 'merge';
 export {};

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

@@ -26,7 +26,7 @@
       [value]="field"
       (change)="toggleExportFieldSelection(field)"
       [checked]="selectedExportFields.includes(field)"
-      [disabled]="config.requiredExportFields.includes(field)"
+      [disabled]="config.requiredExportFields.includes(field) || isMandatoryExportField(field)"
     />
     {{ field }}
   </div>

package/src/ui/components/export-dialog.component.ts

@@ -5,7 +5,6 @@ import { SharedModule } from '@vendure/admin-ui/core'
 import { uniq } from 'lodash'
 
 type ProductFields =
-  | 'productId'
   | 'name'
   | 'slug'
   | 'description'
@@ -51,6 +50,7 @@ export class ExportDialogComponent
     AfterViewInit,
     OnInit
 {
+  private mandatoryOptionFields: Array<ProductFields | VariantFields> = ['optionGroups', 'optionValues']
   @ViewChild('fileNameInput', { static: false }) fileNameElement: ElementRef<HTMLInputElement>
 
   resolveWith: (result?: {
@@ -67,7 +67,6 @@ export class ExportDialogComponent
   exportAssetsAs: 'url' | 'json' = 'url'
   selectedExportFields: ExportFields = []
   availableExportFields: ExportFields = [
-    'productId',
     'name',
     'slug',
     'description',
@@ -99,6 +98,7 @@ export class ExportDialogComponent
     this.selectedExportFields = uniq([
       ...(this.config.defaultExportFields || []),
       ...(this.config.requiredExportFields || []),
+      ...this.mandatoryOptionFields,
     ])
   }
 
@@ -137,6 +137,9 @@ export class ExportDialogComponent
   }
 
   toggleExportFieldSelection(fieldName: ProductFields | VariantFields) {
+    if (this.mandatoryOptionFields.includes(fieldName)) {
+      return
+    }
     const index = this.selectedExportFields.indexOf(fieldName)
     if (index > -1) {
       this.selectedExportFields.splice(index, 1)
@@ -158,8 +161,13 @@ export class ExportDialogComponent
         ...this.availableExportFields.filter((field) =>
           this.config.requiredExportFields?.includes(field),
         ),
+        ...this.mandatoryOptionFields,
       ]
       this.selectedFields = []
     }
   }
+
+  isMandatoryExportField(field: ProductFields | VariantFields): boolean {
+    return this.mandatoryOptionFields.includes(field)
+  }
 }

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

@@ -14,14 +14,6 @@
           <button class="button primary" *ngIf="!selectedFile" (click)="fileUpload.click()">
             {{ 'product-import.card.button-select' | translate }}
           </button>
-          <button
-            class="button primary"
-            *ngIf="selectedFile"
-            (click)="uploadFile()"
-            [disabled]="!selectedMainLanguage"
-          >
-            {{ 'product-import.card.button-upload' | translate }}
-          </button>
         </div>
       </vdr-form-field>
     </div>
@@ -106,6 +98,12 @@
           </label>
         </div>
       </div>
+
+      <div class="input-row" style="margin-top: 24px; padding-top: 16px; border-top: 1px solid #cdcdcd">
+        <button class="button primary" (click)="uploadFile()" [disabled]="!selectedMainLanguage">
+          {{ 'product-import.card.button-upload' | translate }}
+        </button>
+      </div>
     </div>
   </vdr-card>
 </vdr-page-block>

package/src/ui/translations/en.json

@@ -5,7 +5,7 @@
       "title": "Import products from CSV",
       "description": "Choose a CSV file to import products from",
       "button-select": "Select file",
-      "button-upload": "Upload file",
+      "button-upload": "Start import now",
       "update-product-slugs": "Update product slugs based on name",
       "select-main-language": "Select main language: ",
       "updating-strategy": "Updating strategy for facets and assets: ",

package/src/ui/translations/sv.json

@@ -5,7 +5,7 @@
       "title": "Importera produkter från CSV",
       "description": "Välj en CSV-fil att importera produkter från",
       "button-select": "Välj fil",
-      "button-upload": "Ladda upp fil",
+      "button-upload": "Starta import nu",
       "update-product-slugs": "Uppdatera produkt-sluggar utifrån namn",
       "select-main-language": "Välj huvudspråk: ",
       "updating-strategy": "Uppdateringsstrategi för etiketter och filer: ",