Merge remote-tracking branch 'origin/develop' into feat/websocketurl

.github/workflows/pull-request.yml

@@ -79,9 +79,9 @@ jobs:
           echo "Error: Source and Target Branches are the same. Please ensure they are different."
           exit 1
 
-  Check-Unauthorized-Changes:
+  Check-Sensitive-Files:
     if: ${{ github.actor != 'dependabot[bot]' }}
-    name: Checks if no unauthorized files are changed
+    name: Checks if sensitive files have been changed without authorization
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -111,6 +111,14 @@ jobs:
             LICENSE
             setup.ts
             .coderabbit.yaml
+            CODE_OF_CONDUCT.md
+            CODE_STYLE.md
+            CONTRIBUTING.md
+            DOCUMENTATION.md
+            INSTALLATION.md
+            ISSUE_GUIDELINES.md
+            PR_GUIDELINES.md
+            README.md
             
       - name: List all changed unauthorized files
         if: steps.changed-unauth-files.outputs.any_changed == 'true' || steps.changed-unauth-files.outputs.any_deleted == 'true'

package.json

@@ -20,7 +20,7 @@
     "@mui/x-data-grid": "^7.16.0",
     "@mui/x-date-pickers": "^7.11.1",
     "@pdfme/generator": "^4.5.2",
-    "@reduxjs/toolkit": "^2.2.7",
+    "@reduxjs/toolkit": "^2.3.0",
     "@vitejs/plugin-react": "^4.3.2",
     "babel-plugin-transform-import-meta": "^2.2.1",
     "bootstrap": "^5.3.3",
@@ -41,8 +41,8 @@
     "prettier": "^3.3.2",
     "react": "^18.3.1",
     "react-beautiful-dnd": "^13.1.1",
-    "react-bootstrap": "^2.10.4",
-    "react-datepicker": "^7.3.0",
+    "react-bootstrap": "^2.10.5",
+    "react-datepicker": "^7.5.0",
     "react-dom": "^18.3.1",
     "react-google-recaptcha": "^3.1.0",
     "react-i18next": "^15.0.2",
@@ -107,7 +107,7 @@
     "@babel/preset-react": "^7.25.7",
     "@babel/preset-typescript": "^7.24.7",
     "@testing-library/jest-dom": "^6.5.0",
-    "@testing-library/react": "^16.0.0",
+    "@testing-library/react": "^16.0.1",
     "@testing-library/user-event": "^12.1.10",
     "@types/inquirer": "^9.0.7",
     "@types/jest": "^26.0.24",

public/locales/en/translation.json

@@ -332,7 +332,14 @@
     "successfullyUnassigned": "Tag unassigned from user",
     "addPeople": "Add People",
     "add": "Add",
-    "subTags": "Sub Tags"
+    "subTags": "Sub Tags",
+    "assignedToAll": "Tag Assigned to All",
+    "successfullyAssignedToPeople": "Tag assigned successfully",
+    "assignPeople": "Assign",
+    "errorOccurredWhileLoadingMembers": "Error occured while loading members",
+    "userName": "User Name",
+    "actions": "Actions",
+    "noOneSelected": "No One Selected"
   },
   "userListCard": {
     "addAdmin": "Add Admin",

public/locales/fr/translation.json

@@ -332,7 +332,14 @@
     "successfullyUnassigned": "Étiquette retirée de l'utilisateur",
     "addPeople": "Ajouter des personnes",
     "add": "Ajouter",
-    "subTags": "Sous-étiquettes"
+    "subTags": "Sous-étiquettes",
+    "assignedToAll": "Étiquette attribuée à tous",
+    "successfullyAssignedToPeople": "Étiquette attribuée avec succès",
+    "assignPeople": "Attribuer",
+    "errorOccurredWhileLoadingMembers": "Erreur survenue lors du chargement des membres",
+    "userName": "Nom d'utilisateur",
+    "actions": "Actions",
+    "noOneSelected": "Personne sélectionnée"
   },
   "userListCard": {
     "addAdmin": "Ajouter un administrateur",

public/locales/hi/translation.json

@@ -332,7 +332,14 @@
     "successfullyUnassigned": "उपयोगकर्ता से टैग हटा दिया गया",
     "addPeople": "लोगों को जोड़ें",
     "add": "जोड़ें",
-    "subTags": "उप-टैग्स"
+    "subTags": "उप-टैग्स",
+    "assignedToAll": "सभी को टैग असाइन किया गया",
+    "successfullyAssignedToPeople": "टैग सफलतापूर्वक असाइन किया गया",
+    "assignPeople": "असाइन करें",
+    "errorOccurredWhileLoadingMembers": "सदस्यों को लोड करते समय त्रुटि हुई",
+    "userName": "उपयोगकर्ता नाम",
+    "actions": "क्रियाएँ",
+    "noOneSelected": "कोई चयनित नहीं"
   },
   "userListCard": {
     "addAdmin": "व्यवस्थापक जोड़ें",

public/locales/sp/translation.json

@@ -332,7 +332,14 @@
     "successfullyUnassigned": "Etiqueta desasignada del usuario",
     "addPeople": "Agregar Personas",
     "add": "Agregar",
-    "subTags": "Subetiquetas"
+    "subTags": "Subetiquetas",
+    "assignedToAll": "Etiqueta asignada a todos",
+    "successfullyAssignedToPeople": "Etiqueta asignada con éxito",
+    "assignPeople": "Asignar",
+    "errorOccurredWhileLoadingMembers": "Error al cargar los miembros",
+    "userName": "Nombre de usuario",
+    "actions": "Acciones",
+    "noOneSelected": "Nadie seleccionado"
   },
   "userListCard": {
     "joined": "Unido",

public/locales/zh/translation.json

@@ -332,7 +332,14 @@
     "successfullyUnassigned": "标签已从用户中取消分配",
     "addPeople": "添加人员",
     "add": "添加",
-    "subTags": "子标签"
+    "subTags": "子标签",
+    "assignedToAll": "标签分配给所有人",
+    "successfullyAssignedToPeople": "标签分配成功",
+    "assignPeople": "分配",
+    "errorOccurredWhileLoadingMembers": "加载成员时出错",
+    "userName": "用户名",
+    "actions": "操作",
+    "noOneSelected": "未选择任何人"
   },
   "userListCard": {
     "addAdmin": "添加管理员",

src/GraphQl/Mutations/TagMutations.ts

@@ -72,3 +72,18 @@ export const REMOVE_USER_TAG = gql`
     }
   }
 `;
+
+/**
+ * GraphQL mutation to add people to tag.
+ *
+ * @param tagId - Id of the tag to be assigned.
+ * @param userIds - Ids of the users to assign to.
+ */
+
+export const ADD_PEOPLE_TO_TAG = gql`
+  mutation AddPeopleToUserTag($tagId: ID!, $userIds: [ID!]!) {
+    addPeopleToUserTag(input: { tagId: $tagId, userIds: $userIds }) {
+      _id
+    }
+  }
+`;

src/GraphQl/Queries/userTagQueries.ts

@@ -84,6 +84,48 @@ export const USER_TAG_SUB_TAGS = gql`
   }
 `;
 
+/**
+ * GraphQL query to retrieve organization members that aren't assigned a certain tag.
+ *
+ * @param id - The ID of the tag.
+ * @returns The list of organization members.
+ */
+
+export const USER_TAGS_MEMBERS_TO_ASSIGN_TO = gql`
+  query GetMembersToAssignTo(
+    $id: ID!
+    $after: String
+    $before: String
+    $first: PositiveInt
+    $last: PositiveInt
+  ) {
+    getUserTag(id: $id) {
+      name
+      usersToAssignTo(
+        after: $after
+        before: $before
+        first: $first
+        last: $last
+      ) {
+        edges {
+          node {
+            _id
+            firstName
+            lastName
+          }
+        }
+        pageInfo {
+          startCursor
+          endCursor
+          hasNextPage
+          hasPreviousPage
+        }
+        totalCount
+      }
+    }
+  }
+`;
+
 /**
  * GraphQL query to retrieve the ancestor tags of a certain tag.
  *