@ozdao/martyrs 0.2.519 → 0.2.520

package/src/modules/organizations/components/sections/Organizations.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="for-transition bg-white radius-big w-100">
+	<div class="for-transition bg-white radius-medium w-100">
 		<div class="">
 			 <EmptyState 
         v-if="organizations < 1"
@@ -43,7 +43,7 @@
 	// Import state
 	import * as auth from '@martyrs/src/modules/auth/views/store/auth.js'
 	import * as organization from '@martyrs/src/modules/organizations/store/organizations.js'
-	import * as memberships from '@martyrs/src/modules/organizations/store/memberships.js'
+	import membershipsStore from '@martyrs/src/modules/organizations/store/memberships.store.js'
 
 	const props = defineProps({
     owner: {

package/src/modules/organizations/components/sections/Publics.vue

@@ -4,7 +4,7 @@
       		v-if="!publics || publics.length < 1"
       		title="Unfortunately, we couldn't find any recommendations for you"
       		description="Explore and find a community or organization that suits your interests."
-      		class="radius-big bg-light pd-medium"
+      		class="radius-medium bg-light pd-medium"
     	/>
     	
 	    <div v-else class="w-max gap-thin flex-nowrap flex">
@@ -15,7 +15,7 @@
 		      	:organization="organization"
 		      	:user="auth.state.user"
 						@updateMembership="event => handleMembershipUpdate(event, 'isSubscriber', 'numberOfSubscribers')"
-						class="w-max-20r radius-big"
+						class="w-max-20r radius-medium"
 		    />
 		</div>
 	</div>
@@ -28,7 +28,7 @@
 	
 	import * as auth from '@martyrs/src/modules/auth/views/store/auth.js'
 	import * as organization from '@martyrs/src/modules/organizations/store/organizations.js'
-	import * as memberships from '@martyrs/src/modules/organizations/store/memberships.js'
+	import membershipsStore from '@martyrs/src/modules/organizations/store/memberships.store.js'
 
 	let publics = ref(null)
 
@@ -42,7 +42,7 @@
 
 	// Methods
 	const handleMembershipUpdate = ({ membership, status, target }, statusName, statusNumber) => {
-	  memberships.mutations.handleMembershipUpdate(publics.value, membership, status, target, statusName, statusNumber)
+	  membershipsStore.handleMembershipUpdate(publics.value, membership, status, target, statusName, statusNumber)
 	};
 </script>
 

package/src/modules/organizations/configs/navigation.organization.config.js

@@ -14,7 +14,8 @@ import IconAddress from '@martyrs/src/modules/icons/entities/IconAddress.vue';
 
 // Import global mixins for access control
 import { useGlobalMixins } from '@martyrs/src/modules/globals/views/mixins/mixins.js';
-const { hasAccess } = useGlobalMixins();
+
+const { hasAccess, isModuleInstalled } = useGlobalMixins();
 
 // Organization backoffice navigation configuration
 export const navigationItems = [
@@ -68,44 +69,44 @@ export const navigationItems = [
           name: 'Organization_Products',
           params: { _id: route.params._id }
         }),
-        visible: () => true // Public access
+        visible: () => isModuleInstalled('products')
+      },
+      {
+        title: 'Events',
+        iconComponent: IconEvents,
+        route: (auth, route) => ({
+          name: 'Organization_Events',
+          params: { _id: route.params._id }
+        }),
+        visible: () => isModuleInstalled('events')
+      },
+      {
+        title: 'Posts',
+        iconComponent: IconCommunity,
+        route: (auth, route) => ({
+          name: 'Organization_Posts',
+          params: { _id: route.params._id }
+        }),
+        visible: () => isModuleInstalled('blogposts')
+      },
+      {
+        title: 'Spots',
+        iconComponent: IconAddress,
+        route: (auth, route) => ({
+          name: 'Organization_Spots',
+          params: { _id: route.params._id }
+        }),
+        visible: () => isModuleInstalled('spots')
+      },
+      {
+        title: 'Gallery',
+        iconComponent: IconGallery,
+        route: (auth, route) => ({
+          name: 'Backoffice Gallery',
+          params: { _id: route.params._id }
+        }),
+        visible: () => isModuleInstalled('gallery')
       },
-      // {
-      //   title: 'Events',
-      //   iconComponent: IconEvents,
-      //   route: (auth, route) => ({
-      //     name: 'Organization_Events',
-      //     params: { _id: route.params._id }
-      //   }),
-      //   visible: () => true // Public access
-      // },
-      // {
-      //   title: 'Posts',
-      //   iconComponent: IconCommunity,
-      //   route: (auth, route) => ({
-      //     name: 'Organization_Posts',
-      //     params: { _id: route.params._id }
-      //   }),
-      //   visible: () => true // Public access
-      // },
-      // {
-      //   title: 'Spots',
-      //   iconComponent: IconAddress,
-      //   route: (auth, route) => ({
-      //     name: 'Organization_Spots',
-      //     params: { _id: route.params._id }
-      //   }),
-      //   visible: () => true // Public access
-      // },
-      // {
-      //   title: 'Gallery',
-      //   iconComponent: IconGallery,
-      //   route: (auth, route) => ({
-      //     name: 'Backoffice Gallery',
-      //     params: { _id: route.params._id }
-      //   }),
-      //   visible: () => true // Public access
-      // },
     ]
   },
   {
@@ -155,7 +156,7 @@ export const navigationItems = [
           name: 'Organization_Rents',
           params: { _id: route.params._id }
         }),
-        visible: (auth, route) => hasAccess(
+        visible: (auth, route) => isModuleInstalled('events') && hasAccess(
           route.params._id, 
           'orders', 
           'read', 

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

@@ -2,7 +2,7 @@ const controllerFactory = db => {
   const Department = db.department;
   const readOne = (req, res) => {
     Department.findOne({ _id: req.params._id })
-      .populate('members.user')
+      .populate('members.user', '-password')
       .populate('subdepartments')
       .then(department => {
         if (!department) {
@@ -14,42 +14,56 @@ const controllerFactory = db => {
         res.status(500).send({ message: err.message });
       });
   };
-  const read = (req, res) => {
-    let query = {};
-    let options = {};
-    if (req.query.organization) {
-      query.organization = new db.mongoose.Types.ObjectId(req.query.organization);
-    }
-    if (req.query.hidden) {
-      query.hidden = req.query.hidden;
+  const read = async (req, res) => {
+    try {
+      const { skip = 0, limit = 10, organization, hidden, _id, search } = req.query;
+      
+      let query = {};
+      if (_id) {
+        query._id = _id;
+      }
+      if (organization) {
+        query.organization = new db.mongoose.Types.ObjectId(organization);
+      }
+      if (hidden !== undefined) {
+        query.hidden = hidden === 'true';
+      }
+      if (search) {
+        query['profile.name'] = new RegExp(search, 'i');
+      }
+
+      const departments = await Department
+        .find(query)
+        .skip(parseInt(skip))
+        .limit(parseInt(limit))
+        .populate('members.user', '-password')
+        .populate('subdepartments')
+        .sort({ createdAt: -1 });
+      
+      res.send(departments);
+    } catch (err) {
+      res.status(500).send({ message: err.message });
     }
-    Department.find(query, null, options)
-      .populate('members.user')
-      .populate('subdepartments')
-      .then(departments => {
-        if (!departments) {
-          return res.status(404).send({ message: 'Departments not found' });
-        }
-        res.send(departments);
-      })
-      .catch(err => {
-        res.status(500).send({ message: err.message });
-      });
   };
   const create = async (req, res) => {
     try {
       const newDepartment = new Department({
         ...req.body,
-        organization: req.params._id,
+        organization: req.body.organization || req.params._id,
       });
       const data = await newDepartment.save();
-      res.send(data);
+      const populated = await Department.findById(data._id)
+        .populate('members.user', '-password')
+        .populate('subdepartments');
+      res.send(populated);
     } catch (err) {
       res.status(500).send({ message: err.message });
     }
   };
   const update = (req, res) => {
     Department.findOneAndUpdate({ _id: req.body._id }, req.body, { new: true })
+      .populate('members.user', '-password')
+      .populate('subdepartments')
       .then(department => {
         if (!department) {
           return res.status(404).send({ message: 'Department not found' });
@@ -60,17 +74,22 @@ const controllerFactory = db => {
         res.status(500).send({ message: err.message });
       });
   };
-  const deleteDepartment = (req, res) => {
-    Department.findOneAndRemove({ _id: req.body._id, organization: req.params._id })
-      .then(department => {
-        if (!department) {
-          return res.status(404).send({ message: 'Department not found' });
-        }
-        res.send({ message: 'Department deleted successfully' });
-      })
-      .catch(err => {
-        res.status(500).send({ message: err.message });
-      });
+  const deleteDepartment = async (req, res) => {
+    try {
+      const { _id } = req.body;
+      if (!_id) {
+        return res.status(400).send({ message: 'Department ID is required' });
+      }
+      
+      const department = await Department.findOneAndRemove({ _id });
+      if (!department) {
+        return res.status(404).send({ message: 'Department not found' });
+      }
+      
+      res.send(department);
+    } catch (err) {
+      res.status(500).send({ message: err.message });
+    }
   };
   return {
     readOne,

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

@@ -18,10 +18,24 @@ const сontrollerFactory = db => {
   };
   const read = async (req, res) => {
     try {
-      const invites = await Invite.find({ 'owner.target': req.params._id });
-      if (!invites || invites.length === 0) {
-        return res.status(200).send([]);
+      const { skip = 0, limit = 10, owner, target, search } = req.query;
+      
+      const query = {};
+      if (owner) query['owner.user'] = owner;
+      if (target) query['owner.target'] = target;
+      if (search) {
+        query.$or = [
+          { email: new RegExp(search, 'i') },
+          { phone: new RegExp(search, 'i') }
+        ];
       }
+
+      const invites = await Invite
+        .find(query)
+        .skip(parseInt(skip))
+        .limit(parseInt(limit))
+        .sort({ createdAt: -1 });
+      
       res.send(invites);
     } catch (err) {
       res.status(500).send({ message: err.message });
@@ -88,13 +102,37 @@ const сontrollerFactory = db => {
       res.status(500).json({ message: 'Something went wrong' });
     }
   };
+  const update = async (req, res) => {
+    try {
+      const { _id, ...updateData } = req.body;
+      if (!_id) {
+        return res.status(400).send({ message: 'Invite ID is required' });
+      }
+      const invite = await Invite.findByIdAndUpdate(
+        _id,
+        updateData,
+        { new: true, runValidators: true }
+      );
+      if (!invite) {
+        return res.status(404).send({ message: 'Invite not found' });
+      }
+      res.send(invite);
+    } catch (err) {
+      res.status(500).send({ message: err.message });
+    }
+  };
+  
   const deleteInvite = async (req, res) => {
     try {
-      const invite = await Invite.findOneAndDelete({ _id: req.params._id });
+      const { _id } = req.body;
+      if (!_id) {
+        return res.status(400).send({ message: 'Invite ID is required' });
+      }
+      const invite = await Invite.findOneAndDelete({ _id });
       if (!invite) {
         return res.status(404).send({ message: 'Invite not found' });
       }
-      res.send({ message: 'Invite deleted successfully' });
+      res.send(invite);
     } catch (err) {
       res.status(500).send({ message: err.message });
     }
@@ -103,6 +141,7 @@ const сontrollerFactory = db => {
     getOneByCode,
     read,
     create,
+    update,
     delete: deleteInvite,
   };
 };

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

@@ -47,7 +47,30 @@ const controllerFactory = db => {
         {
           $unwind: '$user',
         },
-        // Pagination
+        {
+          $project: {
+            _id: 1,
+            user: {
+              _id: 1,
+              profile: 1,
+              roles: 1,
+              phone: 1,
+              email: 1,
+              username: 1,
+              socials: 1,
+              status: 1,
+              createdAt: 1,
+              updatedAt: 1
+            },
+            type: 1,
+            role: 1,
+            label: 1,
+            target: 1,
+            createdAt: 1,
+            updatedAt: 1
+          }
+        },
+        // Sorting and Pagination
         ...queryProcessorGlobals.getSortingOptions(req.query.sortParam, req.query.sortOrder),
         ...queryProcessorGlobals.getPaginationOptions(req.query.skip, req.query.limit),
       ]);
@@ -69,7 +92,9 @@ const controllerFactory = db => {
     });
     try {
       const data = await newMembership.save();
-      res.send(data);
+      const populated = await Membership.findById(data._id)
+        .populate('user', '-password');
+      res.send(populated);
     } catch (err) {
       console.log(err);
       res.status(500).send({ errorCode: 'SERVER_ERROR' });
@@ -77,7 +102,8 @@ const controllerFactory = db => {
   };
   const update = async (req, res) => {
     try {
-      const membership = await Membership.findByIdAndUpdate(req.body._id, req.body, { new: true });
+      const membership = await Membership.findByIdAndUpdate(req.body._id, req.body, { new: true })
+        .populate('user', '-password');
       if (!membership) {
         return res.status(404).send({ errorCode: 'MEMBERSHIP_NOT_FOUND' });
       }
@@ -88,9 +114,22 @@ const controllerFactory = db => {
   };
   const deleteMembership = async (req, res) => {
     const { _id, type, target, user, role } = req.body;
+    console.log('Delete membership request:', { _id, type, target, user, role });
     try {
       // Обрабатываем сценарий когда мы не знаем _id нашего membership
-      const membership = _id ? await Membership.findOneAndDelete({ _id: new ObjectId(_id) }) : await Membership.findOneAndDelete({ type, target, user, role });
+      const query = _id 
+        ? { _id: new ObjectId(_id) } 
+        : { 
+            type, 
+            target: new ObjectId(target), 
+            user: new ObjectId(user), 
+            role 
+          };
+      console.log('Delete query:', query);
+      
+      const membership = await Membership.findOneAndDelete(query);
+      console.log('Deleted membership:', membership);
+      
       if (!membership) {
         return res.status(404).send({ errorCode: 'MEMBERSHIP_NOT_FOUND' });
       }

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

@@ -1,7 +1,7 @@
 // Store
-import * as storeDepartments from './store/departments.js';
-import * as storeInvites from './store/invites.js';
-import * as storeMemberships from './store/memberships.js';
+import departmentsStore from './store/departments.store.js';
+import invitesStore from './store/invites.store.js';
+import membershipsStore from './store/memberships.store.js';
 import * as storeOrganizations from './store/organizations.js';
 
 // Router
@@ -10,11 +10,16 @@ import routerOrganization from './router/organizations.js';
 // Views
 // Pages
 import Department from './components/pages/Department.vue';
-import DepartmentEdit from './components/pages/DepartmentEdit.vue';
+import Members from './components/pages/Members.vue';
 import Organization from './components/pages/Organization.vue';
 import OrganizationEdit from './components/pages/OrganizationEdit.vue';
 import Organizations from './components/pages/Organizations.vue';
 
+// Forms
+import DepartmentForm from './components/forms/DepartmentForm.vue';
+import InviteForm from './components/forms/InviteForm.vue';
+import AddExistingMembersForm from './components/forms/AddExistingMembersForm.vue';
+
 // Blocks
 import CardDepartment from './components/blocks/CardDepartment.vue';
 import CardOrganization from './components/blocks/CardOrganization.vue';
@@ -40,24 +45,27 @@ function initializeOrganization(app, store, router, options = {}) {
 
   router.addRoute(route, routerOrganization);
 
-  store.addStore('departments', storeDepartments);
-  store.addStore('memberships', storeMemberships);
   store.addStore('organizations', storeOrganizations);
-  store.addStore('invites', storeInvites);
 }
 
 // Export components, store modules, and routes
 export {
+  AddExistingMembersForm,
   ButtonToggleMembership,
   CardDepartment,
   CardOrganization,
   Contacts,
   Department,
-  DepartmentEdit,
+  DepartmentForm,
   DepartmentSub,
+  departmentsStore,
   Documents,
   EmptyState,
+  InviteForm,
+  invitesStore,
+  Members,
   MembersAdd,
+  membershipsStore,
   Organization,
   OrganizationEdit,
   Organizations,
@@ -67,9 +75,6 @@ export {
   Socials,
   Unit,
   routerOrganization,
-  storeDepartments,
-  storeInvites,
-  storeMemberships,
   storeOrganizations,
 };
 
@@ -77,10 +82,10 @@ const ModuleOrganization = {
   initialize: initializeOrganization,
   views: {
     store: {
-      storeDepartments,
-      storeMemberships,
+      departmentsStore,
+      invitesStore,
+      membershipsStore,
       storeOrganizations,
-      storeInvites,
     },
     router: {
       routerOrganization,
@@ -89,9 +94,13 @@ const ModuleOrganization = {
       // Pages
       Organization,
       Department,
+      Members,
       OrganizationEdit,
       Organizations,
-      DepartmentEdit,
+      // Forms
+      DepartmentForm,
+      InviteForm,
+      AddExistingMembersForm,
       // Blocks
       CardOrganization,
       Unit,

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

@@ -1,15 +1,6 @@
 import * as validationAuth from '@martyrs/src/modules/auth/views/middlewares/auth.validation.js';
 
 const departmentRoutes = [
-  {
-    path: 'departments/create',
-    name: 'Department Creation',
-    meta: {
-      title: 'Создание отдела',
-    },
-    beforeEnter: [validationAuth.requiresAuth],
-    component: () => import('@martyrs/src/modules/organizations/components/pages/DepartmentEdit.vue'),
-  },
   {
     path: 'departments/:department',
     name: 'Department',
@@ -19,15 +10,6 @@ const departmentRoutes = [
     beforeEnter: [validationAuth.requiresAuth],
     component: () => import('@martyrs/src/modules/organizations/components/pages/Department.vue'),
   },
-  {
-    path: 'departments/:department/edit',
-    name: 'Department Edit',
-    meta: {
-      title: 'Редактирование отдела',
-    },
-    beforeEnter: [validationAuth.requiresAuth],
-    component: () => import('@martyrs/src/modules/organizations/components/pages/DepartmentEdit.vue'),
-  },
 ];
 
 export default departmentRoutes;

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

@@ -1,14 +1,12 @@
 import controllerFactory from '../controllers/departments.controller.js';
 export default (function (app, db) {
   const controller = controllerFactory(db);
-  // Get organization departments by _id
+  // Standard Store routes
   app.get('/api/departments/read', controller.read);
-  // Get department by _id
+  app.post('/api/departments/create', controller.create);
+  app.put('/api/departments/update', controller.update);
+  app.post('/api/departments/delete', controller.delete);
+  
+  // Legacy routes for backward compatibility (can be removed later)
   app.get('/api/departments/get/:_id', controller.readOne);
-  // Add organization department
-  app.post('/api/departments/:_id/create', controller.create);
-  // Update organization department
-  app.post('/api/departments/:_id/update', controller.update);
-  // Delete organization department
-  app.delete('/api/departments/:_id/delete', controller.delete);
 });

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

@@ -3,12 +3,14 @@ import controllerFactory from '../controllers/invites.controller.js';
 export default (function (app, db) {
   const controller = controllerFactory(db);
   const { verifyInvites } = middlewareFactoryAuth(db);
-  // Get one invite
+  // Read invites with query parameters
+  app.get('/api/invites/read', controller.read);
+  // Get one invite by code
   app.get('/api/invites/get/:_id', controller.getOneByCode);
-  // Get all organiztions invite
-  app.get('/api/invites/:_id', controller.read);
   // Create invite in organization
   app.post('/api/invites/create', [verifyInvites.checkInviteExist, verifyInvites.checkUsersExist], controller.create);
+  // Update invite
+  app.put('/api/invites/update', controller.update);
   // Delete invite in organization
-  app.delete('/api/invites/delete/:_id', controller.delete);
+  app.post('/api/invites/delete', controller.delete);
 });

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

@@ -1,11 +1,12 @@
 import controllerFactory from '../controllers/memberships.controller.js';
 export default (function (app, db) {
   const controller = controllerFactory(db);
-  app.get('/api/memberships', controller.read);
-  // Add organization membder
+  // Standard Store routes
+  app.get('/api/memberships/read', controller.read);
   app.post('/api/memberships/create', controller.create);
-  // Update organization membder
-  app.post('/api/memberships/update', controller.update);
-  // Delete organization membder
+  app.put('/api/memberships/update', controller.update);
   app.post('/api/memberships/delete', controller.deleteMembership);
+  
+  // Legacy route for backward compatibility
+  app.get('/api/memberships', controller.read);
 });

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

@@ -0,0 +1,5 @@
+import Store from '@martyrs/src/modules/globals/views/classes/globals.store.js';
+
+const departmentsStore = new Store('/api/departments');
+
+export default departmentsStore;

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

@@ -0,0 +1,5 @@
+import Store from '@martyrs/src/modules/globals/views/classes/globals.store.js';
+
+const invitesStore = new Store('/api/invites');
+
+export default invitesStore;

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

@@ -0,0 +1,23 @@
+import Store from '@martyrs/src/modules/globals/views/classes/globals.store.js';
+
+const membershipsStore = new Store('/api/memberships');
+
+// Add handleMembershipUpdate method
+membershipsStore.handleMembershipUpdate = function(user, membership, status, target, statusName, statusNumber) {
+  if (!user) return;
+  
+  // status comes as boolean from ButtonToggleMembership
+  if (status === true || status === 'active') {
+    user[statusName] = true;
+    if (statusNumber) {
+      user[statusNumber] = (user[statusNumber] || 0) + 1;
+    }
+  } else {
+    user[statusName] = false;
+    if (statusNumber) {
+      user[statusNumber] = Math.max((user[statusNumber] || 0) - 1, 0);
+    }
+  }
+};
+
+export default membershipsStore;

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

@@ -266,7 +266,6 @@
 
   import FilterProducts from '@martyrs/src/modules/products/components/sections/FilterProducts.vue'
   import BlockSearch from '@martyrs/src/modules/globals/views/components/blocks/BlockSearch.vue'
-  import BlockFilter  from '@martyrs/src/modules/globals/views/components/blocks/BlockFilter.vue'
   import Filters  from '@martyrs/src/modules/globals/views/components/sections/Filters.vue'
   import Spoiler from "@martyrs/src/components/Spoiler/Spoiler.vue"
   import Field from "@martyrs/src/components/Field/Field.vue"