@ozdao/martyrs 0.2.506 → 0.2.507

package/src/modules/products/components/blocks/CardCategory.vue

@@ -9,7 +9,7 @@
           name: 'Category Edit', 
           params: { 
             _id: route.params._id,
-            category: category.url
+            category: category._id
           } 
         }"
         class="

package/src/modules/products/components/blocks/ProductImages.vue

@@ -44,7 +44,7 @@
     </div>
     
     <!-- Popup with photo viewer -->
-    <Popup @close-popup="closePopup" :isPopupOpen="isPopupVisible" class="radius-zero o-hidden">
+    <Popup @close-popup="closePopup" :isPopupOpen="isPopupVisible" class="radius-zero w-100 o-hidden">
       <PhotoViewer
         :photos="images.map(img => (FILE_SERVER_URL || '') + img)"
         :initialIndex="selectedImageIndex"

package/src/modules/products/components/pages/Categories.vue

@@ -36,8 +36,7 @@
         }"
         :options="{
           user: auth.state.user._id,
-          rootOnly: true,
-          excludeChildren: false
+          tree: true
         }"
         v-model:sort="sort"
         v-model:items="categories.state.all"
@@ -117,35 +116,43 @@
     
   });
 
-  // Функция для преобразования иерархического дерева категорий в плоский массив
-  function flattenCategoryTree(categories) {
+  // Функция для преобразования дерева в плоский массив для API (materialised path)
+  function flattenTreeForAPI(treeData, parentUrl = '') {
     let flatCategories = [];
     
-    function flatten(category) {
-      const { children, ...categoryWithoutChildren } = category;
-      flatCategories.push(categoryWithoutChildren);
+    function processNode(node, index, parentUrl) {
+      const { children, ...nodeData } = node;
       
-      if (children && Array.isArray(children)) {
-        children.forEach(child => flatten(child));
+      // Для materialised path отправляем order и parent (если есть)
+      flatCategories.push({
+        _id: nodeData._id,
+        order: index,
+        ...(nodeData.parent && { parent: nodeData.parent })
+      });
+      
+      if (children && children.length > 0) {
+        children.forEach((child, childIndex) => {
+          processNode(child, childIndex, nodeData.url);
+        });
       }
     }
     
-    categories.forEach(category => flatten(category));
+    treeData.forEach((node, index) => {
+      processNode(node, index, parentUrl);
+    });
+    
     return flatCategories;
   }
 
-
   // Функция для обновления порядка категорий
-  async function updateCategoriesOrder(updatedCategories) {
-    alert('helo')
+  async function updateCategoriesOrder(event) {
+    console.log('updateCategoriesOrder called with event:', event);
+    
     try {
-      // Преобразуем категории в плоский массив
-      const flattenedCategories = flattenCategoryTree(categories.state.all);
+      // Игнорируем события drag-and-drop, используем актуальное состояние
+      const flatCategories = flattenTreeForAPI(categories.state.all);
       
-      console.log(flattenedCategories)
-      console.log( categories.state.all)
-      await categories.actions.updateOrder(flattenedCategories);
-        
+      await categories.actions.updateOrder(flatCategories);
       console.log('Categories order updated successfully');
     } catch (error) {
       console.error('Error updating categories order:', error);
@@ -159,9 +166,7 @@
     
     // Если пользователь подтвердил удаление, продолжаем процесс
     if (isConfirmed) {
-      await categories.actions.delete(category.url);
-    } else {
-      alert('Category deletion cancelled'); 
+      await categories.actions.delete(category._id);
     }
   }
 </script>

package/src/modules/products/components/pages/CategoryEdit.vue

@@ -32,8 +32,6 @@
       </div>
 
         <div class="mn-b-thin w-100 flex-nowrap gap-thin flex">
-
-
          <Field
             v-model:field="categories.state.current.order"
             label="Order"
@@ -41,13 +39,21 @@
             class="w-40 bg-white radius-small pd-medium"
           />  
          <Field
-            v-model:field="categories.state.current.url"
-            label="URL"
-            placeholder="Enter category URL"
+            v-model:field="categories.state.current.slug"
+            label="Slug"
+            placeholder="Enter category slug"
+            :disabled="route.params.category ? true : false"
             class="w-100 bg-white radius-small pd-medium"
           />  
-         
       </div>
+      
+      <Field
+        v-if="route.params.category"
+        v-model:field="categories.state.current.url"
+        label="URL Path"
+        :disabled="true"
+        class="w-100 bg-white radius-small pd-medium mn-b-thin"
+      />
 
       <Select 
         v-model:select="categories.state.current.status"
@@ -105,7 +111,7 @@
       placeholder="No filters added yet"
       :actions="[{
         label: '+',
-        function: () => categories.state.current.filters.push({name: '', url: ''})
+        function: () => categories.state.current.filters.push({name: '', options: []})
       }]"
     >
       <div 
@@ -118,9 +124,9 @@
           placeholder="Filter name"
           class="w-100 bg-white radius-small pd-medium"
         />  
-        <Field
-          v-model:field="item.options"
-          placeholder="Filter options divided by ,"
+        <FieldTags
+          v-model:tags="item.options"
+          placeholder="Add filter options"
           class="w-100 bg-white radius-small pd-medium"
         />
         <div
@@ -148,6 +154,7 @@
   import Select from "@martyrs/src/components/Select/Select.vue";
   import UploadImage from '@martyrs/src/components/UploadImage/UploadImage.vue';
   import Field from "@martyrs/src/components/Field/Field.vue";
+  import FieldTags from "@martyrs/src/components/FieldTags/FieldTags.vue";
   import Feed from '@martyrs/src/components/Feed/Feed.vue'
 
 
@@ -170,7 +177,7 @@
   onMounted(async () => {
     emits('page-loading');
     if (route.params.category) {
-      await categories.actions.read({url: route.params.category})
+      await categories.actions.read({_id: route.params.category})
     } else {
       categories.actions.clean() // Adjusted based on the new store's method to reset the category state
     }
@@ -206,12 +213,16 @@
       categories.state.current.creator = {
         type: categories.state.current.creator.type,
         hidden: categories.state.current.creator.hidden,
-        target: categories.state.current.creator.target._id
+        target: typeof categories.state.current.creator.target === 'object' 
+          ? categories.state.current.creator.target._id 
+          : categories.state.current.creator.target
       }
 
       categories.state.current.owner = {
         type: categories.state.current.owner.type,
-        target: categories.state.current.owner.target._id
+        target: typeof categories.state.current.owner.target === 'object' 
+          ? categories.state.current.owner.target._id 
+          : categories.state.current.owner.target
       }
 
       await categories.actions.update(categories.state.current)