@ozdao/martyrs 0.2.519 → 0.2.520

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

@@ -1,11 +1,11 @@
 <template>
   <div class="for-transition w-100">
     
-    <div v-if="departments.state.department" id="dash" class="pd-medium bg-light">
+    <div v-if="departmentsStore.state.items.length > 0" id="dash" class="pd-medium bg-light">
       <section class="mn-b-medium radius-medium pd-semi bg-white">
          <div class="flex-nowrap flex mn-b-small">
 
-          <h2 class="w-100">{{ departments.state.department.profile.name }}</h2>
+          <h2 class="w-100">{{ departmentsStore.state.items[0].profile.name }}</h2>
 
           <router-link 
             :to="{
@@ -28,22 +28,22 @@
           </router-link>
 
         </div>
-        <p class="t-transp p-semi" v-html="departments.state.department.description"></p>
+        <p class="t-transp p-semi" v-html="departmentsStore.state.items[0].description"></p>
       </section>
 
      <section class="mn-b-medium radius-medium pd-semi bg-white">
         <h3 class="mn-b-regular">Команда</h3>
         <ul>
-          <li v-if="departments.state.department.members.length < 1">В отделе еще нет участников</li>
+          <li v-if="departmentsStore.state.items[0]?.members?.length < 1">В отделе еще нет участников</li>
           <User 
             class="br-b br-solid br-grey-transp-25" 
-            v-for="(member, index) in departments.state.department.members" 
+            v-for="(member, index) in departmentsStore.state.items[0]?.members || []" 
             :key="index" 
             :user="member.user" 
             :photo="member.user.profile.photo"
             :name="member.user.profile.name || member.user.phone || member.user.email || member.user._id"
             :position="member.position" 
-            @click="$router.push(`/app/profile/${member.user._id}`)" 
+            @click="$router.push({ name: 'User Profile', params: { _id: member.user._id } })" 
           />
         </ul>
       </section>
@@ -51,8 +51,8 @@
       <section class="mn-b-medium radius-medium pd-semi bg-white">
         <h3 class="mn-b-regular">Подотделы</h3>
         <ul>
-          <li v-if="departments.state.department.subdepartments.length < 1">В отделе еще нет подотделов</li>
-          <DepartmentSub v-for="(subdepartment, index) in departments.state.department.subdepartments" @click="$router.push(`/app/organization/departments/${subdepartment._id}`)" :key="index" class="br-b br-solid br-grey-transp-25" :department="subdepartment" />
+          <li v-if="departmentsStore.state.items[0]?.subdepartments?.length < 1">В отделе еще нет подотделов</li>
+          <DepartmentSub v-for="(subdepartment, index) in departmentsStore.state.items[0]?.subdepartments || []" @click="$router.push(`/app/organization/departments/${subdepartment._id}`)" :key="index" class="br-b br-solid br-grey-transp-25" :department="subdepartment" />
         </ul> 
       </section>
     </div>
@@ -65,14 +65,14 @@ import { useRoute, useRouter } from 'vue-router';
 import Spoiler from '@martyrs/src/components/Spoiler/Spoiler.vue';
 import DepartmentSub from '@martyrs/src/modules/organizations/components/blocks/DepartmentSub.vue';
 import User from '@martyrs/src/modules/auth/views/components/blocks/CardUser.vue';
-import * as departments from '@martyrs/src/modules/organizations/store/departments.js';
+import departmentsStore from '@martyrs/src/modules/organizations/store/departments.store.js';
 
 import IconEdit from '@martyrs/src/modules/icons/navigation/IconEdit.vue'
 
 const router = useRouter();
 const route = useRoute();
 
-await departments.actions.readOne(route.params.department);
+await departmentsStore.read({ _id: route.params.department });
 </script>
 
 <style scoped>

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

@@ -75,7 +75,7 @@
       title="Add member" 
       @close-popup="closeMemberPopup" 
       :isPopupOpen="isOpenAddMemberPopup"
-      class="bg-white w-max-30r radius-big pd-big"
+      class="bg-white w-max-30r radius-medium pd-big"
     >
       <Feed
         :search="{
@@ -99,7 +99,7 @@
         v-slot="{ 
           items 
         }"
-        class="bg-light pd-medium w-min-20r w-max-40r radius-big h-max-20r o-scroll"
+        class="bg-light pd-medium w-min-20r w-max-40r radius-medium h-max-20r o-scroll"
       >
         <CardUser
           v-for="(user, index) in items" 
@@ -119,7 +119,7 @@
 
     <div class="cols-2 gap-thin">
     
-        <div class="bg-light pd-medium o-hidden radius-big">
+        <div class="bg-light pd-medium o-hidden radius-medium">
           <h3 class="mn-b-semi">Department Settings</h3>
           
           <p class="p-medium mn-b-small">Please settings for your department:</p>
@@ -134,7 +134,7 @@
           </div>
         </div>
 
-        <div class="bg-light pd-medium o-hidden radius-big">
+        <div class="bg-light pd-medium o-hidden radius-medium">
           <h3 class="mn-b-semi">Acessess</h3>
           
           <p class="p-medium mn-b-small">Please select organization accesses for user in department:</p>
@@ -221,16 +221,16 @@ import DepartmentSub from "@martyrs/src/modules/organizations/components/blocks/
 import CardUser from '@martyrs/src/modules/auth/views/components/blocks/CardUser.vue'
 
 import * as globals from "@martyrs/src/modules/globals/views/store/globals.js";
-import * as departments from "@martyrs/src/modules/organizations/store/departments.js";
-import * as memberships from "@martyrs/src/modules/organizations/store/memberships.js";
+import departmentsStore from "@martyrs/src/modules/organizations/store/departments.store.js";
+import membershipsStore from "@martyrs/src/modules/organizations/store/memberships.store.js";
 
 const router = useRouter();
 const route = useRoute();
 
 async function fetchData() {
-  const users = ref(memberships.state.memberships);
+  const users = ref(membershipsStore.state.items);
   // await departments.actions.read({organization: route.params._id});
-  if (route.params.department) await departments.actions.readOne(route.params.department);
+  if (route.params.department) await departmentsStore.read({ _id: route.params.department });
 }
 
 fetchData();

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

@@ -1,81 +1,22 @@
 <template>
   <div class="pd-thin">
-    <SectionPageTitle
-      title="Members"
-      @update:tabs_current="(update) => tab = update"
-      :tabs_current="tab"
-      :tabs="[
-        { name: `Members (${organization.state.current.numberOfMembers || 0})`, value: 'members' },
-        { name: 'Departments', value: 'departments' },
-        { name: 'Invites', value: 'invites' }
-      ]"
-      :actions="[
-        { method: openMembersAddPopup, label: 'Invite members' }
-      ]"
-      class="mn-b-small bg-light bg-light radius-medium pd-medium"
-    />
-
-    <Popup 
-      title="Add members"
-      @close-popup="closeMembersAddPopup" 
-      :isPopupOpen="isOpenMembersAddPopup"
-      class="bg-white w-min-30r w-max-30r radius-big pd-medium"
-    >
-      <MembersAdd 
-        text="Please enter your email or phone number to send an invitation link:"
-        :organization="organizationData"
-        @send-invite="handleSendInvite"
-      />
-    </Popup>  
-
-    <Feed
-      v-if="tab === 'departments'"
-      :states="{
-        empty: {
-          title: 'No Departments Found',
-          description: 'Currently, there are no departments available.',
-          action: 'Add department',
-          callback:  () => $router.push(`/organizations/${route.params._id}/departments/create`)
-        }
-      }"
-      :store="{
-        read: (options) => departments.actions.read(options),
-        state: null
-      }"
-      :options="{
-        organization: route.params._id,
-        user: auth.state.user._id,
-      }"
-      v-slot="{ 
-        items 
-      }"
-    >
-      <CardDepartment
-        v-for="(department, index) in items"
-        :key="index"
-        :department="department"
-        :organization="route.params._id"
-        class="radius-semi bg-light pos-relative mn-b-thin"
+    <div v-if="!isLoaded" class="flex-center flex h-20r">
+      <span class="t-transp">Loading...</span>
+    </div>
+    <div v-else>
+    <!-- Members Section -->
+    <section class="mn-b-medium">
+      <SectionPageTitle
+        :title="`Members ${organizationData?.numberOfMembers ? `(${organizationData.numberOfMembers})` : ''}`"
+        :actions="[
+          { method: openAddUsersPopup, label: 'Add user to organization' }
+        ]"
+        class="mn-b-small bg-light radius-medium pd-medium"
       />
 
-     </Feed>
-
-      <router-link
-         v-if="tab === 'departments' && departments.state.departments.length > 0"
-        :to="{
-          path: `/organizations/${route.params._id}/departments/create`
-        }"
-        class="d-block flex-center flex uppercase t-semi bg-main w-100 pd-small radius-extra"
-      >
-        Add department
-      </router-link>
-
-      <!-- Members -->
-      <div 
-         v-if="tab === 'members'"
-        class="cols-1 gap-thin"
-      >
+      <div class="cols-1 gap-thin">
         <Feed
+          v-model:items="membersList"
           :search="true"
           :states="{
             empty: {
@@ -84,7 +25,7 @@
             },
           }"
           :store="{
-            read: (options) => memberships.actions.read(options)
+            read: (options) => membershipsStore.read(options)
           }"
           :options="{
             target: route.params._id,
@@ -105,7 +46,7 @@
             :email="member.user.email"
             :name="member.user.profile.name || 'No name'"
             :role="member.label || member.role"
-            @click="$router.push(`/profile/${member.user._id}`)" 
+            @click="$router.push({ name: 'User Profile', params: { _id: member.user._id } })" 
             :action=" member.role !== 'owner' ? {
               label: {
                 is: IconDelete,
@@ -117,119 +58,230 @@
           />
         </Feed>
       </div>
-      <!-- Invites -->
-      <div 
-        v-if="tab === 'invites'"
-      > 
-        <Feed
-          v-model:items="invitesState"
-          :states="{
-            empty: {
-              title: 'No Invites Found',
-              description: 'Currently, there are no members.'
-            }
-          }"
-          :store="{
-            read: (options) => invites.actions.read(options)
-          }"
-          :options="{
-            owner: route.params._id
-          }"
-          v-slot="{ 
-            items 
-          }"
-          class="gap-thin cols-1"
+    </section>
+
+    <!-- Departments Section -->
+    <section class="mn-b-medium">
+      <SectionPageTitle
+        title="Departments"
+        :actions="[
+          { method: () => openDepartmentPopup(), label: 'Add department' }
+        ]"
+        class="mn-b-small bg-light bg-light radius-medium pd-medium"
+      />
+
+      <Feed
+        v-model:items="departmentsList"
+        :states="{
+          empty: {
+            title: 'No Departments Found',
+            description: 'Currently, there are no departments available.'
+          }
+        }"
+        :store="departmentsStore"
+        :options="{
+          organization: route.params._id,
+          user: auth.state.user._id,
+        }"
+        v-slot="{ 
+          items 
+        }"
+      >
+        <div
+          v-for="(department, index) in items"
+          :key="department._id"
+          @click="() => openDepartmentPopup(department)"
+          class="cursor-pointer hover-scale-1"
         >
-          <CardUser 
-            v-for="invite in items" 
-            :key="index" 
-            :user="{ type: 'invite'} "
-            :name="invite.email || invite.phone"
-            :role="invite.status"
-            :action="{
-              label: {
-                is: IconDelete,
-                props: { class: 'i-medium', fill: 'rgb(var(--white)' }
-              },
-              method: () => removeInvite(index, invite)
-            }"
-            class="h-4r w-100 bg-light radius-big flex-nowrap flex pd-medium"
+          <CardDepartment
+            :department="department"
+            :organization="route.params._id"
+            class="radius-semi bg-light pos-relative mn-b-thin"
           />
-        </Feed>
-      </div>
-  
+        </div>
+      </Feed>
+    </section>
+
+    <!-- Invites Section -->
+    <section>
+      <SectionPageTitle
+        title="Invites"
+        :actions="[
+          { method: openInvitePopup, label: 'Invite members' }
+        ]"
+        class="mn-b-small bg-light bg-light radius-medium pd-medium"
+      />
+
+      <Feed
+        v-model:items="invitesList"
+        :states="{
+          empty: {
+            title: 'No Invites Found',
+            description: 'Currently, there are no pending invites.'
+          }
+        }"
+        :store="{
+          read: (options) => invitesStore.read(options)
+        }"
+        :options="{
+          owner: route.params._id
+        }"
+        v-slot="{ 
+          items 
+        }"
+        class="gap-thin cols-1"
+      >
+        <CardUser 
+          v-for="(invite, index) in items" 
+          :key="invite._id" 
+          :user="{ type: 'invite'} "
+          :name="invite.email || invite.phone"
+          :role="invite.status"
+          :action="{
+            label: {
+              is: IconDelete,
+              props: { class: 'i-medium', fill: 'rgb(var(--white)' }
+            },
+            method: () => removeInvite(index, invite)
+          }"
+          class="h-4r w-100 bg-light radius-medium flex-nowrap flex pd-medium"
+        />
+      </Feed>
+    </section>
+
+    <!-- Invite Members Popup -->
+    <Popup 
+      title="Invite members"
+      @close-popup="closeInvitePopup" 
+      :isPopupOpen="isOpenInvitePopup"
+      class="bg-white w-min-30r w-max-30r radius-medium pd-medium"
+    >
+      <InviteForm 
+        v-if="organizationData"
+        :organization="organizationData"
+        @send-invite="handleSendInvite"
+      />
+    </Popup>
+
+    <!-- Add Existing Users Popup -->
+    <Popup 
+      title="Add users to organization"
+      @close-popup="closeAddUsersPopup" 
+      :isPopupOpen="isOpenAddUsersPopup"
+      class="bg-white w-min-40r w-max-50r radius-medium pd-medium"
+    >
+      <AddExistingMembersForm 
+        :organizationId="route.params._id"
+        @users-added="handleUsersAdded"
+      />
+    </Popup>
+
+    <!-- Department Edit Popup -->
+    <Popup
+      :title="editingDepartment ? 'Edit Department' : 'Create Department'"
+      @close-popup="closeDepartmentPopup"
+      :isPopupOpen="isDepartmentPopupOpen"
+      align="center right"
+      class="bg-white h-min-100 w-max-50r pd-medium"
+    >
+      <DepartmentForm
+        :department="editingDepartment"
+        :organizationId="route.params._id"
+        @close="closeDepartmentPopup"
+        @saved="handleDepartmentSaved"
+      />
+    </Popup>
+    </div>
   </div>
 </template>
 
 <script setup>
 import { ref, computed, onMounted } from 'vue';
-import { useRoute, useRouter } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router';
 
-import Feed from '@martyrs/src/components/Feed/Feed.vue'
-import Tab      from '@martyrs/src/components/Tab/Tab.vue'
-import Block      from '@martyrs/src/components/Block/Block.vue'
+import Feed from '@martyrs/src/components/Feed/Feed.vue';
 import Popup from '@martyrs/src/components/Popup/Popup.vue';
 
-import SectionPageTitle from '@martyrs/src/modules/globals/views/components/sections/SectionPageTitle.vue'
-import PlaceholderUserpic from '@martyrs/src/modules/icons/placeholders/PlaceholderUserpic.vue'
-
-import MembersAdd from '@martyrs/src/modules/organizations/components/sections/MembersAdd.vue';
+import SectionPageTitle from '@martyrs/src/modules/globals/views/components/sections/SectionPageTitle.vue';
 
-// Mobile Module
-import Menu from '@martyrs/src/components/Menu/Menu.vue'
-import MenuItem from '@martyrs/src/components/Menu/MenuItem.vue'
+import InviteForm from '@martyrs/src/modules/organizations/components/forms/InviteForm.vue';
+import AddExistingMembersForm from '@martyrs/src/modules/organizations/components/forms/AddExistingMembersForm.vue';
+import DepartmentForm from '@martyrs/src/modules/organizations/components/forms/DepartmentForm.vue';
 
 import CardUser from '@martyrs/src/modules/auth/views/components/blocks/CardUser.vue';
 import CardDepartment from '@martyrs/src/modules/organizations/components/blocks/CardDepartment.vue';
 
-import IconDelete from '@martyrs/src/modules/icons/navigation/IconDelete.vue'
+import IconDelete from '@martyrs/src/modules/icons/navigation/IconDelete.vue';
+
+import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
+import * as globals from '@martyrs/src/modules/globals/views/store/globals.js';
+import * as organization from '@martyrs/src/modules/organizations/store/organizations.js';
+import departmentsStore from '@martyrs/src/modules/organizations/store/departments.store.js';
+import membershipsStore from '@martyrs/src/modules/organizations/store/memberships.store.js';
+import invitesStore from '@martyrs/src/modules/organizations/store/invites.store.js';
 
-import * as auth      from '@martyrs/src/modules/auth/views/store/auth.js'
-import * as globals      from '@martyrs/src/modules/globals/views/store/globals.js'
-import * as invites from '@martyrs/src/modules/organizations/store/invites.js';
-import * as memberships from '@martyrs/src/modules/organizations/store/memberships.js';
-import * as organization  from '@martyrs/src/modules/organizations/store/organizations.js'
-import * as departments from '@martyrs/src/modules/organizations/store/departments.js';
+const route = useRoute();
+const router = useRouter();
 
-const route   = useRoute()
-const router   = useRouter()
-const organizationData = ref(null)
+// Data
+const organizationData = ref(null);
+const membersList = ref([]);
+const invitesList = ref([]);
+const departmentsList = ref([]);
+const isLoaded = ref(false);
 
-// Tab logic
-const tab = ref('members')
-// States
-const invitesState = ref([])
-// Popup
-const isOpenMembersAddPopup = ref(false);
+// Popups state
+const isOpenInvitePopup = ref(false);
+const isOpenAddUsersPopup = ref(false);
+const isDepartmentPopupOpen = ref(false);
+const editingDepartment = ref(null);
 
-function openMembersAddPopup() {
-  isOpenMembersAddPopup.value = true;
+// Popup functions
+function openInvitePopup() {
+  isOpenInvitePopup.value = true;
 }
 
-function closeMembersAddPopup() {
-  isOpenMembersAddPopup.value = false;
+function closeInvitePopup() {
+  isOpenInvitePopup.value = false;
 }
 
-onMounted(async () => {
-  organizationData.value = (await organization.actions.read({_id: route.params._id, user: auth.state.user._id}))[0]
-  ;
-})
+function openAddUsersPopup() {
+  isOpenAddUsersPopup.value = true;
+}
 
-const FirstLevelDepartments = computed(() => {
-  const departmentsState = departments.state.departments;
+function closeAddUsersPopup() {
+  isOpenAddUsersPopup.value = false;
+}
+
+function openDepartmentPopup(department = null) {
+  editingDepartment.value = department;
+  isDepartmentPopupOpen.value = true;
+}
 
-  const subdepartmentIds = departmentsState.flatMap(department =>
-    department.subdepartments.map(subdepartment => subdepartment._id)
-  );
+function closeDepartmentPopup() {
+  isDepartmentPopupOpen.value = false;
+  editingDepartment.value = null;
+}
 
-  return departmentsState.filter(department =>
-    !subdepartmentIds.includes(department._id)
-  );
+// Load organization data
+onMounted(async () => {
+  try {
+    const response = await organization.actions.read({
+      _id: route.params._id, 
+      user: auth.state.user._id
+    });
+    organizationData.value = response[0];
+    isLoaded.value = true;
+  } catch (error) {
+    console.error('Error loading organization:', error);
+    isLoaded.value = true; // Still show the page even if organization load fails
+  }
 });
 
+// Handlers
 async function handleSendInvite(list, resolve, reject) {
   try {
-    const response = await invites.actions.create({
+    const response = await invitesStore.create({
       owner: {
         type: 'Organization',
         target: organizationData.value._id
@@ -240,30 +292,72 @@ async function handleSendInvite(list, resolve, reject) {
       },
       invites: list,
     });
-    for (let invite of response.createdInvites) {
-      globals.actions.add(invitesState.value, invite)
+    
+    // Assuming the API returns an array of created invites
+    if (response.createdInvites) {
+      for (let invite of response.createdInvites) {
+        invitesStore.addItem(invite, invitesList.value);
+      }
+    } else if (response._id) {
+      // Single invite created
+      invitesStore.addItem(response, invitesList.value);
     }
-    closeMembersAddPopup();
-    resolve(); // Вызываем resolve, когда все операции завершены успешно
+    
+    closeInvitePopup();
+    resolve();
   } catch (error) {
-    reject(error); // Вызываем reject, если произошла ошибка
+    reject(error);
+  }
+}
+
+function handleUsersAdded(addedUsers) {
+  closeAddUsersPopup();
+  // Add new members to the list
+  if (addedUsers && addedUsers.length > 0) {
+    addedUsers.forEach(membership => {
+      membershipsStore.addItem(membership, membersList.value);
+    });
   }
 }
 
-async function removeMember(index,member) {
+function handleDepartmentSaved(department) {
+  closeDepartmentPopup();
+  
+  console.log('handleDepartmentSaved called with:', department);
+  console.log('departmentsList before update:', departmentsList.value);
+  console.log('editingDepartment:', editingDepartment.value);
+  
+  if (department) {
+    // Update or add department in the list
+    if (editingDepartment.value) {
+      departmentsStore.updateItem(department, departmentsList.value);
+    } else {
+      departmentsStore.addItem(department, departmentsList.value);
+    }
+  } else {
+    // Department was deleted
+    if (editingDepartment.value) {
+      departmentsStore.removeItem(editingDepartment.value, departmentsList.value);
+    }
+  }
+  
+  console.log('departmentsList after update:', departmentsList.value);
+}
+
+async function removeMember(index, member) {
   if (confirm("Confirm remove of member") == true) {
-    memberships.state.memberships.splice(index, 1);
-    await memberships.actions.delete(member);
+    await membershipsStore.delete(member);
+    membershipsStore.removeItem(member, membersList.value);
   } 
 }
 
-async function removeInvite(index,invite) {
-  if (confirm("Confirm remove of member") == true) {
-    globals.actions.delete(invitesState.value, invite)
-    await invites.actions.delete(invite._id);
+async function removeInvite(index, invite) {
+  if (confirm("Confirm remove of invite") == true) {
+    await invitesStore.delete(invite);
+    invitesStore.removeItem(invite, invitesList.value);
   }
 }
 </script>
 
 <style scoped>
-</style>
+</style>