Merge pull request #578 from OneSila/development

Update shein schema import performance

Author: BranDavidSebastian

src/core/integrations/integrations/integrations-show/containers/document-types/containers/remote-document-types/components/categories-lists/SheinDocumentTypeCategoriesList.vue

@@ -13,6 +13,7 @@ import { normalizeCategoryNode, type SheinCategoryNode } from '../../../../../..
 
 type CategoryId = string | number;
 interface SheinCategorySelectionNode extends SheinCategoryNode {
+  fullPath?: string | null;
   parentRemoteId?: string | null;
 }
 
@@ -102,6 +103,7 @@ const emptyMessage = computed(() =>
 
 const normalizeSheinNode = (node: any): SheinCategorySelectionNode => ({
   ...normalizeCategoryNode(node),
+  fullPath: node?.fullPath ?? null,
   parentRemoteId: node?.parentRemoteId ?? node?.parent?.remoteId ?? null,
 });
 
@@ -159,32 +161,6 @@ const fetchCategoryByRemoteId = async (remoteId: string): Promise<SheinCategoryS
   }
 };
 
-const buildPathFromNode = async (node: SheinCategorySelectionNode): Promise<string> => {
-  const names: string[] = [];
-  if (node.name) {
-    names.unshift(node.name);
-  }
-
-  let parentRemoteId = node.parentRemoteId ? String(node.parentRemoteId) : null;
-  const visited = new Set<string>([node.remoteId]);
-  let guard = 0;
-
-  while (parentRemoteId && guard < 30 && !visited.has(parentRemoteId)) {
-    visited.add(parentRemoteId);
-    const parentNode = await fetchCategoryByRemoteId(parentRemoteId);
-    if (!parentNode) {
-      break;
-    }
-    if (parentNode.name) {
-      names.unshift(parentNode.name);
-    }
-    parentRemoteId = parentNode.parentRemoteId ? String(parentNode.parentRemoteId) : null;
-    guard += 1;
-  }
-
-  return names.join(' > ') || node.name || node.remoteId;
-};
-
 const decodeCategories = async () => {
   const requestId = ++decodeRequestId;
   const ids = Array.from(new Set(remoteIds.value));
@@ -234,18 +210,14 @@ const decodeCategories = async () => {
           return;
         }
         mapped[node.remoteId] = node;
+        pathMap[node.remoteId] = node.fullPath || node.name || node.remoteId;
         unresolvedIds.delete(node.remoteId);
         nodeCache.value = {
           ...nodeCache.value,
           [node.remoteId]: node,
         };
       });
     }
-
-    for (const remoteId of Object.keys(mapped)) {
-      const path = await buildPathFromNode(mapped[remoteId]);
-      pathMap[remoteId] = path;
-    }
   } catch (error) {
     displayApolloError(error);
   } finally {
@@ -274,7 +246,7 @@ const formatPath = (node: SheinCategorySelectionNode | null, remoteId: string):
   if (!node) {
     return remoteId;
   }
-  return decodedPaths.value[remoteId] || node.name || remoteId;
+  return decodedPaths.value[remoteId] || node.fullPath || node.name || remoteId;
 };
 
 const addCategory = (node: SheinCategorySelectionNode, path: string) => {
@@ -352,7 +324,7 @@ const setManualCategory = async () => {
       return;
     }
 
-    const path = await buildPathFromNode(node);
+    const path = node.fullPath || node.name || node.remoteId;
     addCategory(node, path);
     manualCategoryInput.value = '';
     resetSelectionPreview();

src/core/integrations/integrations/integrations-show/containers/document-types/containers/remote-document-types/configs.ts

@@ -32,12 +32,10 @@ export const remoteDocumentTypesListingConfigConstructor = (
 ): ListingConfig => ({
   headers: [
     t('shared.labels.name'),
-    t('integrations.show.documentTypes.labels.translatedName'),
     t('integrations.show.documentTypes.labels.localInstance'),
   ],
   fields: [
-    { name: 'name', type: FieldType.Text },
-    { name: 'translatedName', type: FieldType.Text },
+    { name: 'effectiveName', type: FieldType.Text },
     {
       name: 'localInstance',
       type: FieldType.NestedText,

src/core/products/products/product-show/containers/tabs/variations/containers/variations-images-bulk-edit/VariationsImagesBulkEdit.vue

@@ -541,6 +541,34 @@ const closePlaceholder = () => {
 
 const normalizeTextValue = (value?: string | null) => (value ?? '').trim();
 
+const getDedupedImagesForSave = (row: VariationRow) => {
+  const mediaMap = new Map<string, { slot: VariationImageSlot; sortOrder: number; isMainImage: boolean }>();
+
+  row.images.forEach((slot, index) => {
+    if (!slot?.mediaId) {
+      return;
+    }
+
+    const existing = mediaMap.get(slot.mediaId);
+    if (!existing) {
+      mediaMap.set(slot.mediaId, {
+        slot,
+        sortOrder: index,
+        isMainImage: !!slot.isMainImage,
+      });
+      return;
+    }
+
+    existing.sortOrder = Math.min(existing.sortOrder, index);
+    existing.isMainImage = existing.isMainImage || !!slot.isMainImage;
+    if (!existing.slot.id && slot.id) {
+      existing.slot = slot;
+    }
+  });
+
+  return Array.from(mediaMap.values()).sort((a, b) => a.sortOrder - b.sortOrder);
+};
+
 const applyEditFormFromSlot = (slot: VariationImageSlot) => {
   syncingEditForm.value = true;
   editTitle.value = slot.title ?? '';
@@ -934,8 +962,9 @@ const save = async () => {
     variations.value.forEach((row) => {
       const original = originalMap.get(row.variation.id);
       const currentIds = new Set<string>();
+      const dedupedImages = getDedupedImagesForSave(row);
 
-      row.images.forEach((slot, index) => {
+      dedupedImages.forEach(({ slot, sortOrder, isMainImage }) => {
         if (!slot || !slot.mediaId) {
           return;
         }
@@ -951,17 +980,17 @@ const save = async () => {
           toCreate.push({
             productId: row.variation.id,
             mediaId: slot.mediaId,
-            sortOrder: index,
-            isMainImage: !!slot.isMainImage,
+            sortOrder,
+            isMainImage,
           });
           return;
         }
         currentIds.add(slot.id);
         const originalSlot = original?.images.find((item) => item?.id === slot.id) ?? null;
         const originalSort = originalSlot?.sortOrder ?? null;
         const originalMain = originalSlot?.isMainImage ?? false;
-        if (originalSort !== index || originalMain !== slot.isMainImage) {
-          toUpdate.push({ id: slot.id, sortOrder: index, isMainImage: !!slot.isMainImage });
+        if (originalSort !== sortOrder || originalMain !== isMainImage) {
+          toUpdate.push({ id: slot.id, sortOrder, isMainImage });
         }
       });
 

src/shared/api/queries/salesChannels.js

@@ -1942,8 +1942,7 @@ export const remoteDocumentTypesQuery = gql`
       edges {
         node {
           id
-          name
-          translatedName
+          effectiveName
           localInstance {
             id
             name

src/shared/api/queries/sheinCategories.js

@@ -21,6 +21,7 @@ export const sheinCategoriesQuery = gql`
         node {
           remoteId
           name
+          fullPath
           parentRemoteId
           isLeaf
           productTypeRemoteId