@ozdao/prometheus-framework 0.2.51 → 0.2.52

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

@@ -1,47 +1,57 @@
 <template>
-  <div class="cols-2-1_3 bg-grey radius-big gap-thin pd-thin">
+  <div class="cols-2-1_3 bg-grey pd-thin radius-big gap-thin">
+
     <FilterProducts
 
     /> 
-    <Feed
-      :states="{
-        empty: {
-          title: 'No Products Found',
-          description: 'Currently, there are no products available.'
-        }
-      }"
-      :store="{
-        read: (options) => products.actions.read(options),
-        state: products.state
-      }"
-      :options="{
-        limit: 15,
-        organization: route.params._id,
-        categories: route.query.categories,
-        prices: route.query.prices,
-        delivery: route.query.delivery,
-        // user: user
-      }"
-      v-slot="{ 
-        items 
-      }"
-      class="cols-3 gap-thin"
-    >
-      <CardProduct
-        v-for="product in items"
-        :key="product._id"
-        :product="product"
-        class="h-max"
-        @click="$router.push({
-          name: 'Product Organization', 
-          params: { 
-            _id: route.params._id, 
-            product: product._id 
-          } 
-        })" 
+
+    <div>
+      <BlockSearch 
+        @search="updateSearch"
+        placeholder="Enter product name"
+        class="bg-white mn-b-thin"
       />
-    </Feed>
 
+      <Feed
+        :states="{
+          empty: {
+            title: 'No Products Found',
+            description: 'Currently, there are no products available.'
+          }
+        }"
+        :store="{
+          read: (options) => products.actions.read(options),
+          state: products.state
+        }"
+        :options="{
+          limit: 15,
+          organization: route.params._id,
+          categories: route.query.categories,
+          prices: route.query.prices,
+          delivery: route.query.delivery,
+          search: route.query.search
+          // user: user
+        }"
+        v-slot="{ 
+          items 
+        }"
+        class="cols-3 gap-thin"
+      >
+        <CardProduct
+          v-for="product in items"
+          :key="product._id"
+          :product="product"
+          class="h-max"
+          @click="$router.push({
+            name: 'Product Organization', 
+            params: { 
+              _id: route.params._id, 
+              product: product._id 
+            } 
+          })" 
+        />
+      </Feed>
+    </div>
   </div>
 </template>
 
@@ -54,6 +64,8 @@
 
   // Import components
   import FilterProducts from '@pf/src/modules/products/components/sections/FilterProducts.vue'
+  import BlockSearch from '@pf/src/modules/globals/components/blocks/BlockSearch.vue'
+  
 
   import Feed from '@pf/src/components/Feed/Feed.vue'
   import CardProduct from '@pf/src/modules/products/components/blocks/CardProduct.vue'
@@ -61,6 +73,14 @@
   // Accessing router and store
   import * as products from '@pf/src/modules/products/store/products';
 
+  function updateSearch(search) {
+    let query = { ...route.query}
+    
+    query.search = search
+    
+    router.push({ query });
+  }
+
   const route = useRoute()
   const router = useRouter()
 </script>

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

@@ -1,8 +1,8 @@
   <template>
-    <div class="pd-medium bg-grey radius-big">
+    <div class="pd-medium bg-white-transp-50 radius-big">
       <!-- Categories Filter -->
       <Spoiler 
-        class="radius-small o-hidden br-1px br-solid br-grey mn-b-small"
+        class="radius-small o-hidden mn-b-small"
         :status="true"
       >
         <template #header>
@@ -22,11 +22,11 @@
         </template>
       </Spoiler>
 
-      <hr class="mn-b-small">
+      <hr class="mn-b-small t-transp">
 
       <!-- Prices Filter -->
       <Spoiler 
-        class="radius-small o-hidden br-1px br-solid br-grey mn-b-small"
+        class="radius-small o-hidden mn-b-small"
         :status="false"
       >
         <template #header>
@@ -46,7 +46,7 @@
         </template>
       </Spoiler>
 
-      <hr class="mn-b-small">
+      <!-- <hr class="mn-b-small"> -->
 
       <!-- Delivery Filter -->
      <!--  <Spoiler 

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

@@ -1,5 +1,3 @@
-const ObjectId = require('mongoose').Types.ObjectId;
-
 const controllerFactory = (db) => {
   const Leftover = db.leftover;
 
@@ -8,16 +6,25 @@ const controllerFactory = (db) => {
       let query = {};
       let options = {};
 
-      if (req.query.organization) query.organization = new ObjectId(req.query.organization)
+      // Проверка наличия req.query.organization
+      if (req.query.organization) {
+        // Создание ObjectId из строки
+        query.organization = new db.mongoose.Types.ObjectId(req.query.organization);
+      }
+
+      console.log(query);
+
+      const leftoveres = await Leftover.find(query, null, options)
+        .sort({ createdAt: "desc" })
+        .exec();
 
-      const leftoveres = await Leftover.find(query, null, options).sort({ 'createdAt': 'desc' }).exec();
-      
       if (!leftoveres) {
         return res.status(404).send({ message: "LEFTOVERES_NOT_FOUND" });
       }
 
       res.status(200).send(leftoveres);
     } catch (err) {
+      console.error(err);
       res.status(500).send({ message: "ERROR_GET_ALL_LEFTOVERES" });
     }
   };

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

@@ -62,6 +62,24 @@ const controllerFactory = (db) => {
         query.delivery = { $in: deliveryOptions };
       }
 
+      const search = req.query.search;
+
+      if (search) {
+        const parts = search.split('.');
+
+        let regexPattern = '';
+
+        if (parts.length === 2) {
+          // Создаем паттерн, который допускает замену одного символа в каждой части
+          regexPattern = parts.map(part => part.substr(0, part.length - 1) + '.{1}').join('\\.');
+        } else {
+          // Если нет точки, применяем аналогичный подход к всей строке
+          regexPattern = search.substr(0, search.length - 1) + '.{1}';
+        }
+
+        query.name = { $regex: regexPattern, $options: 'i' } 
+      }
+
       // Handle price ranges
       const prices = req.query.prices?.split(',') || [];
 

package/src/modules/products/store/products.js

@@ -92,6 +92,10 @@ const actions = {
       query.status = options.status;
     }
 
+    if (options.search) {
+      query.search = options.search;
+    }
+
     query.sort = 'createdAt';
     
     query.skip = options.skip || 0;