@ozdao/martyrs 0.2.448 → 0.2.450

package/dist/martyrs/src/modules/reports/components/sections/FormReport.vue.cjs

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const vue = require("vue");
-const Popup = require("../../../../components/Popup/Popup.vue.cjs");
-const Button = require("../../../../components/Button/Button.vue2.cjs");
+const Popup = require("../../../../components/Popup/Popup.vue2.cjs");
+const Button = require("../../../../components/Button/Button.vue.cjs");
 const Select = require("../../../../components/Select/Select.vue.cjs");
 const reports = require("../../store/reports.cjs");
 const _sfc_main = {

package/dist/martyrs/src/modules/reports/components/sections/FormReport.vue.js

@@ -1,6 +1,6 @@
 import { reactive, ref, createElementBlock, openBlock, renderSlot, createVNode, withCtx, createElementVNode, createTextVNode } from "vue";
-import _sfc_main$1 from "../../../../components/Popup/Popup.vue.js";
-import _sfc_main$2 from "../../../../components/Button/Button.vue2.js";
+import _sfc_main$1 from "../../../../components/Popup/Popup.vue2.js";
+import _sfc_main$2 from "../../../../components/Button/Button.vue.js";
 import Select from "../../../../components/Select/Select.vue.js";
 import { actions } from "../../store/reports.js";
 const _sfc_main = {

package/dist/martyrs/src/modules/spots/components/blocks/CardSpot.vue.cjs

@@ -3,7 +3,7 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 const vue = require("vue");
 const IconEdit = require("../../../icons/navigation/IconEdit.vue.cjs");
 const IconCheckmark = require("../../../icons/navigation/IconCheckmark.vue.cjs");
-const Chips = require("../../../../components/Chips/Chips.vue2.cjs");
+const Chips = require("../../../../components/Chips/Chips.vue.cjs");
 const Map = require("../../../../components/Map/Map.vue.cjs");
 const _pluginVue_exportHelper = require("../../../../../../_virtual/_plugin-vue_export-helper.cjs");
 const _hoisted_1 = { class: "pos-relative cols-2-1_3" };

package/dist/martyrs/src/modules/spots/components/blocks/CardSpot.vue.js

@@ -1,7 +1,7 @@
 import { createElementBlock, openBlock, createVNode, createElementVNode, createBlock, createCommentVNode, toDisplayString } from "vue";
 import _sfc_main$1 from "../../../icons/navigation/IconEdit.vue.js";
 import _sfc_main$2 from "../../../icons/navigation/IconCheckmark.vue.js";
-import _sfc_main$3 from "../../../../components/Chips/Chips.vue2.js";
+import _sfc_main$3 from "../../../../components/Chips/Chips.vue.js";
 import Map from "../../../../components/Map/Map.vue.js";
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
 const _hoisted_1 = { class: "pos-relative cols-2-1_3" };

package/dist/martyrs/src/modules/spots/components/pages/Map.vue.cjs

@@ -3,7 +3,7 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 const vue = require("vue");
 const vueRouter = require("vue-router");
 const index = require("../../../../../../node_modules/.pnpm/@googlemaps_js-api-loader@1.16.8/node_modules/@googlemaps/js-api-loader/dist/index.cjs");
-const Button = require("../../../../components/Button/Button.vue2.cjs");
+const Button = require("../../../../components/Button/Button.vue.cjs");
 const organizations = require("../../../organizations/store/organizations.cjs");
 const globals = require("../../../globals/views/store/globals.cjs");
 const marketplace = require("../../../marketplace/views/store/marketplace.cjs");

package/dist/martyrs/src/modules/spots/components/pages/Map.vue.js

@@ -1,7 +1,7 @@
 import { ref, onMounted, createElementBlock, openBlock, createElementVNode, createVNode, withCtx, createTextVNode } from "vue";
 import { useRouter, useRoute } from "vue-router";
 import { Loader } from "../../../../../../node_modules/.pnpm/@googlemaps_js-api-loader@1.16.8/node_modules/@googlemaps/js-api-loader/dist/index.js";
-import _sfc_main$1 from "../../../../components/Button/Button.vue2.js";
+import _sfc_main$1 from "../../../../components/Button/Button.vue.js";
 import { actions, state as state$2 } from "../../../organizations/store/organizations.js";
 import { state } from "../../../globals/views/store/globals.js";
 import { state as state$1 } from "../../../marketplace/views/store/marketplace.js";

package/dist/martyrs/src/modules/spots/components/pages/SpotEdit.vue.cjs

@@ -4,15 +4,15 @@ const vue = require("vue");
 const vueRouter = require("vue-router");
 const Block = require("../../../../components/Block/Block.vue.cjs");
 const UploadImage = require("../../../../components/UploadImage/UploadImage.vue.cjs");
-;/* empty css                                   */
+;/* empty css                                    */
 const Field = require("../../../../components/Field/Field.vue.cjs");
 const Select = require("../../../../components/Select/Select.vue.cjs");
 const Checkbox = require("../../../../components/Checkbox/Checkbox.vue.cjs");
 const Address = require("../../../../components/Address/Address.vue2.cjs");
 const LocationMarker = require("../../../../components/LocationMarker/LocationMarker.vue2.cjs");
-const Button = require("../../../../components/Button/Button.vue2.cjs");
+const Button = require("../../../../components/Button/Button.vue.cjs");
 require("vue-i18n");
-;/* empty css                                        */
+;/* empty css                                       */
 const spots = require("../../store/spots.cjs");
 const _hoisted_1 = { class: "for-transition w-100 cols-1 pd-thin gap-thin" };
 const _hoisted_2 = { class: "mn-r-auto" };

package/dist/martyrs/src/modules/spots/components/pages/SpotEdit.vue.js

@@ -2,15 +2,15 @@ import { ref, onMounted, createElementBlock, openBlock, createVNode, createEleme
 import { useRouter, useRoute } from "vue-router";
 import _sfc_main$1 from "../../../../components/Block/Block.vue.js";
 import _sfc_main$3 from "../../../../components/UploadImage/UploadImage.vue.js";
-/* empty css                                 */
+/* empty css                                  */
 import Field from "../../../../components/Field/Field.vue.js";
 import Select from "../../../../components/Select/Select.vue.js";
 import _sfc_main$4 from "../../../../components/Checkbox/Checkbox.vue.js";
 import _sfc_main$5 from "../../../../components/Address/Address.vue2.js";
 import _sfc_main$6 from "../../../../components/LocationMarker/LocationMarker.vue2.js";
-import _sfc_main$2 from "../../../../components/Button/Button.vue2.js";
+import _sfc_main$2 from "../../../../components/Button/Button.vue.js";
 import "vue-i18n";
-/* empty css                                      */
+/* empty css                                     */
 import { actions, state } from "../../store/spots.js";
 const _hoisted_1 = { class: "for-transition w-100 cols-1 pd-thin gap-thin" };
 const _hoisted_2 = { class: "mn-r-auto" };

package/dist/organizations.server.js

@@ -445,8 +445,9 @@ function requireOrganizations_controller() {
         const savedMembership = await membership.save();
         const orgTag = `organization_${savedOrganization._id}`;
         await cache.delByTag(orgTag);
-        const newCacheKey = JSON.stringify({ _id: savedOrganization._id });
-        await cache.setWithTags(newCacheKey, [savedOrganization], [orgTag, "organizations"]);
+        const organizationObject = savedOrganization.toObject();
+        const newCacheKey = JSON.stringify({ id: organizationObject._id });
+        await cache.setWithTags(newCacheKey, [organizationObject], [orgTag, "organizations"]);
         res.status(201).json(savedOrganization);
       } catch (error) {
         console.error("Error:", error);
@@ -466,35 +467,35 @@ function requireOrganizations_controller() {
         }
         const orgTag = `organization_${organizationId}`;
         await cache.delByTag(orgTag);
+        const organizationObject = organization.toObject();
         const updateCacheKey = JSON.stringify({ _id: organizationId });
-        await cache.setWithTags(updateCacheKey, [organization], [orgTag, "organizations"]);
+        await cache.setWithTags(updateCacheKey, [organizationObject], [orgTag, "organizations"]);
         res.status(200).json({ message: "Organization updated successfully", organization });
       } catch (error) {
         res.status(500).json({ error: error.message });
       }
     };
     const deleteOrganization = async (req, res) => {
-      Organization.findOneAndRemove({ _id: req.params._id }).then((organization) => {
+      try {
+        const organization = await Organization.findOneAndRemove({ _id: req.params._id });
         if (!organization) {
           return res.status(404).send({ message: "Organization not found" });
         }
-        Membership.deleteMany({ target: req.params._id }).then(() => {
-          const newToken = jwt.sign({
-            _id: user._id,
-            organization: null
-          }, process.env.SECRET_KEY, {
-            expiresIn: 86400
-            // 24 hours
-          });
-          const orgTag = `organization_${req.params._id}`;
-          cache.delByTag(orgTag);
-          res.send({ newToken });
-        }).catch((err) => {
-          res.status(500).send({ message: "Error deleting memberships: " + err.message });
+        await Membership.deleteMany({ target: req.params._id });
+        const newToken = jwt.sign({
+          _id: req.userId,
+          // Предполагаю, что req.userId доступен
+          organization: null
+        }, process.env.SECRET_KEY, {
+          expiresIn: 86400
+          // 24 hours
         });
-      }).catch((err) => {
+        const orgTag = `organization_${req.params._id}`;
+        await cache.delByTag(orgTag);
+        res.send({ newToken });
+      } catch (err) {
         res.status(500).send({ message: err.message });
-      });
+      }
     };
     const checkAccesses = async (req, res) => {
       try {
@@ -504,8 +505,8 @@ function requireOrganizations_controller() {
         if (cachedResult) {
           return res.status(200).json(cachedResult);
         }
-        const depts = await Department.find({ "members.user": uid });
-        const ownedOrgs = await Organization.find({ owner: uid });
+        const depts = await Department.find({ "members.user": uid }).lean();
+        const ownedOrgs = await Organization.find({ owner: uid }).lean();
         const ownedOrgIds = ownedOrgs.map((org) => org._id.toString());
         const accesses = {};
         const processAccesses = (orgId, isOwner, deptAccesses) => {
@@ -668,16 +669,16 @@ function requireMemberships_controller() {
       }
     };
     const deleteMembership = async (req, res) => {
-      const { _id, type, target, user: user2, role } = req.body;
+      const { _id, type, target, user, role } = req.body;
       try {
-        const membership = _id ? await Membership.findOneAndDelete({ _id: new ObjectId(_id) }) : await Membership.findOneAndDelete({ type, target, user: user2, role });
+        const membership = _id ? await Membership.findOneAndDelete({ _id: new ObjectId(_id) }) : await Membership.findOneAndDelete({ type, target, user, role });
         if (!membership) {
           return res.status(404).send({ errorCode: "MEMBERSHIP_NOT_FOUND" });
         }
         if (membership.type === "organization") {
           await Department.updateMany(
             { organization: target },
-            { $pull: { members: { user: user2 } } }
+            { $pull: { members: { user } } }
           );
         }
         res.status(200).send(membership);
@@ -737,18 +738,18 @@ function requireInvites_controller() {
       const createdMemberships = [];
       try {
         for (let invite of list) {
-          let user2 = null;
+          let user = null;
           if (!invite || !invite.contact) {
             continue;
           }
           if (invite.contact.includes("@")) {
-            user2 = await User.findOne({ email: invite.contact });
+            user = await User.findOne({ email: invite.contact });
           } else {
-            user2 = await User.findOne({ phone: invite.contact });
+            user = await User.findOne({ phone: invite.contact });
           }
-          if (user2) {
+          if (user) {
             const membership = new Membership({
-              user: user2._id,
+              user: user._id,
               type: "organization",
               target: req.body.owner.target,
               role: "member",
@@ -1376,7 +1377,7 @@ function requireOrganizations_policies() {
       }
     });
     abacAccessControl.registerGlobalPolicy("OrganizationAccessPolicy", async (context) => {
-      const { user: user2, resource, data, action, currentResource, req } = context;
+      const { user, resource, data, action, currentResource, req } = context;
       if (!resource || !action) {
         return false;
       }
@@ -1395,19 +1396,19 @@ function requireOrganizations_policies() {
       };
       const orgId = findOrgId();
       if (orgId) {
-        if (user2) {
+        if (user) {
           try {
             const objectId = new db.mongoose.Types.ObjectId(orgId);
             const isOrgOwner = await Organization.exists({
               _id: objectId,
-              owner: user2
+              owner: user
             });
             if (isOrgOwner) {
               return true;
             }
             const departments = await Department.find({
               organization: objectId,
-              "members.user": user2
+              "members.user": user
             });
             const hasAccess = departments.some((department) => {
               const accessRights = department.accesses?.[resource];

package/dist/organizations.server.mjs

@@ -444,8 +444,9 @@ function requireOrganizations_controller() {
         const savedMembership = await membership.save();
         const orgTag = `organization_${savedOrganization._id}`;
         await cache.delByTag(orgTag);
-        const newCacheKey = JSON.stringify({ _id: savedOrganization._id });
-        await cache.setWithTags(newCacheKey, [savedOrganization], [orgTag, "organizations"]);
+        const organizationObject = savedOrganization.toObject();
+        const newCacheKey = JSON.stringify({ id: organizationObject._id });
+        await cache.setWithTags(newCacheKey, [organizationObject], [orgTag, "organizations"]);
         res.status(201).json(savedOrganization);
       } catch (error) {
         console.error("Error:", error);
@@ -465,35 +466,35 @@ function requireOrganizations_controller() {
         }
         const orgTag = `organization_${organizationId}`;
         await cache.delByTag(orgTag);
+        const organizationObject = organization.toObject();
         const updateCacheKey = JSON.stringify({ _id: organizationId });
-        await cache.setWithTags(updateCacheKey, [organization], [orgTag, "organizations"]);
+        await cache.setWithTags(updateCacheKey, [organizationObject], [orgTag, "organizations"]);
         res.status(200).json({ message: "Organization updated successfully", organization });
       } catch (error) {
         res.status(500).json({ error: error.message });
       }
     };
     const deleteOrganization = async (req, res) => {
-      Organization.findOneAndRemove({ _id: req.params._id }).then((organization) => {
+      try {
+        const organization = await Organization.findOneAndRemove({ _id: req.params._id });
         if (!organization) {
           return res.status(404).send({ message: "Organization not found" });
         }
-        Membership.deleteMany({ target: req.params._id }).then(() => {
-          const newToken = jwt.sign({
-            _id: user._id,
-            organization: null
-          }, process.env.SECRET_KEY, {
-            expiresIn: 86400
-            // 24 hours
-          });
-          const orgTag = `organization_${req.params._id}`;
-          cache.delByTag(orgTag);
-          res.send({ newToken });
-        }).catch((err) => {
-          res.status(500).send({ message: "Error deleting memberships: " + err.message });
+        await Membership.deleteMany({ target: req.params._id });
+        const newToken = jwt.sign({
+          _id: req.userId,
+          // Предполагаю, что req.userId доступен
+          organization: null
+        }, process.env.SECRET_KEY, {
+          expiresIn: 86400
+          // 24 hours
         });
-      }).catch((err) => {
+        const orgTag = `organization_${req.params._id}`;
+        await cache.delByTag(orgTag);
+        res.send({ newToken });
+      } catch (err) {
         res.status(500).send({ message: err.message });
-      });
+      }
     };
     const checkAccesses = async (req, res) => {
       try {
@@ -503,8 +504,8 @@ function requireOrganizations_controller() {
         if (cachedResult) {
           return res.status(200).json(cachedResult);
         }
-        const depts = await Department.find({ "members.user": uid });
-        const ownedOrgs = await Organization.find({ owner: uid });
+        const depts = await Department.find({ "members.user": uid }).lean();
+        const ownedOrgs = await Organization.find({ owner: uid }).lean();
         const ownedOrgIds = ownedOrgs.map((org) => org._id.toString());
         const accesses = {};
         const processAccesses = (orgId, isOwner, deptAccesses) => {
@@ -667,16 +668,16 @@ function requireMemberships_controller() {
       }
     };
     const deleteMembership = async (req, res) => {
-      const { _id, type, target, user: user2, role } = req.body;
+      const { _id, type, target, user, role } = req.body;
       try {
-        const membership = _id ? await Membership.findOneAndDelete({ _id: new ObjectId(_id) }) : await Membership.findOneAndDelete({ type, target, user: user2, role });
+        const membership = _id ? await Membership.findOneAndDelete({ _id: new ObjectId(_id) }) : await Membership.findOneAndDelete({ type, target, user, role });
         if (!membership) {
           return res.status(404).send({ errorCode: "MEMBERSHIP_NOT_FOUND" });
         }
         if (membership.type === "organization") {
           await Department.updateMany(
             { organization: target },
-            { $pull: { members: { user: user2 } } }
+            { $pull: { members: { user } } }
           );
         }
         res.status(200).send(membership);
@@ -736,18 +737,18 @@ function requireInvites_controller() {
       const createdMemberships = [];
       try {
         for (let invite of list) {
-          let user2 = null;
+          let user = null;
           if (!invite || !invite.contact) {
             continue;
           }
           if (invite.contact.includes("@")) {
-            user2 = await User.findOne({ email: invite.contact });
+            user = await User.findOne({ email: invite.contact });
           } else {
-            user2 = await User.findOne({ phone: invite.contact });
+            user = await User.findOne({ phone: invite.contact });
           }
-          if (user2) {
+          if (user) {
             const membership = new Membership({
-              user: user2._id,
+              user: user._id,
               type: "organization",
               target: req.body.owner.target,
               role: "member",
@@ -1375,7 +1376,7 @@ function requireOrganizations_policies() {
       }
     });
     abacAccessControl.registerGlobalPolicy("OrganizationAccessPolicy", async (context) => {
-      const { user: user2, resource, data, action, currentResource, req } = context;
+      const { user, resource, data, action, currentResource, req } = context;
       if (!resource || !action) {
         return false;
       }
@@ -1394,19 +1395,19 @@ function requireOrganizations_policies() {
       };
       const orgId = findOrgId();
       if (orgId) {
-        if (user2) {
+        if (user) {
           try {
             const objectId = new db.mongoose.Types.ObjectId(orgId);
             const isOrgOwner = await Organization.exists({
               _id: objectId,
-              owner: user2
+              owner: user
             });
             if (isOrgOwner) {
               return true;
             }
             const departments = await Department.find({
               organization: objectId,
-              "members.user": user2
+              "members.user": user
             });
             const hasAccess = departments.some((department) => {
               const accessRights = department.accesses?.[resource];

package/dist/style.css

@@ -1529,13 +1529,13 @@ div.vue-tags-input.disabled * {
 }
 
 /* Base sidebar styling */
-.sidebar-container[data-v-993ec6f5] {
+.sidebar-container[data-v-d90f5691] {
   position: relative;
   left: 0;
   top: 0;
   transition: all 0.3s ease-in-out;
 }
-.dark-mode-toggle[data-v-993ec6f5] {
+.dark-mode-toggle[data-v-d90f5691] {
   align-items: center;
   width: 100%;
   border-radius: var(--small);
@@ -1545,43 +1545,43 @@ div.vue-tags-input.disabled * {
   background: transparent;
   cursor: pointer;
 }
-.dark-mode-toggle[data-v-993ec6f5]:hover {
+.dark-mode-toggle[data-v-d90f5691]:hover {
   background: var(--light-regular);
 }
-.dark-mode-label[data-v-993ec6f5] {
+.dark-mode-label[data-v-d90f5691] {
   font-weight: 500;
   transition: opacity 0.2s, width 0.2s;
   white-space: nowrap;
 }
-.dark-mode-icon[data-v-993ec6f5] {
+.dark-mode-icon[data-v-d90f5691] {
   font-size: 1.25rem;
   transition: transform 0.2s;
 }
-.dark-mode-toggle:hover .dark-mode-icon[data-v-993ec6f5] {
+.dark-mode-toggle:hover .dark-mode-icon[data-v-d90f5691] {
   transform: scale(1.1);
 }
-.hidden[data-v-993ec6f5] {
+.hidden[data-v-d90f5691] {
   opacity: 0;
   width: 0;
   display: none;
 }
-.visible[data-v-993ec6f5] {
+.visible[data-v-d90f5691] {
   opacity: 1;
   display: block;
 }
 
 /* Scrollbar styles */
-[data-v-993ec6f5]::-webkit-scrollbar {
+[data-v-d90f5691]::-webkit-scrollbar {
   width: 6px;
 }
-[data-v-993ec6f5]::-webkit-scrollbar-track {
+[data-v-d90f5691]::-webkit-scrollbar-track {
   background: transparent;
 }
-[data-v-993ec6f5]::-webkit-scrollbar-thumb {
+[data-v-d90f5691]::-webkit-scrollbar-thumb {
   background-color: var(--grey-micro);
   border-radius: 3px;
 }
-[data-v-993ec6f5]::-webkit-scrollbar-thumb:hover {
+[data-v-d90f5691]::-webkit-scrollbar-thumb:hover {
   background-color: var(--grey-small);
 }
 

package/package.json

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

package/src/modules/globals/views/components/partials/Sidebar.vue

@@ -28,12 +28,10 @@ const emits = defineEmits([
   'closeSidebar'
 ])
 
+const { isPhone, isTablet } = useGlobalMixins()
 
-const { isPhone } = useGlobalMixins()
 const router = useRouter()
 
-
-
 const toggleSidebar = () => {
   emit('closeSidebar')
 }

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

@@ -84,11 +84,9 @@ const controllerFactory = (db) => {
     if(req.body._id === null) {
       delete req.body._id;
     }
-
     try {
       const organization = new Organization(req.body);
       const savedOrganization = await organization.save();
-
       const membership = new Membership({
         user: savedOrganization.owner,
         type: 'organization',
@@ -98,15 +96,18 @@ const controllerFactory = (db) => {
       });
       
       const savedMembership = await membership.save();
-
+      
       // Очищаем кэш для этой организации
       const orgTag = `organization_${savedOrganization._id}`;
       await cache.delByTag(orgTag);
-
+      
+      // Convert the Mongoose document to a plain JavaScript object before caching
+      const organizationObject = savedOrganization.toObject();
+      
       // Обновляем кэш, добавляя новую организацию
-      const newCacheKey = JSON.stringify({ _id: savedOrganization._id }); // Ключ для новой записи
-      await cache.setWithTags(newCacheKey, [savedOrganization], [orgTag, 'organizations']);
-
+      const newCacheKey = JSON.stringify({ id: organizationObject._id });
+      await cache.setWithTags(newCacheKey, [organizationObject], [orgTag, 'organizations']);
+      
       res.status(201).json(savedOrganization);
     } catch (error) {
       console.error('Error:', error);
@@ -117,7 +118,6 @@ const controllerFactory = (db) => {
   const update = async (req, res) => {
     try {
       const organizationId = req.params._id;
-
       const updatedData = req.body;
 
       const organization = await Organization.findByIdAndUpdate(organizationId, updatedData, {
@@ -133,9 +133,12 @@ const controllerFactory = (db) => {
       const orgTag = `organization_${organizationId}`;
       await cache.delByTag(orgTag);
 
+      // Преобразуем документ Mongoose в обычный объект перед кэшированием
+      const organizationObject = organization.toObject();
+
       // Обновляем кэш новой версией организации
-      const updateCacheKey = JSON.stringify({ _id: organizationId }); // Ключ для обновленной записи
-      await cache.setWithTags(updateCacheKey, [organization], [orgTag, 'organizations']);
+      const updateCacheKey = JSON.stringify({ _id: organizationId });
+      await cache.setWithTags(updateCacheKey, [organizationObject], [orgTag, 'organizations']);
 
       res.status(200).json({ message: 'Organization updated successfully', organization });
     } catch (error) {
@@ -144,35 +147,31 @@ const controllerFactory = (db) => {
   };
 
   const deleteOrganization = async (req, res) => {
-    Organization.findOneAndRemove({ _id: req.params._id })
-      .then(organization => {
-        if (!organization) {
-          return res.status(404).send({ message: "Organization not found" });
-        }
+    try {
+      const organization = await Organization.findOneAndRemove({ _id: req.params._id });
+      
+      if (!organization) {
+        return res.status(404).send({ message: "Organization not found" });
+      }
 
-        // Удаление всех memberships, связанных с этой организацией
-        Membership.deleteMany({ target: req.params._id })
-          .then(() => {
-            const newToken = jwt.sign({
-              _id: user._id,
-              organization: null
-            }, process.env.SECRET_KEY, {
-              expiresIn: 86400 // 24 hours
-            });
+      // Удаление всех memberships, связанных с этой организацией
+      await Membership.deleteMany({ target: req.params._id });
+      
+      const newToken = jwt.sign({
+        _id: req.userId, // Предполагаю, что req.userId доступен
+        organization: null
+      }, process.env.SECRET_KEY, {
+        expiresIn: 86400 // 24 hours
+      });
 
-            // Очищаем кэш для этой организации
-            const orgTag = `organization_${req.params._id}`;
-            cache.delByTag(orgTag);
+      // Очищаем кэш для этой организации
+      const orgTag = `organization_${req.params._id}`;
+      await cache.delByTag(orgTag);
 
-            res.send({ newToken });
-          })
-          .catch(err => {
-            res.status(500).send({ message: "Error deleting memberships: " + err.message });
-          });
-      })
-      .catch(err => {
-        res.status(500).send({ message: err.message });
-      });
+      res.send({ newToken });
+    } catch (err) {
+      res.status(500).send({ message: err.message });
+    }
   };
 
   const checkAccesses = async (req, res) => {
@@ -186,8 +185,8 @@ const controllerFactory = (db) => {
         return res.status(200).json(cachedResult);
       }
 
-      const depts = await Department.find({ 'members.user': uid });
-      const ownedOrgs = await Organization.find({ owner: uid });
+      const depts = await Department.find({ 'members.user': uid }).lean(); // Используем lean() для получения обычных объектов
+      const ownedOrgs = await Organization.find({ owner: uid }).lean(); // Используем lean() для получения обычных объектов
       const ownedOrgIds = ownedOrgs.map(org => org._id.toString());
       
       const accesses = {};

package/dist/martyrs/src/components/Button/Button.vue2.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"Button.vue2.cjs","sources":["../../../../../src/components/Button/Button.vue"],"sourcesContent":["<script setup>\n\timport { ref } from 'vue'\n\n\timport Loader from '@martyrs/src/components/Loader/Loader.vue'\n\n\tconst props = defineProps({\n\t\tsubmit: {\n\t\t\ttype: Function,\n\t\t\tdefault: async () => { console.log('Button click.') }\n\t\t},\n\t\ttext: {\n\t\t\ttype: Object,\n\t\t\tdefault: (textComponent) => {\n\t\t\t\treturn textComponent = {\n\t\t\t\t\t...textComponent.text,\n\t\t\t\t\tsuccess: '✔',\n\t\t\t\t\terror: '✖'\n\t\t\t\t}\n\t\t\t}\n\t\t},\n\t\tcounter: {\n\t    type: Object\n\t  },\n\t\tcallback: {\n\t\t\ttype: Function,\n\t\t\tdefault: async () => { console.log('Button callback.') }\n\t\t},\n\t\tcallbackDelay: {\n\t\t\ttype: Number,\n\t\t\tdefault: 750\n\t\t},\n\t\tshowSucces: {\n\t\t\ttype: Boolean,\n\t\t\tdefault: true\n\t\t},\n\t\tshowLoader: {\n\t\t\ttype: Boolean,\n\t\t\tdefault: true\n\t\t},\n\t\tvalidation: {\n\t\t\ttype: Boolean,\n\t\t\tdefault: false\n\t\t},\n\t})\t\n\n\tconst emits = defineEmits(['error'])\n\n\tconst button = ref(null);\n\tconst error = ref(null);\n\tconst loading = ref(false);\n\tconst finished = ref(false);\n\n\tasync function Submit() {\n\t\t\tconsole.log('click')\n\t\t\t\n\t    button.value.style['pointer-events'] = 'none';\n\t    error.value = null;\n\t    loading.value = true;\n\n\t    // Функция для сброса состояния кнопки.\n\t    const resetButton = () => {\n        if (button.value) {\n          button.value.classList.replace('bg-second', 'bg-main');\n          button.value.style.pointerEvents = 'auto';\n          loading.value = false;\n          finished.value = false;\n          error.value = null;\n        }\n\t    };\n\n\t    try {\n        await props.submit();\n\n        button.value.classList.replace('bg-main', 'bg-second');\n\n        loading.value = false;\n\n        // Используем функцию сброса состояния кнопки здесь.\n        if (props.showSucces) { \n\t\t\t\t\tfinished.value = true;\n          setTimeout(resetButton, 500);\n        } else {\n          resetButton();\n        }\n\n        // Если есть callback, мы также установим таймер для его вызова.\n        if (props.callback) setTimeout(() => props.callback(), props.callbackDelay);\n\n\t    } catch (err) {\n    \t\temits('error',err)\n        // Если возникла ошибка, мы изменяем стили и устанавливаем сообщение об ошибке.\n        button.value.classList.replace('bg-main', 'bg-fourth-nano');\n        error.value = props.error;\n        \n        // После задержки снова сбрасываем состояние кнопки.\n        setTimeout(() => {\n          resetButton();\n          // Так как класс кнопки был изменен, вернем его в исходное состояние.\n          button.value.classList.replace('bg-fourth-nano', 'bg-main');\n        }, 1330);\n\t    }\n\t}\n\n</script>\n\n<template>\n\t<button @click.stop=\"Submit\" :disabled=\"validation\" ref=\"button\" class=\"button\">\n\t\t<transition name=\"FromTop\" >\n\t\t\t<!-- Slot -->\n\t\t\t<template v-if=\"!loading && !error && !finished || !showLoader\"><slot></slot></template>\n\t\t\t<!-- Loading Circle Animation -->\n\t\t\t<template v-else-if=\"loading && !error && showLoader\"><Loader  class=\"pos-relative pos-t-0 pos-l-0 loading\"/></template>\n\t\t\t<!-- <Loader v-else-if=\"loading && !error && showLoader\"/> -->\n\t\t\t<!-- Success -->\n\t\t\t<span v-else-if=\"finished && showSucces\" class=\"t-semi loading t-black\">{{text.success}}</span>\n\t\t\t<!-- Error if not finished -->\n\t\t\t<span v-else-if=\"error\" class=\"error\">{{ error }}</span>\n\t\t</transition>\n\t\t<!-- Counter -->\n\t\t<p v-if=\"counter\" class=\"button-counter\">{{counter}}</p> \n\n\t</button> \n</template>\n\n\n<style lang=\"scss\">\n\t.FromTop-enter-active,\n\t.FromTop-leave-active {\n\t\ttransform: translateY(0);\n\t\topacity: 1;\n\t\ttransition: all 0.5s ease; \n\t\t\n\t}\n\t.FromTop-enter-from,\n\t.FromTop-leave-to {\n\t\tposition: absolute;\n\t\ttransform: translateY(-1rem);\n\t\topacity: 0;\n\t\ttransition: all 0.5s ease;\n\t}\n\n\tbutton[disabled] {\n\t\topacity: 0.75  !important;\n\t \tpointer-events: none  !important;\n\t \tcursor: default  !important;\n\t \tcolor: rgba(var(--black), 0.5)  !important;\n\t\tbackground: rgba(var(--grey), 1) !important; \n\t}\n\n\t.button {\n\t\tdisplay: flex;\n\n\t\tpadding: 0.75rem 1.5rem;\n\t\tborder-radius: 3rem;\n\n\t\ttransform: scale(1);\n\t\topacity: 1;\n\n\t\talign-items: center;\n\t\tjustify-content: center;\n\t\t\n\t\tcolor: black;\n\t\ttext-align: center;\n\t\ttext-transform: uppercase;\n\t\tfont-size: 1rem;\n\t\tletter-spacing: 5%;\n\n\t\ttransition: all 0.33s ease;\n\t \n\t\t&:hover {\n\t\t\tcursor: pointer;\n\t\t\topacity: 0.9;\n\t\t}\n\n\t\t&:active {\n\t\t\ttransform: scale(0.95);\n\t\t}\n\n\t\t&-small {\n\t\t\tpadding: 0.5rem 0.75rem;\n\t\t\tborder-radius: 0.5rem;\n\t\t\theight: fit-content;\n\t\t}\n\n\t\t.button-counter {\n\t\t\tposition: absolute;\n\t\t\tright: -8px;\n\t    bottom: -8px;\n\t    background: yellow;\n\t    height: 16px;\n\t    border-radius: 16px;\n\t    width: 16px;\n\t    font-weight: 500;\n\t    text-align: center;\n\t    line-height: 16px;\n\t    font-size: 10px;\n\t\t}\n\t}\n</style>"],"names":["ref"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKC,UAAM,QAAQ;AAwCd,UAAM,QAAQ;AAEd,UAAM,SAASA,IAAG,IAAC,IAAI;AACvB,UAAM,QAAQA,IAAG,IAAC,IAAI;AACtB,UAAM,UAAUA,IAAG,IAAC,KAAK;AACzB,UAAM,WAAWA,IAAG,IAAC,KAAK;AAE1B,mBAAe,SAAS;AACtB,cAAQ,IAAI,OAAO;AAEjB,aAAO,MAAM,MAAM,gBAAgB,IAAI;AACvC,YAAM,QAAQ;AACd,cAAQ,QAAQ;AAGhB,YAAM,cAAc,MAAM;AACvB,YAAI,OAAO,OAAO;AAChB,iBAAO,MAAM,UAAU,QAAQ,aAAa,SAAS;AACrD,iBAAO,MAAM,MAAM,gBAAgB;AACnC,kBAAQ,QAAQ;AAChB,mBAAS,QAAQ;AACjB,gBAAM,QAAQ;AAAA,QACxB;AAAA,MACM;AAED,UAAI;AACD,cAAM,MAAM,OAAQ;AAEpB,eAAO,MAAM,UAAU,QAAQ,WAAW,WAAW;AAErD,gBAAQ,QAAQ;AAGhB,YAAI,MAAM,YAAY;AACzB,mBAAS,QAAQ;AACZ,qBAAW,aAAa,GAAG;AAAA,QACrC,OAAe;AACL,sBAAa;AAAA,QACvB;AAGQ,YAAI,MAAM,SAAU,YAAW,MAAM,MAAM,SAAU,GAAE,MAAM,aAAa;AAAA,MAE5E,SAAQ,KAAK;AACb,cAAM,SAAQ,GAAG;AAEf,eAAO,MAAM,UAAU,QAAQ,WAAW,gBAAgB;AAC1D,cAAM,QAAQ,MAAM;AAGpB,mBAAW,MAAM;AACf,sBAAa;AAEb,iBAAO,MAAM,UAAU,QAAQ,kBAAkB,SAAS;AAAA,QAC3D,GAAE,IAAI;AAAA,MACf;AAAA,IACA;;;;;;;;;;;;;;;;;;;;;;;;"}