@ozdao/prometheus-framework 0.2.94 → 0.2.95

package/src/modules/organizations/controllers/memberships.controller.js

@@ -5,17 +5,27 @@ const controllerFactory = (db) => {
 
   const read = async (req, res) => {
     try {
+
+      let search = req.query.search;
+
+      let regexPattern = '';
+
+      if (search) {
+        // Экранируем специальные символы
+        search = search.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+
+        const parts = search.split('.');
+          
+        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}';  
+        }  
+      } 
       
       const memberships = await Membership.aggregate([
-        {
-          $match: {
-            ...(req.query.user && { user: new ObjectId(req.query.user) }),
-            ...(req.query.type && { type: req.query.type }),
-            ...(req.query.target && { target: new ObjectId(req.query.target) }),
-            // ...(req.query.role && { role: req.query.role }),
-             ...(req.query.role && { role: { $in: req.query.role } }),
-          },
-        },
         {
           $lookup: {
             from: 'users',
@@ -24,6 +34,21 @@ const controllerFactory = (db) => {
             as: 'user',
           },
         },
+        {
+          $match: {
+            ...(req.query.user && { user: new ObjectId(req.query.user) }),
+            ...(req.query.type && { type: req.query.type }),
+            ...(req.query.target && { target: new ObjectId(req.query.target) }),
+            ...(req.query.role && { role: { $in: req.query.role } }),
+            ...(req.query.search && {
+              $or: [
+                { "user.profile.name": { $regex: regexPattern, $options: 'i' } },
+                { "user.email": { $regex: regexPattern, $options: 'i' } },
+                { "user.phone": { $regex: regexPattern, $options: 'i' } }
+              ]
+            })
+          },
+        },
         {
           $unwind: '$user',
         },
@@ -32,7 +57,7 @@ const controllerFactory = (db) => {
       if (!memberships || memberships.length === 0) {
         return res.status(404).send({ errorCode: 'MEMBERSHIPS_NOT_FOUND' });
       }
-
+      console.log('membership is', memberships[0].user)
       res.send(memberships);
     } catch (err) {
       console.log(err);
@@ -42,7 +67,6 @@ const controllerFactory = (db) => {
 
   const create = async (req, res) => {
 
-    console.log(req.body)
     const newMembership = new Membership({
       user: req.body.user,
       type: req.body.type,

package/src/modules/organizations/models/invite.model.js

@@ -13,6 +13,10 @@ module.exports = (db) => {
       enum: ['active', 'used', 'deactivated'], 
       default: 'active' 
     },
+    role:  { 
+      type: String, 
+      default: 'member' 
+    }
   }, { 
     timestamps: true 
   });

package/src/modules/organizations/organizations.client.js

@@ -9,7 +9,6 @@ import CardOrganization from './components/blocks/CardOrganization.vue';
 import EditArray from './components/blocks/EditArray.vue';
 import Unit from './components/blocks/Unit.vue';
 import DepartmentSub from './components/blocks/DepartmentSub.vue';
-import DepartmentMemberModify from './components/blocks/DepartmentMemberModify.vue';
 import CardDepartment from './components/blocks/CardDepartment.vue';
 import Rating from './components/blocks/Rating.vue';
 import EmptyState from './components/blocks/EmptyState.vue';
@@ -45,7 +44,6 @@ CardOrganization,
 EditArray,
 Unit,
 DepartmentSub,
-DepartmentMemberModify,
 CardDepartment,
 Rating,
 EmptyState,

package/src/modules/organizations/router/members.router.js

@@ -6,7 +6,7 @@ const membersRoutes = [{
   meta: {
     title: {
       en: 'Members',
-      ru: 'Участникb'
+      ru: 'Участники'
     }
   },
   component: () => import('@pf/src/modules/organizations/components/pages/Members.vue')

package/src/modules/organizations/store/departments.js

@@ -87,7 +87,6 @@ const actions = {
     try {
       const response = await $axios.post(`/api/departments/${organizationId}/create`, department);
       state.error = null;
-      state.department = response.data;
       return response.data; // Return the response data
     } catch (error) {
       setError(error);

package/src/modules/organizations/store/memberships.js

@@ -23,15 +23,8 @@ const state = reactive({
 const actions = {
   async read(options = {}) {
    
-    let params = {}
-
-    if (options._id) params._id = options._id;
-    if (options.user) params.user = options.user;
-    if (options.target) params.target = options.target;
-    if (options.role) params.role = options.role;
-
     try {
-      const response = await $axios.get(`/api/memberships`, { params: params });
+      const response = await $axios.get(`/api/memberships`, { params: options });
       state.error = null;
       state.memberships = response.data;
       return Promise.resolve(response.data);

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

@@ -46,6 +46,39 @@
 				/>
 			</Block>
 
+			<Block
+		    title="Ingredients"
+				placeholder="No ingridients added yet"
+				:actions="[{
+	        label: '+',
+	        function: () => openIngredientPopup()
+	      }]"
+		  >
+		  	<div v-if="products.state.current.ingredients.length > 0" class="cols-1 gap-thin">
+			    <CardPosition 
+			      v-for="(product, index) in products.state.current.ingredients" 
+			      :key="product._id" 
+			      :product="product"
+			      :array="products.state.current.ingredients"
+			      :products="Products"
+			      @add="(item) => {
+					    globals.actions.add(products.state.current.ingredients, item);
+					    closeIngredientPopup();
+					  }"
+					  @update="(item) => {
+					    globals.actions.update(products.state.current.ingredients, item, index);
+					    closeIngredientPopup();
+					  }"
+					  @delete="(item) => {
+					    globals.actions.delete(products.state.current.ingredients, item, index);
+					    closeIngredientPopup();
+					  }"
+			    />
+			  </div>
+		  </Block>
+
+		</div> 
+
 			<Block
   			title="Categories"
   			:actions="[{
@@ -69,6 +102,7 @@
         />
 			</Block>
 
+
 			<Block
 				title="Parameters"
 				placeholder="No parameters added yet"
@@ -102,6 +136,7 @@
         </div>
 			</Block>
 
+
 			<Block
 				title="Localization"
 				placeholder="No localizations added yet"
@@ -134,9 +169,9 @@
         </div>
 			</Block>
 
-		</div> 
+	
 		
-		<Block
+		<!-- <Block
 	    title="Quantity Discount"
 	    class="mn-b-semi"
 	    :actions="[{
@@ -166,7 +201,7 @@
           />
         </div>
       </div>
-		</Block>
+		</Block> -->
 
 		<!-- <EditModifications
 			:product="products.state.current"
@@ -188,36 +223,7 @@
 	    />
 		</Popup>
 
-		<Block
-	    title="Ingredients"
-			placeholder="No positions added yet"
-			:actions="[{
-        label: '+',
-        function: () => openIngredientPopup()
-      }]"
-	  >
-	  	<div class="cols-1 gap-thin">
-		    <CardPosition 
-		      v-for="(product, index) in products.state.current.ingredients" 
-		      :key="product._id" 
-		      :product="product"
-		      :array="products.state.current.ingredients"
-		      :products="Products"
-		      @add="(item) => {
-				    globals.actions.add(products.state.current.ingredients, item);
-				    closeIngredientPopup();
-				  }"
-				  @update="(item) => {
-				    globals.actions.update(products.state.current.ingredients, item, index);
-				    closeIngredientPopup();
-				  }"
-				  @delete="(item) => {
-				    globals.actions.delete(products.state.current.ingredients, item, index);
-				    closeIngredientPopup();
-				  }"
-		    />
-		  </div>
-	  </Block>
+		
 
 </div>
 	

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

@@ -15,13 +15,13 @@
     <Field 
       v-model:field="product.name" 
       label="Name"
-      placeholder="Введите название"
+      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="Введите цену" 
+      placeholder="Enter product price" 
       class="w-100 mn-b-small bg-white radius-small pd-medium"
       type="number"
     >
@@ -39,7 +39,7 @@
     <Field
       v-model:field="product.description" 
       label="Description"
-      placeholder="Введите описание" 
+      placeholder="Enter product description" 
       class="w-100 bg-white radius-small pd-medium"
       type="textarea"
     />

package/src/modules/users/components/blocks/CardUser.vue

@@ -30,7 +30,7 @@
       <span class=" mn-r-small">{{phone || email}}</span>
     </div>
 
-    <div v-if="action || role" class="mn-l-auto  flex-v-center flex">
+    <div v-if="action || role" class="mn-l-auto  flex-stretch flex-v-center flex">
       <span 
         v-if="role"
         class="flex-child flex-child-shrink-0 capitalize w-max t-medium radius-big pd-b-nano pd-t-nano pd-r-thin pd-l-thin bg-main"
@@ -40,10 +40,14 @@
       <button 
         v-if="action" 
         @click.stop="action.method" 
-        class="h-100 w-2r t-white mn-l-thin capitalize t-medium radius-big bg-red"
-        >
-          {{action.label}}
-        </button>
+        class="h-2r w-2r t-white mn-l-thin capitalize t-medium radius-big bg-red"
+      >
+        <component v-if="action.label.is" :is="action.label.is" v-bind="action.label.props"></component>  
+
+        <template v-else>
+          {{action.label}} 
+        </template>
+      </button>
       <!-- {{`Member since  ${user.createdAt}. Invited by ${user.creator.target}`}} -->
     </div>
  

package/src/modules/users/components/pages/Profile.vue

@@ -80,7 +80,7 @@
 				/>
 
 				<img 
-					v-if="users.state.current.profile.photo.length > 0" 
+					v-if="users.state.current.profile.photo && users.state.current.profile.photo.length > 0" 
 					:src="(FILE_SERVER_URL || '')+ users.state.current.profile.photo" 
 					class="radius-extra bg-white mn-b-small object-fit-cover i-extra" 
 				/>
@@ -93,10 +93,11 @@
 				<h3 
 					class="mn-b-thin"
 				>
-					{{users.state.current.profile.name ? users.state.current.profile.name : 'Not specified' }}
+					{{users.state.current.profile.name ? users.state.current.profile.name : 'Anonymous' }}
 				</h3>
 				
 				<p 
+					v-if="users.state.current.username"
 					class="mn-b-thin t-main t-semi"
 				>
 					@{{ users.state.current.username ? users.state.current.username : 'Not specified' }}
@@ -105,7 +106,7 @@
 				<p 
 					class="mn-b-small p-medium"
 				>
-				 {{ users.state.current.profile.description ? users.state.current.profile.description : 'Not specified' }}
+				 {{ users.state.current.profile.description ? users.state.current.profile.description : 'Bio not specified' }}
 				</p>
 				
 				<div class="mn-b-medium flex-center flex-nowrap flex">
@@ -283,6 +284,7 @@ const handleMembershipUpdate = ({ membership, status, target }, statusName, stat
 
 function logout () {
   auth.actions.logout()
+
   router.push({name: 'Sign In'})
 }
 </script>

package/src/modules/organizations/components/blocks/DepartmentMemberModify.vue

@@ -1,126 +0,0 @@
-<template>
-  <div>
-
-    <div class="br-grey radius-small mn-small">
-
-      <div class="bg-grey mn-b-thin h-min-10r h-max-10r o-scroll pd-medium radius-big">
-        <Feed
-          :states="{
-            empty: {
-              title: 'No Members Found',
-              description: 'Currently, there are no members available.'
-            }
-          }"
-          :store="{
-            read: (options) => memberships.actions.read(options),
-            state: null
-          }"
-          :options="{
-            target: $route.params._id
-          }"
-          v-slot="{ 
-            items 
-          }"
-        >
-          <User 
-            v-for="(item, index) in items" 
-            :key="index" 
-            :photo="item.user.profile.photo"
-            :name="item.user.profile.name || item.user.phone || item.user.email || item.user._id"
-            :user="item" 
-            :position="item.position" 
-            @click="$router.push(`/app/profile/${user._id}`)" 
-            class="mn-b-thin" 
-          />
-        </Feed>
-      </div>
-
-    <!--   <div v-else class="pd-small br-grey br-1px br-solid">
-        {{ memberForm.user.name ? memberForm.user.name : 'Безымянный' }}, {{memberForm.user.id}}
-      </div> -->
-      <Field 
-        v-model:field="roleInput"  
-        label="Должность"  
-        placeholder="Название должности" 
-        class="bg-white "
-        :validation="organizationName" 
-      />
-    </div>
-
-    <button :disabled="!userInput || !roleInput" @click="submitForm" class="w-100 button bg-blue t-white">
-      {{ props.member !== null ? "Редактировать участника" : "Добавить участника" }}
-    </button>
-
-    <button  v-if="props.member !== null" @click="removeMember" class="w-100 button bg-red t-white">
-      Удалить участника
-    </button>
-  </div>
-</template>
-
-<script setup>
-import { ref, watch, computed } from "vue";
-// Import components
-import SelectMulti    from '@pf/src/components/SelectMulti/SelectMulti.vue'
-import Field from "@pf/src/components/Field/Field.vue";
-import Select from "@pf/src/components/Select/Select.vue";
-
-import Feed from '@pf/src/components/Feed/Feed.vue'
-import User from '@pf/src/modules/users/components/blocks/CardUser.vue';
-
-import * as memberships   from '@pf/src/modules/organizations/store/memberships'
-
-const props = defineProps({
-  isPopupOpen: Boolean,
-  member: Number,
-  members: Array,
-  users: Array,
-});
-
-const emits = defineEmits(['callback','remove'])
-
-const userInput = ref(null);
-const roleInput = ref(null);
-
-if (props.member !== null) {
-  userInput.value = props.members[props.member]
-}
-
-import * as inputsValidation from '@pf/src/modules/middlewares/client/inputs.validation'
-const placeValidation = ref(null)
-
-
-async function submitForm() {
-   if (props.member !== null) {
-    props.members[props.member] = userInput
-    props.members[props.member].role = roleInput.value
-    emits("callback");
-  } else {
-    props.members.push({...userInput.value, role: roleInput.value});
-    emits("callback");
-  }
-}
-
-async function removeMember() {
-    props.members.splice(props.member, 1);
-    emits("callback");
-}
-
-</script>
-
-<style scoped>
-.form-group {
-  margin-bottom: 1rem;
-}
-
-label {
-  display: block;
-  margin-bottom: 0.5rem;
-}
-
-input {
-  width: 100%;
-  padding: 0.5rem;
-  border: 1px solid #ccc;
-  border-radius: 5px;
-}
-</style>