@ozdao/prometheus-framework 0.2.309 → 0.2.311

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

@@ -7,7 +7,7 @@
       <h2 class="mn-r-medium">Products</h2>
       <button 
         @click="$router.push({
-          name: route.params._id ? 'Organization_ProductAdd' : 'ProductAdd'
+          name: route.params?._id ? 'Organization_ProductAdd' : 'ProductAdd'
         })" 
         class="radius-100 i-big hover-scale-1 cursor-pointer t-white bg-second">
           +
@@ -31,8 +31,9 @@
         gap-micro pd-small pd-t-thin pd-b-thin
         pos-sticky pos-t-0
         z-index-1
+
       "
-      tabClass="bg-white pd-small radius-small w-100"
+      tabClass="bg-white  uppercase pd-small radius-small w-100"
   />
 
   <div class="cols-2-1_3 h-100 z-index-3 pos-relative radius-big gap-thin">
@@ -67,7 +68,7 @@
         }"
         :options="{
           limit: 15,
-          organization: route.params._id,
+          owner: route.params._id,
           categories: route.query.categories,
           prices: route.query.prices,
           delivery: route.query.delivery,
@@ -78,23 +79,22 @@
         v-slot="{ 
           items 
         }"
-        class="cols-4 pd-thin gap-thin"
+        class="cols-4 rows-1 pd-t-zero pd-thin gap-thin"
       >
-        <CardProduct
-          v-for="product in items"
-          :key="product._id"
-          :product="product"
-          :user="auth.state.access"
-          class="h-max bg-white"
-          @click.capture="$router.push({
-            name: 'Organization_Product', 
-            params: { 
-              _id: route.params._id, 
-              product: product._id 
-            } 
-          })" 
-        />
+        <router-link  
+          v-for="product in items" 
+          :to="route.params._id ? { name: 'Organization_Product', params: { _id: route.params._id, product: product._id  } } : { name: 'Product', params: { product: product._id  } }">
+          <CardProduct
+            :key="product._id"
+            :product="product"
+            :user="auth.state.access"
+            :organization="route.params._id"
+            :access="hasAccess(route.params._id, 'products', 'edit', auth.state.accesses)"
+            class="h-max bg-light"
+          />
+        </router-link>
       </Feed>
+
     </div>
   </div>
 </div>
@@ -103,7 +103,7 @@
 
 <script setup="props">
   // Import libs
-  import { computed, watch, onMounted, ref } from 'vue'
+  import { ref, computed, watch, onMounted, onUnmounted } from 'vue'
   import { useRoute, useRouter } from 'vue-router'
 
   // Import components
@@ -116,8 +116,11 @@
 
   import CardProduct from '@pf/src/modules/products/components/blocks/CardProduct.vue'
 
+  import IconPlus from '@pf/src/modules/icons/navigation/IconPlus.vue'
+
   // Accessing router and store
   import * as auth from '@pf/src/modules/auth/views/store/auth';
+  import * as globals from '@pf/src/modules/globals/views/store/globals';
   import * as products from '@pf/src/modules/products/store/products';
   import * as marketplace from '@pf/src/modules/products/store/marketplace';
   import * as categories from '@pf/src/modules/products/store/categories';
@@ -138,11 +141,19 @@
     marketplace.state.filter.selected.delivery = query.delivery ? query.delivery.split(',') : [];
   }
 
-
   watch(tabProducts, (newValue) => {
     if (route.name !== 'Organization') router.replace({ query: { ...route.query, tabProducts: newValue } });
   });
 
+  globals.state.navigation_bar.actions = [{
+    component: IconPlus,
+    props: {
+      fill: "rgb(var(--main))" 
+    },
+    condition: () => auth.state.user && auth.state.user._id,
+    action: () => route.params._id ? router.push({ name: 'Organization_ProductAdd', params: { _id: route.params._id} }) : router.push({ name: 'ProductAdd' })
+  }],
+
   onMounted(async () => {
     let categoriesFilter = await categories.actions.fetchCategories();
 
@@ -166,6 +177,10 @@
     }
   })
 
+  onUnmounted(() => {
+    globals.state.navigation_bar.actions = [];
+  });
+
   watch(() => marketplace.state.sort, (newSortValue, oldSortValue) => {
     let query = { ...route.query}
     

package/src/modules/products/components/sections/CategoriesTree.vue

@@ -0,0 +1,102 @@
+<template>
+  <VueDraggableNext
+    v-bind="dragOptions" 
+    class="dragArea list-group w-full"
+    :list="items"
+    @change="handleChange"
+  >
+    <div v-for="category in items" :key="category._id" class="pd-medium bg-light radius-medium mn-b-thin">
+      <CardCategory 
+        :category="category" 
+        @delete="deleteCategory" 
+      />
+      <div
+      >
+      <!-- Subcategories: -->
+      <CategoryList 
+        :items="category.children"
+        :state="items"
+        @update="emitChange"
+      />
+      </div>
+    </div>
+  </VueDraggableNext>
+</template>
+
+<script setup>
+import { VueDraggableNext } from 'vue-draggable-next';
+import CardCategory from '@pf/src/modules/products/components/blocks/CardCategory.vue';
+import CategoryList from '@pf/src/modules/products/components/sections/CategoriesTree.vue';
+import * as categories from '@pf/src/modules/products/store/categories';
+
+const props = defineProps({
+  items: Array,
+   state: Array
+});
+
+const emits = defineEmits(['update']);
+
+const dragOptions = {
+  animation: 200,
+  group: 'category',
+  ghostClass: 'ghost'
+};
+
+async function deleteCategory(category) {
+  if (confirm(`Are you sure you want to delete the category "${category.name}"?`)) {
+    await categories.actions.deleteCategory(category.url);
+  }
+}
+
+function findCategoryAndUpdateParent(items, targetId, parentId = null) {
+  for (const item of items) {
+    if (item._id === targetId) {
+      item.parent = parentId;
+      return item;
+    }
+    
+    if (item.children) {
+      const found = findCategoryAndUpdateParent(item.children, targetId, item._id);
+      if (found) {
+        return found;
+      }
+    }
+  }
+  return null;
+}
+
+function updateOrders(items, startOrder = 0) {
+  let currentOrder = startOrder;
+  
+  items.forEach(item => {
+    item.order = currentOrder++;
+    
+    if (item.children?.length) {
+      currentOrder = updateOrders(item.children, currentOrder);
+    }
+  });
+  
+  return currentOrder;
+}
+
+function handleChange(event) {
+  if (!event.added && !event.moved) return;
+  
+  const targetId = event.added ? 
+    event.added.element._id : 
+    props.items[event.moved.newIndex]._id;
+    
+  const updatedCategory = findCategoryAndUpdateParent(props.state, targetId);
+  if (!updatedCategory) return;
+  
+  // Обновляем order для всего дерева категорий
+  updateOrders(props.state);
+  
+  // Отправляем обновленную категорию
+  emits('update', updatedCategory);
+}
+
+function emitChange(event) {
+  emits('update', event);
+}
+</script> 

package/src/modules/products/components/sections/EditProductInfo.vue

@@ -1,48 +1,62 @@
 <template>
+  <Select 
+    v-model:select="product.status"
+    label="Status"
+    :options="[
+      'unpublished', 
+      'published',
+      'archivied'
+    ]"
+    
+    placeholder="Display product"
+    class="pos-relative w-100 mn-b-small bg-white radius-small pd-medium"
+  />
+ <Select 
+    v-model:select="product.listing"
+    label="Type"
+    :options="[
+      'sale', 
+      'rent',
+    ]"
+    placeholder="Type of listing"
+    class="pos-relative w-100 mn-b-small bg-white radius-small pd-medium"
+  />
+
+
+  <Field 
+    v-model:field="product.name" 
+    label="Name"
+    placeholder="Enter product name"
+    class="w-100 mn-b-small bg-white radius-small pd-medium"
+  />
+  <Field 
+    v-model:field="product.price" 
+    label="Price"
+    placeholder="Enter product price" 
+    class="w-100 mn-b-small bg-white radius-small pd-medium"
+    type="number"
+  >
     <Select 
-      v-model:select="product.status"
-      label="Status"
+      v-model:select="product.price_currency" 
+      placeholder="$"
       :options="[
-        'unpublished', 
-        'published',
-        'archivied'
+        '$',
+        '£',
+        '€',
+        '฿',
       ]"
-      
-      placeholder="Display product"
-      class="pos-relative w-100 mn-b-small bg-white radius-small pd-medium"
+      class="pos-relative bg-light pd-thin radius-thin"
     />
+  </Field>
 
-    <Field 
-      v-model:field="product.name" 
-      label="Name"
-      placeholder="Enter product name"
-      class="w-100 mn-b-small bg-white radius-small pd-medium"
-    />
-    <Field 
-      v-model:field="product.price" 
-      label="Price"
-      placeholder="Enter product price" 
-      class="w-100 mn-b-small bg-white radius-small pd-medium"
-      type="number"
-    >
-      <Select 
-        v-model:select="product.price.currency" 
-        placeholder="฿"
-        :options="[
-          '฿'
-        ]"
-        class="pos-relative bg-light pd-thin radius-thin"
-      />
-    </Field>
-
-
-    <Field
-      v-model:field="product.description" 
-      label="Description"
-      placeholder="Enter product description" 
-      class="w-100 bg-white radius-small pd-medium"
-      type="textarea"
-    />
+
+  <Field
+    v-model:field="product.description" 
+    label="Description"
+    placeholder="Enter product description" 
+    class="w-100 bg-white radius-small pd-medium"
+    type="textarea"
+  />
 </template>
 
 <script setup>
@@ -51,7 +65,6 @@ import Button  from '@pf/src/components/Button/Button.vue'
 import Field from "@pf/src/components/Field/Field.vue";
 import Select from "@pf/src/components/Select/Select.vue";
 
-
 const props = defineProps({
   product: Object,
 });

package/src/modules/products/controllers/categories.controller.js

@@ -1,120 +1,198 @@
 const controllerFactory = (db) => {
-    const Category = db.category;
+  const Category = db.category;
 
-    const getCategories = async (req, res) => {
-        console.log(Category)
+  return {
+    async read(req, res) {
         try {
-            
-            let query = {};
-            let options = {};
+            const { 
+                parent, 
+                url, 
+                search, 
+                sort = 'order', 
+                order = 1, 
+                page = 1, 
+                limit = 10,
+                excludeChildren = false,
+                rootOnly = false 
+            } = req.query;
 
-            // Проверка наличия req.query.organization
-            if (req.query.status) {
-                // Создание ObjectId из строки
-                query.status = req.query.status;
-            }
+            const matchStage = {
+                ...(req.query.status && { status: req.query.status }),
+                ...(req.query.url && { url: req.query.url }),
+                ...(search && { name: { $regex: search, $options: 'i' } }),
+                ...(parent ? { parent: new db.mongoose.Types.ObjectId(parent) } : {}),
+                ...(rootOnly ? { parent: null } : {})
+            };
 
-            const categories = await Category.find(query, null, options).sort({'order': 'asc'}).exec();
+            const pipeline = [
+                { $match: matchStage },
+                {
+                    $graphLookup: {
+                        from: 'categories',
+                        startWith: '$_id',
+                        connectFromField: '_id',
+                        connectToField: 'parent',
+                        as: 'allDescendants',
+                        maxDepth: 10
+                    }
+                },
+                { $sort: { [sort]: order === 'asc' ? 1 : -1 } },
+                { $skip: (page - 1) * limit },
+                { $limit: Number(limit) },
+            ];
+
+            const flatResults = await Category.aggregate(pipeline);
             
-            if (!categories) {
-                return res.status(404).send({ message: "Categories not found." });
-            }
-            res.status(200).send(categories);
-        } catch (err) {
-            console.log(err)
-            res.status(500).send({ message: err });
-        }
-    };
+            function buildTree(items) {
+              const itemMap = {};
+              const roots = [];
+              
+              // First pass: Create map of items by ID
+              items.forEach(item => {
+                  itemMap[item._id.toString()] = {
+                      ...item,
+                      children: []
+                  };
+              });
 
-    const updateCategories = async (req, res) => {
-        console.log(req.body);
-        try {
-            const bulkOps = req.body.map((categoryUpdated) => ({
-                updateOne: {
-                    filter: { url: categoryUpdated.url },
-                    update: { $set: categoryUpdated },
-                    upsert: false 
-                }
-            }));
-
-            // Выполнение пакетного обновления
-            const result = await Category.bulkWrite(bulkOps, { ordered: false });
-            console.log('Success', result);
-            res.status(200).send({ message: "Categories updated successfully." });
+              // Second pass: Build tree structure
+              items.forEach(item => {
+                  const itemId = item._id.toString();
+                  const parentId = item.parent?._id?.toString();
+                  if (parentId && itemMap[parentId]) {
+                      itemMap[parentId].children.push(itemMap[itemId]);
+                  } else {
+                      roots.push(itemMap[itemId]);
+                  }
+              });
+
+              // Sort children arrays by order property
+              const sortByOrder = (a, b) => {
+                  const orderA = a.order ?? Number.MAX_SAFE_INTEGER;
+                  const orderB = b.order ?? Number.MAX_SAFE_INTEGER;
+                  return orderA - orderB;
+              };
+
+              // Recursive function to sort children at all levels
+              const sortChildren = (node) => {
+                  if (node.children && node.children.length > 0) {
+                      node.children.sort(sortByOrder);
+                      node.children.forEach(sortChildren);
+                  }
+              };
+
+              // Sort roots and all children
+              roots.sort(sortByOrder);
+              roots.forEach(sortChildren);
+
+              return roots;
+          }
+
+          const treeResults = flatResults.map(doc => {
+              const descendants = doc.allDescendants || [];
+              const allItems = [doc, ...descendants];
+              const tree = buildTree(allItems);
+              
+              // Find and return only the root node (original document)
+              return tree.find(node => node._id.toString() === doc._id.toString());
+          });
+
+          // Sort root categories
+          treeResults.sort((a, b) => {
+              const orderA = a.order ?? Number.MAX_SAFE_INTEGER;
+              const orderB = b.order ?? Number.MAX_SAFE_INTEGER;
+              return orderA - orderB;
+          });
+
+          res.json(treeResults);
         } catch (err) {
-            console.error('Error processing bulk update', err);
-            res.status(500).send({ message: err.message });
+            res.status(500).json({ message: err.message });
         }
-    };
+    },
 
+    async create(req, res) {
+      try {
+        const highestOrder = await Category.findOne().sort('-order');
+        const order = highestOrder ? highestOrder.order + 1 : 1;
+        const category = new Category({ ...req.body, order });
 
-    const getCategory = async (req, res) => {
-        try {
-            const category = await Category.findOne({ url: req.params.url }).exec();
-            if (!category) {
-                return res.status(404).send({ message: "Category not found." });
-            }
-            res.status(200).send(category);
-        } catch (err) {
-            res.status(500).send({ message: err });
+        if (req.body.parent) {
+          const parent = await Category.findByIdAndUpdate(
+            req.body.parent,
+            { $push: { children: category._id } },
+            { new: true }
+          );
+          if (!parent) throw new Error('Parent category not found');
+          category.parent = parent._id;
         }
-    };
 
-    const addCategory = async (req, res) => {
-        try {
+        if (req.body.children && req.body.children.length > 0) {
+          await Category.updateMany(
+            { _id: { $in: req.body.children } },
+            { $set: { parent: category._id } }
+          );
+        }
 
-            const highestOrderDoc = await Category.findOne().sort('-order'); 
-            req.body.order = highestOrderDoc ? highestOrderDoc.order + 1 : 1;
+        await category.save();
+        res.status(201).json(category);
+      } catch (err) {
+        res.status(err.message === 'Parent category not found' ? 404 : 500).json({ message: err.message });
+      }
+    },
 
-            const category = await Category.create(req.body);
+    async update(req, res) {
 
-            if (!category) {
-                return res.status(404).send({ message: "Category is not created." });
+      try {
+        const { categories } = req.body;
+        
+        const bulkOps = categories.map(category => ({
+          updateOne: {
+            filter: { _id: category._id },
+            update: { 
+              $set: { 
+                order: category.order,
+                parent: category.parent ? new db.mongoose.Types.ObjectId(category.parent) : null
+              }
             }
-            res.status(200).send(category);
-        } catch (err) {
-            console.log(req.body);
-            console.log(req.category);
-            res.status(500).send({ message: err });
-        }
-    };
+          }
+        }));
 
-    const updateCategory = async (req, res) => {
-        try {
-            const category = await Category.findOneAndUpdate(
-                { url: req.params.url },
-                { $set: req.body },
-                { new: true }
-            ).exec();
-            if (!category) {
-                return res.status(404).send({ message: "Something wrong when updating category." });
-            }
-            res.status(200).send(category);
-        } catch (err) {
-            res.status(500).send({ message: err });
-        }
-    };
+        await Category.bulkWrite(bulkOps);
+        const updatedCategories = await Category.find().sort({ order: 'asc' }).lean();
+        res.status(200).json(updatedCategories);
 
-    const deleteCategory = async (req, res) => {
-        try {
-            const category = await Category.findOneAndDelete({ url: req.params.url }).exec();
-            if (!category) {
-                return res.status(404).send({ message: "Category is not deleted." });
+      } catch (err) {
+        console.error('Category update error:', err);
+        res.status(500).json({ message: 'Failed to update categories' });
+      }
+    },
+
+    async delete(req, res) {
+      try {
+        const category = await Category.findOne({ url: req.body.url });
+        if (!category) throw new Error('Category not found');
+        
+        const deleteSubcategories = async (categoryId) => {
+          const cat = await Category.findById(categoryId);
+          if (cat) {
+            for (const childId of cat.children) {
+              await deleteSubcategories(childId);
             }
-            res.status(200).send(category);
-        } catch (err) {
-            res.status(500).send({ message: err });
+            await Category.findByIdAndDelete(categoryId);
+          }
+        };
+        
+        if (category.parent) {
+          await Category.findByIdAndUpdate(category.parent, { $pull: { children: category._id } });
         }
-    };
-
-    return {
-        getCategories,
-        updateCategories,
-        getCategory,
-        addCategory,
-        updateCategory,
-        deleteCategory
-    };
+        
+        await deleteSubcategories(category._id);
+        res.status(200).json({ message: 'Category deleted successfully' });
+      } catch (err) {
+        res.status(err.message === 'Category not found' ? 404 : 500).json({ message: err.message });
+      }
+    }
+  };
 };
 
-module.exports = controllerFactory;
+module.exports = controllerFactory;

package/src/modules/products/controllers/products.controller.js

@@ -35,8 +35,8 @@ const controllerFactory = (db) => {
   try {
     const query = {};
 
-    if (req.query.organization) {
-      query.organization = new ObjectId(req.query.organization);
+    if (req.query.owner) {
+      query['owner.target'] = new ObjectId(req.query.owner);
     }
 
     if (req.query._id) {
@@ -263,8 +263,10 @@ const controllerFactory = (db) => {
         {
           name: req.body.name,
           status: req.body.status,
+          listing: req.body.listing,
           description: req.body.description,
           price: req.body.price,
+          price_currency: req.body.price_currency,
           sale: req.body.sale,
           category: req.body.category,
           images: req.body.images,