@ozdao/martyrs 0.2.563 → 0.2.565

package/src/modules/notifications/components/elements/NotificationBadge.vue

@@ -83,17 +83,16 @@ const props = defineProps({
 // Get router and notification functionality
 const router = useRouter();
 
-// Check if notifications module is loaded
-const useNotifications = inject('useNotifications');
-
-// Provide fallback values if module is not loaded
-const { notifications, unreadCount, loading, markAllAsRead, getNotifications } = useNotifications ? useNotifications() : {
+// Check if notifications module is loaded, provide fallback if not
+const useNotifications = inject('useNotifications', () => ({
   notifications: ref([]),
   unreadCount: ref(0),
   loading: ref(false),
   markAllAsRead: () => {},
   getNotifications: () => {}
-};
+}));
+
+const { notifications, unreadCount, loading, markAllAsRead, getNotifications } = useNotifications();
 
 // Local state
 const isOpen = ref(false);

package/src/modules/notifications/notifications.server.js

@@ -1,4 +1,3 @@
-import coreabac from '@martyrs/src/modules/core/controllers/classes/core.abac.js';
 import NotificationsController from './controllers/notifications.controller.js';
 import NotificationLogModel from './models/notification-log.model.js';
 import NotificationPreferenceModel from './models/notification-preference.model.js';
@@ -6,14 +5,13 @@ import NotificationModel from './models/notification.model.js';
 import UserDeviceModel from './models/user-device.model.js';
 import notificationsRoutes from './routes/notifications.routes.js';
 import NotificationService from './services/notification.service.js';
-const { getInstance } = coreabac;
+
 function initializeNotifications(app, db, wss, origins, publicPath) {
   // Set up models in the database object
   db.notification = NotificationModel(db);
   db.userDevice = UserDeviceModel(db);
   db.notificationPreference = NotificationPreferenceModel(db);
   db.notificationLog = NotificationLogModel(db);
-  const abac = getInstance(db);
   // const notificationPolicies = initNotificationPolicies(abac, db);
 
   // Initialize notification service and related background tasks only if wss is provided

package/src/modules/orders/components/elements/FieldSubscribeNewsletter.vue

@@ -49,6 +49,8 @@
 <script setup>
 import { ref, computed } from 'vue'
 import { useI18n } from 'vue-i18n'
+import { i18nManager } from '@martyrs/src/modules/core/views/classes/i18n.manager.js'
+import locales from '@martyrs/src/modules/orders/locales/index.js'
 
 import FieldBig from '@martyrs/src/components/FieldBig/FieldBig.vue'
 import Popup from '@martyrs/src/components/Popup/Popup.vue'
@@ -64,6 +66,9 @@ import IconWhatsapp from '@martyrs/src/modules/icons/socials/whatsapp.vue'
 import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js'
 import applications from '@martyrs/src/modules/orders/store/applications.js'
 
+// Регистрируем переводы модуля при использовании компонента
+i18nManager.register('orders', locales)
+
 const store = useStore()
 
 const props = defineProps({

package/src/modules/orders/orders.server.js

@@ -1,4 +1,3 @@
-import CRUD from '@martyrs/src/modules/core/controllers/classes/core.crud.js';
 import FactoryOrder from './controllers/orders.controller.js';
 import ModelApplication from './models/application.model.js';
 import ModelCustomer from './models/customer.model.js';

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

@@ -1,7 +1,7 @@
 <template>
-  <div 
+  <div
     class="o-hidden pos-relative cursor-pointer bg-light "
-    @click="$router.push({name: 'Organization', params: {_id: organization._id}})"
+    @click="$router.push('/organizations/' + organization._id)"
   >
     <div class="h-4r flex pos-relative">
 

package/src/modules/organizations/components/pages/DepartmentEdit.vue

@@ -281,7 +281,7 @@ async function onSubmit() {
 }
 
 function redirectTo() {
-  router.push({ name: "Organization Members", params: { _id: route.params._id } });
+  router.push('/organizations/' + route.params._id + '/members');
 }
 
 async function onDelete() {
@@ -301,7 +301,7 @@ function removeMember(member) {
 }
 
 function redirectDash() {
-  router.replace({ name: "Organization" });
+  router.replace('/organizations/' + route.params._id);
 }
 </script>
 

package/src/modules/organizations/components/pages/OrganizationEdit.vue

@@ -153,11 +153,11 @@
   async function onDelete() {
     if (route.params._id) {
       await organization.actions.remove(route.params._id)
-      router.push({name: 'Organization'})
+      router.push('/organizations/' + route.params._id)
     }
   }
 
   function redirectTo () {
-    router.replace({ name: 'Organization', params: { _id: organization.state.current._id }});
+    router.replace('/organizations/' + organization.state.current._id);
   }
 </script>

package/src/modules/organizations/policies/organizations.policies.js

@@ -94,20 +94,26 @@ export default (function initializeOrganizationPolicies(abacAccessControl, db) {
     // Получить организацию из контекста
     getOrganizationId(context) {
       const { currentResource, data } = context;
-      
+
       if (currentResource?.owner?.type === 'organization') {
         return String(currentResource.owner.target);
       }
-      if (data?.owner?.type === 'organization') {
-        return String(data.owner.target);
+
+      // Проверяем и body и params
+      const ownerData = data?.body?.owner || data?.params?.owner;
+      if (ownerData?.type === 'organization') {
+        return String(ownerData.target);
       }
-      if (data?.organization) {
-        return String(data.organization);
+
+      const orgId = data?.body?.organization || data?.params?.organization;
+      if (orgId) {
+        return String(orgId);
       }
+
       if (currentResource?.organization) {
         return String(currentResource.organization);
       }
-      
+
       return null;
     }
   };

package/src/modules/organizations/routes/organizations.routes.js

@@ -1,11 +1,9 @@
 import middlewareFactoryAuth from '@martyrs/src/modules/auth/controllers/middlewares/index.js';
-import coreabac from '@martyrs/src/modules/core/controllers/classes/core.abac.js';
 import controllerFactory from '../controllers/organizations.controller.js';
-const { getInstance } = coreabac;
+
 export default (function (app, db) {
   const controller = controllerFactory(db);
   const { authJwt } = middlewareFactoryAuth(db);
-  const abac = getInstance(db);
   app.get(
     '/api/organizations',
     [

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

@@ -2,7 +2,7 @@
   <div class="flex-v-center bg-light pd-small radius-small flex-column flex">
     <div class="w-100 flex-v-center flex-nowrap gap-thin flex">
       <img v-if="category.photo" class="i-big radius-small object-fit-contain bg-white" :src="(FILE_SERVER_URL || '') + category.photo"/>
-      <h4 class="my-handle word-break t-truncate w-100 w-max-100 mn-r-auto">{{category.name}}</h4>
+      <h4 class="my-handle t-truncate w-100 w-max-100 mn-r-auto">{{category.name}}</h4>
 
       <router-link
        v-if="access"

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

@@ -10,7 +10,7 @@
 		<!-- Edit Button -->
 		<router-link
 			v-if="access"
-      :to="organization ? { name: 'Organization_ProductEdit', params: { id: organization, product: product._id } } : { name: 'ProductEdit', params: { product: product._id } }"
+      :to="editPath"
       class="
       	z-index-2
         cursor-pointer 
@@ -97,6 +97,7 @@
 <script setup="props">
 	import {computed } from 'vue'
 	import { useI18n }    from 'vue-i18n'
+	import { useRoute } from 'vue-router'
 
 	import IconEdit from '@martyrs/src/modules/icons/navigation/IconEdit.vue'
 	import IconShopcartAdd from '@martyrs/src/modules/icons/actions/IconShopcartAdd.vue'
@@ -106,6 +107,8 @@
 
 	import PlaceholderImage from '@martyrs/src/modules/icons/placeholders/PlaceholderImage.vue'
 
+	const route = useRoute()
+
 	const props = defineProps({
 		product: {
 			type: Object
@@ -122,7 +125,7 @@
 			default: true
 		},
 		user: {
-			type: [Object, String] 
+			type: [Object, String]
 		},
 		type: {
 			type: Object
@@ -130,6 +133,17 @@
 	})
 
   const { t } = useI18n()
+
+	const editPath = computed(() => {
+		if (route.meta.context === 'backoffice') {
+			return `/backoffice/products/${props.product._id}/edit`
+		}
+		if (route.meta.context === 'organization' || props.organization) {
+			const orgId = props.organization || route.params._id
+			return `/organizations/${orgId}/products/${props.product._id}/edit`
+		}
+		return `/products/${props.product._id}/edit`
+	})
 </script>
 
 <style lang="scss">

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

@@ -8,6 +8,7 @@
       </h2>
 
       <router-link
+        v-if="hasAccess(route.params._id, 'products', 'edit', auth.state.accesses, auth.state.access.roles)"
         :to="{
           name: route.meta.context === 'backoffice' ? 'BackofficeCategoryAdd' : 'Organization_CategoryAdd',
           params: {
@@ -35,8 +36,9 @@
           state: categories.state
         }"
         :options="{
-          user: auth.state.user._id,
-          tree: true
+          owner: route.params._id,
+          tree: true,
+          limit: 20
         }"
         v-model:sort="sort"
         v-model:items="categories.state.all"
@@ -45,12 +47,13 @@
         }"
         class="rows-1 gap-thin"
       >
-        <Tree 
-          v-if="items" 
-          :items="categories.state.all" 
+        <Tree
+          v-if="items"
+          :items="categories.state.all"
           :state="categories.state.all"
           :parent-id="null"
-          @update="updateCategoriesOrder" 
+          :dragndrop="hasAccess(route.params._id, 'products', 'edit', auth.state.accesses, auth.state.access.roles)"
+          @update="updateCategoriesOrder"
           v-slot="{ item }"
         >
           <CardCategory 

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

@@ -192,7 +192,7 @@
   onMounted(async () => {
     emits('page-loading');
     if (route.params.category) {
-      await categories.actions.read({_id: route.params.category})
+      await categories.actions.read({_id: route.params.category, owner: route.params._id})
     } else {
       categories.actions.clean() // Adjusted based on the new store's method to reset the category state
     }
@@ -283,11 +283,15 @@
   }
 
   function redirectTo () {
+    const routeName = route.meta.context === 'organization'
+      ? 'Organization_Categories'
+      : 'BackofficeCategories'
+
     router.push({
-      name: 'Categories', 
-      params: { 
+      name: routeName,
+      params: {
         _id: route.params._id
-      } 
+      }
     })
   }
 </script>

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

@@ -11,11 +11,7 @@
         <!-- Edit Button -->
         <router-link
           v-if="hasAccess(route.params._id, 'products', 'edit', auth.state.accesses, auth.state.access.roles)"
-          :to="
-            route.params._id 
-            ? { name: 'Organization_ProductEdit', params: { id: route.params._id, product: product._id } } 
-            : { name: 'ProductEdit', params: { product: product._id } }
-          "
+          :to="editPath"
           class="
             z-index-2
             cursor-pointer 
@@ -147,6 +143,16 @@ const { returnCurrency, hasAccess } = useGlobalMixins()
 const product = computed(() => products.state.current)
 const productImages = computed(() => products.state.current.images || [])
 
+const editPath = computed(() => {
+	if (route.meta.context === 'backoffice') {
+		return `/backoffice/products/${product.value._id}/edit`
+	}
+	if (route.meta.context === 'organization') {
+		return `/organizations/${route.params._id}/products/${product.value._id}/edit`
+	}
+	return `/products/${product.value._id}/edit`
+})
+
 // Состояние для отслеживания текущих изображений (товара или варианта)
 const currentImages = ref([])
 // Выбранный вариант товара

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

@@ -37,13 +37,7 @@
 
 			<IconEdit
 				v-if="accesses && hasAccess(route.params._id, 'products', 'edit', accesses)"
-				@click="$router.push({
-					name: route.meta.context === 'backoffice' ? 'BackofficeProductEdit' : 'Organization_ProductEdit',
-					params: {
-						_id: product.owner.target,
-						product: product._id
-					}
-				})"
+				@click="$router.push(editPath)"
 				class="pos-absolute pos-t-regular pos-r-regular i-medium t-transp"
 			/>
 
@@ -183,6 +177,16 @@ const images = computed(() => {
   return props.product.images
 })
 
+const editPath = computed(() => {
+	if (route.meta.context === 'backoffice') {
+		return `/backoffice/products/${props.product._id}/edit`
+	}
+	if (route.meta.context === 'organization') {
+		return `/organizations/${props.product.owner.target}/products/${props.product._id}/edit`
+	}
+	return `/products/${props.product._id}/edit`
+})
+
 const tabProduct = ref('description')
 
 const text = {

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

@@ -1,11 +1,13 @@
 import Cache from '@martyrs/src/modules/core/controllers/classes/core.cache.js';
 import Logger from '@martyrs/src/modules/core/controllers/classes/core.logger.js';
 import globalsQuery from '@martyrs/src/modules/core/controllers/utils/queryProcessor.js';
+import coreabac from '@martyrs/src/modules/core/controllers/classes/abac/abac.js';
 
 const controllerFactory = db => {
   const Category = db.category;
   const logger = new Logger(db);
   const cache = new Cache();
+  const abac = coreabac.getInstance(db);
 
   // Генерация уникального slug
   const generateSlug = async (name, parentId = null) => {
@@ -174,17 +176,30 @@ const controllerFactory = db => {
         const depthNum = parseInt(depth, 10);
         const isTree = tree === 'true' || tree === true;
         const isRoot = root === 'true' || root === true;
-        
-        console.log('🚀 Read categories params:', { url, depth: depthNum, tree: isTree, root });
-        
-        const cacheKey = JSON.stringify(req.query);
+
+        const cacheKey = JSON.stringify({ query: req.query, userId: req.userId });
         const cached = await cache.get(cacheKey);
         if (cached) return res.json(cached);
 
+        // Проверка прав на просмотр всех статусов
+        let canViewAllStatuses = false;
+        if (req.userId) {
+          const accessCheck = await abac.checkAccess({
+            user: req.userId,
+            resource: 'category',
+            action: 'read',
+            data: {
+              body: owner ? { owner: { type: 'organization', target: owner } } : {}
+            }
+          });
+
+          canViewAllStatuses = accessCheck.allow;
+        }
+
         // Базовая фильтрация
         const match = {
           ...(_id && { _id: new db.mongoose.Types.ObjectId(_id) }),
-          ...(status && { status }),
+          ...(status !== undefined ? { status } : (canViewAllStatuses ? {} : { status: 'published' })),
           ...(search && { name: { $regex: search, $options: 'i' } }),
           ...(type && { 'owner.type': type }),
           ...(owner && { 'owner.target': new db.mongoose.Types.ObjectId(owner) }),
@@ -214,19 +229,13 @@ const controllerFactory = db => {
           match.url = { $regex: '^/[^/]+$' };
         }
 
-        console.log('🔎 Match object:', JSON.stringify(match, null, 2));
-
         const pipeline = [
           { $match: match },
           ...globalsQuery.getSortingOptions(sortParam, sortOrder),
-          // ...(skip || limit ? globalsQuery.getPaginationOptions(skip, limit) : []),
+          ...(!isTree && (skip || limit) ? globalsQuery.getPaginationOptions(skip, limit) : []),
         ];
-        
-        console.log('🔧 Pipeline:', JSON.stringify(pipeline, null, 2));
 
         let results = await Category.aggregate(pipeline);
-        console.log('🔍 Aggregate results:', results.length, 'categories found');
-        console.log('🔍 Results URLs:', results.map(r => r.url));
 
         // Фильтрация по глубине если указан depth > 1 и url
         if (url && depthNum > 1) {
@@ -235,31 +244,28 @@ const controllerFactory = db => {
             const catLevel = cat.url.split('/').filter(Boolean).length;
             return cat.url === url || catLevel <= maxLevel;
           });
-          console.log('🔍 After depth filter:', results.length, 'categories');
         }
 
         // Построение дерева
         if (isTree && results.length > 0) {
-          console.log('🌳 Building tree from results');
           results = buildTreeFromUrl(results, sortParam, sortOrder);
+
+          // Пагинация корневых элементов
+          const skipNum = parseInt(skip, 10) || 0;
+          const limitNum = parseInt(limit, 10) || 0;
+          if (limitNum > 0) {
+            results = results.slice(skipNum, skipNum + limitNum);
+          }
         } else if (!isTree && depthNum === 1 && url && results.length > 0) {
-          console.log('📋 Processing tree=false, depth=1');
-          console.log('📋 Looking for main category with url:', url);
-          
           const mainCategory = results.find(c => c.url === url);
-          console.log('📋 Main category found:', !!mainCategory, mainCategory?.url);
-          
+
           if (mainCategory) {
-            const children = results.filter(c => 
+            const children = results.filter(c =>
               c.url !== url && c.url.startsWith(url + '/')
             );
-            console.log('📋 Children found:', children.length, children.map(c => c.url));
-            
+
             mainCategory.children = children;
             results = [mainCategory];
-            console.log('📋 Final result with children:', results[0].url, 'children:', results[0].children.length);
-          } else {
-            console.log('❌ Main category not found in results!');
           }
         }
 
@@ -267,8 +273,7 @@ const controllerFactory = db => {
         const tags = ['categories'];
         if (owner) tags.push(`organization_${owner}`);
         await cache.setWithTags(cacheKey, results, tags);
-        
-        console.log('✅ Final results count:', results.length);
+
         res.json(results);
       } catch (err) {
         logger.error(`Error reading categories: ${err.message}`);

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

@@ -1,5 +1,5 @@
 import jwtFactory from '@martyrs/src/modules/auth/controllers/middlewares/authJwt.js';
-import coreabac from '@martyrs/src/modules/core/controllers/classes/core.abac.js';
+import coreabac from '@martyrs/src/modules/core/controllers/classes/abac/abac.js';
 import controllerFactory from '../controllers/categories.controller.js';
 import verifierFactory from '../middlewares/categories.verifier.js';
 const { getInstance } = coreabac;

package/src/modules/rents/controllers/routes/rents.routes.js

@@ -1,5 +1,5 @@
 import middlewareFactoryAuth from '@martyrs/src/modules/auth/controllers/middlewares/index.js';
-import coreabac from '@martyrs/src/modules/core/controllers/classes/core.abac.js';
+import coreabac from '@martyrs/src/modules/core/controllers/classes/abac/abac.js';
 import controllerFactory from '../services/rents.services.js';
 // const middlewareFactoryRents = require('../middlewares/rent');
 // ABAC