@ozdao/prometheus-framework 0.2.65 → 0.2.66

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/prometheus-framework",
-  "version": "0.2.65",
+  "version": "0.2.66",
   "description": "Web3 Framework focused on user experience and ease of development.",
   "author": "OZ DAO <hello@ozdao.dev>",
   "license": "GPL-3.0-or-later",

package/src/components/Feed/Feed.vue

@@ -2,18 +2,20 @@
 
   <TransitionGroup tag="ul" name="scaleTransition" >
     <BlockSearch 
-        v-if="search"
-        @search="updateSearch"
-        placeholder="Enter product name"
-        class="bg-white mn-b-thin"
-      />
+      v-if="search"
+      @search="updateSearch"
+      placeholder="Enter product name"
+      class="bg-white mn-b-thin"
+    />
   </TransitionGroup>
+
   <TransitionGroup v-if="isLoading" tag="ul" name="scaleTransition" class="o-hidden bg-grey radius-big">
     <SkeletonEvent
       v-if="isLoading"
       v-for="i in currentLimit" :key="i"
     />
   </TransitionGroup>
+
   <transition name="scaleTransition">
     <EmptyState
       v-if="!isLoading && itemsList.length < 1"
@@ -24,8 +26,6 @@
   </transition>
 
   <TransitionGroup tag="ul" name="scaleTransition" :class="$attrs.class">
-    
-
     <slot
       v-if="!isLoading && itemsList.length > 0"
       :items="itemsList"
@@ -41,7 +41,6 @@
     </button>
   </TransitionGroup>
 
-  
 </template>
 
 <script setup>
@@ -106,6 +105,14 @@ let isLoading = ref(true);
 let currentSkip = ref(props.options.skip ? props.options.skip : 0);
 let currentLimit = ref(props.options.limit ? props.options.limit : 10);
 
+let currentSearch = ref('');
+
+function updateSearch(search) {
+  currentSearch.value = search
+
+  fetchItems();
+}
+
 const loadMoreItems = async () => {
   if (hasMoreItems.value) {
     currentSkip.value += currentLimit.value;
@@ -113,6 +120,7 @@ const loadMoreItems = async () => {
     const data = await props.store.read({
       skip: currentSkip.value,
       limit: currentLimit.value,
+      search: currentSearch.value,
       ...props.options
     });
 
@@ -132,6 +140,7 @@ const fetchItems = async () => {
   const data = await props.store.read({
     skip: currentSkip.value,
     limit: currentLimit.value,
+    search: currentSearch.value,
     ...props.options
   });
 
@@ -143,8 +152,6 @@ const fetchItems = async () => {
     hasMoreItems.value = true;
   }
 
-  console.log(data)
-
   itemsList.value = data;
   isLoading.value = false;
 };
@@ -164,14 +171,6 @@ watch(() => props.options, (newVal, oldVal) => {
   }
 }, { deep: true });
 
-function updateSearch(search) {
-  props.options.search = search
-
-  console.log(search)
-
-  fetchItems();
-}
-
 
 onMounted(async () => {
   await fetchItems()

package/src/components/Field/Field.vue

@@ -60,6 +60,7 @@
         @focus="event => emit('focus', event)"
         @blur="event => emit('blur', event)"
         class="w-100"
+        style="resize: vertical;"
         :value="field"
         :placeholder="placeholder"
         :tabindex="tabindex"

package/src/components/Tooltip/Tooltip.vue

@@ -21,7 +21,7 @@ const visible = ref(false);
 
 const tooltipStyle = reactive({
   position: 'absolute',
-  'min-width': '20rem',
+  width: 'max-content',
   zIndex: 1000,
   background: '#333',
   color: '#fff',

package/src/modules/globals/components/blocks/CardHeader.vue

@@ -35,7 +35,6 @@
 					})" 
 				/>
 
-		
 				<span 
 					v-if="type !== 'short'"
 					class="t-semi"
@@ -62,9 +61,13 @@
 					>
 						· by {{creator.target?.profile?.name}}
 					</span>
-					<span v-if="date">
+
+					<span v-if="date" class="pos-relative">
+							<Tooltip v-if="date" :text="formatDate(date)">
 						· {{getTimeElapsed(date)}}
+						 	</Tooltip>
 					</span>
+
 					<span v-if="dateFormatted">
 						· {{dateFormatted}}
 					</span>
@@ -182,7 +185,7 @@
 
 	import PlaceholderUserpic from '@pf/src/modules/icons/placeholders/PlaceholderUserpic.vue'
 	import FormReport from '@pf/src/modules/reports/components/sections/FormReport.vue'   
-
+	import Tooltip           from '@pf/src/components/Tooltip/Tooltip.vue'
 	import Dropdown from "@pf/src/components/Dropdown/Dropdown.vue";
 	import ButtonToggleMembership from '@pf/src/modules/organizations/components/elements/ButtonToggleMembership.vue'
 

package/src/modules/globals/controllers/utils/queryProcessor.js

@@ -2,7 +2,7 @@ const ObjectId = require('mongoose').Types.ObjectId;
 
 function getBasicOptions(query) {
   // Деструктуризация для извлечения параметров запроса
-  const { _id, url, status, owner, creator } = query;
+  const { _id, url, status, type, owner, creator } = query;
 
   // Подготовка условий для каждого возможного параметра
   const conditions = [];
@@ -10,6 +10,7 @@ function getBasicOptions(query) {
   if (_id) { conditions.push({ _id:  new ObjectId(_id) }); }
   if (url) { conditions.push({ url: url }); }
   if (status) { conditions.push({ status: status }); }
+  if (type) { conditions.push({ type: type }); }
   if (owner) { conditions.push({ "owner.target": new ObjectId(owner) }); }
   if (creator) { conditions.push({ "creator.target": new ObjectId(creator) }); }
   

package/src/modules/globals/store/globals.js

@@ -66,17 +66,16 @@ const actions = {
       array[existingItemIndex] = item
     }
   },
-
   update(array, item) {
     const existingItemIndex = array.findIndex(i => i._id === item._id);
-
     if (existingItemIndex === -1) {
+      // If the item doesn't exist, push it to the array
       array.push(item);
     } else {
-      array[existingItemIndex] = item;
+      // Update the item in the array without creating a new array
+      Object.assign(array[existingItemIndex], item);
     }
   },
-
   delete(array, item) {
     const existingItemIndex = array.findIndex(c => c._id === item._id);
 

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

@@ -1,5 +1,6 @@
 <template>
   <div class="flex-column pos-relative flex-wrap">
+
     <CardHeader 
       :entity="leftover"
       :entityType="'leftover'"
@@ -9,45 +10,64 @@
       :date="leftover.createdAt"
     />
 
-    <div class="w-100 mn-b-thin flex">
-      <p class="p-big">
-        {{leftover.type}}
-      </p> 
+    <router-link 
+      :to="{
+        name: 'LeftoverEdit', 
+        params: {
+          _id: leftover.organization,
+          leftover: leftover._id
+        }
+      }" 
+      class="
+        cursor-pointer 
+        pos-absolute pos-t-regular pos-r-regular
+        radius-extra pd-thin bg-second
+      "
+    >
       <IconEdit
-        @click="$router.push({
-          name: 'LeftoverEdit', 
-          params: {
-            _id: leftover.organization,
-            leftover: leftover._id
-          }
-        })" 
-        class="pos-absolute pos-t-regular pos-r-regular i-regular t-transp"
+        class="i-regular"
+        classes="fill-white"
       />
-    </div>
-
-  
-
-    <div class="w-100 bg-white radius-small pd-small spoiler">
-      <div @click="spoiler = !spoiler"  class="flex">
-        <span>Всего товаров {{leftover.positions.length}}</span>
+    </router-link>
+
+    <div class="mn-t-small w-100 bg-white radius-small pd-small spoiler">
+      <div @click="spoiler = !spoiler"  class="flex-v-center flex">
+        <span 
+          class="flex-child flex-child-shrink-0 capitalize w-max mn-r-thin t-medium radius-big pd-b-nano pd-t-nano pd-r-thin pd-l-thin"
+          :class="{
+            'bg-green': leftover.type === 'stock-in',
+            'bg-red': leftover.type === 'stock-out'
+          }"
+        >
+          {{leftover.type}}
+        </span>
+        <span class="flex-child flex-child-shrink-0">Positions {{leftover.positions.length}}</span>
+        <span v-if="leftover.order" class="mn-r-thin mn-l-thin t-transp">|</span>
+        <span  class="flex-child flex-child-shrink-0" v-if="leftover.order">For order {{leftover.order}}</span>
+        <span v-if="leftover.comment" class="mn-r-thin mn-l-thin t-transp">|</span>
+        <p v-if="leftover.comment" class="t-truncate">Comment: {{leftover.comment}}</p>
         <!-- <img :class="{ 'spoiler-active': spoiler }" class="button-icon" src="@/assets/icons/arrow-down-spoiler.svg"> -->
       </div>
+
       <transition name="fade">
         <div v-if="spoiler">
           <div  v-for="position in leftover.positions" class="mn-t-small w-100 mn-b-thin flex"> 
             <div class=" w-50 flex">
               <span>
-                <!-- <span class="t-transp">Название:</span>  -->
                 {{position.name}}
               </span>
+              <span class="mn-r-thin mn-l-thin t-transp">|</span>
+
+              <span class="w-50">
+                {{position.price}}
+                <span class="t-transp">{{returnCurrency()}}</span> 
+              </span>
+
             </div>
             
-            <div class="t-right w-50 flex">
-              <span class="w-100">
-                
-                {{position.quantity}}
-                <span class="t-transp">{{declOfNum(position.quantity, ['единица', ' единицы', ' единиц'])}}</span> 
-              </span>
+            <div class="t-right w-50">
+              {{position.quantity}}
+              <span class="t-transp">{{position.type}}</span> 
             </div>
           </div> 
         </div>
@@ -76,7 +96,7 @@
 	});
 
 
-	const spoiler = ref(false)
+	const spoiler = ref(true)
 
   function declOfNum(number, words) {  
     return words[(number % 100 > 4 && number % 100 < 20) ? 2 : [2, 0, 1, 1, 1, 2][(number % 10 < 5) ? number % 10 : 5]];

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

@@ -89,6 +89,19 @@
         class="mn-b-small radius-medium bg-white pd-small"
       />
     </Block>
+
+    <Block
+      title="Comment"
+      class="mn-b-semi"
+    >
+      <Field
+        v-model:field="leftovers.state.current.comment"
+        label="Comment"
+        type="textarea"
+        class="w-100 bg-white radius-small pd-medium"
+      />  
+
+    </Block>
    
     <Block class="">
       <section class="gap-thin flex-v-center flex-nojustify flex">

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

@@ -12,7 +12,7 @@
     </header>
     
     <section class="mn-b-semi pd-medium bg-grey radius-big">
-      <p class="mn-b-thin">Spended:</p>
+      <p class="mn-b-thin">Balance:</p>
       <h3>{{formatPrice(totalPrice)}}</h3>
     </section>
 
@@ -47,6 +47,7 @@
     />
 
     <Feed
+      :search="true"
       :states="{
         empty: {
           title: 'No Leftovers Found',
@@ -58,9 +59,8 @@
       }"
       :options="{
         limit: 15,
-        organization: route.params._id,
+        owner: route.params._id,
         ...(tab !== 'all' && { type: tab })
-        // user: user
       }"
       v-slot="{ 
         items 

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

@@ -1,29 +1,66 @@
+const queryProcessorGlobals = require('@pf/src/modules/globals/controllers/utils/queryProcessor');
+
 const controllerFactory = (db) => {
   const Leftover = db.leftover;
 
-  const getAll = async (req, res) => {
+  const read = async (req, res) => {
     try {
-      let query = {};
-      let options = {};
 
-      // Проверка наличия req.query.organization
-      if (req.query.organization) {
-        // Создание ObjectId из строки
-        query.organization = new db.mongoose.Types.ObjectId(req.query.organization);
-      }
+      let matchConditions = [];
+
+      const search = req.query.search;
+
+      if (search) {
+        const parts = search.split('.');
 
-      if (req.query.type) {
-        query.type = req.query.type;
+        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}';
+        }
+
+        matchConditions.push({
+          $or: [
+            { "comment": { $regex: regexPattern, $options: 'i' } },
+            { "positions.name": { $regex: regexPattern, $options: 'i' } }
+          ]
+        });
       }
 
-      console.log(query);
+      const matchStage = matchConditions.length > 0 ? { $match: { $and: matchConditions } } : null;
+
+      let stages = [
+        ...queryProcessorGlobals.getBasicOptions(
+          req.query
+        ), 
+        // For creator
+        queryProcessorGlobals.getCreatorUserLookupStage(), 
+        queryProcessorGlobals.getCreatorOrganizationLookupStage(),
+        // For owner
+        queryProcessorGlobals.getOwnerUserLookupStage(),
+        queryProcessorGlobals.getOwnerOrganizationLookupStage(),
+        queryProcessorGlobals.getAddFieldsCreatorOwnerStage(),
+
+        ...(matchStage != null ? [matchStage] : []),
+        // Pagination
+        ...queryProcessorGlobals.getSortingOptions(
+          req.query.sortParam,
+          req.query.sortOrder,
+        ),
+        ...queryProcessorGlobals.getPaginationOptions(
+          req.query.skip,
+          req.query.limit
+        )
+      ];
 
-      const leftoveres = await Leftover.find(query, null, options)
-        .sort({ createdAt: "desc" })
-        .exec();
+      const leftoveres = await Leftover.aggregate(stages).exec();
 
-      if (!leftoveres) {
-        return res.status(404).send({ message: "LEFTOVERES_NOT_FOUND" });
+      if (!leftoveres.length) {
+          return res.status(404).send({ message: "LEFTOVERES_NOT_FOUND" });
       }
 
       res.status(200).send(leftoveres);
@@ -93,7 +130,7 @@ const controllerFactory = (db) => {
   };
 
   return {
-    getAll,
+    read,
     create,
     get,
     update,

package/src/modules/products/models/leftover.model.js

@@ -13,11 +13,16 @@ module.exports = (db) => {
       required: true,
     },
     order: {
+      type: db.mongoose.Schema.Types.ObjectId,
+      ref: 'Order',
+    },  
+    comment: {
       type: String
     }, 
     store: {
       type: Object
     },
+
     positions: [{
       _id: {
         type: db.mongoose.Schema.Types.ObjectId,

package/src/modules/products/routes/leftovers.routes.js

@@ -10,7 +10,7 @@ module.exports = function(app, db) {
 
   app.get(
     "/leftovers",
-    controller.getAll
+    controller.read
   );
 
 

package/src/styles/config.scss

@@ -91,8 +91,8 @@
 	// Tones
 	--red: 					360, 70, 90;
 	--red-nice: 		354, 80, 100;
-	--green: 				120, 58, 70;
-	--green-nice: 	126, 70, 80;
+	--green: 				88,	 207,	57;
+	--green-nice: 	35,	226,	0;
 	--orange: 			8, 72, 94;
 	--orange-nice:	13, 70, 100;
 	--yellow: 			38, 100, 100;