Merge branch 'develop' into fix/adminProfile

PalisadoesFoundation · Nov 2, 2024 · ba7db8c · ba7db8c
2 parents adaf849 + 7707708
commit ba7db8c
Show file tree

Hide file tree

Showing 28 changed files with 1,888 additions and 730 deletions.
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Count number of lines
         run: |
           chmod +x ./.github/workflows/countline.py
-          ./.github/workflows/countline.py --lines 600 --exclude_files src/screens/LoginPage/LoginPage.tsx src/GraphQl/Queries/Queries.ts src/screens/OrgList/OrgList.tsx src/GraphQl/Mutations/mutations.ts src/components/EventListCard/EventListCardModals.tsx
+          ./.github/workflows/countline.py --lines 600 --exclude_files src/screens/LoginPage/LoginPage.tsx src/GraphQl/Queries/Queries.ts src/screens/OrgList/OrgList.tsx src/GraphQl/Mutations/mutations.ts src/components/EventListCard/EventListCardModals.tsx src/components/TagActions/TagActionsMocks.ts
 
       - name: Get changed TypeScript files
         id: changed-files

diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json
@@ -320,7 +320,8 @@
     "noTagsFound": "No tags found",
     "removeUserTag": "Delete Tag",
     "removeUserTagMessage": "Do you want to delete this tag?",
-    "addChildTag": "Add a Sub Tag"
+    "addChildTag": "Add a Sub Tag",
+    "enterTagName": "Enter Tag Name"
   },
   "manageTag": {
     "title": "Tag Details",
@@ -333,7 +334,6 @@
     "addPeople": "Add People",
     "add": "Add",
     "subTags": "Sub Tags",
-    "assignedToAll": "Tag Assigned to All",
     "successfullyAssignedToPeople": "Tag assigned successfully",
     "errorOccurredWhileLoadingMembers": "Error occured while loading members",
     "userName": "User Name",
@@ -359,7 +359,8 @@
     "collapse": "Collapse",
     "expand": "Expand",
     "tagNamePlaceholder": "Write the name of the tag",
-    "allTags": "All Tags"
+    "allTags": "All Tags",
+    "noMoreMembersFound": "No more members found"
   },
   "userListCard": {
     "addAdmin": "Add Admin",

diff --git a/public/locales/fr/translation.json b/public/locales/fr/translation.json
@@ -320,7 +320,8 @@
     "noTagsFound": "Aucune étiquette trouvée",
     "removeUserTag": "Supprimer l'Étiquette",
     "removeUserTagMessage": "Voulez-vous supprimer cette étiquette ?",
-    "addChildTag": "Ajouter une Sous-Étiquette"
+    "addChildTag": "Ajouter une Sous-Étiquette",
+    "enterTagName": "Entrez le nom de l'étiquette"
   },
   "manageTag": {
     "title": "Détails de l'étiquette",
@@ -333,7 +334,6 @@
     "addPeople": "Ajouter des personnes",
     "add": "Ajouter",
     "subTags": "Sous-étiquettes",
-    "assignedToAll": "Étiquette attribuée à tous",
     "successfullyAssignedToPeople": "Étiquette attribuée avec succès",
     "errorOccurredWhileLoadingMembers": "Erreur survenue lors du chargement des membres",
     "userName": "Nom d'utilisateur",
@@ -359,7 +359,8 @@
     "collapse": "Réduire",
     "expand": "Développer",
     "tagNamePlaceholder": "Écrire le nom de l'étiquette",
-    "allTags": "Toutes les étiquettes"
+    "allTags": "Toutes les étiquettes",
+    "noMoreMembersFound": "Aucun autre membre trouvé"
   },
   "userListCard": {
     "addAdmin": "Ajouter un administrateur",

diff --git a/public/locales/hi/translation.json b/public/locales/hi/translation.json
@@ -320,7 +320,8 @@
     "noTagsFound": "कोई टैग नहीं मिला",
     "removeUserTag": "टैग हटाएँ",
     "removeUserTagMessage": "क्या आप इस टैग को हटाना चाहते हैं?",
-    "addChildTag": "उप-टैग जोड़ें"
+    "addChildTag": "उप-टैग जोड़ें",
+    "enterTagName": "टैग का नाम दर्ज करें"
   },
   "manageTag": {
     "title": "टैग विवरण",
@@ -333,7 +334,6 @@
     "addPeople": "लोगों को जोड़ें",
     "add": "जोड़ें",
     "subTags": "उप-टैग्स",
-    "assignedToAll": "सभी को टैग असाइन किया गया",
     "successfullyAssignedToPeople": "टैग सफलतापूर्वक असाइन किया गया",
     "errorOccurredWhileLoadingMembers": "सदस्यों को लोड करते समय त्रुटि हुई",
     "userName": "उपयोगकर्ता नाम",
@@ -359,7 +359,8 @@
     "collapse": "संक्षिप्त करें",
     "expand": "विस्तारित करें",
     "tagNamePlaceholder": "टैग का नाम लिखें",
-    "allTags": "सभी टैग"
+    "allTags": "सभी टैग",
+    "noMoreMembersFound": "कोई और सदस्य नहीं मिला"
   },
   "userListCard": {
     "addAdmin": "व्यवस्थापक जोड़ें",

diff --git a/public/locales/sp/translation.json b/public/locales/sp/translation.json
@@ -320,7 +320,8 @@
     "noTagsFound": "No se encontraron etiquetas",
     "removeUserTag": "Eliminar Etiqueta",
     "removeUserTagMessage": "¿Desea eliminar esta etiqueta?",
-    "addChildTag": "Agregar una Sub Etiqueta"
+    "addChildTag": "Agregar una Sub Etiqueta",
+    "enterTagName": "Ingrese el nombre de la etiqueta"
   },
   "manageTag": {
     "title": "Detalles de la Etiqueta",
@@ -333,7 +334,6 @@
     "addPeople": "Agregar Personas",
     "add": "Agregar",
     "subTags": "Subetiquetas",
-    "assignedToAll": "Etiqueta asignada a todos",
     "successfullyAssignedToPeople": "Etiqueta asignada con éxito",
     "errorOccurredWhileLoadingMembers": "Error al cargar los miembros",
     "userName": "Nombre de usuario",
@@ -359,7 +359,8 @@
     "collapse": "Colapsar",
     "expand": "Expandir",
     "tagNamePlaceholder": "Escribe el nombre de la etiqueta",
-    "allTags": "Todas las etiquetas"
+    "allTags": "Todas las etiquetas",
+    "noMoreMembersFound": "No se encontraron más miembros"
   },
   "userListCard": {
     "joined": "Unido",

diff --git a/public/locales/zh/translation.json b/public/locales/zh/translation.json
@@ -320,7 +320,8 @@
     "noTagsFound": "未找到标签",
     "removeUserTag": "删除标签",
     "removeUserTagMessage": "您确定要删除此标签吗？",
-    "addChildTag": "添加子标签"
+    "addChildTag": "添加子标签",
+    "enterTagName": "输入标签名称"
   },
   "manageTag": {
     "title": "标签详情",
@@ -333,7 +334,6 @@
     "addPeople": "添加人员",
     "add": "添加",
     "subTags": "子标签",
-    "assignedToAll": "标签分配给所有人",
     "successfullyAssignedToPeople": "标签分配成功",
     "errorOccurredWhileLoadingMembers": "加载成员时出错",
     "userName": "用户名",
@@ -359,7 +359,8 @@
     "collapse": "收起",
     "expand": "展开",
     "tagNamePlaceholder": "输入标签名称",
-    "allTags": "所有标签"
+    "allTags": "所有标签",
+    "noMoreMembersFound": "未找到更多成员"
   },
   "userListCard": {
     "addAdmin": "添加管理员",

diff --git a/src/GraphQl/Queries/OrganizationQueries.ts b/src/GraphQl/Queries/OrganizationQueries.ts
@@ -89,19 +89,35 @@ export const ORGANIZATION_USER_TAGS_LIST = gql`
     $before: String
     $first: PositiveInt
     $last: PositiveInt
+    $where: UserTagWhereInput
+    $sortedBy: UserTagSortedByInput
   ) {
     organizations(id: $id) {
-      userTags(after: $after, before: $before, first: $first, last: $last) {
+      userTags(
+        after: $after
+        before: $before
+        first: $first
+        last: $last
+        where: $where
+        sortedBy: $sortedBy
+      ) {
         edges {
           node {
             _id
             name
+            parentTag {
+              _id
+            }
             usersAssignedTo(first: $first, last: $last) {
               totalCount
             }
             childTags(first: $first, last: $last) {
               totalCount
             }
+            ancestorTags {
+              _id
+              name
+            }
           }
           cursor
         }

diff --git a/src/GraphQl/Queries/userTagQueries.ts b/src/GraphQl/Queries/userTagQueries.ts
@@ -14,6 +14,8 @@ export const USER_TAGS_ASSIGNED_MEMBERS = gql`
     $before: String
     $first: PositiveInt
     $last: PositiveInt
+    $where: UserTagUsersAssignedToWhereInput
+    $sortedBy: UserTagUsersAssignedToSortedByInput
   ) {
     getAssignedUsers: getUserTag(id: $id) {
       name
@@ -22,6 +24,8 @@ export const USER_TAGS_ASSIGNED_MEMBERS = gql`
         before: $before
         first: $first
         last: $last
+        where: $where
+        sortedBy: $sortedBy
       ) {
         edges {
           node {
@@ -38,6 +42,10 @@ export const USER_TAGS_ASSIGNED_MEMBERS = gql`
         }
         totalCount
       }
+      ancestorTags {
+        _id
+        name
+      }
     }
   }
 `;
@@ -56,10 +64,19 @@ export const USER_TAG_SUB_TAGS = gql`
     $before: String
     $first: PositiveInt
     $last: PositiveInt
+    $where: UserTagWhereInput
+    $sortedBy: UserTagSortedByInput
   ) {
     getChildTags: getUserTag(id: $id) {
       name
-      childTags(after: $after, before: $before, first: $first, last: $last) {
+      childTags(
+        after: $after
+        before: $before
+        first: $first
+        last: $last
+        where: $where
+        sortedBy: $sortedBy
+      ) {
         edges {
           node {
             _id
@@ -70,6 +87,10 @@ export const USER_TAG_SUB_TAGS = gql`
             childTags(first: $first, last: $last) {
               totalCount
             }
+            ancestorTags {
+              _id
+              name
+            }
           }
         }
         pageInfo {
@@ -80,6 +101,10 @@ export const USER_TAG_SUB_TAGS = gql`
         }
         totalCount
       }
+      ancestorTags {
+        _id
+        name
+      }
     }
   }
 `;
@@ -98,6 +123,7 @@ export const USER_TAGS_MEMBERS_TO_ASSIGN_TO = gql`
     $before: String
     $first: PositiveInt
     $last: PositiveInt
+    $where: UserTagUsersToAssignToWhereInput
   ) {
     getUsersToAssignTo: getUserTag(id: $id) {
       name
@@ -106,6 +132,7 @@ export const USER_TAGS_MEMBERS_TO_ASSIGN_TO = gql`
         before: $before
         first: $first
         last: $last
+        where: $where
       ) {
         edges {
           node {
@@ -125,19 +152,3 @@ export const USER_TAGS_MEMBERS_TO_ASSIGN_TO = gql`
     }
   }
 `;
-
-/**
- * GraphQL query to retrieve the ancestor tags of a certain tag.
- *
- * @param id - The ID of the current tag.
- * @returns The list of ancestor tags.
- */
-
-export const USER_TAG_ANCESTORS = gql`
-  query GetUserTagAncestors($id: ID!) {
-    getUserTagAncestors(id: $id) {
-      _id
-      name
-    }
-  }
-`;
diff --git a/src/components/AddPeopleToTag/AddPeopleToTag.module.css b/src/components/AddPeopleToTag/AddPeopleToTag.module.css
@@ -28,7 +28,7 @@
 }
 
 .scrollContainer {
-  max-height: 100px;
+  height: 100px;
   overflow-y: auto;
   margin-bottom: 1rem;
 }
@@ -45,3 +45,10 @@
 .removeFilterIcon {
   cursor: pointer;
 }
+
+.loadingDiv {
+  min-height: 300px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}